More Class Refactoring for TintData and HitboxData

This commit is contained in:
Kam committed 2024-02-29 22:20:35 -05:00
1 parent 982ceb4aa4
commit 0b73ae91bb
10 files changed
+379 -387

No files matched your search

@@ -11,7 +11,7 @@ import noppes.npcs.client.model.part.legs.ModelMermaidLegs2;
import noppes.npcs.client.model.part.legs.ModelNagaLegs;
import noppes.npcs.client.model.util.ModelScaleRenderer;
import noppes.npcs.constants.EnumAnimation;
import noppes.npcs.controllers.data.CustomTintData;
import noppes.npcs.controllers.data.TintData;
import noppes.npcs.entity.EntityCustomNpc;
import noppes.npcs.entity.data.ModelPartData;
import org.lwjgl.opengl.GL11;
@@ -387,9 +387,9 @@ public class ModelLegs extends ModelScaleRenderer{
y *= 2f;
}
}
CustomTintData customTintData = entity.display.customTintData;
TintData tintData = entity.display.tintData;
boolean bo = entity.hurtTime <= 0 && entity.deathTime <= 0 && !base.isArmor &&
!(customTintData.isTintEnabled() && customTintData.isGeneralTintEnabled());
!(tintData.isTintEnabled() && tintData.isGeneralTintEnabled());
if(bo){
float red = (entity.modelData.legParts.color >> 16 & 255) / 255f;
float green = (entity.modelData.legParts.color >> 8 & 255) / 255f;
@@ -10,7 +10,7 @@ import noppes.npcs.client.model.ModelMPM;
import noppes.npcs.client.model.part.tails.*;
import noppes.npcs.client.model.util.ModelScaleRenderer;
import noppes.npcs.constants.EnumAnimation;
import noppes.npcs.controllers.data.CustomTintData;
import noppes.npcs.controllers.data.TintData;
import noppes.npcs.entity.EntityCustomNpc;
import noppes.npcs.entity.data.ModelPartData;
import org.lwjgl.opengl.GL11;
@@ -151,9 +151,9 @@ public class ModelTail extends ModelScaleRenderer {
base.currentlyPlayerTexture = true;
}
}
CustomTintData customTintData = entity.display.customTintData;
TintData tintData = entity.display.tintData;
boolean bo = entity.hurtTime <= 0 && entity.deathTime <= 0 && !base.isArmor &&
!(customTintData.isTintEnabled() && customTintData.isGeneralTintEnabled());
!(tintData.isTintEnabled() && tintData.isGeneralTintEnabled());
if(bo){
float red = (color >> 16 & 255) / 255f;
float green = (color >> 8 & 255) / 255f;
@@ -6,7 +6,7 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.ResourceLocation;
import noppes.npcs.client.ClientProxy;
import noppes.npcs.client.model.ModelMPM;
import noppes.npcs.controllers.data.CustomTintData;
import noppes.npcs.controllers.data.TintData;
import noppes.npcs.entity.EntityCustomNpc;
import noppes.npcs.entity.data.ModelData;
import noppes.npcs.entity.data.ModelPartData;
@@ -60,9 +60,9 @@ public abstract class ModelPartInterface extends ModelRenderer {
base.currentlyPlayerTexture = true;
}
}
CustomTintData customTintData = entity.display.customTintData;
TintData tintData = entity.display.tintData;
boolean bo = entity.hurtTime <= 0 && entity.deathTime <= 0 && !base.isArmor &&
!(customTintData.isTintEnabled() && customTintData.isGeneralTintEnabled());
!(tintData.isTintEnabled() && tintData.isGeneralTintEnabled());
if(bo){
float red = (color >> 16 & 255) / 255f;
float green = (color >> 8 & 255) / 255f;