diff options
| author | Jakub <53441451+kuba6000@users.noreply.github.com> | 2023-06-15 17:53:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-15 17:53:16 +0200 |
| commit | cb383c824c3f799e678fb98f29661d79b5a13836 (patch) | |
| tree | c27ec3672eb0cb1726565bf28ae2655404496231 /src/main/java/kubatech/nei | |
| parent | b2c2a6dfe91696d4ecada95e5e43806ddb144ece (diff) | |
| download | GT5-Unofficial-cb383c824c3f799e678fb98f29661d79b5a13836.tar.gz GT5-Unofficial-cb383c824c3f799e678fb98f29661d79b5a13836.tar.bz2 GT5-Unofficial-cb383c824c3f799e678fb98f29661d79b5a13836.zip | |
Use mixins accessors + some misc fixes (#77)
* Change reflections to mixins
* Wrap witchery checking
* Remove more repeating code
* hmm
* test generation
* test
* client sided
* Update CommandCustomDrops.java
* Update MobRecipeLoader.java
* Save to static variable
* Imports
* Log message
* Convert InfernalHelper to mixin accessors
* Update build.gradle
* One more
* Return class nodes to optimize
* Translations mixin
* Automatically add commands
* Fixes
* Fix https://github.com/GTNewHorizons/GT-New-Horizons-Modpack/issues/12021
* Update kubatech.java
* Update CommonProxy.java
* Unnecessary qualified reference
* Simplify ItemUtils
* Check if single player diffrently
* Remove accessor for infernal-mobs
Diffstat (limited to 'src/main/java/kubatech/nei')
| -rw-r--r-- | src/main/java/kubatech/nei/Mob_Handler.java | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/src/main/java/kubatech/nei/Mob_Handler.java b/src/main/java/kubatech/nei/Mob_Handler.java index f6e859eceb..10f932ec71 100644 --- a/src/main/java/kubatech/nei/Mob_Handler.java +++ b/src/main/java/kubatech/nei/Mob_Handler.java @@ -38,7 +38,6 @@ import static kubatech.nei.Mob_Handler.Translations.PLAYER_ONLY; import static kubatech.nei.Mob_Handler.Translations.RARE_DROPS; import java.awt.*; -import java.lang.reflect.Field; import java.nio.FloatBuffer; import java.util.ArrayList; import java.util.List; @@ -49,7 +48,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.ScaledResolution; import net.minecraft.client.gui.inventory.GuiInventory; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.RendererLivingEntity; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EntityList; import net.minecraft.entity.EntityLiving; @@ -70,6 +68,7 @@ import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import org.lwjgl.util.glu.GLU; +import atomicstryker.infernalmobs.common.InfernalMobsCore; import codechicken.lib.gui.GuiDraw; import codechicken.nei.NEIClientUtils; import codechicken.nei.PositionedStack; @@ -85,7 +84,6 @@ import crazypants.enderio.machine.spawner.BlockPoweredSpawner; import gregtech.api.util.GT_Utility; import kubatech.Tags; import kubatech.api.LoaderReference; -import kubatech.api.helpers.InfernalHelper; import kubatech.api.mobhandler.MobDrop; import kubatech.api.utils.FastRandom; import kubatech.api.utils.MobUtils; @@ -232,18 +230,6 @@ public class Mob_Handler extends TemplateRecipeHandler { return "kubatech:textures/gui/MobHandler.png"; } - private static final Field mainmodelfield; - - static { - try { - mainmodelfield = RendererLivingEntity.class - .getDeclaredField(ModUtils.isDeobfuscatedEnvironment ? "mainModel" : "field_77045_g"); - mainmodelfield.setAccessible(true); - } catch (NoSuchFieldException e) { - throw new RuntimeException(e); - } - } - @Override public void drawBackground(int recipe) { GL11.glColor4f(1f, 1f, 1f, 1f); @@ -530,8 +516,8 @@ public class Mob_Handler extends TemplateRecipeHandler { if (isPlayerOnly) { extraTooltip.add(EnumChatFormatting.RESET + PLAYER_ONLY.get()); extraTooltip.add( - EnumChatFormatting.RESET - + EEC_CHANCE.get(((double) chance / 100d) * Config.MobHandler.playerOnlyDropsModifier)); + EnumChatFormatting.RESET + EEC_CHANCE + .get(((double) ((int) ((double) chance * Config.MobHandler.playerOnlyDropsModifier)) / 100d))); } extraTooltip.add(EnumChatFormatting.RESET + AVERAGE_REMINDER.get()); @@ -603,8 +589,9 @@ public class Mob_Handler extends TemplateRecipeHandler { if (!LoaderReference.InfernalMobs) infernaltype = -1; // not supported else { - if (!InfernalHelper.isClassAllowed(mob)) infernaltype = 0; // not allowed - else if (InfernalHelper.checkEntityClassForced(mob)) infernaltype = 2; // forced + InfernalMobsCore infernalMobsCore = InfernalMobsCore.instance(); + if (!infernalMobsCore.isClassAllowed(mob)) infernaltype = 0; // not allowed + else if (infernalMobsCore.checkEntityClassForced(mob)) infernaltype = 2; // forced else infernaltype = 1; // normal } } |
