Partially fix quiver on skeletons in EEC (#91)

* Update dependencies.gradle

* Update build.gradle

* Fix quiver

* Create new entity to stop messing with NEI preview

* Update build.gradle

* Update dependencies.gradle

5 files changed, 44 insertions, 22 deletions

diff --git a/build.gradle b/build.gradle
index 1aaadcce85..15ec201925 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-//version: 1690104383
+//version: 1690818808
 /*
  DO NOT CHANGE THIS FILE!
  Also, you may replace this file at any time if there is an update available.
@@ -401,9 +401,13 @@ if (identifiedVersion == versionOverride) {
 
 group = "com.github.GTNewHorizons"
 if (project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
-    archivesBaseName = customArchiveBaseName
+    base {
+        archivesName = customArchiveBaseName
+    }
 } else {
-    archivesBaseName = modId
+    base {
+        archivesName = modId
+    }
 }
 
 
@@ -627,6 +631,8 @@ def mixinProviderSpecNoClassifer = "${mixinProviderGroup}:${mixinProviderModule}
 def mixinProviderSpec = "${mixinProviderSpecNoClassifer}:dev"
 ext.mixinProviderSpec = mixinProviderSpec
 
+def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
+
 dependencies {
     if (usesMixins.toBoolean()) {
         annotationProcessor('org.ow2.asm:asm-debug-all:5.0.3')
@@ -638,7 +644,7 @@ dependencies {
         }
     }
     if (usesMixins.toBoolean()) {
-        implementation(modUtils.enableMixins(mixinProviderSpec))
+        implementation(modUtils.enableMixins(mixinProviderSpec, mixingConfigRefMap))
     } else if (forceEnableMixins.toBoolean()) {
         runtimeOnlyNonPublishable(mixinProviderSpec)
     }
@@ -691,8 +697,6 @@ if (file('dependencies.gradle.kts').exists()) {
     throw new RuntimeException("Missing dependencies.gradle[.kts]")
 }
 
-def mixingConfigRefMap = 'mixins.' + modId + '.refmap.json'
-
 tasks.register('generateAssets') {
     group = "GTNH Buildscript"
     description = "Generates a mixin config file at /src/main/resources/mixins.modid.json if needed"
@@ -775,10 +779,10 @@ dependencies {
         java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
     }
     if (modId != 'hodgepodge') {
-        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.19')
+        java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.2.26')
     }
 
-    java17PatchDependencies('net.minecraft:launchwrapper:1.15') {transitive = false}
+    java17PatchDependencies('net.minecraft:launchwrapper:1.17.2') {transitive = false}
     java17PatchDependencies("org.ow2.asm:asm:${asmVersion}")
     java17PatchDependencies("org.ow2.asm:asm-commons:${asmVersion}")
     java17PatchDependencies("org.ow2.asm:asm-tree:${asmVersion}")
diff --git a/dependencies.gradle b/dependencies.gradle
index d2f25dcaa0..94cc2de249 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -35,17 +35,17 @@
  */
 
 dependencies {
-    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.140:dev')
-    api("com.github.GTNewHorizons:EnderCore:0.2.16:dev")
-    api("com.github.GTNewHorizons:EnderIO:2.4.21:dev")
+    api('com.github.GTNewHorizons:GT5-Unofficial:5.09.43.160:dev')
+    api("com.github.GTNewHorizons:EnderCore:0.2.17:dev")
+    api("com.github.GTNewHorizons:EnderIO:2.4.24:dev")
     api("com.github.GTNewHorizons:ForestryMC:4.6.13:dev")
-    api("com.github.GTNewHorizons:ModularUI:1.1.15:dev")
-    api("com.github.GTNewHorizons:Mobs-Info:0.0.7-GTNH:dev")
+    api("com.github.GTNewHorizons:ModularUI:1.1.16:dev")
+    api("com.github.GTNewHorizons:Mobs-Info:0.0.8-GTNH:dev")
     devOnlyNonPublishable("com.github.GTNewHorizons:Infernal-Mobs:1.7.9-GTNH:dev")
     //compileOnly("curse.maven:extrautilities-225561:2264384") {
     //    transitive = false
     //}
-    compileOnly("com.github.GTNewHorizons:GTplusplus:1.9.62:dev")
+    compileOnly("com.github.GTNewHorizons:GTplusplus:1.9.71:dev")
     {
         transitive = false
     }
@@ -61,11 +61,11 @@ dependencies {
     {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:bartworks:0.7.32:dev")
+    compileOnly("com.github.GTNewHorizons:bartworks:0.7.36:dev")
     {
         transitive = false
     }
-    compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.1.87:dev")
+    compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.1.93:dev")
     {
         transitive = false
     }
@@ -84,14 +84,14 @@ dependencies {
 
     // For testing
     //runtimeOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.4.2-GTNH:dev")
-    //runtimeOnly("com.github.GTNewHorizons:GTplusplus:1.9.62:dev")
+    //runtimeOnly("com.github.GTNewHorizons:GTplusplus:1.9.71:dev")
     //runtimeOnly("com.github.GTNewHorizons:harvestcraft:1.1.0-GTNH:dev")
-    //runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.1.87:dev")
+    //runtimeOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.1.93:dev")
     //runtimeOnly("com.github.GTNewHorizons:OpenBlocks:1.7.0-GTNH:dev")
-    //runtimeOnly("com.github.GTNewHorizons:bartworks:0.7.32:dev")
+    //runtimeOnly("com.github.GTNewHorizons:bartworks:0.7.36:dev")
     //runtimeOnly("com.github.GTNewHorizons:CraftTweaker:3.2.13:dev")
     //api("com.github.GTNewHorizons:SpecialMobs:3.4.3:dev")
-    //api("com.github.GTNewHorizons:twilightforest:2.4.3:dev")
+    //api("com.github.GTNewHorizons:twilightforest:2.4.4:dev")
     //api("com.github.GTNewHorizons:EnderZoo:1.0.23:dev")
     //runtimeOnly("com.github.GTNewHorizons:Draconic-Evolution:1.1.19-GTNH:dev")
     //runtimeOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev")
diff --git a/src/main/java/kubatech/client/effect/EntityRenderer.java b/src/main/java/kubatech/client/effect/EntityRenderer.java
index 247b6ba788..42c233cddd 100644
--- a/src/main/java/kubatech/client/effect/EntityRenderer.java
+++ b/src/main/java/kubatech/client/effect/EntityRenderer.java
@@ -105,7 +105,12 @@ public class EntityRenderer extends EntityFX {
         GL11.glEnable(GL11.GL_COLOR_MATERIAL);
 
         entityToRender.worldObj = this.worldObj;
-        entityToRender.setPosition(this.posX, this.posY, this.posZ);
+
+        // quiver still bugged a bit, but it is on the skeleton now
+        entityToRender.setPosition(this.posX, this.posY + 1d /* for some reason quiver renders too low? */, this.posZ);
+        entityToRender.lastTickPosX = entityToRender.posX;
+        entityToRender.lastTickPosY = entityToRender.posY;
+        entityToRender.lastTickPosZ = entityToRender.posZ;
 
         Minecraft mc = Minecraft.getMinecraft();
 
@@ -164,6 +169,8 @@ public class EntityRenderer extends EntityFX {
             (float) (this.posY - renderPosY),
             (float) (this.posZ - renderPosZ));
         GL11.glEnable(GL12.GL_RESCALE_NORMAL);
+
+        // TODO: Use new scale calculator
         float desiredScale = MobUtils.getDesiredScale(entityToRender, 2f);
         if (desiredScale < 1f) GL11.glScalef(desiredScale, desiredScale, desiredScale);
 
diff --git a/src/main/java/kubatech/loaders/MobHandlerLoader.java b/src/main/java/kubatech/loaders/MobHandlerLoader.java
index 72947c726d..c56c397308 100644
--- a/src/main/java/kubatech/loaders/MobHandlerLoader.java
+++ b/src/main/java/kubatech/loaders/MobHandlerLoader.java
@@ -23,6 +23,7 @@ package kubatech.loaders;
 import static kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber.DIAMOND_SPIKES_DAMAGE;
 import static kubatech.tileentity.gregtech.multiblock.GT_MetaTileEntity_ExtremeExterminationChamber.MOB_SPAWN_INTERVAL;
 
+import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -37,6 +38,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.JsonToNBT;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.StatCollector;
+import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;
 
 import org.apache.logging.log4j.LogManager;
@@ -83,10 +85,19 @@ public class MobHandlerLoader {
 
         public final int mEUt = 2000;
         public final int mDuration;
+        public final EntityLiving entityCopy;
 
         public MobEECRecipe(List<MobDrop> transformedDrops, MobRecipe recipe) {
             this.mOutputs = transformedDrops;
             this.recipe = recipe;
+            try {
+                this.entityCopy = this.recipe.entity.getClass()
+                    .getConstructor(World.class)
+                    .newInstance(this.recipe.entity.worldObj);
+            } catch (NoSuchMethodException | InvocationTargetException | InstantiationException
+                | IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }
             mDuration = Math.max(MOB_SPAWN_INTERVAL, (int) ((recipe.maxEntityHealth / DIAMOND_SPIKES_DAMAGE) * 10d));
         }
 
diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java
index 38a50ee1f9..bea621232f 100644
--- a/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java
+++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/GT_MetaTileEntity_ExtremeExterminationChamber.java
@@ -375,7 +375,7 @@ public class GT_MetaTileEntity_ExtremeExterminationChamber
             MobHandlerLoader.MobEECRecipe r = MobHandlerLoader.recipeMap.get(mobType);
             if (r != null) {
                 if (entityRenderer == null) setupEntityRenderer(getBaseMetaTileEntity(), 40);
-                entityRenderer.setEntity(r.recipe.entity);
+                entityRenderer.setEntity(r.entityCopy);
             } else entityRenderer.setEntity(null);
         } else {
             renderEntity = false;