From fc216413172a2704c77d341b4fb9256e0688dc46 Mon Sep 17 00:00:00 2001 From: ReignOfFROZE Date: Sun, 2 Mar 2025 14:04:41 -0500 Subject: [PATCH] Made ModularUI an optional dependency --- dependencies.gradle | 2 +- .../client/core/handler/KeyHandler.java | 20 +++---- .../client/gui/loki/GuiLokiSchematics.java | 35 +++++++++-- .../common/item/relic/ItemLokiRing.java | 59 ++++++++----------- .../botania/common/network/PacketHandler.java | 2 +- 5 files changed, 64 insertions(+), 54 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 9378fc6a6..3a7aaf2f8 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -11,7 +11,7 @@ dependencies { compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.18-GTNH:dev') compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.42:api') {transitive=false} api('com.github.GTNewHorizons:GTNHLib:0.6.1:dev') - implementation("com.github.GTNewHorizons:ModularUI:1.2.18:dev") + compileOnly("com.github.GTNewHorizons:ModularUI:1.2.18:dev") compileOnly('curse.maven:cofh-lib-220333:2388748') compileOnly('curse.maven:minefactory-reloaded-66672:2366150') diff --git a/src/main/java/vazkii/botania/client/core/handler/KeyHandler.java b/src/main/java/vazkii/botania/client/core/handler/KeyHandler.java index d309ad554..8ea001503 100644 --- a/src/main/java/vazkii/botania/client/core/handler/KeyHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/KeyHandler.java @@ -1,19 +1,17 @@ package vazkii.botania.client.core.handler; -import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.EntityClientPlayerMP; -import net.minecraft.client.settings.KeyBinding; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.item.ItemStack; -import vazkii.botania.common.item.relic.ItemLokiRing; -import vazkii.botania.common.network.*; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.InputEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; +import net.minecraft.client.settings.KeyBinding; +import net.minecraft.item.ItemStack; +import vazkii.botania.client.gui.loki.GuiLokiSchematics; +import vazkii.botania.common.item.relic.ItemLokiRing; +import vazkii.botania.common.network.*; public class KeyHandler { @@ -70,7 +68,9 @@ public class KeyHandler { PacketHandler.INSTANCE.sendToServer(new PacketLokiSaveSchematic()); } private static void ringOfLokiOpenUI() { - ItemStack ring = ItemLokiRing.getLokiRing(Minecraft.getMinecraft().thePlayer); - ItemLokiRing.openUI(Minecraft.getMinecraft().thePlayer, ring); + if(ItemLokiRing.isModularUIEnabled) { + ItemStack ring = ItemLokiRing.getLokiRing(Minecraft.getMinecraft().thePlayer); + GuiLokiSchematics.openUI(Minecraft.getMinecraft().thePlayer, ring); + } } } diff --git a/src/main/java/vazkii/botania/client/gui/loki/GuiLokiSchematics.java b/src/main/java/vazkii/botania/client/gui/loki/GuiLokiSchematics.java index be3bd2add..e5c6e57ad 100644 --- a/src/main/java/vazkii/botania/client/gui/loki/GuiLokiSchematics.java +++ b/src/main/java/vazkii/botania/client/gui/loki/GuiLokiSchematics.java @@ -16,6 +16,8 @@ import com.gtnewhorizons.modularui.common.widget.MultiChildWidget; import com.gtnewhorizons.modularui.common.widget.Scrollable; import com.gtnewhorizons.modularui.common.widget.TextWidget; import com.gtnewhorizons.modularui.common.widget.textfield.TextFieldWidget; +import cpw.mods.fml.common.Optional; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTBase; import net.minecraft.nbt.NBTTagCompound; @@ -26,22 +28,40 @@ import vazkii.botania.common.network.PacketHandler; import vazkii.botania.common.network.PacketLokiChangeSchematic; import vazkii.botania.common.network.PacketLokiDeleteSchematic; +import java.util.ArrayList; import java.util.concurrent.atomic.AtomicInteger; public class GuiLokiSchematics { - private static final AdaptableUITexture BACKGROUND = AdaptableUITexture - .of("botania:textures/gui/croppedPaper", 330, 252, 12); private static Object selectedSchematic; - private static final AdaptableUITexture DELETE = AdaptableUITexture - .of("botania:textures/gui/lokiDelete", 500, 500, 0); - private static final AdaptableUITexture RENAME = AdaptableUITexture - .of("botania:textures/gui/lokiRename", 500, 500, 0); + private static String newSchematicName = ""; private static final int WINDOW_WIDTH = 350, WINDOW_HEIGHT = 225, SCROLL_AREA_WIDTH = 350, SCROLL_AREA_HEIGHT = 200, SAVED_SCHEMATICS_HEADER_HEIGHT = 25, X_PADDING = 5, Y_PADDING = 5; + @Optional.Method(modid = "modularui") + public static ModularWindow createWindow(Object buildContext, ItemStack heldStack) { + ItemLokiRing loki = (ItemLokiRing) heldStack.getItem(); + loki.window = GuiLokiSchematics.getWindow((UIBuildContext) buildContext, heldStack); + loki.schematicNames = new ArrayList<>(heldStack.getTagCompound().getCompoundTag(ItemLokiRing.TAG_SAVED_SCHEMATICS).tagMap.keySet()); + return (ModularWindow) loki.window; + } + + @Optional.Method(modid = "modularui") + public static void openUI(EntityPlayer player, ItemStack stack) { + if(ItemLokiRing.isLokiRing(stack) && stack.getItem() instanceof ItemLokiRing) { + UIInfos.openClientUI(player, uiBuildContext -> GuiLokiSchematics.createWindow(uiBuildContext, stack)); + } + } + + @Optional.Method(modid = "modularui") public static ModularWindow getWindow(UIBuildContext buildContext, ItemStack lokiRing) { + final AdaptableUITexture BACKGROUND = AdaptableUITexture + .of("botania:textures/gui/croppedPaper", 330, 252, 12); + final AdaptableUITexture DELETE = AdaptableUITexture + .of("botania:textures/gui/lokiDelete", 500, 500, 0); + final AdaptableUITexture RENAME = AdaptableUITexture + .of("botania:textures/gui/lokiRename", 500, 500, 0); if(lokiRing.getTagCompound().tagMap.containsKey(ItemLokiRing.TAG_CURRENT_SCHEMATIC)) { // Substring to remove the leading and ending double quotes selectedSchematic = lokiRing.stackTagCompound.getString(ItemLokiRing.TAG_CURRENT_SCHEMATIC).substring(1); @@ -116,7 +136,10 @@ public class GuiLokiSchematics { .build(); } + @Optional.Method(modid = "modularui") public static ModularWindow getRenameWindow(UIBuildContext buildContext, ItemStack lokiRing, Object schematicName) { + final AdaptableUITexture BACKGROUND = AdaptableUITexture + .of("botania:textures/gui/croppedPaper", 330, 252, 12); ModularWindow.Builder builder = ModularWindow.builder(200, 100); buildContext.addCloseListener(() -> { diff --git a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java index 3a7666bff..9d1090bdd 100644 --- a/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java +++ b/src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java @@ -11,15 +11,19 @@ package vazkii.botania.common.item.relic; -import java.awt.Color; -import java.util.*; -import java.util.stream.Collectors; - +import baubles.api.BaubleType; +import baubles.common.container.InventoryBaubles; +import baubles.common.lib.PlayerHandler; +import baubles.common.network.PacketSyncBauble; import com.gtnewhorizon.gtnhlib.GTNHLib; import com.gtnewhorizons.modularui.api.UIInfos; -import com.gtnewhorizons.modularui.api.screen.IItemWithModularUI; import com.gtnewhorizons.modularui.api.screen.ModularWindow; import com.gtnewhorizons.modularui.api.screen.UIBuildContext; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.Optional; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.client.Minecraft; @@ -33,13 +37,8 @@ import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; - import net.minecraft.nbt.NBTTagString; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.util.StatCollector; +import net.minecraft.util.*; import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; @@ -59,17 +58,16 @@ import vazkii.botania.common.core.helper.LokiCursor; import vazkii.botania.common.item.ModItems; import vazkii.botania.common.item.equipment.tool.ToolCommons; import vazkii.botania.common.lib.LibItemNames; -import baubles.api.BaubleType; -import baubles.common.container.InventoryBaubles; -import baubles.common.lib.PlayerHandler; -import baubles.common.network.PacketSyncBauble; -import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import vazkii.botania.common.network.PacketLokiHudNotificationAck; +import java.awt.*; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; -public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeCoordinateListProvider, IManaUsingItem, IInWorldRenderable, IItemWithModularUI { +public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeCoordinateListProvider, IManaUsingItem, IInWorldRenderable { + + public static final boolean isModularUIEnabled = Loader.isModLoaded("modularui"); public static final String TAG_CURSOR_LIST = "cursorList"; public static final String TAG_CURSOR_PREFIX = "cursor"; @@ -84,23 +82,10 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC public static final String TAG_CURRENT_SCHEMATIC = "currentSchematic"; private boolean recursion = false; - private ModularWindow window; + public Object window; + public List schematicNames; - @Override - public ModularWindow createWindow(UIBuildContext buildContext, ItemStack heldStack) { - this.window = GuiLokiSchematics.getWindow(buildContext, heldStack); - this.schematicNames = new ArrayList<>(heldStack.getTagCompound().getCompoundTag(TAG_SAVED_SCHEMATICS).tagMap.keySet()); - return window; - } - - public static void openUI(EntityPlayer player, ItemStack stack) { - if(isLokiRing(stack) && stack.getItem() instanceof ItemLokiRing) { - ItemLokiRing lokiRing = (ItemLokiRing) stack.getItem(); - UIInfos.openClientUI(player, uiBuildContext -> lokiRing.createWindow(uiBuildContext, stack)); - } - } - public static enum HUD_MESSAGE { MODE, BREAKING, CLEAR, MIRROR, INSUFFICIENT_MANA, SCHEMATIC_SAVED } @@ -354,6 +339,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC stack.getTagCompound().setTag(TAG_CURRENT_SCHEMATIC, new NBTTagString(schematicName)); } + @Optional.Method(modid = "modularui") public static void deleteSchematic(ItemStack lokiStack, String schematicName) { NBTTagCompound map = lokiStack.getTagCompound().getCompoundTag(TAG_SAVED_SCHEMATICS); if(map != null) { @@ -364,7 +350,8 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC ItemLokiRing lokiRing = ((ItemLokiRing) lokiStack.getItem()); if(lokiRing != null) { lokiRing.schematicNames.remove(schematicName); - lokiRing.window.markNeedsRebuild(); + if(isModularUIEnabled) + ((ModularWindow) lokiRing.window).markNeedsRebuild(); } } @@ -608,7 +595,7 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC baubles.common.network.PacketHandler.INSTANCE.sendTo(new PacketSyncBauble(player, getLokiRingSlot(player)), (EntityPlayerMP) player); } - private static boolean isLokiRing(ItemStack stack) { + public static boolean isLokiRing(ItemStack stack) { return stack != null && (stack.getItem() == ModItems.lokiRing || stack.getItem() == ModItems.aesirRing); } diff --git a/src/main/java/vazkii/botania/common/network/PacketHandler.java b/src/main/java/vazkii/botania/common/network/PacketHandler.java index 65554a81d..562df705f 100644 --- a/src/main/java/vazkii/botania/common/network/PacketHandler.java +++ b/src/main/java/vazkii/botania/common/network/PacketHandler.java @@ -1,9 +1,9 @@ package vazkii.botania.common.network; -import vazkii.botania.common.lib.LibMisc; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; import cpw.mods.fml.relauncher.Side; +import vazkii.botania.common.lib.LibMisc; public class PacketHandler {