From 8a581938862a4d612f510a8afed88727a34c3916 Mon Sep 17 00:00:00 2001
From: Jakub <53441451+kuba6000@users.noreply.github.com>
Date: Thu, 15 Dec 2022 16:53:12 +0100
Subject: MODULAR UI (#34)

* MODULAR UUUUUUUUIIIIIIIIIII

* Tea

* Add recipe to ULTIMATE TEA

* Stupid MT Scripts. I hate it

* Yeet

* More TEA

* Add blocks

* More Modular UIs

* Textures

* Fix custom UI containers

* Texture, tooltip

* UI with tabs

* ButtonWidget

* fix

* Fix

* Texture

* Color is fixed

* More UI work

* Modular UI is hard dependency now

* Spotless

* Simplify

* Format numbers

* A

* Update TeaAcceptorTile.java

* Shadow is fixed, lets gooooo

* hardness

* Mixins mixins mixins

* Tab icons

* Fix crash

* Shop concept

* Bump ModularUI

* Bump Modular UI

* Nooooooooooo

* GREY -> GRAY

* Bump ModularUI

* Bump GT5

* EEC with MUI test

* Include incomplete structure

* REFLECTIONS !!

* Just use slot filter

* Update pos when needed

* Update GT_MetaTileEntity_ExtremeExterminationChamber.java

* Spawner status

* Nice toggle button

* Send messages

* Next toggle button

* Start work on IAADDS

* Scrollable inventory test

* Draw queen slots

* Fix

* Update dependencies.gradle

* Use sync widget

* Add button to enable/disable working

* Configuration in Mega Apiary

* Refactor a bit

* Update ModularUI

* Bump ModularUI

* Bump GT5

* Fix build

* Update dependencies.gradle

* Update build.gradle

* Update dependencies.gradle

* spotless

* Begin working on configuration window

* Update dependencies.gradle

* Deprecated

* Update dependencies.gradle

* Optimize bee storage rendering (2 fps -> 100 fps)

* Make Mega Apiary storage GUI usable

* Configuration window looks ok

* Color is fixed

* TC research

* Disable for now

* Finish tea command

* ok

* Fix

* Update en_US.lang

* ZzZ

* Stuff changed
---
 src/main/java/kubatech/api/network/CustomTileEntityPacket.java | 6 +++++-
 src/main/java/kubatech/api/network/LoadConfigPacket.java       | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/main/java/kubatech/api/network')

diff --git a/src/main/java/kubatech/api/network/CustomTileEntityPacket.java b/src/main/java/kubatech/api/network/CustomTileEntityPacket.java
index b81bbb0337..11fb4f848f 100644
--- a/src/main/java/kubatech/api/network/CustomTileEntityPacket.java
+++ b/src/main/java/kubatech/api/network/CustomTileEntityPacket.java
@@ -128,7 +128,11 @@ public class CustomTileEntityPacket implements IMessage {
         @Override
         public IMessage onMessage(CustomTileEntityPacket message, MessageContext ctx) {
             if (!ModUtils.isClientSided) return null;
-            World w = Minecraft.getMinecraft().thePlayer.getEntityWorld();
+            Minecraft mc = Minecraft.getMinecraft();
+            if (mc == null) return null;
+            if (mc.thePlayer == null) return null;
+            World w = mc.thePlayer.getEntityWorld();
+            if (w == null) return null;
             if (message.w != w.provider.dimensionId) return null;
             TileEntity e = w.getTileEntity(message.x, message.y, message.z);
             if (e == null || e.isInvalid()) return null;
diff --git a/src/main/java/kubatech/api/network/LoadConfigPacket.java b/src/main/java/kubatech/api/network/LoadConfigPacket.java
index defb139151..03602e89f1 100644
--- a/src/main/java/kubatech/api/network/LoadConfigPacket.java
+++ b/src/main/java/kubatech/api/network/LoadConfigPacket.java
@@ -26,10 +26,12 @@ import io.netty.buffer.ByteBuf;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.HashSet;
+import kubatech.api.LoaderReference;
 import kubatech.config.Config;
 import kubatech.config.OverridesConfig;
 import kubatech.kubatech;
 import kubatech.loaders.MobRecipeLoader;
+import kubatech.loaders.TCLoader;
 
 public class LoadConfigPacket implements IMessage {
 
@@ -85,6 +87,7 @@ public class LoadConfigPacket implements IMessage {
         public IMessage onMessage(LoadConfigPacket message, MessageContext ctx) {
             kubatech.info("Received Mob Handler config, parsing");
             MobRecipeLoader.processMobRecipeMap(message.mobsToLoad, message.mobsOverrides);
+            if (LoaderReference.Thaumcraft) TCLoader.lateLoad();
             return null;
         }
     }
-- 
cgit