CAI subtitles spec fix + TIMV enderchests

Author: roccodev

src/main/java/tk/roccodev/beezig/forge/BeezigForgeMod.java

@@ -16,7 +16,8 @@
 import net.minecraftforge.fml.common.network.FMLNetworkEvent;
 import tk.roccodev.beezig.forge.api.BeezigAPIImpl;
 import tk.roccodev.beezig.forge.init.ClassFinder;
-import tk.roccodev.beezig.forge.listener.CAITitleListener;
+import tk.roccodev.beezig.forge.listener.games.cai.TitleListener;
+import tk.roccodev.beezig.forge.listener.games.timv.EnderchestsListener;
 import tk.roccodev.beezig.forge.packet.BeezigNetHandler;
 
 
@@ -41,7 +42,8 @@ public class BeezigForgeMod {
     public void onInit(FMLInitializationEvent evt) {
 
         MinecraftForge.EVENT_BUS.register(this);
-        CAITitleListener.inst = new CAITitleListener();
+        MinecraftForge.EVENT_BUS.register(new EnderchestsListener());
+        TitleListener.inst = new TitleListener();
     }
 
     @SubscribeEvent

src/main/java/tk/roccodev/beezig/forge/gamefields/TIMV.java

@@ -0,0 +1,27 @@
+package tk.roccodev.beezig.forge.gamefields;
+
+import tk.roccodev.beezig.forge.init.ClassFinder;
+
+import java.lang.reflect.Field;
+
+public class TIMV {
+
+    private static Field currentEnderchestField;
+
+    public static void callInit() {
+        try {
+            currentEnderchestField = ClassFinder.findClass("tk.roccodev.beezig.games.TIMV").getField("currentEnderchests");
+        } catch (NoSuchFieldException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public static void setEnderchests(long enderchests) {
+        try {
+            currentEnderchestField.set(null, enderchests);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        }
+    }
+
+}

src/main/java/tk/roccodev/beezig/forge/listener/ForgeListenerImpl.java

@@ -3,6 +3,7 @@
 import net.minecraft.client.Minecraft;
 import net.minecraftforge.fml.client.config.IConfigElement;
 import tk.roccodev.beezig.forge.BeezigForgeMod;
+import tk.roccodev.beezig.forge.gamefields.TIMV;
 import tk.roccodev.beezig.forge.gui.settings.GuiBeezigSettings;
 import tk.roccodev.beezig.forge.settings.BeezigConfigElement;
 
@@ -15,11 +16,11 @@ public void onLoad(String s, String s1) {
         System.out.println("Found Beezig " + s + " on 5zig " + s1);
         BeezigForgeMod.loaded = true;
 
-        if(!s.equals(BeezigForgeMod.VERSION)) {
+        if(!s.equals(BeezigForgeMod.VERSION))
            BeezigForgeMod.versionUpdate = true;
 
 
-        }
+        TIMV.callInit();
 
     }
 

src/main/java/tk/roccodev/beezig/forge/listener/CAITitleListener.java renamed to src/main/java/tk/roccodev/beezig/forge/listener/games/cai/TitleListener.java

@@ -1,4 +1,4 @@
-package tk.roccodev.beezig.forge.listener;
+package tk.roccodev.beezig.forge.listener.games.cai;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.network.play.server.S45PacketTitle;
@@ -9,9 +9,9 @@
 import java.util.regex.Pattern;
 
 
-public class CAITitleListener {
+public class TitleListener {
 
-    public static CAITitleListener inst;
+    public static TitleListener inst;
 
     public boolean onTitle(S45PacketTitle packetIn) {
         if(packetIn == null) return true;
@@ -25,6 +25,7 @@ public boolean onTitle(S45PacketTitle packetIn) {
 
         if(msg.equals("§r§eThe leader of the §r§bindians§r§e has been§r§4 CAUGHT§r§e!§r")) {
             String caiTeam = API.inst.getCAITeam();
+            if(caiTeam.isEmpty()) return true;
             if(caiTeam.equals("Indians")) {
                 Minecraft.getMinecraft().ingameGUI.displayTitle(null,
                         "§cYour leader has been §e§lCAUGHT!",
@@ -43,6 +44,7 @@ public boolean onTitle(S45PacketTitle packetIn) {
         }
         else if(msg.equals("§r§eThe leader of the §r§bcowboys§r§e has been§r§4 CAUGHT§r§e!§r")) {
             String caiTeam = API.inst.getCAITeam();
+            if(caiTeam.isEmpty()) return true;
             if(caiTeam.equals("Cowboys")) {
                 Minecraft.getMinecraft().ingameGUI.displayTitle(null,
                         "§cYour leader has been §e§lCAUGHT!",
@@ -73,6 +75,7 @@ else if(msg.startsWith("§r§cCowboys§r§b leader")) {
             }
             if(msg.endsWith("has been§r§6 §r§6§lCAPTURED!§r")) {
                 String caiTeam = API.inst.getCAITeam();
+                if(caiTeam.isEmpty()) return true;
                 if(caiTeam.equals("Cowboys")) {
                     name = name.replace("~", "§c");
                     Minecraft.getMinecraft().ingameGUI.displayTitle(null,
@@ -92,6 +95,7 @@ else if(msg.startsWith("§r§cCowboys§r§b leader")) {
             }
             else if(msg.endsWith("has§r§5 §r§5§lESCAPED!§r")) {
                 String caiTeam = API.inst.getCAITeam();
+                if(caiTeam.isEmpty()) return true;
                 if(caiTeam.equals("Cowboys")) {
                     name = name.replace("~", "§a");
                     Minecraft.getMinecraft().ingameGUI.displayTitle(null,
@@ -125,6 +129,7 @@ else if(msg.startsWith("§r§eIndians§r§b leader")) {
             }
             if(msg.endsWith("has been§r§6 §r§6§lCAPTURED!§r")) {
                 String caiTeam = API.inst.getCAITeam();
+                if(caiTeam.isEmpty()) return true;
                 if(caiTeam.equals("Indians")) {
                     name = name.replace("~", "§c");
                     Minecraft.getMinecraft().ingameGUI.displayTitle(null,
@@ -144,6 +149,7 @@ else if(msg.startsWith("§r§eIndians§r§b leader")) {
             }
             else if(msg.endsWith("has§r§5 §r§5§lESCAPED!§r")) {
                 String caiTeam = API.inst.getCAITeam();
+                if(caiTeam.isEmpty()) return true;
                 if(caiTeam.equals("Indians")) {
                     name = name.replace("~", "§a");
                     Minecraft.getMinecraft().ingameGUI.displayTitle(null,

src/main/java/tk/roccodev/beezig/forge/listener/games/timv/EnderchestsListener.java

@@ -0,0 +1,24 @@
+package tk.roccodev.beezig.forge.listener.games.timv;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.init.Blocks;
+import net.minecraft.world.World;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.common.gameevent.TickEvent;
+import tk.roccodev.beezig.forge.gamefields.TIMV;
+
+public class EnderchestsListener {
+
+    @SubscribeEvent
+    public void onRenderChunk(TickEvent.ClientTickEvent evt) {
+        try {
+            if(evt.phase != TickEvent.Phase.END) return;
+            if(Minecraft.getMinecraft().theWorld == null) return;
+            World w = Minecraft.getMinecraft().theWorld;
+
+            TIMV.setEnderchests(w.loadedTileEntityList.stream()
+                    .filter(tileEntity -> tileEntity.getBlockType() == Blocks.ender_chest).count());
+        } catch(Exception ignored) {}
+    }
+
+}

src/main/java/tk/roccodev/beezig/forge/packet/BeezigNetHandler.java

@@ -3,12 +3,10 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.network.NetHandlerPlayClient;
-import net.minecraft.network.Packet;
 import net.minecraft.network.play.server.*;
-import net.minecraft.util.IChatComponent;
 import tk.roccodev.beezig.forge.API;
 import tk.roccodev.beezig.forge.api.BeezigAPIImpl;
-import tk.roccodev.beezig.forge.listener.CAITitleListener;
+import tk.roccodev.beezig.forge.listener.games.cai.TitleListener;
 
 import java.lang.reflect.Field;
 
@@ -360,7 +358,7 @@ public void handleWorldBorder(S44PacketWorldBorder packetIn) {
 
     @Override
     public void handleTitle(S45PacketTitle packetIn) {
-        if(!CAITitleListener.inst.onTitle(packetIn)) return;
+        if(!TitleListener.inst.onTitle(packetIn)) return;
         if(api.onPacketReceived(0x45, packetIn.toString()))
         parent.handleTitle(packetIn);
     }