From 0a2876d407d71f7caeb0572d94c27dbaf973d5a0 Mon Sep 17 00:00:00 2001 From: jss2a98aj Date: Thu, 4 Nov 2021 23:36:02 -0400 Subject: [PATCH] More work on the API but IIcons are not behaving as expected --- build.gradle | 41 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- .../api/expanded/BaubleExpandedSlots.java | 87 ++++++++---- .../BaubleSlotTypeBackgroundIconManager.java | 71 ++++++++++ .../baubles/client/gui/GuiPlayerExpanded.java | 19 +-- src/main/java/baubles/common/Baubles.java | 36 +++-- .../java/baubles/common/ItemDebugger.java | 127 ++++++++++++++++++ .../container/ContainerPlayerExpanded.java | 15 ++- .../baubles/common/container/SlotBauble.java | 11 +- .../resources/assets/baubles/lang/en_US.lang | 3 + .../textures/gui/expanded_inventory.png | Bin 6456 -> 767 bytes .../items/empty_bauble_slot_amulet.png | Bin 0 -> 121 bytes .../textures/items/empty_bauble_slot_belt.png | Bin 0 -> 122 bytes .../textures/items/empty_bauble_slot_body.png | Bin 0 -> 124 bytes .../textures/items/empty_bauble_slot_cape.png | Bin 0 -> 120 bytes .../items/empty_bauble_slot_charm.png | Bin 0 -> 115 bytes .../items/empty_bauble_slot_gauntlet.png | Bin 0 -> 141 bytes .../textures/items/empty_bauble_slot_head.png | Bin 0 -> 118 bytes .../textures/items/empty_bauble_slot_ring.png | Bin 0 -> 113 bytes .../items/empty_bauble_slot_unknown.png | Bin 0 -> 124 bytes 20 files changed, 340 insertions(+), 72 deletions(-) create mode 100644 src/main/java/baubles/api/expanded/BaubleSlotTypeBackgroundIconManager.java create mode 100644 src/main/java/baubles/common/ItemDebugger.java create mode 100644 src/main/resources/assets/baubles/textures/items/empty_bauble_slot_amulet.png create mode 100644 src/main/resources/assets/baubles/textures/items/empty_bauble_slot_belt.png create mode 100644 src/main/resources/assets/baubles/textures/items/empty_bauble_slot_body.png create mode 100644 src/main/resources/assets/baubles/textures/items/empty_bauble_slot_cape.png create mode 100644 src/main/resources/assets/baubles/textures/items/empty_bauble_slot_charm.png create mode 100644 src/main/resources/assets/baubles/textures/items/empty_bauble_slot_gauntlet.png create mode 100644 src/main/resources/assets/baubles/textures/items/empty_bauble_slot_head.png create mode 100644 src/main/resources/assets/baubles/textures/items/empty_bauble_slot_ring.png create mode 100644 src/main/resources/assets/baubles/textures/items/empty_bauble_slot_unknown.png diff --git a/build.gradle b/build.gradle index df49089..df43326 100644 --- a/build.gradle +++ b/build.gradle @@ -1,21 +1,21 @@ buildscript { - repositories { - maven { - name = "mavenCentral" - url = "https://repo1.maven.org/maven2/" - } - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' - } + repositories { + mavenCentral() + maven { + name = "gt" + url = "https://gregtech.overminddl1.com/" + } + } + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' + } +} + +repositories { + maven { + name 'gt' + url "https://gregtech.overminddl1.com/" + } } apply plugin: 'forge' @@ -24,6 +24,13 @@ version = "1.7.10-1.0.1.10" group= "com.azanor.baubles" archivesBaseName = "Baubles" +sourceCompatibility = 1.8 +targetCompatibility = 1.8 +compileJava.options.bootClasspath = org.gradle.internal.jvm.Jvm.current().getJre().getHomeDir().toString() +"/lib/rt.jar" +compileJava { + options.encoding = "UTF-8" +} + minecraft { version = "1.7.10-10.13.4.1614-1.7.10" runDir = "eclipse" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 678d9d8..a4e35a1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip diff --git a/src/main/java/baubles/api/expanded/BaubleExpandedSlots.java b/src/main/java/baubles/api/expanded/BaubleExpandedSlots.java index 587abac..aaa258a 100644 --- a/src/main/java/baubles/api/expanded/BaubleExpandedSlots.java +++ b/src/main/java/baubles/api/expanded/BaubleExpandedSlots.java @@ -3,43 +3,57 @@ package baubles.api.expanded; import baubles.api.BaubleType; public class BaubleExpandedSlots { - + //The total number of slots that can be added. public static final int slotLimit = 20; + + //All "default" types will have slot backgrounds registered automatically. + public static final String ringType = "ring"; + public static final String amuletType = "amulet"; + public static final String beltType = "belt"; + public static final String headType = "head"; + public static final String bodyType = "body"; + public static final String charmType = "charm"; + public static final String gauntletType = "gauntlet"; + public static final String capeType = "cape"; + + public static final String[] defaultTypes = { + ringType, + amuletType, + beltType, + headType, + bodyType, + charmType, + gauntletType, + capeType + }; private static String[] slots = new String[slotLimit]; private static int newSlotsRemaining = slotLimit; - public static final String ringType = "ring"; - public static final String amuletType = "amulet"; - public static final String beltType = "belt"; - - static { - tryAddSlot(amuletType); - tryAddSlot(ringType); - tryAddSlot(ringType); - tryAddSlot(beltType); - - tryAddSlot(ringType); - tryAddSlot(ringType); - tryAddSlot(ringType); - tryAddSlot(ringType); - tryAddSlot(ringType); - tryAddSlot(ringType); - } - + + /** + * Attempts to add a slot, but will not if there are no slots left. + * + * @param type The type of the slot being added + * @return If adding a slot was successful + */ public static boolean tryAddSlot(String type) { - //TODO: block after GUI init if(newSlotsRemaining >= 1) { slots[slotLimit - newSlotsRemaining] = type; newSlotsRemaining--; return true; } - + return false; } + /** + * Remove a slot of the specified type if one could be found. + * + * @param type The type of the slot being removed + * @return If removing a slot was successful + */ public static boolean tryRemoveSlot(String type) { - //TODO: block after GUI init for(int slotToCheck = 0; slotToCheck < slotLimit; slotToCheck++) { if(slots[slotToCheck].equals(type)) { for(int slotToMove = slotToCheck + 1; slotToMove < slotLimit; slotToMove++) { @@ -53,6 +67,13 @@ public class BaubleExpandedSlots { return false; } + + /** + * Returns the currently number of slots matching the specified type. + * + * @param type The type of slot being counted + * @return The current total number of matching slots found + */ public static int totalCurrentSlotsOfType(String type) { int total = 0; for(int slotToCheck = 0; slotToCheck < slotLimit; slotToCheck++) { @@ -63,18 +84,36 @@ public class BaubleExpandedSlots { return total; } + /** + * Returns the number of slots that are currently used. + * + * @return The total number of slots currently used + */ public static int getTotalSlots() { return slotLimit - newSlotsRemaining; } + + /** + * Returns the type of the specified slot or null if none or out of range. + * + * @param slot The slot to check + * @return The type in the specified slot or "unknown" + */ public static String getSlotType(int slot) { - if (slot > 0 & slot < slotLimit) { + if (slot >= 0 & slot < slotLimit) { return slots[slot]; } else { - return null; + return "unknown"; } } + /** + * Returns the type based on the specified BaubleType. + * + * @param type The BaubleType get a matching type from + * @return The type matching the BaubleType or "unknown" + */ public static String getTypeStringFromBaubleType(BaubleType type) { switch(type) { case RING: diff --git a/src/main/java/baubles/api/expanded/BaubleSlotTypeBackgroundIconManager.java b/src/main/java/baubles/api/expanded/BaubleSlotTypeBackgroundIconManager.java new file mode 100644 index 0000000..bbf1f8a --- /dev/null +++ b/src/main/java/baubles/api/expanded/BaubleSlotTypeBackgroundIconManager.java @@ -0,0 +1,71 @@ +package baubles.api.expanded; + +import java.util.ArrayList; + +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.LoaderState; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.util.IIcon; + +public class BaubleSlotTypeBackgroundIconManager { + + @SideOnly(Side.CLIENT) + private static class TypeIIconPair { + public IIcon icon; + public String type; + + public TypeIIconPair(IIcon icon, String type){ + this.icon = icon; + this.type = type; + } + } + + @SideOnly(Side.CLIENT) + private static ArrayList typeIIconPairList = new ArrayList(); + + @SideOnly(Side.CLIENT) + private static IIcon unknownIcon; + + @SideOnly(Side.CLIENT) + public static IIcon getBackgroundIconForSlotType(String type) { + if(type != null) { + for(TypeIIconPair pair : typeIIconPairList) { + if(type.equals(pair.type)) { + return pair.icon; + } + } + } + return unknownIcon; + } + + @SideOnly(Side.CLIENT) + public static boolean doesBackgroundIconForSlotTypeExist(String type) { + if(type != null) { + for(TypeIIconPair pair : typeIIconPairList) { + if(type.equals(pair.type)) { + return true; + } + } + } + return false; + } + + @SideOnly(Side.CLIENT) + public static boolean tryAddBackgroundIconForSlotType(IIcon icon, String type) { + if(icon != null && type != null && !doesBackgroundIconForSlotTypeExist(type)) { + typeIIconPairList.add(new TypeIIconPair(icon, type)); + return true; + } + return false; + } + + @SideOnly(Side.CLIENT) + public static void setBakgroundIconForUnknownSlotType(IIcon icon) { + if(icon != null) { + unknownIcon = icon; + } + } + +} diff --git a/src/main/java/baubles/client/gui/GuiPlayerExpanded.java b/src/main/java/baubles/client/gui/GuiPlayerExpanded.java index 8293f3c..2ec7bf9 100644 --- a/src/main/java/baubles/client/gui/GuiPlayerExpanded.java +++ b/src/main/java/baubles/client/gui/GuiPlayerExpanded.java @@ -63,19 +63,19 @@ public class GuiPlayerExpanded extends InventoryEffectRenderer { @Override public void drawScreen(int par1, int par2, float par3) { super.drawScreen(par1, par2, par3); - this.xSizeFloat = (float)par1; - this.ySizeFloat = (float)par2; + xSizeFloat = (float)par1; + ySizeFloat = (float)par2; } @Override protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) { GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(background); - this.drawTexturedModalRect(guiLeft, guiTop, 0, 0, this.xSize, this.ySize); + mc.getTextureManager().bindTexture(background); + drawTexturedModalRect(guiLeft, guiTop, 0, 0, this.xSize, this.ySize); for (int i1 = 4; i1 < BaubleExpandedSlots.getTotalSlots() + 4; ++i1) { Slot slot = (Slot)this.inventorySlots.inventorySlots.get(i1); - this.drawTexturedModalRect(guiLeft + slot.xDisplayPosition - 1, guiTop + slot.yDisplayPosition - 1, 200, 0, 18, 18); + drawTexturedModalRect(guiLeft + slot.xDisplayPosition - 1, guiTop + slot.yDisplayPosition - 1, 200, 0, 18, 18); } drawPlayerModel(guiLeft + 51, guiTop + 75, 30, (float)(guiLeft + 51) - this.xSizeFloat, (float)(guiTop + 75 - 50) - this.ySizeFloat, this.mc.thePlayer); } @@ -126,11 +126,12 @@ public class GuiPlayerExpanded extends InventoryEffectRenderer { } @Override - protected void keyTyped(char par1, int par2) { - if (par2 == Baubles.proxy.keyHandler.key.getKeyCode()) { + protected void keyTyped(char par1, int keyCode) { + if (keyCode == Baubles.proxy.keyHandler.key.getKeyCode()) { this.mc.thePlayer.closeScreen(); - } else - super.keyTyped(par1, par2); + } else { + super.keyTyped(par1, keyCode); + } } } diff --git a/src/main/java/baubles/common/Baubles.java b/src/main/java/baubles/common/Baubles.java index 4267d5d..9152c55 100644 --- a/src/main/java/baubles/common/Baubles.java +++ b/src/main/java/baubles/common/Baubles.java @@ -2,11 +2,10 @@ package baubles.common; import java.io.File; -import net.minecraftforge.common.MinecraftForge; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import baubles.api.expanded.BaubleExpandedSlots; import baubles.common.event.EventHandlerEntity; import baubles.common.event.EventHandlerNetwork; import baubles.common.network.PacketHandler; @@ -16,51 +15,62 @@ import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.Mod.Instance; import cpw.mods.fml.common.SidedProxy; import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.item.Item; +import net.minecraftforge.common.MinecraftForge; -@Mod(modid = Baubles.MODID, name = Baubles.MODNAME, version = Baubles.VERSION, dependencies="required-after:Forge@[10.13.2,);") +@Mod(modid = Baubles.MODID, name = Baubles.MODNAME, version = Baubles.VERSION) public class Baubles { - + public static final String MODID = "Baubles"; public static final String MODNAME = "Baubles"; public static final String VERSION = "1.0.1.10"; @SidedProxy(clientSide = "baubles.client.ClientProxy", serverSide = "baubles.common.CommonProxy") public static CommonProxy proxy; - + @Instance(value=Baubles.MODID) public static Baubles instance; - + public EventHandlerEntity entityEventHandler; public EventHandlerNetwork entityEventNetwork; public File modDir; - + public static final Logger log = LogManager.getLogger("Baubles"); public static final int GUI = 0; + + private static Item itemDebugger; @EventHandler public void preInit(FMLPreInitializationEvent event) { event.getModMetadata().version = Baubles.VERSION; modDir = event.getModConfigurationDirectory(); - + PacketHandler.init(); - + entityEventHandler = new EventHandlerEntity(); entityEventNetwork = new EventHandlerNetwork(); - + MinecraftForge.EVENT_BUS.register(entityEventHandler); FMLCommonHandler.instance().bus().register(entityEventNetwork); proxy.registerHandlers(); + + itemDebugger = new ItemDebugger().setUnlocalizedName("baubleSlotDebugTool"); + GameRegistry.registerItem(itemDebugger, "bauble_slot_debug_tool", Baubles.MODID); + BaubleExpandedSlots.tryAddSlot(BaubleExpandedSlots.amuletType); + BaubleExpandedSlots.tryAddSlot(BaubleExpandedSlots.ringType); + BaubleExpandedSlots.tryAddSlot(BaubleExpandedSlots.ringType); + BaubleExpandedSlots.tryAddSlot(BaubleExpandedSlots.beltType); } @EventHandler - public void init(FMLInitializationEvent evt) { + public void init(FMLInitializationEvent event) { NetworkRegistry.INSTANCE.registerGuiHandler(instance, proxy); proxy.registerKeyBindings(); } - + } diff --git a/src/main/java/baubles/common/ItemDebugger.java b/src/main/java/baubles/common/ItemDebugger.java new file mode 100644 index 0000000..30ae10a --- /dev/null +++ b/src/main/java/baubles/common/ItemDebugger.java @@ -0,0 +1,127 @@ +package baubles.common; + +import java.util.List; + +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; +import baubles.api.BaubleType; +import baubles.api.IBauble; +import baubles.api.expanded.BaubleExpandedSlots; +import baubles.api.expanded.BaubleSlotTypeBackgroundIconManager; +import baubles.api.expanded.IBaubleExpanded; +import baubles.common.container.InventoryBaubles; +import baubles.common.lib.PlayerHandler; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public class ItemDebugger extends Item implements IBaubleExpanded { + + public ItemDebugger() { + super(); + this.setMaxStackSize(1); + this.setHasSubtypes(true); + setCreativeTab(CreativeTabs.tabTools); + } + + public IIcon[] icons; + @SideOnly(Side.CLIENT) + @Override + public void registerIcons(IIconRegister ir) { + icons = new IIcon[1 + BaubleExpandedSlots.defaultTypes.length]; + + icons[0] = ir.registerIcon("baubles:empty_bauble_slot_unknown"); + BaubleSlotTypeBackgroundIconManager.setBakgroundIconForUnknownSlotType(icons[0]); + + for(int i = 1; i < icons.length; i++) { + String type = BaubleExpandedSlots.defaultTypes[i - 1]; + icons[i] = ir.registerIcon("baubles:empty_bauble_slot_" + type); + BaubleSlotTypeBackgroundIconManager.tryAddBackgroundIconForSlotType(icons[i], type); + } + } + + @SideOnly(Side.CLIENT) + @Override + public IIcon getIconFromDamage(int meta) { + return icons[meta >= icons.length ? 0 : meta]; + } + + @SideOnly(Side.CLIENT) + @Override + public void getSubItems(Item item, CreativeTabs tab, List list) { + for(int i = 0; i < icons.length; i++) { + list.add(new ItemStack(this, 1, i)); + } + } + + /*@Override + public EnumRarity getRarity(ItemStack itemStack) { + return EnumRarity.rare; + }*/ + + @Override + public String[] getBaubleTypes(ItemStack itemStack) { + String type; + int meta = itemStack.getItemDamage(); + if(meta <= 0 || meta > BaubleExpandedSlots.defaultTypes.length) { + type = "unknown"; + } else { + type = BaubleExpandedSlots.defaultTypes[meta - 1]; + } + return new String[] {type}; + } + + @Override + public BaubleType getBaubleType(ItemStack itemStack) { + return null; + } + + public void addInformation(ItemStack itemStack, EntityPlayer player, List list, boolean par4) { + list.add("Valid bauble slot types:"); + for(String type : getBaubleTypes(itemStack)) { + list.add(type); + } + + } + + @Override + public void onWornTick(ItemStack itemStack, EntityLivingBase player) { + } + + @Override + public boolean hasEffect(ItemStack itemStack, int a) { + return true; + } + + @Override + public String getUnlocalizedName(ItemStack itemStack) { + return super.getUnlocalizedName();// + "." + itemStack.getItemDamage(); + } + + @Override + public void onEquipped(ItemStack itemStack, EntityLivingBase player) { + } + + @Override + public void onUnequipped(ItemStack itemStack, EntityLivingBase player) { + } + + @Override + public boolean canEquip(ItemStack itemStack, EntityLivingBase player) { + return true; + } + + @Override + public boolean canUnequip(ItemStack itemStack, EntityLivingBase player) { + return true; + } + +} diff --git a/src/main/java/baubles/common/container/ContainerPlayerExpanded.java b/src/main/java/baubles/common/container/ContainerPlayerExpanded.java index dd96262..6906b6d 100644 --- a/src/main/java/baubles/common/container/ContainerPlayerExpanded.java +++ b/src/main/java/baubles/common/container/ContainerPlayerExpanded.java @@ -16,6 +16,7 @@ import net.minecraft.util.IIcon; import baubles.api.BaubleType; import baubles.api.IBauble; import baubles.api.expanded.BaubleExpandedSlots; +import baubles.api.expanded.BaubleSlotTypeBackgroundIconManager; import baubles.api.expanded.IBaubleExpanded; import baubles.common.lib.PlayerHandler; import cpw.mods.fml.relauncher.Side; @@ -50,6 +51,7 @@ public class ContainerPlayerExpanded extends Container { return itemStack.getItem().isValidArmor(itemStack, k, thePlayer); } + @Override @SideOnly(Side.CLIENT) public IIcon getBackgroundIconIndex() { return ItemArmor.func_94602_b(k); @@ -64,7 +66,15 @@ public class ContainerPlayerExpanded extends Container { //bauble slots for(i = 0; i < totalBaubleSlots; i++) { - addSlotToContainer(new SlotBauble(baubles, BaubleExpandedSlots.getSlotType(i), i, slotStartX + (slotOffset * (i / 4)), slotStartY + (slotOffset * (i % 4)))); + final String type = BaubleExpandedSlots.getSlotType(i); + addSlotToContainer(new SlotBauble(baubles, BaubleExpandedSlots.getSlotType(i), i, slotStartX + (slotOffset * (i / 4)), slotStartY + (slotOffset * (i % 4))) { + @Override + @SideOnly(Side.CLIENT) + public IIcon getBackgroundIconIndex() { + //Not working? + return BaubleSlotTypeBackgroundIconManager.getBackgroundIconForSlotType(type); + } + }); } //inventory slots @@ -112,8 +122,7 @@ public class ContainerPlayerExpanded extends Container { if(item instanceof IBaubleExpanded) { types = ((IBaubleExpanded)item).getBaubleTypes(itemstack); } else { - BaubleType legacyType = ((IBauble)item).getBaubleType(itemstack); - types = new String[] {BaubleExpandedSlots.getTypeStringFromBaubleType(legacyType)}; + types = new String[] {BaubleExpandedSlots.getTypeStringFromBaubleType(((IBauble)item).getBaubleType(itemstack))}; } for(String type : types) { if(type.equals(BaubleExpandedSlots.getSlotType(baubleSlot - 4)) && !mergeItemStack(itemstack1, baubleSlot, baubleSlot + 1, false)) { diff --git a/src/main/java/baubles/common/container/SlotBauble.java b/src/main/java/baubles/common/container/SlotBauble.java index 65023db..e0029dd 100644 --- a/src/main/java/baubles/common/container/SlotBauble.java +++ b/src/main/java/baubles/common/container/SlotBauble.java @@ -10,6 +10,7 @@ import net.minecraft.util.IIcon; import baubles.api.BaubleType; import baubles.api.IBauble; import baubles.api.expanded.BaubleExpandedSlots; +import baubles.api.expanded.BaubleSlotTypeBackgroundIconManager; import baubles.api.expanded.IBaubleExpanded; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -48,10 +49,9 @@ public class SlotBauble extends Slot { if(item instanceof IBaubleExpanded) { types = ((IBaubleExpanded)item).getBaubleTypes(stack); } else { - BaubleType legacyType = ((IBauble)item).getBaubleType(stack); - types = new String[] {BaubleExpandedSlots.getTypeStringFromBaubleType(legacyType)}; + types = new String[] {BaubleExpandedSlots.getTypeStringFromBaubleType(((IBauble)item).getBaubleType(stack))}; } - + for(String type : types) { if(type.equals(slotType)) { return true; @@ -72,9 +72,10 @@ public class SlotBauble extends Slot { return 1; } - /*@SideOnly(Side.CLIENT) + /*@Override + @SideOnly(Side.CLIENT) public IIcon getBackgroundIconIndex() { - return null; + return BaubleSlotTypeBackgroundIconManager.getBackgroundIconForSlotType(slotType); }*/ } diff --git a/src/main/resources/assets/baubles/lang/en_US.lang b/src/main/resources/assets/baubles/lang/en_US.lang index ea50453..4536e97 100644 --- a/src/main/resources/assets/baubles/lang/en_US.lang +++ b/src/main/resources/assets/baubles/lang/en_US.lang @@ -1,4 +1,7 @@ # +# ITEMS +item.baubleSlotDebugTool.name=Bauble Slot Debug Tool +# # GUI button.baubles=Baubles button.normal=Normal diff --git a/src/main/resources/assets/baubles/textures/gui/expanded_inventory.png b/src/main/resources/assets/baubles/textures/gui/expanded_inventory.png index 1e127703136018a7572e25c0f5ab4e20821e27db..c11165ffdcf8a01dd5b13fba9df30f62d141e980 100644 GIT binary patch literal 767 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 U;3kFz{U1J56f~iga+dG@1EvMUIsgCw diff --git a/src/main/resources/assets/baubles/textures/items/empty_bauble_slot_amulet.png b/src/main/resources/assets/baubles/textures/items/empty_bauble_slot_amulet.png new file mode 100644 index 0000000000000000000000000000000000000000..c3dc89be94670b75d8468a2affc0cbdf2a909a24 GIT binary patch literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;TYyi9>;M1%B^8v|F6tcziZGT0 z`2{mLJiCzw<05z4UVl( Qfr=SCUHx3vIVCg!0231(RR910 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/baubles/textures/items/empty_bauble_slot_belt.png b/src/main/resources/assets/baubles/textures/items/empty_bauble_slot_belt.png new file mode 100644 index 0000000000000000000000000000000000000000..3a5bdc1c0239487736789870e8ab16c8c37aec28 GIT binary patch literal 122 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;TYyi9>;M1%B^8v|F6tcziZGT0 z`2{mLJiCzw;M1%B^8v|F6tcziZGT0 z`2{mLJiCzw)iZdy`njxgN@xNAqNpFF literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/baubles/textures/items/empty_bauble_slot_cape.png b/src/main/resources/assets/baubles/textures/items/empty_bauble_slot_cape.png new file mode 100644 index 0000000000000000000000000000000000000000..a9d28f82224f10072010e0a4933744c1ce63113a GIT binary patch literal 120 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;TYyi9>;M1%fy~fDm+OEOV@Z%- zFoVOh8)-m}f~SjPNJU(71H(6V9vLQ{Kk^Ps7}!NLH!M*2ZO_BQ!;o~D#V;~>lORwn NgQu&X%Q~loCIBKt9hLw9 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/baubles/textures/items/empty_bauble_slot_charm.png b/src/main/resources/assets/baubles/textures/items/empty_bauble_slot_charm.png new file mode 100644 index 0000000000000000000000000000000000000000..1ed076f17da2f1e442ce9a0ef31d8b6210b980b4 GIT binary patch literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;TYyi9>;M1%B^8v|F6tcziZGT0 z`2{mLJiCzw;M1%fy~fDm+OEOV@Z%- zFoVOh8)-m}si%u$2#0Jk1Jg4$HZgWKK329yCbmXCHb*fwRkb!1wKfGcHd!$?Nj|o9 iOl;TK*wWY(7#MP6Sp0QlmiGV+VDNPHb6Mw<&;$UW@Eqv? literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/baubles/textures/items/empty_bauble_slot_head.png b/src/main/resources/assets/baubles/textures/items/empty_bauble_slot_head.png new file mode 100644 index 0000000000000000000000000000000000000000..a406b677bf83680465ce52968fcea1eeabe990a0 GIT binary patch literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!D3?x-;bCrM;TYyi9>;M1%B^8v|F6tcziZGT0 z`2{mLJiCzw;M1%B^8v|F6tcziZGT0 z`2{mLJiCzw;M1%B^8v|F6tcziZGT0 z`2{mLJiCzwbP0l+XkKU}GKE literal 0 HcmV?d00001