From da427dbe43eefaa97dbfa88d36ba966b9e4038d7 Mon Sep 17 00:00:00 2001 From: nao7016 <213825473+nao7016@users.noreply.github.com> Date: Sat, 21 Feb 2026 12:54:39 +0900 Subject: [PATCH 1/3] add step assist gadget / jumping gadget todo: change gadget textures --- .../ClayiumAdditions/common/CAItems.java | 8 +++++ .../item/gadget/GadgetAddFlight.java | 28 +++++++++++++++ .../item/gadget/GadgetJumping.java | 29 ++++++++++++++++ .../item/gadget/GadgetStepAssist.java | 26 ++++++++++++++ .../ClayiumAdditions/recipe/CARecipes.java | 32 +++++++++++++++++- .../textures/items/gadget_jumping1.png | Bin 0 -> 821 bytes .../textures/items/gadget_jumping2.png | Bin 0 -> 821 bytes .../textures/items/gadget_jumping3.png | Bin 0 -> 821 bytes .../textures/items/gadget_stepassist.png | Bin 0 -> 821 bytes 9 files changed, 122 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/nao7016/ClayiumAdditions/item/gadget/GadgetAddFlight.java create mode 100644 src/main/java/com/nao7016/ClayiumAdditions/item/gadget/GadgetJumping.java create mode 100644 src/main/java/com/nao7016/ClayiumAdditions/item/gadget/GadgetStepAssist.java create mode 100644 src/main/resources/assets/clayiumadditions/textures/items/gadget_jumping1.png create mode 100644 src/main/resources/assets/clayiumadditions/textures/items/gadget_jumping2.png create mode 100644 src/main/resources/assets/clayiumadditions/textures/items/gadget_jumping3.png create mode 100644 src/main/resources/assets/clayiumadditions/textures/items/gadget_stepassist.png diff --git a/src/main/java/com/nao7016/ClayiumAdditions/common/CAItems.java b/src/main/java/com/nao7016/ClayiumAdditions/common/CAItems.java index 58e59d2..288c694 100644 --- a/src/main/java/com/nao7016/ClayiumAdditions/common/CAItems.java +++ b/src/main/java/com/nao7016/ClayiumAdditions/common/CAItems.java @@ -12,8 +12,10 @@ import com.nao7016.ClayiumAdditions.item.ItemClayHammer; import com.nao7016.ClayiumAdditions.item.ItemClayMiningHammer; import com.nao7016.ClayiumAdditions.item.ItemRawClayOre; +import com.nao7016.ClayiumAdditions.item.gadget.GadgetJumping; import com.nao7016.ClayiumAdditions.item.gadget.GadgetNightVision; import com.nao7016.ClayiumAdditions.item.gadget.GadgetSpeed; +import com.nao7016.ClayiumAdditions.item.gadget.GadgetStepAssist; import com.nao7016.ClayiumAdditions.item.storagebox.itemClayStorageBox; import com.nao7016.ClayiumAdditions.item.storagebox.itemMiningStorageBox; import com.nao7016.ClayiumAdditions.item.storagebox.itemStorageBox; @@ -50,9 +52,15 @@ public static void registerItems() { addGadget.addItemList("Speed1", 97, "gadget_speed1", 8); addGadget.addItemList("Speed2", 98, "gadget_speed2", 11); // addGadget.addItemList("NightVision", 112, "gadget_nightvision", 7); + addGadget.addItemList("StepAssist", 128, "gadget_stepassist", 7); + addGadget.addItemList("Jumping1", 144, "gadget_jumping1", 6); + addGadget.addItemList("Jumping2", 145, "gadget_jumping2", 8); + addGadget.addItemList("Jumping3", 146, "gadget_jumping3", 9); register(addGadget, "itemGadget"); ItemGadgetHolder.addGadget(new GadgetSpeed()); ItemGadgetHolder.addGadget(new GadgetNightVision()); + ItemGadgetHolder.addGadget(new GadgetStepAssist()); + ItemGadgetHolder.addGadget(new GadgetJumping()); if (Config.cfgSplitEnergeticClay) { clayEnergy = register(new ItemClayEnergy(), "clay_energy"); } diff --git a/src/main/java/com/nao7016/ClayiumAdditions/item/gadget/GadgetAddFlight.java b/src/main/java/com/nao7016/ClayiumAdditions/item/gadget/GadgetAddFlight.java new file mode 100644 index 0000000..68859c2 --- /dev/null +++ b/src/main/java/com/nao7016/ClayiumAdditions/item/gadget/GadgetAddFlight.java @@ -0,0 +1,28 @@ +package com.nao7016.ClayiumAdditions.item.gadget; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; + +public class GadgetAddFlight extends GadgetAddOrdinal { + + public GadgetAddFlight() { + super(new String[] { "AddFlight" }); + } + + @Override + public void update(int itemIndex, Entity entity, boolean isRemote) { + if (entity instanceof EntityPlayer player) { + if (itemIndex == -1 && !player.capabilities.isCreativeMode) { + player.capabilities.allowFlying = false; + player.capabilities.isFlying = false; + player.sendPlayerAbilities(); + } else if (itemIndex == 0 && !player.capabilities.isCreativeMode) { + player.capabilities.allowFlying = true; + if (player.motionY >= 0.0D) { + player.fallDistance = 0.0F; + } + player.sendPlayerAbilities(); + } + } + } +} diff --git a/src/main/java/com/nao7016/ClayiumAdditions/item/gadget/GadgetJumping.java b/src/main/java/com/nao7016/ClayiumAdditions/item/gadget/GadgetJumping.java new file mode 100644 index 0000000..206186a --- /dev/null +++ b/src/main/java/com/nao7016/ClayiumAdditions/item/gadget/GadgetJumping.java @@ -0,0 +1,29 @@ +package com.nao7016.ClayiumAdditions.item.gadget; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; + +public class GadgetJumping extends GadgetAddOrdinal { + + private int previousIndex = -1; + + public GadgetJumping() { + super(new String[] { "Jumping1", "Jumping2", "Jumping3" }); + } + + @Override + public void update(int itemIndex, Entity entity, boolean isRemote) { + if (itemIndex == previousIndex) return; + previousIndex = itemIndex; + + if (itemIndex >= 0 && entity instanceof EntityPlayer && !isRemote) { + EntityPlayer player = (EntityPlayer) entity; + player.addPotionEffect(new PotionEffect(Potion.jump.getId(), Integer.MAX_VALUE, itemIndex, false)); + } else if (entity instanceof EntityPlayer && !isRemote) { + EntityPlayer player = (EntityPlayer) entity; + player.removePotionEffect(Potion.jump.getId()); + } + } +} diff --git a/src/main/java/com/nao7016/ClayiumAdditions/item/gadget/GadgetStepAssist.java b/src/main/java/com/nao7016/ClayiumAdditions/item/gadget/GadgetStepAssist.java new file mode 100644 index 0000000..e74e7dc --- /dev/null +++ b/src/main/java/com/nao7016/ClayiumAdditions/item/gadget/GadgetStepAssist.java @@ -0,0 +1,26 @@ +package com.nao7016.ClayiumAdditions.item.gadget; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; + +public class GadgetStepAssist extends GadgetAddOrdinal { + + public GadgetStepAssist() { + super(new String[] { "StepAssist" }); + } + + @Override + public void update(int itemIndex, Entity entity, boolean isRemote) { + if (entity instanceof EntityPlayer player) { + if (itemIndex >= 0) { + if (player.isSneaking()) { + player.stepHeight = 0.0F; + } else { + player.stepHeight = 1.002F; + } + } else { + player.stepHeight = 0.5F; + } + } + } +} diff --git a/src/main/java/com/nao7016/ClayiumAdditions/recipe/CARecipes.java b/src/main/java/com/nao7016/ClayiumAdditions/recipe/CARecipes.java index a937f21..1c8a9a8 100644 --- a/src/main/java/com/nao7016/ClayiumAdditions/recipe/CARecipes.java +++ b/src/main/java/com/nao7016/ClayiumAdditions/recipe/CARecipes.java @@ -335,7 +335,7 @@ private static void registerAssembler() { ii(CItems.itemMisc.get("PrecisionCircuit"), CMaterials.get(CMaterials.EXC_CLAY, CMaterials.DUST, 8)), 0, 10, - ii(CItems.itemMisc.get("IntegratedCircuit")), + ii(s(CItems.itemMisc.get("IntegratedCircuit"), 2)), 6000000L, 20L); CRecipes.recipeAssembler.addRecipe( @@ -369,6 +369,36 @@ private static void registerAssembler() { ii(CAItems.addGadget.get("Speed2")), e(11), 120L); + + CRecipes.recipeAssembler.addRecipe( + oo(CItems.itemGadget.get("Blank"), i(Items.diamond_boots, 1)), + 0, + 6, + ii(CAItems.addGadget.get("StepAssist")), + e(7), + 120L); + + CRecipes.recipeAssembler.addRecipe( + oo(CItems.itemGadget.get("Blank"), i(Items.feather, 4)), + 0, + 4, + ii(CAItems.addGadget.get("Jumping1")), + e(6), + 120L); + CRecipes.recipeAssembler.addRecipe( + oo(CAItems.addGadget.get("Jumping1"), i(Items.feather, 16)), + 0, + 6, + ii(CAItems.addGadget.get("Jumping2")), + e(8), + 120L); + CRecipes.recipeAssembler.addRecipe( + oo(CAItems.addGadget.get("Jumping2"), i(Items.feather, 64)), + 0, + 6, + ii(CAItems.addGadget.get("Jumping3")), + e(9), + 120L); } private static void registerBlastFurnace() { diff --git a/src/main/resources/assets/clayiumadditions/textures/items/gadget_jumping1.png b/src/main/resources/assets/clayiumadditions/textures/items/gadget_jumping1.png new file mode 100644 index 0000000000000000000000000000000000000000..47de6bcb95dc699f51e0c22fd182a7349203b15f GIT binary patch literal 821 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv=}#LT=BJwMkF1yemk zJwwAT4zY7UMLSX>JkvZqwHP>n999M?Mpgz!Aj=DgrJ-z)b2J#4!QxCnwjm=EgCLNO z0^-be7O;2@kPQL}Kn&6kqtR_;U|?oon841!0#svQWNg5=0Aemk59Mybe+V{}Y#WBRff9a&XSyLQE+U6U7u3g<^@3NQ4 zI#4I4DWZeJZ1#L7#R^ugtVF>Ry%|nAN=-?rJQ<2BVjZNn2Ie1_krSi1?*8`OpYu1~ zyvZB&(pqMQ<>z_r#%Cr@5&Ewz$+RwJ|ExY=ndO0I0)h-%G`56Aybt71WZlD`vvqq# z+5eRcBF>kNOkC^}KSOZ|M}wA#l9LaoZqv0{63Q1{!|t!)I~{PiH%v;^X(hK;?1IGs z3o<<#-2`h}7-u{2TBYo17GUOZIQ08K&gV+A-t4zWMGD1_RIneDGTUZ;GiUpcU3(8c zYTm3IeobieS_eGX}~Ext{+Txx@7Qp|d}8B(86r>CSK?p-8WOv9Vlubku#d&rk1f`B5QtIsW`} zn^WS?^_EUn_j|aPeSwY_1K*qb?HnxjA4Hcv`@5WfPt~U&iFzlW##`5BWN@%pEpt9z zvf`Cq=yvbW>s#voF4+2c?mX$Uj_)3Pd20Of!$D_;j8K8(B|6+)Zp`m(G+oz7@2P$M ioG(7EewuAV{nh;I8qfT)vnH#8BHq*0&t;ucLK6VC5ES+R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/clayiumadditions/textures/items/gadget_jumping2.png b/src/main/resources/assets/clayiumadditions/textures/items/gadget_jumping2.png new file mode 100644 index 0000000000000000000000000000000000000000..47de6bcb95dc699f51e0c22fd182a7349203b15f GIT binary patch literal 821 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv=}#LT=BJwMkF1yemk zJwwAT4zY7UMLSX>JkvZqwHP>n999M?Mpgz!Aj=DgrJ-z)b2J#4!QxCnwjm=EgCLNO z0^-be7O;2@kPQL}Kn&6kqtR_;U|?oon841!0#svQWNg5=0Aemk59Mybe+V{}Y#WBRff9a&XSyLQE+U6U7u3g<^@3NQ4 zI#4I4DWZeJZ1#L7#R^ugtVF>Ry%|nAN=-?rJQ<2BVjZNn2Ie1_krSi1?*8`OpYu1~ zyvZB&(pqMQ<>z_r#%Cr@5&Ewz$+RwJ|ExY=ndO0I0)h-%G`56Aybt71WZlD`vvqq# z+5eRcBF>kNOkC^}KSOZ|M}wA#l9LaoZqv0{63Q1{!|t!)I~{PiH%v;^X(hK;?1IGs z3o<<#-2`h}7-u{2TBYo17GUOZIQ08K&gV+A-t4zWMGD1_RIneDGTUZ;GiUpcU3(8c zYTm3IeobieS_eGX}~Ext{+Txx@7Qp|d}8B(86r>CSK?p-8WOv9Vlubku#d&rk1f`B5QtIsW`} zn^WS?^_EUn_j|aPeSwY_1K*qb?HnxjA4Hcv`@5WfPt~U&iFzlW##`5BWN@%pEpt9z zvf`Cq=yvbW>s#voF4+2c?mX$Uj_)3Pd20Of!$D_;j8K8(B|6+)Zp`m(G+oz7@2P$M ioG(7EewuAV{nh;I8qfT)vnH#8BHq*0&t;ucLK6VC5ES+R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/clayiumadditions/textures/items/gadget_jumping3.png b/src/main/resources/assets/clayiumadditions/textures/items/gadget_jumping3.png new file mode 100644 index 0000000000000000000000000000000000000000..47de6bcb95dc699f51e0c22fd182a7349203b15f GIT binary patch literal 821 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv=}#LT=BJwMkF1yemk zJwwAT4zY7UMLSX>JkvZqwHP>n999M?Mpgz!Aj=DgrJ-z)b2J#4!QxCnwjm=EgCLNO z0^-be7O;2@kPQL}Kn&6kqtR_;U|?oon841!0#svQWNg5=0Aemk59Mybe+V{}Y#WBRff9a&XSyLQE+U6U7u3g<^@3NQ4 zI#4I4DWZeJZ1#L7#R^ugtVF>Ry%|nAN=-?rJQ<2BVjZNn2Ie1_krSi1?*8`OpYu1~ zyvZB&(pqMQ<>z_r#%Cr@5&Ewz$+RwJ|ExY=ndO0I0)h-%G`56Aybt71WZlD`vvqq# z+5eRcBF>kNOkC^}KSOZ|M}wA#l9LaoZqv0{63Q1{!|t!)I~{PiH%v;^X(hK;?1IGs z3o<<#-2`h}7-u{2TBYo17GUOZIQ08K&gV+A-t4zWMGD1_RIneDGTUZ;GiUpcU3(8c zYTm3IeobieS_eGX}~Ext{+Txx@7Qp|d}8B(86r>CSK?p-8WOv9Vlubku#d&rk1f`B5QtIsW`} zn^WS?^_EUn_j|aPeSwY_1K*qb?HnxjA4Hcv`@5WfPt~U&iFzlW##`5BWN@%pEpt9z zvf`Cq=yvbW>s#voF4+2c?mX$Uj_)3Pd20Of!$D_;j8K8(B|6+)Zp`m(G+oz7@2P$M ioG(7EewuAV{nh;I8qfT)vnH#8BHq*0&t;ucLK6VC5ES+R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/clayiumadditions/textures/items/gadget_stepassist.png b/src/main/resources/assets/clayiumadditions/textures/items/gadget_stepassist.png new file mode 100644 index 0000000000000000000000000000000000000000..47de6bcb95dc699f51e0c22fd182a7349203b15f GIT binary patch literal 821 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv=}#LT=BJwMkF1yemk zJwwAT4zY7UMLSX>JkvZqwHP>n999M?Mpgz!Aj=DgrJ-z)b2J#4!QxCnwjm=EgCLNO z0^-be7O;2@kPQL}Kn&6kqtR_;U|?oon841!0#svQWNg5=0Aemk59Mybe+V{}Y#WBRff9a&XSyLQE+U6U7u3g<^@3NQ4 zI#4I4DWZeJZ1#L7#R^ugtVF>Ry%|nAN=-?rJQ<2BVjZNn2Ie1_krSi1?*8`OpYu1~ zyvZB&(pqMQ<>z_r#%Cr@5&Ewz$+RwJ|ExY=ndO0I0)h-%G`56Aybt71WZlD`vvqq# z+5eRcBF>kNOkC^}KSOZ|M}wA#l9LaoZqv0{63Q1{!|t!)I~{PiH%v;^X(hK;?1IGs z3o<<#-2`h}7-u{2TBYo17GUOZIQ08K&gV+A-t4zWMGD1_RIneDGTUZ;GiUpcU3(8c zYTm3IeobieS_eGX}~Ext{+Txx@7Qp|d}8B(86r>CSK?p-8WOv9Vlubku#d&rk1f`B5QtIsW`} zn^WS?^_EUn_j|aPeSwY_1K*qb?HnxjA4Hcv`@5WfPt~U&iFzlW##`5BWN@%pEpt9z zvf`Cq=yvbW>s#voF4+2c?mX$Uj_)3Pd20Of!$D_;j8K8(B|6+)Zp`m(G+oz7@2P$M ioG(7EewuAV{nh;I8qfT)vnH#8BHq*0&t;ucLK6VC5ES+R literal 0 HcmV?d00001 From 2d6226d9afe719c9575982a55cc168baa35a5e65 Mon Sep 17 00:00:00 2001 From: nao7016 <213825473+nao7016@users.noreply.github.com> Date: Wed, 25 Feb 2026 19:19:16 +0900 Subject: [PATCH 2/3] add textures and lang key change some recipes --- dependencies.gradle | 2 +- .../ClayiumAdditions/common/CAItems.java | 6 +++--- .../item/gadget/GadgetJumping.java | 2 +- .../ClayiumAdditions/recipe/CARecipes.java | 14 +++++++------- .../assets/clayiumadditions/lang/en_US.lang | 4 ++++ .../assets/clayiumadditions/lang/ja_JP.lang | 4 ++++ .../assets/clayiumadditions/lang/zh_CN.lang | 4 ++++ .../textures/items/gadget_blank.png | Bin 562 -> 824 bytes .../textures/items/gadget_blank_moving.png | Bin 0 -> 819 bytes .../textures/items/gadget_jumping0.png | Bin 0 -> 893 bytes .../textures/items/gadget_jumping1.png | Bin 821 -> 858 bytes .../textures/items/gadget_jumping2.png | Bin 821 -> 852 bytes .../textures/items/gadget_jumping3.png | Bin 821 -> 0 bytes .../textures/items/gadget_speed0.png | Bin 818 -> 821 bytes .../textures/items/gadget_speed0_2.png | Bin 833 -> 0 bytes .../textures/items/gadget_speed1.png | Bin 826 -> 820 bytes .../textures/items/gadget_speed1_2.png | Bin 821 -> 0 bytes .../textures/items/gadget_speed2.png | Bin 812 -> 812 bytes .../textures/items/gadget_speed2_2.png | Bin 828 -> 0 bytes .../textures/items/gadget_stepassist.png | Bin 821 -> 791 bytes .../textures/items/gadget_stepassist_old.png | Bin 0 -> 822 bytes 21 files changed, 24 insertions(+), 12 deletions(-) create mode 100644 src/main/resources/assets/clayiumadditions/textures/items/gadget_blank_moving.png create mode 100644 src/main/resources/assets/clayiumadditions/textures/items/gadget_jumping0.png delete mode 100644 src/main/resources/assets/clayiumadditions/textures/items/gadget_jumping3.png delete mode 100644 src/main/resources/assets/clayiumadditions/textures/items/gadget_speed0_2.png delete mode 100644 src/main/resources/assets/clayiumadditions/textures/items/gadget_speed1_2.png delete mode 100644 src/main/resources/assets/clayiumadditions/textures/items/gadget_speed2_2.png create mode 100644 src/main/resources/assets/clayiumadditions/textures/items/gadget_stepassist_old.png diff --git a/dependencies.gradle b/dependencies.gradle index 4f1f5bf..0dac13c 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -38,7 +38,7 @@ dependencies { //devOnlyNonPublishable("curse.maven:clayium-243111:2351145") // devOnlyNonPublishable("curse.maven:cofh-core-69162:2388750") - devOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.7.4-GTNH:dev") + devOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.50-GTNH:dev") //devOnlyNonPublishable("ganymedes01.etfuturum:Et-Futurum-Requiem:2.6.2.9-GTNH:dev") //devOnlyNonPublishable("com.github.GTNewHorizons:InventoryBogoSorter:1.2.51-GTNH:dev") //devOnlyNonPublishable("curse.maven:craftguide-75557:2459319") diff --git a/src/main/java/com/nao7016/ClayiumAdditions/common/CAItems.java b/src/main/java/com/nao7016/ClayiumAdditions/common/CAItems.java index 288c694..5e1ed80 100644 --- a/src/main/java/com/nao7016/ClayiumAdditions/common/CAItems.java +++ b/src/main/java/com/nao7016/ClayiumAdditions/common/CAItems.java @@ -53,9 +53,9 @@ public static void registerItems() { addGadget.addItemList("Speed2", 98, "gadget_speed2", 11); // addGadget.addItemList("NightVision", 112, "gadget_nightvision", 7); addGadget.addItemList("StepAssist", 128, "gadget_stepassist", 7); - addGadget.addItemList("Jumping1", 144, "gadget_jumping1", 6); - addGadget.addItemList("Jumping2", 145, "gadget_jumping2", 8); - addGadget.addItemList("Jumping3", 146, "gadget_jumping3", 9); + addGadget.addItemList("Jumping0", 144, "gadget_jumping0", 6); + addGadget.addItemList("Jumping1", 145, "gadget_jumping1", 8); + addGadget.addItemList("Jumping2", 146, "gadget_jumping2", 9); register(addGadget, "itemGadget"); ItemGadgetHolder.addGadget(new GadgetSpeed()); ItemGadgetHolder.addGadget(new GadgetNightVision()); diff --git a/src/main/java/com/nao7016/ClayiumAdditions/item/gadget/GadgetJumping.java b/src/main/java/com/nao7016/ClayiumAdditions/item/gadget/GadgetJumping.java index 206186a..577a49d 100644 --- a/src/main/java/com/nao7016/ClayiumAdditions/item/gadget/GadgetJumping.java +++ b/src/main/java/com/nao7016/ClayiumAdditions/item/gadget/GadgetJumping.java @@ -10,7 +10,7 @@ public class GadgetJumping extends GadgetAddOrdinal { private int previousIndex = -1; public GadgetJumping() { - super(new String[] { "Jumping1", "Jumping2", "Jumping3" }); + super(new String[] { "Jumping0", "Jumping1", "Jumping2" }); } @Override diff --git a/src/main/java/com/nao7016/ClayiumAdditions/recipe/CARecipes.java b/src/main/java/com/nao7016/ClayiumAdditions/recipe/CARecipes.java index 1c8a9a8..18f4b50 100644 --- a/src/main/java/com/nao7016/ClayiumAdditions/recipe/CARecipes.java +++ b/src/main/java/com/nao7016/ClayiumAdditions/recipe/CARecipes.java @@ -318,7 +318,7 @@ private static void registerAssembler() { } } - // Buffer One + // Limit Buffer for (int i = 4; i <= 13; i++) { CRecipes.recipeAssembler.addRecipe( ii(i(CBlocks.blocksBuffer[i]), CMaterials.get(getMaterial(i), CMaterials.PLATE)), @@ -335,7 +335,7 @@ private static void registerAssembler() { ii(CItems.itemMisc.get("PrecisionCircuit"), CMaterials.get(CMaterials.EXC_CLAY, CMaterials.DUST, 8)), 0, 10, - ii(s(CItems.itemMisc.get("IntegratedCircuit"), 2)), + ii(s(CItems.itemMisc.get("IntegratedCircuit"), 3)), 6000000L, 20L); CRecipes.recipeAssembler.addRecipe( @@ -382,21 +382,21 @@ private static void registerAssembler() { oo(CItems.itemGadget.get("Blank"), i(Items.feather, 4)), 0, 4, - ii(CAItems.addGadget.get("Jumping1")), + ii(CAItems.addGadget.get("Jumping0")), e(6), 120L); CRecipes.recipeAssembler.addRecipe( - oo(CAItems.addGadget.get("Jumping1"), i(Items.feather, 16)), + oo(CAItems.addGadget.get("Jumping0"), i(Items.feather, 16)), 0, 6, - ii(CAItems.addGadget.get("Jumping2")), + ii(CAItems.addGadget.get("Jumping1")), e(8), 120L); CRecipes.recipeAssembler.addRecipe( - oo(CAItems.addGadget.get("Jumping2"), i(Items.feather, 64)), + oo(CAItems.addGadget.get("Jumping1"), i(Items.feather, 64)), 0, 6, - ii(CAItems.addGadget.get("Jumping3")), + ii(CAItems.addGadget.get("Jumping2")), e(9), 120L); } diff --git a/src/main/resources/assets/clayiumadditions/lang/en_US.lang b/src/main/resources/assets/clayiumadditions/lang/en_US.lang index 0accca1..5710d90 100644 --- a/src/main/resources/assets/clayiumadditions/lang/en_US.lang +++ b/src/main/resources/assets/clayiumadditions/lang/en_US.lang @@ -44,6 +44,10 @@ item.mining_storage_box.tooltip.line4=Sand, Torch, Netherrack, Soul Sand item.itemGadget.Speed0.name=Clay Gadget [Speed I] item.itemGadget.Speed1.name=Clay Gadget [Speed II] item.itemGadget.Speed2.name=Clay Gadget [Speed III] +item.itemGadget.StepAssist.name=Clay Gadget [Step Assist] +item.itemGadget.Jumping0.name=Clay Gadget [Jumping I] +item.itemGadget.Jumping1.name=Clay Gadget [Jumping II] +item.itemGadget.Jumping2.name=Clay Gadget [Jumping III] tile.blockAutoSimpleWaterWheel.name=Simple Auto Clay Water Wheel tile.blockAutoBasicWaterWheel.name=Basic Auto Clay Water Wheel diff --git a/src/main/resources/assets/clayiumadditions/lang/ja_JP.lang b/src/main/resources/assets/clayiumadditions/lang/ja_JP.lang index f0904d6..b4a69dc 100644 --- a/src/main/resources/assets/clayiumadditions/lang/ja_JP.lang +++ b/src/main/resources/assets/clayiumadditions/lang/ja_JP.lang @@ -44,6 +44,10 @@ item.mining_storage_box.tooltip.line4=砂, 松明, ネザーラック, ソウル item.itemGadget.Speed0.name=粘土ガジェット [移動速度 I] item.itemGadget.Speed1.name=粘土ガジェット [移動速度 II] item.itemGadget.Speed2.name=粘土ガジェット [移動速度 III] +item.itemGadget.StepAssist.name=粘土ガジェット [ステップアシスト] +item.itemGadget.Jumping0.name=粘土ガジェット [跳躍 I] +item.itemGadget.Jumping1.name=粘土ガジェット [跳躍 II] +item.itemGadget.Jumping2.name=粘土ガジェット [跳躍 III] tile.blockAutoSimpleWaterWheel.name=簡易自動粘土水車 tile.blockAutoBasicWaterWheel.name=基本自動粘土水車 diff --git a/src/main/resources/assets/clayiumadditions/lang/zh_CN.lang b/src/main/resources/assets/clayiumadditions/lang/zh_CN.lang index 6b837c5..32b4642 100644 --- a/src/main/resources/assets/clayiumadditions/lang/zh_CN.lang +++ b/src/main/resources/assets/clayiumadditions/lang/zh_CN.lang @@ -44,6 +44,10 @@ item.mining_storage_box.tooltip.line4=Sand, Torch, Netherrack, Soul Sand item.itemGadget.Speed0.name=Clay Gadget [Speed I] item.itemGadget.Speed1.name=Clay Gadget [Speed II] item.itemGadget.Speed2.name=Clay Gadget [Speed III] +item.itemGadget.StepAssist.name=Clay Gadget [Step Assist] +item.itemGadget.Jumping0.name=Clay Gadget [Jumping I] +item.itemGadget.Jumping1.name=Clay Gadget [Jumping II] +item.itemGadget.Jumping2.name=Clay Gadget [Jumping III] tile.blockAutoSimpleWaterWheel.name=简易自动粘土水车 tile.blockAutoBasicWaterWheel.name=基础自动粘土水车 diff --git a/src/main/resources/assets/clayiumadditions/textures/items/gadget_blank.png b/src/main/resources/assets/clayiumadditions/textures/items/gadget_blank.png index d25da81f665f13b34c0a67b68bb78b2ebe5330b0..c5bee72d5bcf5bbac1162ccf36871802b2b50ae5 100644 GIT binary patch literal 824 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv=}#LT=BJwMkF1yemk zJwwAT4zY7UMLSX>JkvZqwHP>n999M?Mpgz!Aj=DgrJ-z)b2J#4!QxCnwjm=EgCLNO z0^-be7O;2@kPQL}Kn&6kqtR_;U|?oon841!0#svQWNg5=0Aemk59Mybe+V{lM#WBRff9Yl4JYh$HwujqyRnOtI=PKYi zB6?$EGw+>7=R)>FtPdnM^h}x1BYP~#X5P$y@6!^k6^p_G_GWGk>9?D@YU#C8|EI__ ze3!Ss@_e~|gbB9`3xh7#T2Vz+5vO%Crx=~iJ2~BdKI;LQC6||>8s=~-Idyf;d2N?>@T{11^qj99K^=7o zY>P}b*(QNKoN;L-Di+wu&rk z%8ws-;+9iVQtSSG_v1&uCY^rDy80^b_1DwB?pQYa+Kne1H|3cxsy`A5@N8^nXRk^9C*NfEHiCR`mxMKx7S5}-M`^u9)F(w<qb_S( o1m{T~)0WG^mh^A?c^C{nEKmCIW#*ij`7$RtQvjy^hjFqP zS^_VH5tZYJatv~e9v3kT%z`x-qZ_w$R#ATt;aG z?!cnjnlM4YCH*i?>p1?=fPPX%xnWQo^7Fh&G%wDeRu1tp%Gm|}<1A7+a#SA2ysiooOj+Xa6Wgzp9v5FAp|b{ ziU^BQtV>bwnFxHTRjNA{@7o1;9^A#W$3e_2IpOfkz_mP!Ic^>V2NP_tafD;>EdT%j07*qoM6N<$f|$SquK)l5 diff --git a/src/main/resources/assets/clayiumadditions/textures/items/gadget_blank_moving.png b/src/main/resources/assets/clayiumadditions/textures/items/gadget_blank_moving.png new file mode 100644 index 0000000000000000000000000000000000000000..867afcd1d2c51f2bcfb595e758814c0595012491 GIT binary patch literal 819 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv=}#LT=BJwMkF1yemk zJwwAT4zY7UMLSX>JkvZqwHP>n999M?Mpgz!Aj=DgrJ-z)b2J#4!QxCnwjm=EgCLNO z0^-be7O;2@kPQL}Kn&6kqtR_;U|?oon841!0#svQWNg5=0Aemk59Mybe+IQd6#WBRff9WLOJYh!xxA@ZYGk95)`VPt_ zG)8QC$XB3sL{vbW<9dR4=Y%7DYMsg7eg21UmdJ58+I?l!t}FMouZFYw^W0ROzrQAH zy#kH`an7C^!*zJWliSzjnJ&C#P}ldb{QXY(mKH;7x`5yo%`ly7 zQ6W?3Ox?Wsy|rZ8e2H#B=k#i;+s#oeeA?VB-kM#n{%kk@y^p;i%Qa=*$|+7~1m$h) zD%Nb>!j{Amy7Y}lKclAWH1p|qc&@L>`&UrDJ4s@lWLx&T>&%aT9C)%VCT7m#z4mMz zZF7Xq?fkiSyLi&KDYGR0PFwe0;O1#QhK3+*C8u+(G1{xTRy|sNz@$=5UO+jbdV#&u z$^C1&G}VJnU0LOGFVWh2rKoaSl-Am}q3jOlIx}xgxYQD`Fm!<;$1H6_mLQ)cQ#d}_ z%N;S8v?+bB+>ZV7JNEoKn^k$RXlv4ry@z&2-?5m`?VfGL)-q$}F(1t~3CD;B&6mEP zKk#J=(=Dr_bu9uwKU5`^^gNy=U^eAZrfy=CVxO|1%bhgmPr{nhlNo$HGhIxXrb?I} z*^y{%b>~UJ;^fV;JEGU0`1#;qo&0FR=AUsjzW;a8`)&Pgg&ebxsLQ0QI>RPyhe` literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/clayiumadditions/textures/items/gadget_jumping0.png b/src/main/resources/assets/clayiumadditions/textures/items/gadget_jumping0.png new file mode 100644 index 0000000000000000000000000000000000000000..effd6c975a4932703bb8fb8e9718c5e779e0e3fe GIT binary patch literal 893 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enP_o1|q9iy!t)x7$D3u`~F*C13&(AeP!Bo#s z&(N@oL+l(-(T>yz&ooa@Ed~xChm}E!k(GfF$npYWX($`y91TWhus9QtZOF*PAPA(R zfHoLVq;&{FB=Y2tu(@G|4 zOwg<4NW7Bhcxjq|=i6qDg}jHl=PGSm(5!HAVX^K+^}}y8TvNaE7%FjCiI#F`=}fqB zc-^*mGJ9mPU{~R z2wDesM^wKatGR>r&UcT<(Dxn_!VzcZflxI{_%VeO(UhMtR4PHShxx(O8KK4jyO zWqf>~qT=H`_S)|kqJr1{J>DF(wZ%-7tJUVF`Qwch-Cak!SsB*p#iSpNiV>;a$``O! z@|0@x)@?6K5y6bomA$HUOllLPQ8LkVrz3 zB!m!fF0j7-aVSHL5|yAtktP{wl0isVoW9BOwK*ag-UmYH_hxD|cMJ%jL8SjC?>$S` zXW0NYfW_$vYrxXXEPq{Hu)Y1As;Z6y z1ckE}tu+9fzz^W-)D)Y89$R%uvlNk$YzzSKO@oMV=glh?fO2pafV&@7DXSV$LXwQk zI|5KLa8M|?93NZifHKwky#$v6dHvidy zsSB*D=yY-p4sv$dKY#fGTzvM3e7}v>`{*La`HIl=Z}<St>@_N^#CZjQD{&-EN1^ f>)*y+o+SPP3-=J*HRS>m00000NkvXXu0mjf3nvHX delta 556 zcmV+{0@MB42DJu|NeaUN01m?e$8V@)kyCdLU;qFB0RR91U;qFB0RWNMTz>{N)N`_r zaytM30pUqRK~y+TrINjBltC1RpEL7)tAam7y#hN?ENp^UhzK^DpF$yc1qy0m5y*{b zLM$SJVr2|yA*fwI8?{kyz?f`YA+F!IyYp|c+1U+R={p>lIrE-}Gt7~c68|F^0#}K}bKF~5CU_5Hqmu#F zSvuVgUE3w#xpU(-@ODpFW0-3`q-Xkn0_uK6&-GcjHP6D$`D_^1wV6i%*kE!lf1@)V zS6f=&CiCUrwD@=$(|=#j=RC?6=Psp_Cr;tL2cRrU01oWmhX@2e@D-)z{ihGSdh${j ze?m-w+SZt82n0H&L&tQe>Mm8cOI6pjfBm4f^PQd>%|Y(q^yM?@@WDd>XjKqnq$~@H uMg#9WDMhRsynW~A4qsk>mOX%f)o<4*=1yyBlO+HE002ovP6b4+LSTY^5%b;v diff --git a/src/main/resources/assets/clayiumadditions/textures/items/gadget_jumping2.png b/src/main/resources/assets/clayiumadditions/textures/items/gadget_jumping2.png index 47de6bcb95dc699f51e0c22fd182a7349203b15f..6e6098e6e5e062df146141bd1510d41dace0aff7 100644 GIT binary patch delta 587 zcmV-R0<`_L2GjQ%QqayK2vLG;ZtmB7+!>3zdv`^<92n;C&YWis^By>6h)MGB(amsX z;Vf}HhY+|HLd65D`ws+Q$LQ=VkFl}fGu-1_03C85LFt$?@*LzuFw80odsi%L?^m6~fYB+cP zB1UTfHebAME_Jq^*MIY%6e>Ew*Ds&h?R^x?c2H_do>`oeXbtNdPXO51dSvI096Pzn}y8aj$96HO;r6x@hOp#-(`xij)7?a_>1}d~p&^qBL zOG)#TG)qa24){I#iM9XvgDZ;{!l{$|=gd~8o^_(0Yj`-C7Huds2 Z@dvwg_4)YIP4WN$002ovPDHLkV1h7&5lR36 delta 556 zcmV+{0@MA}2DJu|NeaUN01m?e$8V@)kyCdLU;qFB0RR91U;qFB0RWNMTz>{N)N`_r zaytM30pUqRK~y+TrINjBltC1RpEL7)tAam7y#hN?ENp^UhzK^DpF$yc1qy0m5y*{b zLM$SJVr2|yA*fwI8?{kyz?f`YA+F!IyYp|c+1U+R={p>lIrE-}Gt7~c68|F^0#}K}bKF~5CU_5Hqmu#F zSvuVgUE3w#xpU(-@ODpFW0-3`q-Xkn0_uK6&-GcjHP6D$`D_^1wV6i%*kE!lf1@)V zS6f=&CiCUrwD@=$(|=#j=RC?6=Psp_Cr;tL2cRrU01oWmhX@2e@D-)z{ihGSdh${j ze?m-w+SZt82n0H&L&tQe>Mm8cOI6pjfBm4f^PQd>%|Y(q^yM?@@WDd>XjKqnq$~@H uMg#9WDMhRsynW~A4qsk>mOX%f)o<4*=1yyBlO+HE002ovP6b4+LSTY%3G>(h diff --git a/src/main/resources/assets/clayiumadditions/textures/items/gadget_jumping3.png b/src/main/resources/assets/clayiumadditions/textures/items/gadget_jumping3.png deleted file mode 100644 index 47de6bcb95dc699f51e0c22fd182a7349203b15f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 821 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv=}#LT=BJwMkF1yemk zJwwAT4zY7UMLSX>JkvZqwHP>n999M?Mpgz!Aj=DgrJ-z)b2J#4!QxCnwjm=EgCLNO z0^-be7O;2@kPQL}Kn&6kqtR_;U|?oon841!0#svQWNg5=0Aemk59Mybe+V{}Y#WBRff9a&XSyLQE+U6U7u3g<^@3NQ4 zI#4I4DWZeJZ1#L7#R^ugtVF>Ry%|nAN=-?rJQ<2BVjZNn2Ie1_krSi1?*8`OpYu1~ zyvZB&(pqMQ<>z_r#%Cr@5&Ewz$+RwJ|ExY=ndO0I0)h-%G`56Aybt71WZlD`vvqq# z+5eRcBF>kNOkC^}KSOZ|M}wA#l9LaoZqv0{63Q1{!|t!)I~{PiH%v;^X(hK;?1IGs z3o<<#-2`h}7-u{2TBYo17GUOZIQ08K&gV+A-t4zWMGD1_RIneDGTUZ;GiUpcU3(8c zYTm3IeobieS_eGX}~Ext{+Txx@7Qp|d}8B(86r>CSK?p-8WOv9Vlubku#d&rk1f`B5QtIsW`} zn^WS?^_EUn_j|aPeSwY_1K*qb?HnxjA4Hcv`@5WfPt~U&iFzlW##`5BWN@%pEpt9z zvf`Cq=yvbW>s#voF4+2c?mX$Uj_)3Pd20Of!$D_;j8K8(B|6+)Zp`m(G+oz7@2P$M ioG(7EewuAV{nh;I8qfT)vnH#8BHq*0&t;ucLK6VC5ES+R diff --git a/src/main/resources/assets/clayiumadditions/textures/items/gadget_speed0.png b/src/main/resources/assets/clayiumadditions/textures/items/gadget_speed0.png index dcf1e51fb2a6ac834355efa356d77d46637e2257..e039587ad67bbb914295fd54c0183d469c5ac3a6 100644 GIT binary patch delta 551 zcmV+?0@(es2DJu|NeaLK01m(bYSxJfkyCdGzjgrt=mP)%zmd~nf7TWHXG63NM*si; z;Ymb6R5(wild)?QK@^9-H?w=qX*7rsk0>G*q9PbmU%(`iCJ+vEmI2#TU`*gU7x*oMRN^kg}1^^}ftqR7Pp{D(6G-ep9jfHanSZnBZ zfAi+mOV;1MX7hnSmk`%J&a$v@ovG{9!0+e-CZQo%2}hNYg9;!WK-HaN+VrXnhNp027mw(E1F(m8%n&q>Hh6xDWrr z&1Su*ojwbIQW36iGm5HcB^c}QK1C^E^T!5j&p*i!V0!jaarDRt0HS)|eI<^GDiPM^ pP!#0-?dbC>@U+yDRo07*qo1w^hwV1mqF3Z4J} delta 548 zcmV+<0^9wy2C@c_NeaOL01m+cxRGn^kyCdG*>(W{=mP)%*^$#>e_1Jhu+Qvx)Bpeh z-bqA3R5(wilf7;eK@^3*JF_-OCWc_gQLIQn5FJ87NEAr?G^B$RAVGuNpit4}F?fPN zLqP%!p+})WqyP#xh`fNY6EKoVY_E5BekhE`4u}TM>Pma>ocVNicUHXj{EuV=xb@(+ zFHM)p=kkaM09q7Ue=AaBPzcsrjIr#rcX;*qr2s@D()7{e+_-uZ>m2|pQiur7d$b5z zYn*eq%(3xiW3+7y&`P63P--|@eYPG@t~ASn;dd?7YA|th0wB#&_WFBl zZoTK-hdPbrCiDq)Ve2|ewHlW%o+nNQe*$`gE+6aLG?tsg&3{pB2BbC#eE?+1@VV(8 ztohaIxCd-ze@O;oK==xA(&yyDDOd|@0GwHv4YSiHD)i%hOlHG+NZ`Dsm-aYTjwn|S zQ!FWpB}KQ_r#d&qY`H*t|2w;#Z^YU79E6|g?BY3JJTe7JkvZqwHP>n999M?Mpgz!Aj=DgrJ-z)b2J#4!QxCnwjm=EgCLNO z0^-be7O;2@kPQL}Kn&6kqtR_;U|?oon841!0#svQWNg5=0Aemk59Mybe+V|Ge#WBRff9a&%*&=}=$LiDH%?<73f3$eR zR$+OKrU*@?jlnFU+8YJe9yxdE(EbDL9TTo82^d60u=KP}ICjXy?v#j>S*LWz>vLz$ z)keK}cbBv5S1g|l-~GQI3oV3_pVX@;AGo^v`lEd(|8Dstro_}RiD#)%PjL!|UDce= zYs$hZZU1^PeCaURnXW(mTi}*R4X_|>5125 z?Ov`Xw~Io(O3FJJn9Z!DRhG;=z|PMkP_4 zv2ov_x7)8DU$;e);@@#atGHYZr8PPg!>4 zaYf}D-YHA0wptv0EPmeLSisf4`x#yLyQls>GjC4%w<9%1CRa7hR>a6Zer@8-5N(~4 zxZwD-Sy2{~t7MD!e7*A5P+{(;pVH!w9y+@hoMW8uTBbqv_I5?4d%QJP;WfWD9oapz za^Xw`7ym@AR{@Vdmb})xyUTmM#>=UydlxPET;06&?EH|j8g|Wt7rT!?em8eFL%>Y6 z7KeG+C97LE_en4x<6D&f@79yshr(|%{Rscd_;lt+8+H?QQBWfAboFyt=akR{0Ee$G A8~^|S diff --git a/src/main/resources/assets/clayiumadditions/textures/items/gadget_speed1.png b/src/main/resources/assets/clayiumadditions/textures/items/gadget_speed1.png index 14c9afbd572b72908972bddc9e0a3c99c8be1a96..bab46525bcb06a3fbcbb64089f443bd7d6fc2dab 100644 GIT binary patch delta 550 zcmV+>0@?k#2DAo{NeaLK01m(bYSxJfkyCdGzjgrt=mP)%zmd~nf7TWHXG63NM*si; z;7LS5R5(wilD}&dK^(X~R0LX==3h@BisAw?Hj zNOeT?(%5;IA__tX7Ew}2Q1C|#R~W(jv9mK{vA1(~VwVRC^WMJiu1mK;hIdQ&(rO&HxYu5+MZES(H#H zrLfkbwWU^jnUD1Xq*O>Dky7GNtUO!rrheSJ|AbKbv0i|+hHi6KmKUg0#=WT@b8}A_ zJ2&RJ%nwP@VgKM82aO+0-<~0k_q-`b9PeSRrPXSA%{LH8e{_l9-wlUGFFv)XU<=mkj8y;VV?lL1pdN~LK=Mn^pNpP+R@ zv-z9NjT!*eYTcVMTwr$gI_1SC^N+uJ)i>z0|FF4Hqgt*1XE;N7vH7pmYtZg!jIsRu zJ~?1`Fn^4te{y?(7ltCw{VLzNd(DlXzsT;+NBv+44vkU`+NSgWxzy3KDIwwvCj6FP}fL{^IRmz>S-i+{qIK0EEo;J_a|@zdnEh?jDfAN5@0?n00000NkvXX1g=70f+Af5%>V!Z delta 556 zcmV+{0@MAp2D%22NeaOL01m+cxRGn^kyCdG*>(W{=mP)%*^$#>e_1Jhu+Qvx)Bpeh z=1D|BR5(wil09owK@^6cGjn%UG@E31O^9VsgDAEEEmVYbx`je)^fscEg{8kB|6#2* zq9%=T8$mEu28@Dhqag@(`B+V{3EAx4uNjNYoxL%gzQci;Gw(dS_j1Hq%l}AHz^#Y3 zZE3hnK9@&C0MMe)e_9d7F$y8E32~gTxwXmbr>_LSOG(3nMQ&WVNn#BE%2S94##*!p zT5F6kn8>j3ej$C<2WX{HA}G~sRiD3frmXJYnZ{GSgk%AUNk9NB)faQrYsZ`^tBOC* z$&n-OtkO*o2CV(sU}LMv)YVH={EjoFN_(A7|IQ^)2w@lyf5!>Ad=7x+rLWEiP_MlK zirjtVyPit`kR%2XA&z1ICNE2-o;jcB{y%U4Q5xA_VH7#T->UdNWJbpU!YE{CZ->RD zWj=grP_NAbA2W59ivO7E%qpFrdl=B}?((^@LcKP-|M;+~GphiEN#J@85Cy&OZmv%r zsEU8j?ExMJkvZqwHP>n999M?Mpgz!Aj=DgrJ-z)b2J#4!QxCnwjm=EgCLNO z0^-be7O;2@kPQL}Kn&6kqtR_;U|?oon841!0#svQWNg5=0Aemk59Mybe+V{}Y#WBRff9a&XSyLQE+U6U7u3g<^@3NQ4 zI#4I4DWZeJZ1#L7#R^ugtVF>Ry%|nAN=-?rJQ<2BVjZNn2Ie1_krSi1?*8`OpYu1~ zyvZB&(pqMQ<>z_r#%Cr@5&Ewz$+RwJ|ExY=ndO0I0)h-%G`56Aybt71WZlD`vvqq# z+5eRcBF>kNOkC^}KSOZ|M}wA#l9LaoZqv0{63Q1{!|t!)I~{PiH%v;^X(hK;?1IGs z3o<<#-2`h}7-u{2TBYo17GUOZIQ08K&gV+A-t4zWMGD1_RIneDGTUZ;GiUpcU3(8c zYTm3IeobieS_eGX}~Ext{+Txx@7Qp|d}8B(86r>CSK?p-8WOv9Vlubku#d&rk1f`B5QtIsW`} zn^WS?^_EUn_j|aPeSwY_1K*qb?HnxjA4Hcv`@5WfPt~U&iFzlW##`5BWN@%pEpt9z zvf`Cq=yvbW>s#voF4+2c?mX$Uj_)3Pd20Of!$D_;j8K8(B|6+)Zp`m(G+oz7@2P$M ioG(7EewuAV{nh;I8qfT)vnH#8BHq*0&t;ucLK6VC5ES+R diff --git a/src/main/resources/assets/clayiumadditions/textures/items/gadget_speed2.png b/src/main/resources/assets/clayiumadditions/textures/items/gadget_speed2.png index 2f53bd266c09645202cb984f32f59f518403182d..ded4f66a7d5e43861ae784c44e66ffdd240e9f1a 100644 GIT binary patch delta 541 zcmV+&0^QSjg`mC>6yt2 zrBWHCGPhO%VGv*ve}h7krVg7VbUJO;p0^Z0m*LfqUdd2HWJV}Kr4;b8h}?XRwZd14<9|Dq@`>m;JstmIWN~%dGq?6Bo**rk=n(Y zOta+xV`AC|KRD?8Vt#RnMsq=uax|I?c<<@=`{EM;g~l2~f4AF}AiKK-?yYaJx4y;U z??Xuu0f59glu}rm;GBnAy+~kcd7iW9t5P!(&}w+A3S$ibX?4ULpElmJ|NW=T2U*^U6%+|0&tT)BT6fJ(I@KItGH{9|W3qV+7JYExj2n{#t`mvzXvz#z8SzV|8c z-pZ`l&UvhLdkhA#2*?&p+~@MOtMGJIf&kO?y7;c&n8x&b7@J63{z9WUlb*Y92>`7_ z+_23sJVBrp#yY$opta)L*Dtg-KB|Jiox4-%sgn}`D4o6ga;ZdE4zV_YG$k3{&e72y fK183T_E`82Fp$G>23Dvq00000NkvXXu0mjfdHw+p delta 541 zcmV+&0^(W{=mP)%*^$#>e_1Jhu+Qvx)Bpeh z*hxe|R5(wil22<>K@`P*cjhH3+GtHoRRp0Tv?wm5D>o`acV?qdcW)#35&R7O3U&1s zYFD;qC#YYb#jG>|!Iia%Mo4SY^!=N0k-m9((3PIyz|5IDhclNe)>{4tk{LXD_SjZu zYm`f6L<9gW3au4Uf0CdOQk#+_DcydT%@=P3z{{Lw&z|Su-3F;O04Pr(A{cAYB518K z#$aN@#>b89S#F?}Mv0)*L|S|K+7(UX>5~;aHA%>{L26PE0L$8|b(%roiVE<3F4RxB zqslg66teSkm)(Ak<$HH%_`WO3kZI%b*lEr{Aw*Hga5!|Ae{63T*a-qUL4XqXEH?m1 zQ-g?*#K}asvQ#9n;QNTqd*BR2Y2;`{aSVXHm@`8s2w-Y-Toa=>V*g;DtyUX=x5qSb zA?v}Z&}lBg=y1qZt4(t?pt%|#T?)*wbbFB~J;opokN*9=$i{O&KLcr;5+3FTZj|q@ zJg|%NH`w{Hd*?0zuFuc$^;-{sYgg-dCC#VLE#9xc6Q&awn=*<L;mG6_u)D zI6C0+r5WaGr|JLsO>gjvah%VAOK@}fmaUwb0YEDcV+^H|hgU9>#0l0KqIeR0us5Ln f;foXu{uO@#d{M~O*LB=i00000NkvXXu0mjfItTxH diff --git a/src/main/resources/assets/clayiumadditions/textures/items/gadget_speed2_2.png b/src/main/resources/assets/clayiumadditions/textures/items/gadget_speed2_2.png deleted file mode 100644 index cb05e6a34f9cd30b1a336b23b7bd3b78d6de0536..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 828 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv=}#LT=BJwMkF1yemk zJwwAT4zY7UMLSX>JkvZqwHP>n999M?Mpgz!Aj=DgrJ-z)b2J#4!QxCnwjm=EgCLNO z0^-be7O;2@kPQL}Kn&6kqtR_;U|?oon841!0#svQWNg5=0Aemk59Mybe+V{fK#WBRff9a&%*&&V+N9*sOxwE>7f03A2 zSlOb8&b1v0kDDEorX@XI9H5gl@tD1nql#D*8_VWav8G$xj@ny&5}nKnnP2ZJe}B(f zzx(doyRJE3c-Y(ejoa_O_=ieOl)-+jpZ1(k*M8U}{p|Kk`?md~7-Tn0~ z@4P(`Qp?+-^7f>>{VkOmxhzsCfTJ|_;T-kTn;Fl(%Hm?OnX{Mcz|7s(FY5?0RLBbm z&MB>sfB52MCiC}s`ifP5_=6fXdU^bFb+>IhqO8*Y<;5}I84+{8aBf}u@{5&3vcrRe zZ+}0&5>P(R?pWpdf4kbAJLl;JSKilu zuBxR~yk7b1anqJl&)3cEKi)t0fF-*_ni0ddH}_gOD$GyJ^!fbqboxEr{i14|PG3Yy z9YwWl=J{P+7+m^7%y!paxx0%Ne9dlO`;Fhr`d+h3!KXtjchtYPW7uNUB5=Z}`DF2& s(jyWp-ZJd{yZP+)@A0Xt9>jl@R=N5n=XZbWJ5c<4y85}Sb4q9e0N`3CaR2}S diff --git a/src/main/resources/assets/clayiumadditions/textures/items/gadget_stepassist.png b/src/main/resources/assets/clayiumadditions/textures/items/gadget_stepassist.png index 47de6bcb95dc699f51e0c22fd182a7349203b15f..5b9240925d7996e0f89070c0aafc4a1f954c48c3 100644 GIT binary patch delta 525 zcmV+o0`mQ}2A2kqNeaRM01mh3=fyQ?fL1ceAjI1oDvh1@2> zHTD)FcGf|-`mBZBUMq=*l7oZX8Slr=?9N!M`}R<~JQ(=$eee6-_ukCHB}3KV(ZQW? zZRa|1yoFK~t(74%23uGZntu>VTv0Hcp7HMO2L%w-2HRJ6cy;myfOf0H@!$}p6h3&2 zG8kj<-s7BSG&-qeje*vNcB>0bUM{1jkxr=o)xmlBKB}fOG?g07@&o_Y~g$ zYhZ0IBtVv?s3d_T0bsG1v;1|zc>I;sY9)2ji$c@xbjZ40Nw$YW!GA?*S?2{&9HEqa zw=t+=Qv{G@836b0?hE(i>3zW)+fY0_cmRNPImSd7t;rr|@M%}d0K)qQOE1n@mdl@5 zyF^h!D1iV#zc-=Zn+RU#%?`vMUoWt3#cVd^{CvvyAK#dqjioS2gP8cz3NIt9bH|Hk z14;ZHNvC?9L)z@En`Rqpt}$O#v;Ob=5dw6{u&xk;W{JT|i*+2m-lgB0aC!kZ$w>DKKVp><`uB6aodx8j&+E5f+~LZEQf?DP4IkE73`y;S@LUiHXd_{A`x P00000NkvXXu0mjf^Q!*C delta 556 zcmV+{0@MAM2DJu|NeaUN01m?e$8V@)kyCdLU;qFB0RR91U;qFB0RWNMTz>{N)N`_r zaytM30pUqRK~y+TrINjBltC1RpEL7)tAam7y#hN?ENp^UhzK^DpF$yc1qy0m5y*{b zLM$SJVr2|yA*fwI8?{kyz?f`YA+F!IyYp|c+1U+R={p>lIrE-}Gt7~c68|F^0#}K}bKF~5CU_5Hqmu#F zSvuVgUE3w#xpU(-@ODpFW0-3`q-Xkn0_uK6&-GcjHP6D$`D_^1wV6i%*kE!lf1@)V zS6f=&CiCUrwD@=$(|=#j=RC?6=Psp_Cr;tL2cRrU01oWmhX@2e@D-)z{ihGSdh${j ze?m-w+SZt82n0H&L&tQe>Mm8cOI6pjfBm4f^PQd>%|Y(q^yM?@@WDd>XjKqnq$~@H uMg#9WDMhRsynW~A4qsk>mOX%f)o<4*=1yyBlO+HE002ovP6b4+LSTaIe)F3E diff --git a/src/main/resources/assets/clayiumadditions/textures/items/gadget_stepassist_old.png b/src/main/resources/assets/clayiumadditions/textures/items/gadget_stepassist_old.png new file mode 100644 index 0000000000000000000000000000000000000000..ce5b30a770ffef4399dbfad5b3893cf93cb6f785 GIT binary patch literal 822 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufG}g$wN6f;pk#?_L`iUdT1k0gQ7S_~VrE{6o}X)of~lUN zo}pnEhuArwq8+Ibo@t(*S_~XO4l9EcBP#||X4F>4x-4FXI+ zlbOIOgDfq8ET}F+0|SukHPK(`&Rclhfg$tA)5S5w!hh+c^I5@;BFE~})AFKRS05D@ z5MTL7+e7roQfWcON5@)OFaGP+6FIW1+Lc>Oa0z#LQ$P*FW9c1129->$3c0gpRKGtn zx3F;b&WT)Hb*qc_&3r%mbNT~&#m5h>9hzED^Nqzb$a%?g*j0Mq&TIg`>BdmOJ#c`3k< zxz#JFcJA@lzDBQa&YQjXb_T*^;J5nc`luCQ#{b@{#{}zYw+dZJ24p_KGdCL zUXm&H_{Nv3+2V&z2B#OCV@&X2I`HtNvxZ<%INy$G5_a`JkL=zq-*UfA!lu&h$ZsBv z6PxTJuchZ(Bz!17kYKT3|Mkbm&y}xPnvpt(uO0FptU^+ML me@c0Id;i<@_3=0NKM-fFJ=vKz>l!~O<~?2gT-G@yGywntHYLvh literal 0 HcmV?d00001 From eaadb19a8afe89f0ec46892ec4975b11d0754faa Mon Sep 17 00:00:00 2001 From: nao7016 <213825473+nao7016@users.noreply.github.com> Date: Wed, 25 Feb 2026 23:50:16 +0900 Subject: [PATCH 3/3] version 0.2.2 and refactoring --- build.gradle.kts | 2 +- dependencies.gradle | 15 ++++++++------- .../ClayiumAdditions/block/RawClayOreBlock.java | 2 +- .../block/tile/TileAutoWaterWheel.java | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d3b7daf..4d15d78 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -9,4 +9,4 @@ java { targetCompatibility = JavaVersion.VERSION_1_8 } -version = "0.2.1" +version = "0.2.2" diff --git a/dependencies.gradle b/dependencies.gradle index 0dac13c..be52f59 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -34,22 +34,23 @@ * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph */ dependencies { - implementation("curse.maven:clayium-243111:2353582") + implementation(rfg.deobf("curse.maven:clayium-243111:2353582")) //devOnlyNonPublishable("curse.maven:clayium-243111:2351145") // devOnlyNonPublishable("curse.maven:cofh-core-69162:2388750") - devOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.50-GTNH:dev") + devOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.8.71-GTNH:dev") //devOnlyNonPublishable("ganymedes01.etfuturum:Et-Futurum-Requiem:2.6.2.9-GTNH:dev") - //devOnlyNonPublishable("com.github.GTNewHorizons:InventoryBogoSorter:1.2.51-GTNH:dev") - //devOnlyNonPublishable("curse.maven:craftguide-75557:2459319") + devOnlyNonPublishable("com.github.GTNewHorizons:InventoryBogoSorter:1.2.51-GTNH:dev") + //devOnlyNonPublishable("curse.maven:craftguide-75557:2459320") compileOnly("com.github.GTNewHorizons:NotEnoughItems:2.7.4-GTNH:dev") compileOnly("ganymedes01.etfuturum:Et-Futurum-Requiem:2.6.2.9-GTNH:dev") compileOnly("com.github.GTNewHorizons:InventoryBogoSorter:1.2.51-GTNH:dev") - compileOnly("curse.maven:craftguide-75557:2459319") + compileOnly("curse.maven:craftguide-75557:2459320") - runtimeOnlyNonPublishable("curse.maven:inventory-tweaks-223094:2210792") - runtimeOnlyNonPublishable("curse.maven:nbtreader-227127:2224950") + //runtimeOnlyNonPublishable(rfg.deobf("curse.maven:inventory-tweaks-223094:2210792")) + runtimeOnlyNonPublishable(rfg.deobf("curse.maven:nbtreader-227127:2224950")) + runtimeOnlyNonPublishable("curse.maven:angelica-988067:7196981") //runtimeOnlyNonPublishable("curse.maven:waila-73488:2230518") //runtimeOnlyNonPublishable("curse.maven:wawla-224712:2298772") } diff --git a/src/main/java/com/nao7016/ClayiumAdditions/block/RawClayOreBlock.java b/src/main/java/com/nao7016/ClayiumAdditions/block/RawClayOreBlock.java index 3c56771..6350732 100644 --- a/src/main/java/com/nao7016/ClayiumAdditions/block/RawClayOreBlock.java +++ b/src/main/java/com/nao7016/ClayiumAdditions/block/RawClayOreBlock.java @@ -30,7 +30,7 @@ public RawClayOreBlock() { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(Item item, CreativeTabs tab, List list) { + public void getSubBlocks(Item item, CreativeTabs tab, List list) { for (int meta : VALID_METAS) { list.add(new ItemStack(item, 1, meta)); } diff --git a/src/main/java/com/nao7016/ClayiumAdditions/block/tile/TileAutoWaterWheel.java b/src/main/java/com/nao7016/ClayiumAdditions/block/tile/TileAutoWaterWheel.java index 41d7951..bfb8ec4 100644 --- a/src/main/java/com/nao7016/ClayiumAdditions/block/tile/TileAutoWaterWheel.java +++ b/src/main/java/com/nao7016/ClayiumAdditions/block/tile/TileAutoWaterWheel.java @@ -15,7 +15,7 @@ public class TileAutoWaterWheel extends TileWaterWheel { private static final Random random = new Random(); @Override - public void func_145845_h() { + public void updateEntity() { if (!this.worldObj.isRemote && this.progressEfficiency < 500) { this.progressEfficiency = 1000; this.setSyncFlag(); // クライアントと同期