From c78ea3459227d1c825d526f12294f49eba43078e Mon Sep 17 00:00:00 2001 From: Kam Date: Wed, 26 Jul 2023 18:23:48 -0400 Subject: [PATCH] Remove Redundancies --- .../java/noppes/npcs/compat/DBCHelper.java | 107 ------------------ .../npcs/scripted/entity/ScriptDBCPlayer.java | 65 ----------- 2 files changed, 172 deletions(-) delete mode 100644 src/main/java/noppes/npcs/compat/DBCHelper.java diff --git a/src/main/java/noppes/npcs/compat/DBCHelper.java b/src/main/java/noppes/npcs/compat/DBCHelper.java deleted file mode 100644 index 658c6c341..000000000 --- a/src/main/java/noppes/npcs/compat/DBCHelper.java +++ /dev/null @@ -1,107 +0,0 @@ -package noppes.npcs.compat; - -import cpw.mods.fml.common.Loader; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityList; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.passive.EntityTameable; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ChatComponentText; -import net.minecraft.world.World; -import noppes.npcs.LogWriter; -import noppes.npcs.constants.EnumJobType; -import noppes.npcs.entity.EntityNPCInterface; -import noppes.npcs.roles.JobSpawner; -import org.apache.logging.log4j.LogManager; - -import java.lang.reflect.Array; -import java.lang.reflect.Constructor; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; - -public class DBCHelper { - public static boolean Enabled = false; - - private static Method StatusEffectsMethod = null; - private static Method PlyrSkillsMethod = null; - private static Method TransPwrModAtr = null; - private static Method statMethod = null; - - public static void load(){ - Enabled = Loader.isModLoaded("jinryuujrmcore"); - if(!Enabled) - return; - - try{ - Class c = Class.forName("JinRyuu.JRMCore.JRMCoreH"); - StatusEffectsMethod = c.getMethod("StusEfcts",int.class, String.class); - PlyrSkillsMethod = c.getMethod("PlyrSkills", EntityPlayer.class); - TransPwrModAtr = c.getMethod("TransPwrModAtr", int[].class, int.class, int.class, int.class, int.class, String.class, int.class, int.class, boolean.class, boolean.class, boolean.class, boolean.class, int.class, String[].class, boolean.class); - statMethod = c.getMethod("stat", int.class, int.class, int.class, int.class, int.class, float.class); - } - catch(Exception e){ - LogWriter.except(e); - } - - } - - public static boolean StatusEffects(int id, String effect){ - try { - Object returnValue = StatusEffectsMethod.invoke(null, id, effect); - return (Boolean) returnValue; - } catch (Exception e) { - LogManager.getLogger().error("StatusEffects", e); - } - return false; - } - - public static String[] PlayerSkills(EntityPlayer p){ - try { - Object returnValue = PlyrSkillsMethod.invoke(null, p); - if (returnValue instanceof String[]) { - return (String[]) returnValue; // Cast and return the String[] value - } else { - return new String[]{}; - } - } catch (Exception e) { - LogManager.getLogger().error("PlayerSkills", e); - } - - return new String[]{}; - } - - public static int TransPwrMod(int[] currAttributes, int attribute, int st, int st2, int race, String SklX, int currRelease, int arcRel, boolean legendOn, boolean majinOn, boolean mysticOn, boolean uiOn, int powerType, String[] Skls, boolean isFused){ - try { - Object returnValue = TransPwrModAtr.invoke(null, currAttributes, attribute, st, st2, race, SklX, currRelease, arcRel, legendOn, majinOn, mysticOn, uiOn, powerType, Skls, isFused); - if (returnValue instanceof Integer) { - return (int) returnValue; - } else { - return -1; - } - } catch (Exception e) { - LogManager.getLogger().error("TransPwrModAtr", e); - } - - return -1; - } - - public static int StatMethod(int g, int s, int a, int r, int c, float b){ - try { - Object returnValue = statMethod.invoke(null, g, s, a, r, c, b); - if (returnValue instanceof Integer) { - return (int) returnValue; - } else { - return -1; - } - } catch (Exception e) { - LogManager.getLogger().error("statMethod", e); - } - - return -1; - } -} diff --git a/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java b/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java index 840993b57..d4ae3d2f1 100644 --- a/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java +++ b/src/main/java/noppes/npcs/scripted/entity/ScriptDBCPlayer.java @@ -1,13 +1,11 @@ package noppes.npcs.scripted.entity; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import noppes.npcs.api.entity.IDBCPlayer; import noppes.npcs.api.item.IItemStack; -import noppes.npcs.compat.DBCHelper; import noppes.npcs.scripted.CustomNPCsException; import noppes.npcs.scripted.NpcAPI; @@ -797,67 +795,4 @@ public class ScriptDBCPlayer extends ScriptPlayer i } return ""; } - - public int calcDexResistance(int damage, int percentPierce){ - if(!DBCHelper.Enabled){ - return 0; - } - - NBTTagCompound nbt = player.getEntityData().getCompoundTag("PlayerPersisted"); - if(nbt != null){ - byte st = nbt.getByte("jrmcState"); - byte st2 = nbt.getByte("jrmcState2"); - byte rc = nbt.getByte("jrmcRace"); - byte cls = nbt.getByte("jrmcClass"); - String sklx = nbt.getString("jrmcSSltX"); - byte rls = nbt.getByte("jrmcRelease"); - int resrv = nbt.getInteger("jrmcArcRsrv"); - - String statusEffects = nbt.getString("jrmcStatusEff"); - boolean mj = DBCHelper.StatusEffects(12 ,statusEffects); - boolean mc = DBCHelper.StatusEffects(13 ,statusEffects); - boolean lg = DBCHelper.StatusEffects(14 ,statusEffects); - boolean mn = DBCHelper.StatusEffects(19 ,statusEffects); - - byte pwr = nbt.getByte("jrmcPwrtyp"); - String[] ps = DBCHelper.PlayerSkills(player); - boolean c = DBCHelper.StatusEffects(10 ,statusEffects) || DBCHelper.StatusEffects(11 ,statusEffects); - int dex = DBCHelper.TransPwrMod(getStats(player), 1, st, st2, rc, sklx, rls, resrv, lg, mj, mc, mn, pwr, ps, c); - - int def = (int) (DBCHelper.StatMethod(1, 1, dex, rc, cls, 0.0F) * rls * 0.01D * JRMCoreH.weightPerc(1, player)); - - boolean block = ExtendedPlayer.get(player).getBlocking() != 0; - - if (!block) { - def /= (100 / JRMCoreConfig.cStatPasDef); - } - - int dmg = damage - def; - - if (dmg <= 0) { - dmg = (int) (damage * percentPierce); - } - - int hp = nbt.getInteger("jrmcBdy") - (dmg / 2); - - if (hp < 0) { - hp = 0; - } - - nbt.setInteger("jrmcBdy", hp); - } - } - - private int[] getStats(EntityPlayer player) { - NBTTagCompound nbt = player.getEntityData().getCompoundTag("PlayerPersisted"); - int[] stats = new int[6]; - String[] attr = { "jrmcStrI", "jrmcDexI", "jrmcCnsI", "jrmcWilI", "jrmcIntI", "jrmcCncI" }; - - for (int i = 0; i < attr.length; i++) { - stats[i] = nbt.getInteger(attr[i]); - } - - return stats; - } - } \ No newline at end of file