fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Electroblob77
2019-01-05 22:18:14 +00:00
parent b374f71533
commit 224ee281ef
33 changed files with 160 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/client/model/ModelArmourFixer.java
+7 -2
View File
@@ -4,9 +4,14 @@ import net.minecraft.client.model.ModelBiped;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityArmorStand;
public class ModelWtfMojang extends ModelBiped {
/**
* Fixes custom armour models 'breathing' on the stand and rotates the helmet properly.
* @author Shadows-of-Fire
* @since Wizardry 4.1.2
*/
public class ModelArmourFixer extends ModelBiped {
public ModelWtfMojang(float modelSize, float rotationYOffset, int textureWidth, int textureHeight) {
public ModelArmourFixer(float modelSize, float rotationYOffset, int textureWidth, int textureHeight) {
super(modelSize, rotationYOffset, textureWidth, textureHeight);
}
src/main/java/electroblob/wizardry/client/model/ModelHammer.java
+55 -48
View File
@@ -5,64 +5,71 @@ import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelHammer extends ModelBase {
ModelRenderer Shape1;
ModelRenderer Shape2;
ModelRenderer Shape3;
ModelRenderer Shape4;
ModelRenderer Shape5;
ModelRenderer Shape6;
ModelRenderer hammerHead;
ModelRenderer handle;
ModelRenderer handleEnd;
ModelRenderer handleBase;
ModelRenderer ring1;
ModelRenderer ring2;
public ModelHammer(){
textureWidth = 64;
textureHeight = 64;
Shape1 = new ModelRenderer(this, 0, 0);
Shape1.addBox(0F, 0F, 0F, 20, 12, 12);
Shape1.setRotationPoint(-10F, 12F, -6F);
Shape1.setTextureSize(64, 64);
Shape1.mirror = true;
setRotation(Shape1, 0F, 0F, 0F);
Shape2 = new ModelRenderer(this, 0, 24);
Shape2.addBox(0F, 0F, 0F, 4, 14, 4);
Shape2.setRotationPoint(-2F, -2F, -2F);
Shape2.setTextureSize(64, 64);
Shape2.mirror = true;
setRotation(Shape2, 0F, 0F, 0F);
Shape3 = new ModelRenderer(this, 0, 49);
Shape3.addBox(0F, 0F, 0F, 5, 5, 5);
Shape3.setRotationPoint(-2.5F, -7F, -2.5F);
Shape3.setTextureSize(64, 64);
Shape3.mirror = true;
setRotation(Shape3, 0F, 0F, 0F);
Shape4 = new ModelRenderer(this, 0, 42);
Shape4.addBox(0F, 0F, 0F, 5, 2, 5);
Shape4.setRotationPoint(-2.5F, 10F, -2.5F);
Shape4.setTextureSize(64, 64);
Shape4.mirror = true;
setRotation(Shape4, 0F, 0F, 0F);
Shape5 = new ModelRenderer(this, 20, 24);
Shape5.addBox(0F, 0F, 0F, 2, 14, 14);
Shape5.setRotationPoint(-8F, 11F, -7F);
Shape5.setTextureSize(64, 64);
Shape5.mirror = true;
setRotation(Shape5, 0F, 0F, 0F);
Shape6 = new ModelRenderer(this, 20, 24);
Shape6.addBox(0F, 0F, 0F, 2, 14, 14);
Shape6.setRotationPoint(6F, 11F, -7F);
Shape6.setTextureSize(64, 64);
Shape6.mirror = true;
setRotation(Shape6, 0F, 0F, 0F);
hammerHead = new ModelRenderer(this, 0, 0);
hammerHead.addBox(0F, 0F, 0F, 20, 12, 12);
hammerHead.setRotationPoint(-10F, 12F, -6F);
hammerHead.setTextureSize(64, 64);
hammerHead.mirror = true;
setRotation(hammerHead, 0F, 0F, 0F);
handle = new ModelRenderer(this, 0, 24);
handle.addBox(0F, 0F, 0F, 4, 14, 4);
handle.setRotationPoint(-2F, -2F, -2F);
handle.setTextureSize(64, 64);
handle.mirror = true;
setRotation(handle, 0F, 0F, 0F);
handleEnd = new ModelRenderer(this, 0, 49);
handleEnd.addBox(0F, 0F, 0F, 5, 5, 5);
handleEnd.setRotationPoint(-2.5F, -7F, -2.5F);
handleEnd.setTextureSize(64, 64);
handleEnd.mirror = true;
setRotation(handleEnd, 0F, 0F, 0F);
handleBase = new ModelRenderer(this, 0, 42);
handleBase.addBox(0F, 0F, 0F, 5, 2, 5);
handleBase.setRotationPoint(-2.5F, 10F, -2.5F);
handleBase.setTextureSize(64, 64);
handleBase.mirror = true;
setRotation(handleBase, 0F, 0F, 0F);
ring1 = new ModelRenderer(this, 20, 24);
ring1.addBox(0F, 0F, 0F, 2, 14, 14);
ring1.setRotationPoint(-8F, 11F, -7F);
ring1.setTextureSize(64, 64);
ring1.mirror = true;
setRotation(ring1, 0F, 0F, 0F);
ring2 = new ModelRenderer(this, 20, 24);
ring2.addBox(0F, 0F, 0F, 2, 14, 14);
ring2.setRotationPoint(6F, 11F, -7F);
ring2.setTextureSize(64, 64);
ring2.mirror = true;
setRotation(ring2, 0F, 0F, 0F);
}
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5){
super.render(entity, f, f1, f2, f3, f4, f5);
setRotationAngles(f, f1, f2, f3, f4, f5, entity);
Shape1.render(f5);
Shape2.render(f5);
Shape3.render(f5);
Shape4.render(f5);
Shape5.render(f5);
Shape6.render(f5);
hammerHead.render(f5);
handle.render(f5);
handleEnd.render(f5);
handleBase.render(f5);
ring1.render(f5);
ring2.render(f5);
}
private void setRotation(ModelRenderer model, float x, float y, float z){
src/main/java/electroblob/wizardry/client/model/ModelWizardArmour.java
+1 -1
View File
@@ -3,7 +3,7 @@ package electroblob.wizardry.client.model;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;
public class ModelWizardArmour extends ModelWtfMojang {
public class ModelWizardArmour extends ModelArmourFixer {
ModelRenderer Shape1;
ModelRenderer Shape2;
ModelRenderer Shape3;
src/main/java/electroblob/wizardry/client/model/WizardryItemModels.java
+2 -3
View File
@@ -166,9 +166,8 @@ public final class WizardryItemModels {
* Registers an item model, using the item's registry name as the model name (this convention makes it easier to
* keep track of everything). Variant defaults to "normal". Registers the model for metadata 0 automatically, plus
* all the other metadata values that the item can take, as defined in
* {@link Item#getSubItems(Item, net.minecraft.creativetab.CreativeTabs, java.util.List)}. The passed in item
* <b>must</b> allow null to be passed in for the creative tab parameter in the aforementioned method, or a
* {@link NullPointerException} will result.
* {@link Item#getSubItems(Item, net.minecraft.creativetab.CreativeTabs, java.util.List)}. The creative tab supplied
* to the aforementioned method will be whichever one the item is in.
*/
private static void registerItemModel(Item item){