From 16b9e0013814da00c603ba54b96c741db0556112 Mon Sep 17 00:00:00 2001 From: Ethryan <3237986+Ethryan@users.noreply.github.com> Date: Tue, 1 Oct 2024 23:03:02 +0200 Subject: [PATCH] update deps and trying to fix the keyhandler --- dependencies.gradle | 11 ++++++----- .../common/items/baubles/ItemCloak.java | 3 ++- .../common/recipes/infusion/WG_infusion_baubles.java | 8 ++++---- .../witchinggadgets/common/util/WGKeyHandler.java | 8 +++++--- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 22e6f5e42..138d712ab 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -5,10 +5,10 @@ dependencies { // we don't want the old Baubles Messing stuff up so lets disable that exclude module: "Baubles" } - implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.68:dev') {exclude module: "Baubles" } + implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.50.26:dev') {exclude module: "Baubles" } implementation('com.github.GTNewHorizons:ForbiddenMagic:0.7.0-GTNH:dev') {exclude module: "Baubles" } - implementation('com.github.GTNewHorizons:twilightforest:2.6.33:dev') - implementation('com.github.GTNewHorizons:NotEnoughItems:2.6.34-GTNH:dev') + implementation('com.github.GTNewHorizons:twilightforest:2.6.34:dev') + implementation('com.github.GTNewHorizons:NotEnoughItems:2.6.39-GTNH:dev') implementation('com.github.GTNewHorizons:Baubles-Expanded:2.0.3:dev') implementation('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false} implementation('com.github.GTNewHorizons:CodeChickenLib:1.3.0:dev') @@ -18,6 +18,7 @@ dependencies { compileOnly('com.github.GTNewHorizons:CraftTweaker:3.4.0:dev') {transitive=false} compileOnly('com.github.GTNewHorizons:ZenScript:1.0.0-GTNH') {transitive=false} compileOnly('com.github.GTNewHorizons:MagicBees:2.8.3-GTNH:api') {transitive=false} - compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.12.9-GTNH:dev') {transitive=false} + compileOnly('com.github.GTNewHorizons:MagicBees:2.8.5-GTNH:api') {transitive=false} + compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.12.10-GTNH:dev') {transitive=false} compileOnly(deobfCurse('enviromine-230236:2269710')) -} \ No newline at end of file +} diff --git a/src/main/java/witchinggadgets/common/items/baubles/ItemCloak.java b/src/main/java/witchinggadgets/common/items/baubles/ItemCloak.java index 00a9239e4..b355d4101 100644 --- a/src/main/java/witchinggadgets/common/items/baubles/ItemCloak.java +++ b/src/main/java/witchinggadgets/common/items/baubles/ItemCloak.java @@ -27,6 +27,7 @@ import net.minecraftforge.event.entity.player.AttackEntityEvent; import baubles.api.BaubleType; +import baubles.api.expanded.BaubleExpandedSlots; import baubles.api.expanded.IBaubleExpanded; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Optional; @@ -370,7 +371,7 @@ public boolean canUnequip(ItemStack itemStack, EntityLivingBase entityLivingBase @Override public String[] getBaubleTypes(ItemStack itemstack) { - return new String[] { "cape" }; + return new String[] { BaubleExpandedSlots.capeType }; } @Override diff --git a/src/main/java/witchinggadgets/common/recipes/infusion/WG_infusion_baubles.java b/src/main/java/witchinggadgets/common/recipes/infusion/WG_infusion_baubles.java index c2907e18b..ea136dc93 100644 --- a/src/main/java/witchinggadgets/common/recipes/infusion/WG_infusion_baubles.java +++ b/src/main/java/witchinggadgets/common/recipes/infusion/WG_infusion_baubles.java @@ -36,7 +36,7 @@ public static void registerInfusionBaubles() { 2, new AspectList().add(Aspect.MINE, 48).add(Aspect.TOOL, 24).add(Aspect.MOTION, 24) .add(Aspect.AIR, 16).add((Aspect) gregtech.api.enums.TCAspects.NEBRISUM.mAspect, 8), - new ItemStack(Blocks.fire, 0, 1), //WIP: Register a new Glove Item instead + new ItemStack(Blocks.fire, 0, 1), // WIP: Register a new Glove Item instead new ItemStack[] { Materials.Platinum.getIngots(1), ItemList.IC2_CoffeePowder.get(1L, Materials.Coffee.getDust(1)), new ItemStack(Items.potionitem, 1, 8194), @@ -49,7 +49,7 @@ public static void registerInfusionBaubles() { 2, new AspectList().add(Aspect.FLIGHT, 16).add(Aspect.MOTION, 8).add(Aspect.AIR, 16) .add((Aspect) gregtech.api.enums.TCAspects.NEBRISUM.mAspect, 8), - new ItemStack(Blocks.fire, 0, 1), //WIP: Register a new Shoulder Item instead + new ItemStack(Blocks.fire, 0, 1), // WIP: Register a new Shoulder Item instead new ItemStack[] { new ItemStack(WGModCompat.tfMagicMapFocus), ItemList.Electric_Piston_MV.get(1L), new ItemStack(WGModCompat.tfMagicMapFocus), new ItemStack(ConfigItems.itemShard, 1, 0), new ItemStack(WGModCompat.tfMagicMapFocus), ItemList.Electric_Piston_MV.get(1L) }); @@ -91,7 +91,7 @@ public static void registerInfusionBaubles() { new ItemStack(WGContent.ItemMagicalBaubles, 1, 3), 2, new AspectList().add(Aspect.MINE, 8).add(Aspect.TOOL, 4).add(Aspect.MOTION, 4).add(Aspect.AIR, 8), - new ItemStack(Blocks.fire, 0, 1), //WIP: Register a new Glove Item instead + new ItemStack(Blocks.fire, 0, 1), // WIP: Register a new Glove Item instead new ItemStack[] { new ItemStack(Items.gold_ingot), new ItemStack(Items.sugar), new ItemStack(Items.potionitem, 1, 8194), new ItemStack(Items.sugar) }); @@ -106,7 +106,7 @@ public static void registerInfusionBaubles() { new ItemStack(WGContent.ItemMagicalBaubles, 1, 0), 2, new AspectList().add(Aspect.FLIGHT, 16).add(Aspect.MOTION, 8).add(Aspect.AIR, 16), - new ItemStack(Blocks.fire, 0, 1), //WIP: Register a new Shoulder Item instead + new ItemStack(Blocks.fire, 0, 1), // WIP: Register a new Shoulder Item instead new ItemStack[] { new ItemStack(Items.feather), stack_ingot, new ItemStack(Items.feather), new ItemStack(ConfigItems.itemShard, 1, 0), new ItemStack(Items.feather), stack_ingot }); diff --git a/src/main/java/witchinggadgets/common/util/WGKeyHandler.java b/src/main/java/witchinggadgets/common/util/WGKeyHandler.java index 85d006e8b..f2afaf96f 100644 --- a/src/main/java/witchinggadgets/common/util/WGKeyHandler.java +++ b/src/main/java/witchinggadgets/common/util/WGKeyHandler.java @@ -7,6 +7,7 @@ import net.minecraftforge.common.ForgeHooks; import baubles.api.BaublesApi; +import baubles.api.expanded.BaubleExpandedSlots; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; @@ -15,6 +16,7 @@ import witchinggadgets.WitchingGadgets; import witchinggadgets.common.WGConfig; import witchinggadgets.common.WGContent; +import witchinggadgets.common.items.baubles.ItemMagicalBaubles; import witchinggadgets.common.items.tools.ItemPrimordialGlove; import witchinggadgets.common.util.network.message.MessagePrimordialGlove; @@ -61,9 +63,9 @@ public void playerTick(TickEvent.PlayerTickEvent event) { if (!isJumping) { multiJumps = 0; isJumping = event.player.isAirBorne; - if (BaublesApi.getBaubles(event.player) != null - && player.inventory.getCurrentItem().getItem().equals(WGContent.ItemMagicalBaubles) - && player.inventory.getCurrentItem().getItemDamage() == 0) + if ( player.getCurrentEquippedItem() != null + && player.getCurrentEquippedItem().getItem() instanceof ItemMagicalBaubles + && player.getCurrentEquippedItem().getItemDamage() == 0) multiJumps += 1; } keyDown[2] = true;