Trying to get away from Travellers Gear

dependencies.gradle

@@ -1,24 +1,25 @@
 // Add your dependencies here
 
 dependencies {
-	implementation('com.github.GTNewHorizons:Tainted-Magic:7.6.13-GTNH:dev')
-	implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.50.67:dev')
-	implementation('com.github.GTNewHorizons:ForbiddenMagic:0.7.0-GTNH:dev')
-	implementation('com.github.GTNewHorizons:twilightforest:2.6.35:dev')
-	implementation('curse.maven:travellers-gear-224440:2262113')
-	implementation('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
-	implementation('com.github.GTNewHorizons:NotEnoughItems:2.6.44-GTNH:dev')
-	api ('com.github.GTNewHorizons:ThaumicBoots:1.3.10:dev'){
-		exclude group: 'com.github.GTNewHorizons', module: 'WitchingGadgets'
+
+	api ('com.github.GTNewHorizons:ThaumicBoots:1.4.0:dev'){transitive=false}
+
+	implementation('com.github.GTNewHorizons:Baubles-Expanded:2.0.3:dev')
+	implementation('com.github.GTNewHorizons:Tainted-Magic:7.6.13-GTNH:dev') {
+		// 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.51.27:dev') {exclude module: "Baubles" }
+	implementation('com.github.GTNewHorizons:ForbiddenMagic:0.7.0-GTNH:dev') {exclude module: "Baubles" }
+	implementation('com.github.GTNewHorizons:twilightforest:2.7.1:dev')
+	implementation('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') {transitive=false}
+	implementation('com.github.GTNewHorizons:NotEnoughItems:2.7.4-GTNH:dev')
 
 	compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.5.0:dev') {transitive=false}
-	compileOnly('com.github.GTNewHorizons:Botania:1.11.5-GTNH:api') {transitive=false}
+	compileOnly('com.github.GTNewHorizons:Botania:1.12.2-GTNH:api') {transitive=false}
 	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.5-GTNH:api') {transitive=false}
-	compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.12.14-GTNH:dev') {transitive=false}
+	compileOnly('com.github.GTNewHorizons:TinkersConstruct:1.13.0-GTNH:dev') {transitive=false}
 	compileOnly(deobfCurse('enviromine-230236:2269710'))
-
-	runtimeOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev')
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.29'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30'
 }
 
 

src/main/java/witchinggadgets/WitchingGadgets.java

@@ -10,6 +10,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import baubles.api.expanded.BaubleExpandedSlots;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
@@ -45,10 +46,9 @@
         name = WitchingGadgets.MODNAME,
         version = WitchingGadgets.VERSION,
         dependencies = "required-after:Thaumcraft;" + "required-after:ForbiddenMagic;"
-                + "required-after:TravellersGear@[1.16.4,);"
-                + "required-after:gregtech;"
                 + "required-after:TwilightForest;"
                 + "required-after:TaintedMagic;"
+                + "after:gregtech;"
                 + "after:miscutils;"
                 + "after:Mystcraft;"
                 + "after:TConstruct;"
@@ -85,6 +85,7 @@ public class WitchingGadgets {
     @Mod.EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         logger.log(Level.INFO, "Setting up 'WitchingGadgets'");
+
         if (Loader.isModLoaded(BOOTS)) {
             isBootsActive = true;
         }
@@ -93,7 +94,10 @@ public void preInit(FMLPreInitializationEvent event) {
         WGContent.preInit();
 
         packetHandler = NetworkRegistry.INSTANCE.newSimpleChannel(MODID);
-
+        BaubleExpandedSlots.tryAssignSlotOfType(BaubleExpandedSlots.capeType);
+        BaubleExpandedSlots.tryAssignSlotOfType(BaubleExpandedSlots.gauntletType);
+        BaubleExpandedSlots.tryAssignSlotOfType(BaubleExpandedSlots.charmType);
+        BaubleExpandedSlots.tryAssignSlotOfType("Title");
         eventHandler = new EventHandler();
         MinecraftForge.EVENT_BUS.register(eventHandler);
         playerTickHandler = new PlayerTickHandler();

src/main/java/witchinggadgets/client/ClientEventHandler.java

@@ -40,8 +40,8 @@
 import thaumcraft.client.gui.GuiResearchBrowser;
 import thaumcraft.common.Thaumcraft;
 import thaumcraft.common.config.ConfigItems;
-import travellersgear.api.RenderTravellersGearEvent;
 import witchinggadgets.WitchingGadgets;
+import witchinggadgets.client.render.armor.RenderGearEvent;
 import witchinggadgets.common.WGContent;
 import witchinggadgets.common.WGResearch;
 import witchinggadgets.common.blocks.tiles.TileEntitySaunaStove;
@@ -283,7 +283,7 @@ public void renderArmor(SetArmorModel event) {
 
     @SideOnly(Side.CLIENT)
     @SubscribeEvent
-    public void renderTravellersGear(RenderTravellersGearEvent event) {
+    public void renderTravellersGear(RenderGearEvent event) {
         int translucency = EnchantmentHelper.getEnchantmentLevel(WGContent.enc_invisibleGear.effectId, event.stack);
         if (event.stack != null && (translucency > 1 || (translucency > 0 && event.entityPlayer.isInvisible()))) {
             boolean unveiling = EnchantmentHelper.getEnchantmentLevel(

src/main/java/witchinggadgets/client/ClientProxy.java

@@ -1,6 +1,7 @@
 package witchinggadgets.client;
 
 import net.minecraft.client.particle.EntityLavaFX;
+import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.tileentity.TileEntity;
@@ -10,15 +11,18 @@
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import org.lwjgl.input.Keyboard;
+
 import baubles.api.BaublesApi;
+import baubles.api.expanded.BaubleExpandedSlots;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import cpw.mods.fml.common.FMLCommonHandler;
 import thaumcraft.client.fx.ParticleEngine;
 import thaumcraft.client.fx.particles.FXEssentiaTrail;
 import thaumcraft.client.fx.particles.FXWisp;
-import travellersgear.api.TravellersGearAPI;
+import witchinggadgets.WitchingGadgets;
 import witchinggadgets.client.fx.EntityFXSweat;
 import witchinggadgets.client.gui.GuiBag;
 import witchinggadgets.client.gui.GuiCloakBag;
@@ -115,7 +119,11 @@ public void registerHandlers() {
         MinecraftForge.EVENT_BUS.register(new ClientEventHandler());
         FMLCommonHandler.instance().bus().register(new WGKeyHandler());
         FMLCommonHandler.instance().bus().register(new ClientTickHandler());
-
+        ClientRegistry.registerKeyBinding(
+                WGKeyHandler.activateKey = new KeyBinding(
+                        "wg.config.activateKey",
+                        Keyboard.KEY_NONE,
+                        WitchingGadgets.MODNAME));
         if (WGConfig.enableSearch) {
             ThaumonomiconIndexSearcher.init();
         }
@@ -130,8 +138,8 @@ public Object getClientGuiElement(int ID, EntityPlayer player, World world, int
         if (ID == 4 || ID == 5) return new GuiCloakBag(
                 player.inventory,
                 world,
-                ID == 4 ? TravellersGearAPI.getExtendedInventory(player)[0]
-                        : BaublesApi.getBaubles(player).getStackInSlot(3));
+                BaublesApi.getBaubles(player).getStackInSlot(
+                        BaubleExpandedSlots.getIndexOfTypeInRegisteredTypes(BaubleExpandedSlots.capeType)));
 
         if (ID == 6) return new GuiPatchedFocusPouch(player.inventory, world, x, y, z);