Skip to content

Commit 6131cfe

Browse files
ReignOfFROZEReignOfFROZE
committed
tmp commit
1 parent f601f77 commit 6131cfe

File tree

5 files changed

+47
-41
lines changed

5 files changed

+47
-41
lines changed

‎dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ dependencies {
1111
compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.7.18-GTNH:dev')
1212
compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.42:api') {transitive=false}
1313
api('com.github.GTNewHorizons:GTNHLib:0.6.1:dev')
14-
implementation("com.github.GTNewHorizons:ModularUI:1.2.18:dev")
14+
compileOnly("com.github.GTNewHorizons:ModularUI:1.2.18:dev")
1515

1616
compileOnly('curse.maven:cofh-lib-220333:2388748')
1717
compileOnly('curse.maven:minefactory-reloaded-66672:2366150')

‎src/main/java/vazkii/botania/client/core/handler/KeyHandler.java

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
package vazkii.botania.client.core.handler;
22

3-
import net.minecraft.client.Minecraft;
4-
import net.minecraft.client.entity.EntityClientPlayerMP;
5-
import net.minecraft.client.settings.KeyBinding;
6-
import net.minecraft.entity.Entity;
7-
import net.minecraft.entity.player.EntityPlayerMP;
8-
import net.minecraft.item.ItemStack;
9-
import vazkii.botania.common.item.relic.ItemLokiRing;
10-
import vazkii.botania.common.network.*;
113
import cpw.mods.fml.client.registry.ClientRegistry;
124
import cpw.mods.fml.common.FMLCommonHandler;
135
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
146
import cpw.mods.fml.common.gameevent.InputEvent;
157
import cpw.mods.fml.relauncher.Side;
168
import cpw.mods.fml.relauncher.SideOnly;
9+
import net.minecraft.client.Minecraft;
10+
import net.minecraft.client.settings.KeyBinding;
11+
import net.minecraft.item.ItemStack;
12+
import vazkii.botania.common.item.relic.ItemLokiRing;
13+
import vazkii.botania.common.network.*;
1714

1815

1916
public class KeyHandler {
@@ -70,7 +67,9 @@ private static void ringOfLokiSaveSchematic() {
7067
PacketHandler.INSTANCE.sendToServer(new PacketLokiSaveSchematic());
7168
}
7269
private static void ringOfLokiOpenUI() {
73-
ItemStack ring = ItemLokiRing.getLokiRing(Minecraft.getMinecraft().thePlayer);
74-
ItemLokiRing.openUI(Minecraft.getMinecraft().thePlayer, ring);
70+
if(ItemLokiRing.isModularUIEnabled) {
71+
ItemStack ring = ItemLokiRing.getLokiRing(Minecraft.getMinecraft().thePlayer);
72+
ItemLokiRing.openUI(Minecraft.getMinecraft().thePlayer, ring);
73+
}
7574
}
7675
}

‎src/main/java/vazkii/botania/client/gui/loki/GuiLokiSchematics.java

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import com.gtnewhorizons.modularui.common.widget.Scrollable;
1717
import com.gtnewhorizons.modularui.common.widget.TextWidget;
1818
import com.gtnewhorizons.modularui.common.widget.textfield.TextFieldWidget;
19+
import cpw.mods.fml.common.Optional;
1920
import net.minecraft.item.ItemStack;
2021
import net.minecraft.nbt.NBTBase;
2122
import net.minecraft.nbt.NBTTagCompound;
@@ -30,18 +31,20 @@
3031

3132
public class GuiLokiSchematics {
3233

33-
private static final AdaptableUITexture BACKGROUND = AdaptableUITexture
34-
.of("botania:textures/gui/croppedPaper", 330, 252, 12);
3534
private static Object selectedSchematic;
36-
private static final AdaptableUITexture DELETE = AdaptableUITexture
37-
.of("botania:textures/gui/lokiDelete", 500, 500, 0);
38-
private static final AdaptableUITexture RENAME = AdaptableUITexture
39-
.of("botania:textures/gui/lokiRename", 500, 500, 0);
35+
4036
private static String newSchematicName = "";
4137

4238
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;
4339

40+
@Optional.Method(modid = "modularui")
4441
public static ModularWindow getWindow(UIBuildContext buildContext, ItemStack lokiRing) {
42+
final AdaptableUITexture BACKGROUND = AdaptableUITexture
43+
.of("botania:textures/gui/croppedPaper", 330, 252, 12);
44+
final AdaptableUITexture DELETE = AdaptableUITexture
45+
.of("botania:textures/gui/lokiDelete", 500, 500, 0);
46+
final AdaptableUITexture RENAME = AdaptableUITexture
47+
.of("botania:textures/gui/lokiRename", 500, 500, 0);
4548
if(lokiRing.getTagCompound().tagMap.containsKey(ItemLokiRing.TAG_CURRENT_SCHEMATIC)) {
4649
// Substring to remove the leading and ending double quotes
4750
selectedSchematic = lokiRing.stackTagCompound.getString(ItemLokiRing.TAG_CURRENT_SCHEMATIC).substring(1);
@@ -116,7 +119,10 @@ public static ModularWindow getWindow(UIBuildContext buildContext, ItemStack lok
116119
.build();
117120
}
118121

122+
@Optional.Method(modid = "modularui")
119123
public static ModularWindow getRenameWindow(UIBuildContext buildContext, ItemStack lokiRing, Object schematicName) {
124+
final AdaptableUITexture BACKGROUND = AdaptableUITexture
125+
.of("botania:textures/gui/croppedPaper", 330, 252, 12);
120126
ModularWindow.Builder builder = ModularWindow.builder(200, 100);
121127

122128
buildContext.addCloseListener(() -> {

‎src/main/java/vazkii/botania/common/item/relic/ItemLokiRing.java

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,19 @@
1111
package vazkii.botania.common.item.relic;
1212

1313

14-
import java.awt.Color;
15-
import java.util.*;
16-
import java.util.stream.Collectors;
17-
14+
import baubles.api.BaubleType;
15+
import baubles.common.container.InventoryBaubles;
16+
import baubles.common.lib.PlayerHandler;
17+
import baubles.common.network.PacketSyncBauble;
1818
import com.gtnewhorizon.gtnhlib.GTNHLib;
1919
import com.gtnewhorizons.modularui.api.UIInfos;
20-
import com.gtnewhorizons.modularui.api.screen.IItemWithModularUI;
2120
import com.gtnewhorizons.modularui.api.screen.ModularWindow;
2221
import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
22+
import cpw.mods.fml.common.Loader;
23+
import cpw.mods.fml.common.Optional;
24+
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
25+
import cpw.mods.fml.relauncher.Side;
26+
import cpw.mods.fml.relauncher.SideOnly;
2327
import net.minecraft.block.Block;
2428
import net.minecraft.block.material.Material;
2529
import net.minecraft.client.Minecraft;
@@ -33,13 +37,8 @@
3337
import net.minecraft.item.Item;
3438
import net.minecraft.item.ItemStack;
3539
import net.minecraft.nbt.NBTTagCompound;
36-
3740
import net.minecraft.nbt.NBTTagString;
38-
import net.minecraft.util.AxisAlignedBB;
39-
import net.minecraft.util.ChunkCoordinates;
40-
import net.minecraft.util.EnumChatFormatting;
41-
import net.minecraft.util.MovingObjectPosition;
42-
import net.minecraft.util.StatCollector;
41+
import net.minecraft.util.*;
4342
import net.minecraft.world.World;
4443
import net.minecraftforge.common.MinecraftForge;
4544
import net.minecraftforge.common.util.ForgeDirection;
@@ -59,17 +58,16 @@
5958
import vazkii.botania.common.item.ModItems;
6059
import vazkii.botania.common.item.equipment.tool.ToolCommons;
6160
import vazkii.botania.common.lib.LibItemNames;
62-
import baubles.api.BaubleType;
63-
import baubles.common.container.InventoryBaubles;
64-
import baubles.common.lib.PlayerHandler;
65-
import baubles.common.network.PacketSyncBauble;
66-
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
67-
import cpw.mods.fml.relauncher.Side;
68-
import cpw.mods.fml.relauncher.SideOnly;
6961
import vazkii.botania.common.network.PacketLokiHudNotificationAck;
7062

63+
import java.awt.*;
64+
import java.util.ArrayList;
65+
import java.util.List;
66+
import java.util.UUID;
67+
68+
public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeCoordinateListProvider, IManaUsingItem, IInWorldRenderable {
7169

72-
public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeCoordinateListProvider, IManaUsingItem, IInWorldRenderable, IItemWithModularUI {
70+
public static final boolean isModularUIEnabled = Loader.isModLoaded("modularui");
7371

7472
public static final String TAG_CURSOR_LIST = "cursorList";
7573
public static final String TAG_CURSOR_PREFIX = "cursor";
@@ -84,16 +82,18 @@ public class ItemLokiRing extends ItemRelicBauble implements IExtendedWireframeC
8482
public static final String TAG_CURRENT_SCHEMATIC = "currentSchematic";
8583
private boolean recursion = false;
8684

87-
private ModularWindow window;
85+
private Object window;
86+
8887
public List<Object> schematicNames;
8988

90-
@Override
89+
@Optional.Method(modid = "modularui")
9190
public ModularWindow createWindow(UIBuildContext buildContext, ItemStack heldStack) {
9291
this.window = GuiLokiSchematics.getWindow(buildContext, heldStack);
9392
this.schematicNames = new ArrayList<>(heldStack.getTagCompound().getCompoundTag(TAG_SAVED_SCHEMATICS).tagMap.keySet());
94-
return window;
93+
return (ModularWindow) window;
9594
}
9695

96+
@Optional.Method(modid = "modularui")
9797
public static void openUI(EntityPlayer player, ItemStack stack) {
9898
if(isLokiRing(stack) && stack.getItem() instanceof ItemLokiRing) {
9999
ItemLokiRing lokiRing = (ItemLokiRing) stack.getItem();
@@ -364,7 +364,8 @@ public static void deleteSchematic(ItemStack lokiStack, String schematicName) {
364364
ItemLokiRing lokiRing = ((ItemLokiRing) lokiStack.getItem());
365365
if(lokiRing != null) {
366366
lokiRing.schematicNames.remove(schematicName);
367-
lokiRing.window.markNeedsRebuild();
367+
if(isModularUIEnabled)
368+
((ModularWindow) lokiRing.window).markNeedsRebuild();
368369
}
369370
}
370371

‎src/main/java/vazkii/botania/common/network/PacketHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package vazkii.botania.common.network;
22

3-
import vazkii.botania.common.lib.LibMisc;
43
import cpw.mods.fml.common.network.NetworkRegistry;
54
import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper;
65
import cpw.mods.fml.relauncher.Side;
6+
import vazkii.botania.common.lib.LibMisc;
77

88
public class PacketHandler {
99

0 commit comments

Comments
 (0)