mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-16 23:25:07 +00:00
Proper Reformating
This commit is contained in:
1 parent
ce75880aba
commit
180d257024
1179 files changed
+59847
-61583
No files matched your search
@@ -133,7 +133,7 @@ public class AnimationMixinFunctions {
|
||||
}
|
||||
|
||||
private static EnumAnimationPart pivotEqualPart(ModelRenderer renderer) {
|
||||
if(renderer.baseModel instanceof ModelBiped){
|
||||
if (renderer.baseModel instanceof ModelBiped) {
|
||||
ModelRenderer head = ((ModelBiped) renderer.baseModel).bipedHead;
|
||||
ModelRenderer body = ((ModelBiped) renderer.baseModel).bipedBody;
|
||||
ModelRenderer larm = ((ModelBiped) renderer.baseModel).bipedLeftArm;
|
||||
@@ -141,22 +141,22 @@ public class AnimationMixinFunctions {
|
||||
ModelRenderer lleg = ((ModelBiped) renderer.baseModel).bipedLeftLeg;
|
||||
ModelRenderer rleg = ((ModelBiped) renderer.baseModel).bipedRightLeg;
|
||||
|
||||
if (pivotsEqual(renderer,head)) {
|
||||
if (pivotsEqual(renderer, head)) {
|
||||
return EnumAnimationPart.HEAD;
|
||||
}
|
||||
if (pivotsEqual(renderer,body)) {
|
||||
if (pivotsEqual(renderer, body)) {
|
||||
return EnumAnimationPart.BODY;
|
||||
}
|
||||
if (pivotsEqual(renderer,rarm)) {
|
||||
if (pivotsEqual(renderer, rarm)) {
|
||||
return EnumAnimationPart.RIGHT_ARM;
|
||||
}
|
||||
if (pivotsEqual(renderer,larm)) {
|
||||
if (pivotsEqual(renderer, larm)) {
|
||||
return EnumAnimationPart.LEFT_ARM;
|
||||
}
|
||||
if (pivotsEqual(renderer,rleg)) {
|
||||
if (pivotsEqual(renderer, rleg)) {
|
||||
return EnumAnimationPart.RIGHT_LEG;
|
||||
}
|
||||
if (pivotsEqual(renderer,lleg)) {
|
||||
if (pivotsEqual(renderer, lleg)) {
|
||||
return EnumAnimationPart.LEFT_LEG;
|
||||
}
|
||||
}
|
||||
@@ -179,7 +179,7 @@ public class AnimationMixinFunctions {
|
||||
declared = ClientEventHandler.declaredFieldCache.get(RenderClass);
|
||||
} else {
|
||||
declared = RenderClass.getDeclaredFields();
|
||||
ClientEventHandler.declaredFieldCache.put(RenderClass,declared);
|
||||
ClientEventHandler.declaredFieldCache.put(RenderClass, declared);
|
||||
}
|
||||
for (Field f : declared) {
|
||||
f.setAccessible(true);
|
||||
@@ -190,7 +190,8 @@ public class AnimationMixinFunctions {
|
||||
if (partName.equals(f.getName()) && renderer == f.get(model)) {
|
||||
return entry.getKey();
|
||||
}
|
||||
} catch (IllegalAccessException ignored) {}
|
||||
} catch (IllegalAccessException ignored) {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -268,7 +269,7 @@ public class AnimationMixinFunctions {
|
||||
int i = Minecraft.getMinecraft().theWorld.getLightBrightnessForSkyBlocks(MathHelper.floor_double(entityclientplayermp.posX), MathHelper.floor_double(entityclientplayermp.posY), MathHelper.floor_double(entityclientplayermp.posZ), 0);
|
||||
int j = i % 65536;
|
||||
int k = i / 65536;
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float)j, (float)k);
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) j, (float) k);
|
||||
|
||||
float f3 = entityclientplayermp.prevRenderArmPitch + (entityclientplayermp.renderArmPitch - entityclientplayermp.prevRenderArmPitch) * partialRenderTick;
|
||||
float f4 = entityclientplayermp.prevRenderArmYaw + (entityclientplayermp.renderArmYaw - entityclientplayermp.prevRenderArmYaw) * partialRenderTick;
|
||||
@@ -285,13 +286,11 @@ public class AnimationMixinFunctions {
|
||||
|
||||
ItemRenderer itemRenderer = Minecraft.getMinecraft().entityRenderer.itemRenderer;
|
||||
ItemStack itemstack = itemRenderer.itemToRender;
|
||||
if (frame.frameParts.containsKey(EnumAnimationPart.RIGHT_ARM) && itemstack != null)
|
||||
{
|
||||
if (frame.frameParts.containsKey(EnumAnimationPart.RIGHT_ARM) && itemstack != null) {
|
||||
float f11, f12;
|
||||
GL11.glPushMatrix();
|
||||
|
||||
if (player.fishEntity != null)
|
||||
{
|
||||
if (player.fishEntity != null) {
|
||||
itemstack = new ItemStack(Items.stick);
|
||||
}
|
||||
|
||||
@@ -310,27 +309,23 @@ public class AnimationMixinFunctions {
|
||||
GL11.glRotatef(45, 1, 0, 0);
|
||||
GL11.glRotatef(80, 0, 0, 1);
|
||||
|
||||
float f6 = 1/1.5F;
|
||||
float f6 = 1 / 1.5F;
|
||||
GL11.glScalef(f6, f6, f6);
|
||||
|
||||
if (itemstack.getItem().requiresMultipleRenderPasses())
|
||||
{
|
||||
for (k = 0; k < itemstack.getItem().getRenderPasses(itemstack.getItemDamage()); ++k)
|
||||
{
|
||||
if (itemstack.getItem().requiresMultipleRenderPasses()) {
|
||||
for (k = 0; k < itemstack.getItem().getRenderPasses(itemstack.getItemDamage()); ++k) {
|
||||
i = itemstack.getItem().getColorFromItemStack(itemstack, k);
|
||||
f12 = (float)(i >> 16 & 255) / 255.0F;
|
||||
f3 = (float)(i >> 8 & 255) / 255.0F;
|
||||
f4 = (float)(i & 255) / 255.0F;
|
||||
f12 = (float) (i >> 16 & 255) / 255.0F;
|
||||
f3 = (float) (i >> 8 & 255) / 255.0F;
|
||||
f4 = (float) (i & 255) / 255.0F;
|
||||
GL11.glColor4f(f12, f3, f4, 1.0F);
|
||||
mixin_renderItem(player, itemstack, k, EQUIPPED_FIRST_PERSON, renderBlocksIr, resItemGlint);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
} else {
|
||||
k = itemstack.getItem().getColorFromItemStack(itemstack, 0);
|
||||
f11 = (float)(k >> 16 & 255) / 255.0F;
|
||||
f12 = (float)(k >> 8 & 255) / 255.0F;
|
||||
f3 = (float)(k & 255) / 255.0F;
|
||||
f11 = (float) (k >> 16 & 255) / 255.0F;
|
||||
f12 = (float) (k >> 8 & 255) / 255.0F;
|
||||
f3 = (float) (k & 255) / 255.0F;
|
||||
GL11.glColor4f(f11, f12, f3, 1.0F);
|
||||
mixin_renderItem(player, itemstack, 0, EQUIPPED_FIRST_PERSON, renderBlocksIr, resItemGlint);
|
||||
}
|
||||
@@ -469,7 +464,7 @@ public class AnimationMixinFunctions {
|
||||
|
||||
boolean instantTransmission = blocking == 2;
|
||||
int id = blocking != 0 ? (instantTransmission ? 6 : 0) : (animKiShoot != 0 ? an[animKiShoot - 1] + 2 : -1);
|
||||
if (!(boolean)JGConfigClientSettings.getField("CLIENT_DA4").get(null)) {
|
||||
if (!(boolean) JGConfigClientSettings.getField("CLIENT_DA4").get(null)) {
|
||||
id = -1;
|
||||
}
|
||||
|
||||
@@ -478,12 +473,12 @@ public class AnimationMixinFunctions {
|
||||
int jx;
|
||||
int j;
|
||||
if (dbcBool) {
|
||||
String[] s = ((String) JRMCoreH.getMethod("data", String.class, int.class, String.class).invoke(null,acp.getCommandSenderName(), 1, "0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0")).split(";");
|
||||
String[] s = ((String) JRMCoreH.getMethod("data", String.class, int.class, String.class).invoke(null, acp.getCommandSenderName(), 1, "0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0;0")).split(";");
|
||||
tailCol = Integer.parseInt(s[2]);
|
||||
if (tailCol == 1) {
|
||||
String[] PlyrSkills = (String[]) JRMCoreH.getMethod("PlyrSkills", EntityPlayer.class).invoke(null, acp);
|
||||
jx = (int) JRMCoreH.getMethod("SklLvl", int.class, String[].class).invoke(null,12, PlyrSkills);
|
||||
j = (int) JRMCoreH.getMethod("SklLvl", int.class, String[].class).invoke(null,15, PlyrSkills);
|
||||
jx = (int) JRMCoreH.getMethod("SklLvl", int.class, String[].class).invoke(null, 12, PlyrSkills);
|
||||
j = (int) JRMCoreH.getMethod("SklLvl", int.class, String[].class).invoke(null, 15, PlyrSkills);
|
||||
String ss = s[17];
|
||||
boolean v = dbcBool && !ss.equals("-1");
|
||||
GL11.glPushMatrix();
|
||||
@@ -676,10 +671,10 @@ public class AnimationMixinFunctions {
|
||||
|
||||
if (State == 14) {
|
||||
tailCol = race != 2 && bodytype == 0 ? 6498048 : bodytype;
|
||||
tailCol = (boolean)JRMCoreH.getMethod("isAprilFoolsModeOn").invoke(null) ? 13292516 : tailCol;
|
||||
tailCol = (boolean) JRMCoreH.getMethod("isAprilFoolsModeOn").invoke(null) ? 13292516 : tailCol;
|
||||
tailCol = skintype == 1 ? bodyc1 : tailCol;
|
||||
if ((boolean) JRMCoreH.getMethod("rSai", int.class).invoke(null, race) && tailCol == 6498048 && State == 14) {
|
||||
if ((boolean)JRMCoreH.getMethod("isAprilFoolsModeOn").invoke(null)) {
|
||||
if ((boolean) JRMCoreH.getMethod("isAprilFoolsModeOn").invoke(null)) {
|
||||
tailCol = 13292516;
|
||||
} else {
|
||||
tailCol = 14292268;
|
||||
@@ -703,8 +698,8 @@ public class AnimationMixinFunctions {
|
||||
GL11.glDepthMask(false);
|
||||
tailCol = Integer.parseInt((String) JRMCoreH.getMethod("data", String.class, int.class, String.class
|
||||
).invoke(null, par1EntityPlayer.getCommandSenderName(), 8, "200"));
|
||||
float one = (float)tailCol / 100.0F;
|
||||
j = (int)((float)tailCol / one);
|
||||
float one = (float) tailCol / 100.0F;
|
||||
j = (int) ((float) tailCol / one);
|
||||
if (j < 70) {
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
mc.getTextureManager().bindTexture(new ResourceLocation("jinryuumodscore:cc/bruises1.png"));
|
||||
@@ -744,7 +739,7 @@ public class AnimationMixinFunctions {
|
||||
if (itemstack != null) {
|
||||
item = itemstack.getItem();
|
||||
if (item instanceof ItemArmor) {
|
||||
itemarmor = (ItemArmor)item;
|
||||
itemarmor = (ItemArmor) item;
|
||||
GL11.glPushMatrix();
|
||||
dbcarmor = itemarmor.getArmorTexture(itemstack, par1EntityPlayer, 2, null);
|
||||
mcarmor = RenderBiped.getArmorResource(par1EntityPlayer, itemstack, 1, null);
|
||||
@@ -875,10 +870,10 @@ public class AnimationMixinFunctions {
|
||||
|
||||
if (State == 14) {
|
||||
tailCol = race != 2 && bodytype == 0 ? 6498048 : bodytype;
|
||||
tailCol = (boolean)JRMCoreH.getMethod("isAprilFoolsModeOn").invoke(null) ? 13292516 : tailCol;
|
||||
tailCol = (boolean) JRMCoreH.getMethod("isAprilFoolsModeOn").invoke(null) ? 13292516 : tailCol;
|
||||
jx = skintype == 1 ? bodyc1 : tailCol;
|
||||
if ((boolean) JRMCoreH.getMethod("rSai", int.class).invoke(null, race) && jx == 6498048 && State == 14) {
|
||||
if ((boolean)JRMCoreH.getMethod("isAprilFoolsModeOn").invoke(null)) {
|
||||
if ((boolean) JRMCoreH.getMethod("isAprilFoolsModeOn").invoke(null)) {
|
||||
jx = 13292516;
|
||||
} else {
|
||||
jx = 14292268;
|
||||
@@ -907,8 +902,8 @@ public class AnimationMixinFunctions {
|
||||
((int[]) JRMCoreH.getField("PlyrAttrbts").get(null))[2], race,
|
||||
(byte) JRMCoreH.getField("Class").get(null), 0.0F);
|
||||
jx = Integer.parseInt((String) JRMCoreH.getMethod("data", String.class, int.class, String.class).invoke(null, par1EntityPlayer.getCommandSenderName(), 8, "200"));
|
||||
float one = (float)tailCol / 100.0F;
|
||||
int perc = (int)((float)jx / one);
|
||||
float one = (float) tailCol / 100.0F;
|
||||
int perc = (int) ((float) jx / one);
|
||||
if (perc < 70) {
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
mc.getTextureManager().bindTexture(new ResourceLocation("jinryuumodscore:cc/bruises1.png"));
|
||||
@@ -942,7 +937,7 @@ public class AnimationMixinFunctions {
|
||||
if (itemstack != null) {
|
||||
item = itemstack.getItem();
|
||||
if (item instanceof ItemArmor) {
|
||||
itemarmor = (ItemArmor)item;
|
||||
itemarmor = (ItemArmor) item;
|
||||
GL11.glPushMatrix();
|
||||
dbcarmor = itemarmor.getArmorTexture(itemstack, par1EntityPlayer, 2, null);
|
||||
mcarmor = RenderBiped.getArmorResource(par1EntityPlayer, itemstack, 1, null);
|
||||
@@ -1020,9 +1015,9 @@ public class AnimationMixinFunctions {
|
||||
}
|
||||
|
||||
private static void glColor3f(int c) throws ClassNotFoundException, InvocationTargetException, NoSuchMethodException, IllegalAccessException {
|
||||
float h2 = (float)(c >> 16 & 255) / 255.0F;
|
||||
float h3 = (float)(c >> 8 & 255) / 255.0F;
|
||||
float h4 = (float)(c & 255) / 255.0F;
|
||||
float h2 = (float) (c >> 16 & 255) / 255.0F;
|
||||
float h3 = (float) (c >> 8 & 255) / 255.0F;
|
||||
float h4 = (float) (c & 255) / 255.0F;
|
||||
float h1 = 1.0F;
|
||||
float r = h1 * h2;
|
||||
float g = h1 * h3;
|
||||
@@ -1048,7 +1043,7 @@ public class AnimationMixinFunctions {
|
||||
} else if (p_78443_2_.getItemSpriteNumber() == 0 && item instanceof ItemBlock && RenderBlocks.renderItemIn3d(block.getRenderType())) {
|
||||
texturemanager.bindTexture(texturemanager.getResourceLocation(0));
|
||||
|
||||
GL11.glTranslatef(0.0F, 0.2F,-0.2F);
|
||||
GL11.glTranslatef(0.0F, 0.2F, -0.2F);
|
||||
if (p_78443_2_ != null && block != null && block.getRenderBlockPass() != 0) {
|
||||
GL11.glDepthMask(false);
|
||||
renderBlocksIr.renderBlockAsItem(block, p_78443_2_.getItemDamage(), 1.0F);
|
||||
|
||||
Reference in new issue
Block a user