Skip to content

Commit

Permalink
update deps and trying to fix the keyhandler
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ethryan
Ethryan committed Oct 1, 2024
1 parent c58d6c6 commit 16b9e00
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 13 deletions.
11 changes: 6 additions & 5 deletions dependencies.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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'))
}
}
3 changes: 2 additions & 1 deletion src/main/java/witchinggadgets/common/items/baubles/ItemCloak.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/witchinggadgets/common/recipes/infusion/WG_infusion_baubles.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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) });
Expand Down Expand Up @@ -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) });

Expand All @@ -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 });

Expand Down
8 changes: 5 additions & 3 deletions src/main/java/witchinggadgets/common/util/WGKeyHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 16b9e00

Please sign in to comment.