From 3377cc137172adb92d80c382c57369cdf5c82466 Mon Sep 17 00:00:00 2001
From: Jakub <53441451+kuba6000@users.noreply.github.com>
Date: Tue, 20 Sep 2022 18:05:24 +0200
Subject: Stop GL error spam + Full head rotation on mobs in EEC (#20)

* Stop GL error log spam with buggy mobs

* Also save attribs

* Snowqueen

* Keep error log with config option

* Update EntityRenderer.java

* Update

* Update Config.java

* spotlessApply

* Also rotate head in EEC to look at the player

* Update EntityRenderer.java

Co-authored-by: GitHub GTNH Actions <>
---
 .../java/kubatech/loaders/MobRecipeLoader.java     | 28 ++++++++++++++++------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'src/main/java/kubatech/loaders')

diff --git a/src/main/java/kubatech/loaders/MobRecipeLoader.java b/src/main/java/kubatech/loaders/MobRecipeLoader.java
index 6b183aa205..62b7d819f2 100644
--- a/src/main/java/kubatech/loaders/MobRecipeLoader.java
+++ b/src/main/java/kubatech/loaders/MobRecipeLoader.java
@@ -57,6 +57,7 @@ import minetweaker.MineTweakerAPI;
 import minetweaker.api.entity.IEntityDefinition;
 import minetweaker.api.item.IItemStack;
 import minetweaker.mc1710.item.MCItemStack;
+import net.minecraft.block.Block;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.Entity;
@@ -67,6 +68,7 @@ import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.monster.EntitySkeleton;
 import net.minecraft.entity.monster.EntitySlime;
 import net.minecraft.entity.monster.IMob;
+import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -82,7 +84,7 @@ import thaumcraft.common.items.wands.ItemWandCasting;
 
 public class MobRecipeLoader {
 
-    private static final Logger LOG = LogManager.getLogger(Tags.MODID + "[Mob Handler]");
+    private static final Logger LOG = LogManager.getLogger(Tags.MODID + "[Mob Recipe Loader]");
 
     public static final MobRecipeLoader instance = new MobRecipeLoader();
 
@@ -580,7 +582,7 @@ public class MobRecipeLoader {
 
         if (alreadyGenerated) return;
         alreadyGenerated = true;
-        if (!Config.mobHandlerEnabled) return;
+        if (!Config.MobHandler.mobHandlerEnabled) return;
 
         World f = new GT_DummyWorld() {
             @Override
@@ -593,6 +595,17 @@ public class MobRecipeLoader {
             public List getEntitiesWithinAABB(Class p_72872_1_, AxisAlignedBB p_72872_2_) {
                 return new ArrayList();
             }
+
+            @Override
+            public Block getBlock(int aX, int aY, int aZ) {
+                if (LoaderReference.TwilightForest
+                        && new Throwable()
+                                .getStackTrace()[1]
+                                .getClassName()
+                                .equals("twilightforest.client.renderer.entity.RenderTFSnowQueenIceShield"))
+                    return Blocks.packed_ice;
+                return super.getBlock(aX, aY, aZ);
+            }
         };
         f.isRemote = true; // quick hack to get around achievements
 
@@ -603,17 +616,18 @@ public class MobRecipeLoader {
         Gson gson = GSONUtils.GSON_BUILDER.create();
 
         String modlistversion;
-        if (Config.regenerationTrigger == Config._CacheRegenerationTrigger.ModAdditionRemoval)
+        if (Config.MobHandler.regenerationTrigger == Config.MobHandler._CacheRegenerationTrigger.ModAdditionRemoval)
             modlistversion = ModUtils.getModListVersionIgnoringModVersions();
         else modlistversion = ModUtils.getModListVersion();
 
-        if (Config.regenerationTrigger != Config._CacheRegenerationTrigger.Always && cache.exists()) {
+        if (Config.MobHandler.regenerationTrigger != Config.MobHandler._CacheRegenerationTrigger.Always
+                && cache.exists()) {
             LOG.info("Parsing Cached map");
             Reader reader = null;
             try {
                 reader = Files.newReader(cache, StandardCharsets.UTF_8);
                 MobRecipeLoaderCacheStructure s = gson.fromJson(reader, MobRecipeLoaderCacheStructure.class);
-                if (Config.regenerationTrigger == Config._CacheRegenerationTrigger.Never
+                if (Config.MobHandler.regenerationTrigger == Config.MobHandler._CacheRegenerationTrigger.Never
                         || s.version.equals(modlistversion)) {
                     for (Map.Entry<String, ArrayList<MobDrop>> entry : s.moblist.entrySet()) {
                         try {
@@ -1133,7 +1147,7 @@ public class MobRecipeLoader {
         for (Map.Entry<String, GeneralMappedMob> entry : GeneralMobList.entrySet()) {
             String k = entry.getKey();
             GeneralMappedMob v = entry.getValue();
-            if (Arrays.asList(Config.mobBlacklist).contains(k)) {
+            if (Arrays.asList(Config.MobHandler.mobBlacklist).contains(k)) {
                 LOG.info("Entity " + k + " is blacklisted, skipping");
                 continue;
             }
@@ -1167,7 +1181,7 @@ public class MobRecipeLoader {
 
             if (drops.isEmpty()) {
                 LOG.info("Entity " + k + " doesn't drop any items, skipping EEC map");
-                if (!Config.includeEmptyMobs) continue;
+                if (!Config.MobHandler.includeEmptyMobs) continue;
                 LoadConfigPacket.instance.mobsToLoad.add(k);
                 LOG.info("Registered " + k);
                 continue;
-- 
cgit