From 64a9cb2163a57a91954e0732786feb7a5124c1f1 Mon Sep 17 00:00:00 2001 From: zumbiepig <121742281+zumbiepig@users.noreply.github.com> Date: Tue, 8 Oct 2024 09:20:45 -0700 Subject: [PATCH] Starlike v0.2.2 --- SIGNED_CLIENT.env | 6 +++--- .../resources/EPKVersionIdentifier.txt | 2 +- .../resources/assets/starlike/lang/en_US.lang | 1 + src/game/java/net/minecraft/block/Block.java | 5 ++--- .../net/minecraft/block/BlockSteelGrate.java | 1 - .../enchantment/EnchantmentArrowDamage.java | 2 +- .../minecraft/enchantment/EnchantmentDamage.java | 2 +- .../enchantment/EnchantmentDigging.java | 2 +- .../enchantment/EnchantmentDurability.java | 2 +- .../enchantment/EnchantmentFireAspect.java | 2 +- .../enchantment/EnchantmentProtection.java | 2 +- .../minecraft/enchantment/EnchantmentThorns.java | 2 +- .../java/net/minecraft/entity/EntityList.java | 2 +- src/game/java/net/minecraft/item/Item.java | 14 ++++++++------ .../minecraft/item/crafting/RecipesCrafting.java | 16 +++++++--------- .../eaglercraft/v1_8/EaglercraftVersion.java | 4 ++-- 16 files changed, 32 insertions(+), 33 deletions(-) diff --git a/SIGNED_CLIENT.env b/SIGNED_CLIENT.env index bf3a8201..95693cc7 100644 --- a/SIGNED_CLIENT.env +++ b/SIGNED_CLIENT.env @@ -1,3 +1,3 @@ -SIGNED_CLIENT_INTEGER="201" -SIGNED_CLIENT_VERSION="0.2.1" -SIGNED_CLIENT_CHANGELOG="Bugfix" +SIGNED_CLIENT_INTEGER="202" +SIGNED_CLIENT_VERSION="0.2.2" +SIGNED_CLIENT_CHANGELOG="Mosaic bugfix" diff --git a/desktopRuntime/resources/EPKVersionIdentifier.txt b/desktopRuntime/resources/EPKVersionIdentifier.txt index 7dff5b89..f4778493 100644 --- a/desktopRuntime/resources/EPKVersionIdentifier.txt +++ b/desktopRuntime/resources/EPKVersionIdentifier.txt @@ -1 +1 @@ -0.2.1 \ No newline at end of file +0.2.2 \ No newline at end of file diff --git a/desktopRuntime/resources/assets/starlike/lang/en_US.lang b/desktopRuntime/resources/assets/starlike/lang/en_US.lang index d12bc627..98ede7b7 100644 --- a/desktopRuntime/resources/assets/starlike/lang/en_US.lang +++ b/desktopRuntime/resources/assets/starlike/lang/en_US.lang @@ -43,3 +43,4 @@ tile.mosaic.birch.name=Birch Mosaic tile.mosaic.jungle.name=Jungle Mosaic tile.mosaic.acacia.name=Acacia Mosaic tile.mosaic.dark_oak.name=Dark Oak Mosaic +entity.NetherCreeper.name=Nether Creeper diff --git a/src/game/java/net/minecraft/block/Block.java b/src/game/java/net/minecraft/block/Block.java index 65efa168..38110a40 100644 --- a/src/game/java/net/minecraft/block/Block.java +++ b/src/game/java/net/minecraft/block/Block.java @@ -703,9 +703,8 @@ public class Block { .setStepSound(soundTypeMetal).setUnlocalizedName("steel_block") .setCreativeTab(CreativeTabs.tabStarlike)); registerBlock(515, (String) "starlike:steel_grate", - (new BlockSteelGrate()).setHardness(5.0F).setResistance(10.0F) - .setStepSound(soundTypeMetal).setUnlocalizedName("steel_grate") - .setCreativeTab(CreativeTabs.tabStarlike)); + (new BlockSteelGrate()).setHardness(5.0F).setResistance(10.0F).setStepSound(soundTypeMetal) + .setUnlocalizedName("steel_grate").setCreativeTab(CreativeTabs.tabStarlike)); registerBlock(516, (String) "starlike:platinum_ore", (new BlockOre()).setHardness(50.0F).setResistance(250.0F).setStepSound(soundTypePiston) .setUnlocalizedName("platinum_ore").setCreativeTab(CreativeTabs.tabStarlike)); diff --git a/src/game/java/net/minecraft/block/BlockSteelGrate.java b/src/game/java/net/minecraft/block/BlockSteelGrate.java index 31d249fa..629ad39b 100644 --- a/src/game/java/net/minecraft/block/BlockSteelGrate.java +++ b/src/game/java/net/minecraft/block/BlockSteelGrate.java @@ -3,7 +3,6 @@ package net.minecraft.block; import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager; import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.util.EnumWorldBlockLayer; /** diff --git a/src/game/java/net/minecraft/enchantment/EnchantmentArrowDamage.java b/src/game/java/net/minecraft/enchantment/EnchantmentArrowDamage.java index 56eb8195..70799ebf 100644 --- a/src/game/java/net/minecraft/enchantment/EnchantmentArrowDamage.java +++ b/src/game/java/net/minecraft/enchantment/EnchantmentArrowDamage.java @@ -43,7 +43,7 @@ public class EnchantmentArrowDamage extends Enchantment { * + Returns the maximum level that the enchantment can have. */ public int getMaxLevel() { - return 5; + return 8; } /** diff --git a/src/game/java/net/minecraft/enchantment/EnchantmentDamage.java b/src/game/java/net/minecraft/enchantment/EnchantmentDamage.java index a0d8af66..869e13bc 100644 --- a/src/game/java/net/minecraft/enchantment/EnchantmentDamage.java +++ b/src/game/java/net/minecraft/enchantment/EnchantmentDamage.java @@ -99,7 +99,7 @@ public class EnchantmentDamage extends Enchantment { * + Returns the maximum level that the enchantment can have. */ public int getMaxLevel() { - return 5; + return 7; } /** diff --git a/src/game/java/net/minecraft/enchantment/EnchantmentDigging.java b/src/game/java/net/minecraft/enchantment/EnchantmentDigging.java index a83f5489..4af1cf9b 100644 --- a/src/game/java/net/minecraft/enchantment/EnchantmentDigging.java +++ b/src/game/java/net/minecraft/enchantment/EnchantmentDigging.java @@ -52,7 +52,7 @@ public class EnchantmentDigging extends Enchantment { * + Returns the maximum level that the enchantment can have. */ public int getMaxLevel() { - return 5; + return 8; } /** diff --git a/src/game/java/net/minecraft/enchantment/EnchantmentDurability.java b/src/game/java/net/minecraft/enchantment/EnchantmentDurability.java index 282743ea..d1e4351b 100644 --- a/src/game/java/net/minecraft/enchantment/EnchantmentDurability.java +++ b/src/game/java/net/minecraft/enchantment/EnchantmentDurability.java @@ -65,7 +65,7 @@ public class EnchantmentDurability extends Enchantment { * + Returns the maximum level that the enchantment can have. */ public int getMaxLevel() { - return 3; + return 5; } /** diff --git a/src/game/java/net/minecraft/enchantment/EnchantmentFireAspect.java b/src/game/java/net/minecraft/enchantment/EnchantmentFireAspect.java index 74872289..8948ea7e 100644 --- a/src/game/java/net/minecraft/enchantment/EnchantmentFireAspect.java +++ b/src/game/java/net/minecraft/enchantment/EnchantmentFireAspect.java @@ -43,7 +43,7 @@ public class EnchantmentFireAspect extends Enchantment { * + Returns the maximum level that the enchantment can have. */ public int getMaxLevel() { - return 2; + return 3; } /** diff --git a/src/game/java/net/minecraft/enchantment/EnchantmentProtection.java b/src/game/java/net/minecraft/enchantment/EnchantmentProtection.java index e3634a6d..2cf04d78 100644 --- a/src/game/java/net/minecraft/enchantment/EnchantmentProtection.java +++ b/src/game/java/net/minecraft/enchantment/EnchantmentProtection.java @@ -130,7 +130,7 @@ public class EnchantmentProtection extends Enchantment { * + Returns the maximum level that the enchantment can have. */ public int getMaxLevel() { - return 4; + return 8; } /** diff --git a/src/game/java/net/minecraft/enchantment/EnchantmentThorns.java b/src/game/java/net/minecraft/enchantment/EnchantmentThorns.java index 055622a5..5483b3c8 100644 --- a/src/game/java/net/minecraft/enchantment/EnchantmentThorns.java +++ b/src/game/java/net/minecraft/enchantment/EnchantmentThorns.java @@ -64,7 +64,7 @@ public class EnchantmentThorns extends Enchantment { * + Returns the maximum level that the enchantment can have. */ public int getMaxLevel() { - return 3; + return 5; } /** diff --git a/src/game/java/net/minecraft/entity/EntityList.java b/src/game/java/net/minecraft/entity/EntityList.java index 6a182578..74309ab9 100644 --- a/src/game/java/net/minecraft/entity/EntityList.java +++ b/src/game/java/net/minecraft/entity/EntityList.java @@ -203,7 +203,7 @@ public class EntityList { addMapping(EntityVillager.class, EntityVillager::new, "Villager", 120, 5651507, 12422002); addMapping(EntityEnderCrystal.class, EntityEnderCrystal::new, "EnderCrystal", 200); // Starlike - addMapping(EntityNetherCreeper.class, EntityNetherCreeper::new, "NetherCreeper", 201, 894731, 0); + addMapping(EntityNetherCreeper.class, EntityNetherCreeper::new, "NetherCreeper", 201, 0xFFCC0000, 0xFFFFA500); } diff --git a/src/game/java/net/minecraft/item/Item.java b/src/game/java/net/minecraft/item/Item.java index f18235b5..d8e9091f 100644 --- a/src/game/java/net/minecraft/item/Item.java +++ b/src/game/java/net/minecraft/item/Item.java @@ -796,14 +796,16 @@ public class Item { .setUnlocalizedName("platinum_axe").setCreativeTab(CreativeTabs.tabStarlike)); registerItem(1030, (String) "starlike:platinum_hoe", (new ItemHoe(Item.ToolMaterial.PLATINUM)) .setUnlocalizedName("platinum_hoe").setCreativeTab(CreativeTabs.tabStarlike)); - registerItem(1031, (String) "starlike:platinum_helmet", - (new ItemArmor(ItemArmor.ArmorMaterial.PLATINUM, 5, 0)).setUnlocalizedName("platinum_helmet")); + registerItem(1031, (String) "starlike:platinum_helmet", (new ItemArmor(ItemArmor.ArmorMaterial.PLATINUM, 5, 0)) + .setUnlocalizedName("platinum_helmet").setCreativeTab(CreativeTabs.tabStarlike)); registerItem(1032, (String) "starlike:platinum_chestplate", - (new ItemArmor(ItemArmor.ArmorMaterial.PLATINUM, 5, 1)).setUnlocalizedName("platinum_chestplate")); + (new ItemArmor(ItemArmor.ArmorMaterial.PLATINUM, 5, 1)).setUnlocalizedName("platinum_chestplate") + .setCreativeTab(CreativeTabs.tabStarlike)); registerItem(1033, (String) "starlike:platinum_leggings", - (new ItemArmor(ItemArmor.ArmorMaterial.PLATINUM, 5, 2)).setUnlocalizedName("platinum_leggings")); - registerItem(1034, (String) "starlike:platinum_boots", - (new ItemArmor(ItemArmor.ArmorMaterial.PLATINUM, 5, 3)).setUnlocalizedName("platinum_boots")); + (new ItemArmor(ItemArmor.ArmorMaterial.PLATINUM, 5, 2)).setUnlocalizedName("platinum_leggings") + .setCreativeTab(CreativeTabs.tabStarlike)); + registerItem(1034, (String) "starlike:platinum_boots", (new ItemArmor(ItemArmor.ArmorMaterial.PLATINUM, 5, 3)) + .setUnlocalizedName("platinum_boots").setCreativeTab(CreativeTabs.tabStarlike)); registerItem(1035, (String) "starlike:titanium_ingot", (new Item()).setUnlocalizedName("titanium_ingot").setCreativeTab(CreativeTabs.tabStarlike)); registerItem(1036, (String) "starlike:uranium_crystal", diff --git a/src/game/java/net/minecraft/item/crafting/RecipesCrafting.java b/src/game/java/net/minecraft/item/crafting/RecipesCrafting.java index f129eaf5..e5e47d47 100644 --- a/src/game/java/net/minecraft/item/crafting/RecipesCrafting.java +++ b/src/game/java/net/minecraft/item/crafting/RecipesCrafting.java @@ -37,7 +37,7 @@ public class RecipesCrafting { parCraftingManager.addRecipe(new ItemStack(Items.steel, 1), new Object[] { "III", "ICI", "III", Character.valueOf('I'), Items.iron_ingot, Character.valueOf('C'), Items.coal }); parCraftingManager.addRecipe(new ItemStack(Blocks.steel_grate, 4), - new Object[] { "SSS", "S S", "SSS", Character.valueOf('S'), Items.steel }); + new Object[] { "S S", " S ", "S S", Character.valueOf('S'), Items.steel }); parCraftingManager.addRecipe(new ItemStack(Items.platinum_sword, 1), new Object[] { "P", "P", "B", Character.valueOf('P'), Items.platinum_ingot, Character.valueOf('B'), Items.blaze_rod }); parCraftingManager.addRecipe(new ItemStack(Items.platinum_pickaxe, 1), new Object[] { "PPP", " B ", " B ", @@ -67,25 +67,23 @@ public class RecipesCrafting { Character.valueOf('S'), Items.steel, Character.valueOf('U'), Items.uranium_rod }); parCraftingManager.addRecipe(new ItemStack(Items.titanium_drill, 1), new Object[] { "TTT", "TDT", "TTT", Character.valueOf('T'), Items.titanium_ingot, Character.valueOf('D'), Items.platinum_drill }); - /* parCraftingManager.addRecipe(new ItemStack(Blocks.mosaic, 4, BlockMosaic.EnumType.OAK.getMetadata()), - new Object[] { "##", "##", Character.valueOf('#'), + new Object[] { "# #", " ", "# #", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.OAK.getMetadata()) }); parCraftingManager.addRecipe(new ItemStack(Blocks.mosaic, 4, BlockMosaic.EnumType.SPRUCE.getMetadata()), - new Object[] { "##", "##", Character.valueOf('#'), + new Object[] { "# #", " ", "# #", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.SPRUCE.getMetadata()) }); parCraftingManager.addRecipe(new ItemStack(Blocks.mosaic, 4, BlockMosaic.EnumType.BIRCH.getMetadata()), - new Object[] { "##", "##", Character.valueOf('#'), + new Object[] { "# #", " ", "# #", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.BIRCH.getMetadata()) }); parCraftingManager.addRecipe(new ItemStack(Blocks.mosaic, 4, BlockMosaic.EnumType.JUNGLE.getMetadata()), - new Object[] { "##", "##", Character.valueOf('#'), + new Object[] { "# #", " ", "# #", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.JUNGLE.getMetadata()) }); parCraftingManager.addRecipe(new ItemStack(Blocks.mosaic, 4, BlockMosaic.EnumType.ACACIA.getMetadata()), - new Object[] { "##", "##", Character.valueOf('#'), + new Object[] { "# #", " ", "# #", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.ACACIA.getMetadata()) }); parCraftingManager.addRecipe(new ItemStack(Blocks.mosaic, 4, BlockMosaic.EnumType.DARK_OAK.getMetadata()), - new Object[] { "##", "##", Character.valueOf('#'), + new Object[] { "# #", " ", "# #", Character.valueOf('#'), new ItemStack(Blocks.planks, 1, BlockPlanks.EnumType.DARK_OAK.getMetadata()) }); - */ } } \ No newline at end of file diff --git a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java index 9e9c6b5d..50bd2e08 100644 --- a/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java +++ b/src/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java @@ -9,7 +9,7 @@ public class EaglercraftVersion { /// Customize these to fit your fork: public static final String projectForkName = "Starlike Client"; - public static final String projectForkVersion = "0.2.1"; + public static final String projectForkVersion = "0.2.2"; public static final String projectForkVendor = "SpeedSlicer and zumbiepig"; public static final String projectForkURL = ""; @@ -32,7 +32,7 @@ public class EaglercraftVersion { public static final boolean enableUpdateService = true; public static final String updateBundlePackageName = "dev.zumbiepig.starlikeclient.client"; - public static final int updateBundlePackageVersionInt = 201; // (0.2.1 would be 000201 or just 201) + public static final int updateBundlePackageVersionInt = 202; // (0.2.1 would be 000201 or just 201) public static final String updateLatestLocalStorageKey = "latestUpdate_" + updateBundlePackageName;