aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/core/client
diff options
context:
space:
mode:
authorJakub <53441451+kuba6000@users.noreply.github.com>2022-08-29 16:04:28 +0200
committerGitHub <noreply@github.com>2022-08-29 16:04:28 +0200
commit7d1f51a8937e0a86486267437d444696e81e8aa0 (patch)
treea5b145e7271998f7b4b968a2212ed487e54a92b5 /src/main/java/gtPlusPlus/core/client
parent5267969156d30b4bb5f4cb2279ebb49db6bd40e2 (diff)
downloadGT5-Unofficial-7d1f51a8937e0a86486267437d444696e81e8aa0.tar.gz
GT5-Unofficial-7d1f51a8937e0a86486267437d444696e81e8aa0.tar.bz2
GT5-Unofficial-7d1f51a8937e0a86486267437d444696e81e8aa0.zip
Buildscript + Spotless (#318)
* Convert AES.java to readable class * Buildscript * Spotless
Diffstat (limited to 'src/main/java/gtPlusPlus/core/client')
-rw-r--r--src/main/java/gtPlusPlus/core/client/CustomTextureSet.java37
-rw-r--r--src/main/java/gtPlusPlus/core/client/model/ModelBatKing.java59
-rw-r--r--src/main/java/gtPlusPlus/core/client/model/ModelDecayChest.java11
-rw-r--r--src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java50
-rw-r--r--src/main/java/gtPlusPlus/core/client/model/ModelGiantChicken.java61
-rw-r--r--src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java58
-rw-r--r--src/main/java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java66
-rw-r--r--src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java16
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java99
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/CustomOreBlockRenderer.java3572
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/RenderBatKing.java292
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/RenderDecayChest.java118
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/RenderGiantChicken.java5
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/RenderMiningExplosivesPrimed.java196
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/RenderPlasmaBolt.java317
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/RenderPotionthrow.java42
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/RenderSickBlaze.java76
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/RenderStaballoyConstruct.java293
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/RenderToxinball.java47
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/particle/EntityDropParticleFX.java175
-rw-r--r--src/main/java/gtPlusPlus/core/client/renderer/tabula/RenderTabulaBase.java59
21 files changed, 3042 insertions, 2607 deletions
diff --git a/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java b/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java
index 400503b2fa..687dc65fb1 100644
--- a/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java
+++ b/src/main/java/gtPlusPlus/core/client/CustomTextureSet.java
@@ -4,25 +4,24 @@ import gregtech.api.enums.TextureSet;
public class CustomTextureSet extends TextureSet {
- public static enum TextureSets {
-
- REFINED(),
- GEM_A(),
- ENRICHED(),
- NUCLEAR;
+ public static enum TextureSets {
+ REFINED(),
+ GEM_A(),
+ ENRICHED(),
+ NUCLEAR;
- private final CustomTextureSet A;
-
- private TextureSets (){
- A = new CustomTextureSet(this.name().toUpperCase());
- }
- public CustomTextureSet get() {
- return A;
- }
- }
-
- public CustomTextureSet(String aSetName) {
- super(aSetName);
- }
+ private final CustomTextureSet A;
+ private TextureSets() {
+ A = new CustomTextureSet(this.name().toUpperCase());
+ }
+
+ public CustomTextureSet get() {
+ return A;
+ }
+ }
+
+ public CustomTextureSet(String aSetName) {
+ super(aSetName);
+ }
}
diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelBatKing.java b/src/main/java/gtPlusPlus/core/client/model/ModelBatKing.java
index ac64dee26a..590345e8e6 100644
--- a/src/main/java/gtPlusPlus/core/client/model/ModelBatKing.java
+++ b/src/main/java/gtPlusPlus/core/client/model/ModelBatKing.java
@@ -1,19 +1,16 @@
package gtPlusPlus.core.client.model;
-import org.lwjgl.opengl.GL11;
-
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gtPlusPlus.core.entity.monster.EntityBatKing;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
-import net.minecraft.entity.passive.EntityBat;
import net.minecraft.util.MathHelper;
+import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT)
-public class ModelBatKing extends ModelBase
-{
+public class ModelBatKing extends ModelBase {
private ModelRenderer batHead;
/** The body box of the bat model. */
private ModelRenderer batBody;
@@ -26,11 +23,10 @@ public class ModelBatKing extends ModelBase
/** The outer left wing box of the bat model. */
private ModelRenderer batOuterLeftWing;
- public ModelBatKing()
- {
+ public ModelBatKing() {
this.textureWidth = 64;
this.textureHeight = 64;
-
+
this.batHead = new ModelRenderer(this, 0, 0);
this.batHead.addBox(-3.0F, -3.0F, -3.0F, 6, 6, 6);
ModelRenderer modelrenderer = new ModelRenderer(this, 24, 0);
@@ -65,56 +61,57 @@ public class ModelBatKing extends ModelBase
* not actually sure this is size, is not used as of now, but the model would be recreated if the value changed and
* it seems a good match for a bats size
*/
- public int getBatSize()
- {
+ public int getBatSize() {
return 72;
}
/**
* Sets the models various rotation angles then renders the model.
*/
- public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
- {
- EntityBatKing entitybat = (EntityBatKing)p_78088_1_;
+ public void render(
+ Entity p_78088_1_,
+ float p_78088_2_,
+ float p_78088_3_,
+ float p_78088_4_,
+ float p_78088_5_,
+ float p_78088_6_,
+ float p_78088_7_) {
+ EntityBatKing entitybat = (EntityBatKing) p_78088_1_;
float f6;
- if (entitybat.getIsBatHanging())
- {
- f6 = (180F / (float)Math.PI);
- this.batHead.rotateAngleX = p_78088_6_ / (180F / (float)Math.PI);
- this.batHead.rotateAngleY = (float)Math.PI - p_78088_5_ / (180F / (float)Math.PI);
- this.batHead.rotateAngleZ = (float)Math.PI;
+ if (entitybat.getIsBatHanging()) {
+ f6 = (180F / (float) Math.PI);
+ this.batHead.rotateAngleX = p_78088_6_ / (180F / (float) Math.PI);
+ this.batHead.rotateAngleY = (float) Math.PI - p_78088_5_ / (180F / (float) Math.PI);
+ this.batHead.rotateAngleZ = (float) Math.PI;
this.batHead.setRotationPoint(0.0F, -2.0F, 0.0F);
this.batRightWing.setRotationPoint(-3.0F, 0.0F, 3.0F);
this.batLeftWing.setRotationPoint(3.0F, 0.0F, 3.0F);
- this.batBody.rotateAngleX = (float)Math.PI;
+ this.batBody.rotateAngleX = (float) Math.PI;
this.batRightWing.rotateAngleX = -0.15707964F;
- this.batRightWing.rotateAngleY = -((float)Math.PI * 2F / 5F);
+ this.batRightWing.rotateAngleY = -((float) Math.PI * 2F / 5F);
this.batOuterRightWing.rotateAngleY = -1.7278761F;
this.batLeftWing.rotateAngleX = this.batRightWing.rotateAngleX;
this.batLeftWing.rotateAngleY = -this.batRightWing.rotateAngleY;
this.batOuterLeftWing.rotateAngleY = -this.batOuterRightWing.rotateAngleY;
- }
- else
- {
- f6 = (180F / (float)Math.PI);
- this.batHead.rotateAngleX = p_78088_6_ / (180F / (float)Math.PI);
- this.batHead.rotateAngleY = p_78088_5_ / (180F / (float)Math.PI);
+ } else {
+ f6 = (180F / (float) Math.PI);
+ this.batHead.rotateAngleX = p_78088_6_ / (180F / (float) Math.PI);
+ this.batHead.rotateAngleY = p_78088_5_ / (180F / (float) Math.PI);
this.batHead.rotateAngleZ = 0.0F;
this.batHead.setRotationPoint(0.0F, 0.0F, 0.0F);
this.batRightWing.setRotationPoint(0.0F, 0.0F, 0.0F);
this.batLeftWing.setRotationPoint(0.0F, 0.0F, 0.0F);
- this.batBody.rotateAngleX = ((float)Math.PI / 4F) + MathHelper.cos(p_78088_4_ * 0.1F) * 0.15F;
+ this.batBody.rotateAngleX = ((float) Math.PI / 4F) + MathHelper.cos(p_78088_4_ * 0.1F) * 0.15F;
this.batBody.rotateAngleY = 0.0F;
- this.batRightWing.rotateAngleY = MathHelper.cos(p_78088_4_ * 1.3F) * (float)Math.PI * 0.25F;
+ this.batRightWing.rotateAngleY = MathHelper.cos(p_78088_4_ * 1.3F) * (float) Math.PI * 0.25F;
this.batLeftWing.rotateAngleY = -this.batRightWing.rotateAngleY;
this.batOuterRightWing.rotateAngleY = this.batRightWing.rotateAngleY * 0.5F;
this.batOuterLeftWing.rotateAngleY = -this.batRightWing.rotateAngleY * 0.5F;
}
-
GL11.glScalef(4, 4, 4);
this.batHead.render(p_78088_7_);
this.batBody.render(p_78088_7_);
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelDecayChest.java b/src/main/java/gtPlusPlus/core/client/model/ModelDecayChest.java
index c116dcf115..98c474a160 100644
--- a/src/main/java/gtPlusPlus/core/client/model/ModelDecayChest.java
+++ b/src/main/java/gtPlusPlus/core/client/model/ModelDecayChest.java
@@ -6,8 +6,7 @@ import net.minecraft.client.model.ModelBase;
import net.minecraft.client.model.ModelRenderer;
@SideOnly(Side.CLIENT)
-public class ModelDecayChest extends ModelBase
-{
+public class ModelDecayChest extends ModelBase {
/** The chest lid in the chest's model. */
public ModelRenderer chestLid = (new ModelRenderer(this, 0, 0)).setTextureSize(64, 64);
/** The model of the bottom of the chest. */
@@ -15,8 +14,7 @@ public class ModelDecayChest extends ModelBase
/** The chest's knob in the chest model. */
public ModelRenderer chestKnob;
- public ModelDecayChest()
- {
+ public ModelDecayChest() {
this.chestLid.addBox(0.0F, -5.0F, -14.0F, 14, 5, 14, 0.0F);
this.chestLid.rotationPointX = 1.0F;
this.chestLid.rotationPointY = 7.0F;
@@ -36,11 +34,10 @@ public class ModelDecayChest extends ModelBase
/**
* This method renders out all parts of the chest model.
*/
- public void renderAll()
- {
+ public void renderAll() {
this.chestKnob.rotateAngleX = this.chestLid.rotateAngleX;
this.chestLid.render(0.0625F);
this.chestKnob.render(0.0625F);
this.chestBelow.render(0.0625F);
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java b/src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java
index 0aef4eb7b0..a12b48c7d2 100644
--- a/src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java
+++ b/src/main/java/gtPlusPlus/core/client/model/ModelEggBox.java
@@ -1,6 +1,5 @@
package gtPlusPlus.core.client.model;
-import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.api.objects.data.Pair;
import gtPlusPlus.core.client.model.tabula.ModelTabulaBase;
@@ -14,19 +13,19 @@ import net.minecraft.entity.Entity;
* Created using Tabula 4.1.1
*/
public class ModelEggBox extends ModelTabulaBase {
-
- private final AutoMap<Pair<ModelRenderer, Float>> mParts = new AutoMap<Pair<ModelRenderer, Float>>();
-
- private static RenderTabulaBase mRendererInstance;
-
+
+ private final AutoMap<Pair<ModelRenderer, Float>> mParts = new AutoMap<Pair<ModelRenderer, Float>>();
+
+ private static RenderTabulaBase mRendererInstance;
+
public ModelRenderer bottom;
- //EggBox_full.png
+ // EggBox_full.png
public ModelEggBox() {
- super(64, 64);
+ super(64, 64);
this.textureWidth = 64;
this.textureHeight = 64;
-
+
this.bottom = new ModelRenderer(this, 0, 19);
this.bottom.setRotationPoint(1.0F, 6.0F, 1.0F);
this.bottom.addBox(0.0F, 0.0F, 0.0F, 14, 10, 14, 0.0F);
@@ -34,8 +33,8 @@ public class ModelEggBox extends ModelTabulaBase {
}
@Override
- public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
- //Logger.INFO("Rendering EggBox");
+ public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
+ // Logger.INFO("Rendering EggBox");
this.bottom.render(f5);
}
@@ -48,18 +47,19 @@ public class ModelEggBox extends ModelTabulaBase {
modelRenderer.rotateAngleZ = z;
}
- @Override
- protected AutoMap<Pair<ModelRenderer, Float>> getModelParts() {
- AutoMap<Pair<ModelRenderer, Float>> aParts = new AutoMap<Pair<ModelRenderer, Float>>();
- aParts.add(new Pair<ModelRenderer, Float>(bottom, 0.0625F));
- return aParts;
- //return mParts;
- }
-
- public static RenderTabulaBase getRenderer() {
- if (mRendererInstance == null) {
- mRendererInstance = new RenderTabulaBase(new ModelEggBox(), "textures/blocks/TileEntities/EggBox_full.png", TileEntityEggBox.class);
- }
- return mRendererInstance;
- }
+ @Override
+ protected AutoMap<Pair<ModelRenderer, Float>> getModelParts() {
+ AutoMap<Pair<ModelRenderer, Float>> aParts = new AutoMap<Pair<ModelRenderer, Float>>();
+ aParts.add(new Pair<ModelRenderer, Float>(bottom, 0.0625F));
+ return aParts;
+ // return mParts;
+ }
+
+ public static RenderTabulaBase getRenderer() {
+ if (mRendererInstance == null) {
+ mRendererInstance = new RenderTabulaBase(
+ new ModelEggBox(), "textures/blocks/TileEntities/EggBox_full.png", TileEntityEggBox.class);
+ }
+ return mRendererInstance;
+ }
}
diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelGiantChicken.java b/src/main/java/gtPlusPlus/core/client/model/ModelGiantChicken.java
index f7fb92f550..586dfec2db 100644
--- a/src/main/java/gtPlusPlus/core/client/model/ModelGiantChicken.java
+++ b/src/main/java/gtPlusPlus/core/client/model/ModelGiantChicken.java
@@ -2,7 +2,6 @@ package gtPlusPlus.core.client.model;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
-
import net.minecraft.client.model.ModelChicken;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
@@ -10,46 +9,50 @@ import net.minecraft.util.MathHelper;
import org.lwjgl.opengl.GL11;
@SideOnly(Side.CLIENT)
-public class ModelGiantChicken extends ModelChicken{
+public class ModelGiantChicken extends ModelChicken {
- public ModelGiantChicken()
- {
+ public ModelGiantChicken() {
byte b0 = 16;
this.head = new ModelRenderer(this, 0, 0);
this.head.addBox(-2.0F, -6.0F, -2.0F, 4, 6, 3, 0.0F);
- this.head.setRotationPoint(0.0F, (float)(-1 + b0), -4.0F);
+ this.head.setRotationPoint(0.0F, (float) (-1 + b0), -4.0F);
this.bill = new ModelRenderer(this, 14, 0);
this.bill.addBox(-2.0F, -4.0F, -4.0F, 4, 2, 2, 0.0F);
- this.bill.setRotationPoint(0.0F, (float)(-1 + b0), -4.0F);
+ this.bill.setRotationPoint(0.0F, (float) (-1 + b0), -4.0F);
this.chin = new ModelRenderer(this, 14, 4);
this.chin.addBox(-1.0F, -2.0F, -3.0F, 2, 2, 2, 0.0F);
- this.chin.setRotationPoint(0.0F, (float)(-1 + b0), -4.0F);
+ this.chin.setRotationPoint(0.0F, (float) (-1 + b0), -4.0F);
this.body = new ModelRenderer(this, 0, 9);
this.body.addBox(-3.0F, -4.0F, -3.0F, 6, 8, 6, 0.0F);
- this.body.setRotationPoint(0.0F, (float)b0, 0.0F);
+ this.body.setRotationPoint(0.0F, (float) b0, 0.0F);
this.rightLeg = new ModelRenderer(this, 26, 0);
this.rightLeg.addBox(-1.0F, 0.0F, -3.0F, 3, 5, 3);
- this.rightLeg.setRotationPoint(-2.0F, (float)(3 + b0), 1.0F);
+ this.rightLeg.setRotationPoint(-2.0F, (float) (3 + b0), 1.0F);
this.leftLeg = new ModelRenderer(this, 26, 0);
this.leftLeg.addBox(-1.0F, 0.0F, -3.0F, 3, 5, 3);
- this.leftLeg.setRotationPoint(1.0F, (float)(3 + b0), 1.0F);
+ this.leftLeg.setRotationPoint(1.0F, (float) (3 + b0), 1.0F);
this.rightWing = new ModelRenderer(this, 24, 13);
this.rightWing.addBox(0.0F, 0.0F, -3.0F, 1, 4, 6);
- this.rightWing.setRotationPoint(-4.0F, (float)(-3 + b0), 0.0F);
+ this.rightWing.setRotationPoint(-4.0F, (float) (-3 + b0), 0.0F);
this.leftWing = new ModelRenderer(this, 24, 13);
this.leftWing.addBox(-1.0F, 0.0F, -3.0F, 1, 4, 6);
- this.leftWing.setRotationPoint(4.0F, (float)(-3 + b0), 0.0F);
+ this.leftWing.setRotationPoint(4.0F, (float) (-3 + b0), 0.0F);
}
/**
* Sets the models various rotation angles then renders the model.
*/
- public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
- {
+ public void render(
+ Entity p_78088_1_,
+ float p_78088_2_,
+ float p_78088_3_,
+ float p_78088_4_,
+ float p_78088_5_,
+ float p_78088_6_,
+ float p_78088_7_) {
this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
- if (this.isChild)
- {
+ if (this.isChild) {
float f6 = 1.0F;
GL11.glPushMatrix();
GL11.glTranslatef(0.0F, 0F, 0F);
@@ -66,10 +69,8 @@ public class ModelGiantChicken extends ModelChicken{
this.rightWing.render(p_78088_7_);
this.leftWing.render(p_78088_7_);
GL11.glPopMatrix();
- //super.render(p_78088_1_, p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_);
- }
- else
- {
+ // super.render(p_78088_1_, p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_);
+ } else {
float f6 = 2.0F;
GL11.glPushMatrix();
GL11.glScalef(1.0F * f6, 1.0F * f6, 1.0F * f6);
@@ -95,18 +96,24 @@ public class ModelGiantChicken extends ModelChicken{
* and legs, where par1 represents the time(so that arms and legs swing back and forth) and par2 represents how
* "far" arms and legs can swing at most.
*/
- public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
- {
- this.head.rotateAngleX = p_78087_5_ / (180F / (float)Math.PI);
- this.head.rotateAngleY = p_78087_4_ / (180F / (float)Math.PI);
+ public void setRotationAngles(
+ float p_78087_1_,
+ float p_78087_2_,
+ float p_78087_3_,
+ float p_78087_4_,
+ float p_78087_5_,
+ float p_78087_6_,
+ Entity p_78087_7_) {
+ this.head.rotateAngleX = p_78087_5_ / (180F / (float) Math.PI);
+ this.head.rotateAngleY = p_78087_4_ / (180F / (float) Math.PI);
this.bill.rotateAngleX = this.head.rotateAngleX;
this.bill.rotateAngleY = this.head.rotateAngleY;
this.chin.rotateAngleX = this.head.rotateAngleX;
this.chin.rotateAngleY = this.head.rotateAngleY;
- this.body.rotateAngleX = ((float)Math.PI / 2F);
+ this.body.rotateAngleX = ((float) Math.PI / 2F);
this.rightLeg.rotateAngleX = MathHelper.cos(p_78087_1_ * 0.6662F) * 1.4F * p_78087_2_;
- this.leftLeg.rotateAngleX = MathHelper.cos(p_78087_1_ * 0.6662F + (float)Math.PI) * 1.4F * p_78087_2_;
+ this.leftLeg.rotateAngleX = MathHelper.cos(p_78087_1_ * 0.6662F + (float) Math.PI) * 1.4F * p_78087_2_;
this.rightWing.rotateAngleZ = p_78087_3_;
this.leftWing.rotateAngleZ = -p_78087_3_;
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java b/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java
index 455df761cb..7cfb7ec2ea 100644
--- a/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java
+++ b/src/main/java/gtPlusPlus/core/client/model/ModelSickBlaze.java
@@ -2,23 +2,20 @@ package gtPlusPlus.core.client.model;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
-
import net.minecraft.client.model.ModelBlaze;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.util.MathHelper;
@SideOnly(Side.CLIENT)
-public class ModelSickBlaze extends ModelBlaze
-{
+public class ModelSickBlaze extends ModelBlaze {
/** The sticks that fly around the Blaze. */
private ModelRenderer[] blazeSticks = new ModelRenderer[24];
+
private ModelRenderer blazeHead;
- public ModelSickBlaze()
- {
- for (int i = 0; i < this.blazeSticks.length; ++i)
- {
+ public ModelSickBlaze() {
+ for (int i = 0; i < this.blazeSticks.length; ++i) {
this.blazeSticks[i] = new ModelRenderer(this, 0, 16);
this.blazeSticks[i].addBox(0.0F, 0.0F, 0.0F, 2, 8, 2);
}
@@ -28,8 +25,7 @@ public class ModelSickBlaze extends ModelBlaze
}
@Override
- public int func_78104_a()
- {
+ public int func_78104_a() {
return 8;
}
@@ -37,13 +33,18 @@ public class ModelSickBlaze extends ModelBlaze
* Sets the models various rotation angles then renders the model.
*/
@Override
- public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
- {
+ public void render(
+ Entity p_78088_1_,
+ float p_78088_2_,
+ float p_78088_3_,
+ float p_78088_4_,
+ float p_78088_5_,
+ float p_78088_6_,
+ float p_78088_7_) {
this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
this.blazeHead.render(p_78088_7_);
- for (int i = 0; i < this.blazeSticks.length; ++i)
- {
+ for (int i = 0; i < this.blazeSticks.length; ++i) {
this.blazeSticks[i].render(p_78088_7_);
}
}
@@ -54,40 +55,43 @@ public class ModelSickBlaze extends ModelBlaze
* "far" arms and legs can swing at most.
*/
@Override
- public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
- {
- float f6 = p_78087_3_ * (float)Math.PI * -0.1F;
+ public void setRotationAngles(
+ float p_78087_1_,
+ float p_78087_2_,
+ float p_78087_3_,
+ float p_78087_4_,
+ float p_78087_5_,
+ float p_78087_6_,
+ Entity p_78087_7_) {
+ float f6 = p_78087_3_ * (float) Math.PI * -0.1F;
int i;
- for (i = 0; i < 4; ++i)
- {
+ for (i = 0; i < 4; ++i) {
this.blazeSticks[i].rotationPointY = -2.0F + MathHelper.cos((i * 2 + p_78087_3_) * 0.25F);
this.blazeSticks[i].rotationPointX = MathHelper.cos(f6) * 9.0F;
this.blazeSticks[i].rotationPointZ = MathHelper.sin(f6) * 9.0F;
++f6;
}
- f6 = ((float)Math.PI / 4F) + p_78087_3_ * (float)Math.PI * 0.03F;
+ f6 = ((float) Math.PI / 4F) + p_78087_3_ * (float) Math.PI * 0.03F;
- for (i = 4; i < 8; ++i)
- {
+ for (i = 4; i < 8; ++i) {
this.blazeSticks[i].rotationPointY = 2.0F + MathHelper.cos((i * 2 + p_78087_3_) * 0.25F);
this.blazeSticks[i].rotationPointX = MathHelper.cos(f6) * 7.0F;
this.blazeSticks[i].rotationPointZ = MathHelper.sin(f6) * 7.0F;
++f6;
}
- f6 = 0.47123894F + p_78087_3_ * (float)Math.PI * -0.05F;
+ f6 = 0.47123894F + p_78087_3_ * (float) Math.PI * -0.05F;
- for (i = 8; i < 12; ++i)
- {
+ for (i = 8; i < 12; ++i) {
this.blazeSticks[i].rotationPointY = 11.0F + MathHelper.cos((i * 1.5F + p_78087_3_) * 0.5F);
this.blazeSticks[i].rotationPointX = MathHelper.cos(f6) * 5.0F;
this.blazeSticks[i].rotationPointZ = MathHelper.sin(f6) * 5.0F;
++f6;
}
- this.blazeHead.rotateAngleY = p_78087_4_ / (180F / (float)Math.PI);
- this.blazeHead.rotateAngleX = p_78087_5_ / (180F / (float)Math.PI);
+ this.blazeHead.rotateAngleY = p_78087_4_ / (180F / (float) Math.PI);
+ this.blazeHead.rotateAngleX = p_78087_5_ / (180F / (float) Math.PI);
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java b/src/main/java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java
index aa23635b4d..879e06516a 100644
--- a/src/main/java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java
+++ b/src/main/java/gtPlusPlus/core/client/model/ModelStaballoyConstruct.java
@@ -2,7 +2,6 @@ package gtPlusPlus.core.client.model;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
-
import net.minecraft.client.model.ModelIronGolem;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
@@ -10,21 +9,17 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.monster.EntityIronGolem;
@SideOnly(Side.CLIENT)
-public class ModelStaballoyConstruct extends ModelIronGolem
-{
-
- public ModelStaballoyConstruct()
- {
+public class ModelStaballoyConstruct extends ModelIronGolem {
+
+ public ModelStaballoyConstruct() {
this(0.0F);
}
- public ModelStaballoyConstruct(float p_i1161_1_)
- {
+ public ModelStaballoyConstruct(float p_i1161_1_) {
this(p_i1161_1_, -7.0F);
}
- public ModelStaballoyConstruct(float p_i1162_1_, float p_i1162_2_)
- {
+ public ModelStaballoyConstruct(float p_i1162_1_, float p_i1162_2_) {
short short1 = 128;
short short2 = 128;
this.ironGolemHead = (new ModelRenderer(this)).setTextureSize(short1, short2);
@@ -54,8 +49,14 @@ public class ModelStaballoyConstruct extends ModelIronGolem
* Sets the models various rotation angles then renders the model.
*/
@Override
- public void render(Entity p_78088_1_, float p_78088_2_, float p_78088_3_, float p_78088_4_, float p_78088_5_, float p_78088_6_, float p_78088_7_)
- {
+ public void render(
+ Entity p_78088_1_,
+ float p_78088_2_,
+ float p_78088_3_,
+ float p_78088_4_,
+ float p_78088_5_,
+ float p_78088_6_,
+ float p_78088_7_) {
this.setRotationAngles(p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_, p_78088_1_);
this.ironGolemHead.render(p_78088_7_);
this.ironGolemBody.render(p_78088_7_);
@@ -71,10 +72,16 @@ public class ModelStaballoyConstruct extends ModelIronGolem
* "far" arms and legs can swing at most.
*/
@Override
- public void setRotationAngles(float p_78087_1_, float p_78087_2_, float p_78087_3_, float p_78087_4_, float p_78087_5_, float p_78087_6_, Entity p_78087_7_)
- {
- this.ironGolemHead.rotateAngleY = p_78087_4_ / (180F / (float)Math.PI);
- this.ironGolemHead.rotateAngleX = p_78087_5_ / (180F / (float)Math.PI);
+ public void setRotationAngles(
+ float p_78087_1_,
+ float p_78087_2_,
+ float p_78087_3_,
+ float p_78087_4_,
+ float p_78087_5_,
+ float p_78087_6_,
+ Entity p_78087_7_) {
+ this.ironGolemHead.rotateAngleY = p_78087_4_ / (180F / (float) Math.PI);
+ this.ironGolemHead.rotateAngleX = p_78087_5_ / (180F / (float) Math.PI);
this.ironGolemLeftLeg.rotateAngleX = -1.5F * this.func_78172_a(p_78087_1_, 13.0F) * p_78087_2_;
this.ironGolemRightLeg.rotateAngleX = 1.5F * this.func_78172_a(p_78087_1_, 13.0F) * p_78087_2_;
this.ironGolemLeftLeg.rotateAngleY = 0.0F;
@@ -86,35 +93,28 @@ public class ModelStaballoyConstruct extends ModelIronGolem
* and third as in the setRotationAngles method.
*/
@Override
- public void setLivingAnimations(EntityLivingBase p_78086_1_, float p_78086_2_, float p_78086_3_, float p_78086_4_)
- {
- EntityIronGolem entityirongolem = (EntityIronGolem)p_78086_1_;
+ public void setLivingAnimations(EntityLivingBase p_78086_1_, float p_78086_2_, float p_78086_3_, float p_78086_4_) {
+ EntityIronGolem entityirongolem = (EntityIronGolem) p_78086_1_;
int i = entityirongolem.getAttackTimer();
- if (i > 0)
- {
+ if (i > 0) {
this.ironGolemRightArm.rotateAngleX = -2.0F + 1.5F * this.func_78172_a(i - p_78086_4_, 10.0F);
this.ironGolemLeftArm.rotateAngleX = -2.0F + 1.5F * this.func_78172_a(i - p_78086_4_, 10.0F);
- }
- else
- {
+ } else {
int j = entityirongolem.getHoldRoseTick();
- if (j > 0)
- {
+ if (j > 0) {
this.ironGolemRightArm.rotateAngleX = -0.8F + 0.025F * this.func_78172_a(j, 70.0F);
this.ironGolemLeftArm.rotateAngleX = 0.0F;
- }
- else
- {
- this.ironGolemRightArm.rotateAngleX = (-0.2F + 1.5F * this.func_78172_a(p_78086_2_, 13.0F)) * p_78086_3_;
+ } else {
+ this.ironGolemRightArm.rotateAngleX =
+ (-0.2F + 1.5F * this.func_78172_a(p_78086_2_, 13.0F)) * p_78086_3_;
this.ironGolemLeftArm.rotateAngleX = (-0.2F - 1.5F * this.func_78172_a(p_78086_2_, 13.0F)) * p_78086_3_;
}
}
}
- private float func_78172_a(float p_78172_1_, float p_78172_2_)
- {
+ private float func_78172_a(float p_78172_1_, float p_78172_2_) {
return (Math.abs(p_78172_1_ % p_78172_2_ - p_78172_2_ * 0.5F) - p_78172_2_ * 0.25F) / (p_78172_2_ * 0.25F);
}
-} \ No newline at end of file
+}
diff --git a/src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java b/src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java
index 3a0cbb636b..2ec6e4f06d 100644
--- a/src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java
+++ b/src/main/java/gtPlusPlus/core/client/model/tabula/ModelTabulaBase.java
@@ -1,6 +1,5 @@
package gtPlusPlus.core.client.model.tabula;
-import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.AutoMap;
import gtPlusPlus.api.objects.data.Pair;
import net.minecraft.client.model.ModelBase;
@@ -11,20 +10,19 @@ import net.minecraft.client.model.ModelRenderer;
* Created using Tabula 4.1.1
*/
public abstract class ModelTabulaBase extends ModelBase {
-
-
+
public ModelTabulaBase(int aTexWidth, int aTexHeight) {
this.textureWidth = aTexWidth;
this.textureHeight = aTexHeight;
}
-
+
protected abstract AutoMap<Pair<ModelRenderer, Float>> getModelParts();
-
+
public void renderAll() {
- for (Pair<ModelRenderer, Float> part : getModelParts()) {
- //Logger.INFO("Rendering EggBox");
- part.getKey().render(part.getValue());
- }
+ for (Pair<ModelRenderer, Float> part : getModelParts()) {
+ // Logger.INFO("Rendering EggBox");
+ part.getKey().render(part.getValue());
+ }
}
/**
diff --git a/src/main/java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java b/src/main/java/gtPlusPlus/core/client/renderer/CustomItemBlockRenderer.java
index f40357495a..b24bc48dbd 100644
--- a/