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 4f1f5bf..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.7.4-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(); // クライアントと同期 diff --git a/src/main/java/com/nao7016/ClayiumAdditions/common/CAItems.java b/src/main/java/com/nao7016/ClayiumAdditions/common/CAItems.java index 58e59d2..5e1ed80 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("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()); + 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..577a49d --- /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[] { "Jumping0", "Jumping1", "Jumping2" }); + } + + @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..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(CItems.itemMisc.get("IntegratedCircuit")), + ii(s(CItems.itemMisc.get("IntegratedCircuit"), 3)), 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("Jumping0")), + e(6), + 120L); + CRecipes.recipeAssembler.addRecipe( + oo(CAItems.addGadget.get("Jumping0"), i(Items.feather, 16)), + 0, + 6, + ii(CAItems.addGadget.get("Jumping1")), + e(8), + 120L); + CRecipes.recipeAssembler.addRecipe( + oo(CAItems.addGadget.get("Jumping1"), i(Items.feather, 64)), + 0, + 6, + ii(CAItems.addGadget.get("Jumping2")), + e(9), + 120L); } private static void registerBlastFurnace() { 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 d25da81..c5bee72 100644 Binary files a/src/main/resources/assets/clayiumadditions/textures/items/gadget_blank.png and b/src/main/resources/assets/clayiumadditions/textures/items/gadget_blank.png differ 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 0000000..867afcd Binary files /dev/null and b/src/main/resources/assets/clayiumadditions/textures/items/gadget_blank_moving.png differ 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 0000000..effd6c9 Binary files /dev/null and b/src/main/resources/assets/clayiumadditions/textures/items/gadget_jumping0.png differ 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 0000000..aee04b8 Binary files /dev/null and b/src/main/resources/assets/clayiumadditions/textures/items/gadget_jumping1.png differ 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 0000000..6e6098e Binary files /dev/null and b/src/main/resources/assets/clayiumadditions/textures/items/gadget_jumping2.png differ 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 dcf1e51..e039587 100644 Binary files a/src/main/resources/assets/clayiumadditions/textures/items/gadget_speed0.png and b/src/main/resources/assets/clayiumadditions/textures/items/gadget_speed0.png differ diff --git a/src/main/resources/assets/clayiumadditions/textures/items/gadget_speed0_2.png b/src/main/resources/assets/clayiumadditions/textures/items/gadget_speed0_2.png deleted file mode 100644 index f6ce025..0000000 Binary files a/src/main/resources/assets/clayiumadditions/textures/items/gadget_speed0_2.png and /dev/null differ 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 14c9afb..bab4652 100644 Binary files a/src/main/resources/assets/clayiumadditions/textures/items/gadget_speed1.png and b/src/main/resources/assets/clayiumadditions/textures/items/gadget_speed1.png differ diff --git a/src/main/resources/assets/clayiumadditions/textures/items/gadget_speed1_2.png b/src/main/resources/assets/clayiumadditions/textures/items/gadget_speed1_2.png deleted file mode 100644 index 47de6bc..0000000 Binary files a/src/main/resources/assets/clayiumadditions/textures/items/gadget_speed1_2.png and /dev/null differ 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 2f53bd2..ded4f66 100644 Binary files a/src/main/resources/assets/clayiumadditions/textures/items/gadget_speed2.png and b/src/main/resources/assets/clayiumadditions/textures/items/gadget_speed2.png differ 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 cb05e6a..0000000 Binary files a/src/main/resources/assets/clayiumadditions/textures/items/gadget_speed2_2.png and /dev/null differ 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 0000000..5b92409 Binary files /dev/null and b/src/main/resources/assets/clayiumadditions/textures/items/gadget_stepassist.png differ 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 0000000..ce5b30a Binary files /dev/null and b/src/main/resources/assets/clayiumadditions/textures/items/gadget_stepassist_old.png differ