Skip to content

Commit

Permalink
spotless
Browse files Browse the repository at this point in the history
  • Loading branch information
Caedis committed May 19, 2024
1 parent 1195dfa commit 8f09158
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion src/main/java/emt/client/model/ModelSpecialArmor.java
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public ModelSpecialArmor(float scale, float offset, int type) {

}

public static ModelSpecialArmor getInstance(){
public static ModelSpecialArmor getInstance() {
if (instance == null) instance = new ModelSpecialArmor();

return instance;
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/emt/client/model/ModelWings.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package emt.client.model;

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.model.ModelBiped;
import net.minecraft.client.model.ModelRenderer;
import net.minecraft.entity.Entity;

import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

public class ModelWings extends ModelBiped {

@SideOnly(Side.CLIENT)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import java.util.Collection;
import java.util.List;

import emt.client.model.ModelWings;
import net.minecraft.client.model.ModelBiped;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.Entity;
Expand Down Expand Up @@ -391,14 +390,13 @@ public int getTier(ItemStack itemStack) {
@Override
@SideOnly(Side.CLIENT)
public ModelBiped getArmorModel(EntityLivingBase entity, ItemStack stack, int armorSlot) {
if (entity instanceof EntityPlayer && stack != null
&& stack.stackTagCompound != null) {
if (entity instanceof EntityPlayer && stack != null && stack.stackTagCompound != null) {
byte wing = stack.stackTagCompound.getByte("wing");
if (wing == JETPACK) {
ModelSpecialArmor.getInstance().type = 1;
} else if (wing != 0) {
ModelSpecialArmor.getInstance().type = 2;
if (stack.stackTagCompound.hasKey("isJumping")){
if (stack.stackTagCompound.hasKey("isJumping")) {
ModelSpecialArmor.getInstance().isJumping = stack.stackTagCompound.getBoolean("isJumping");
}
} else {
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/emt/item/armor/wings/ItemFeatherWing.java
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ public String getArmorTexture(ItemStack stack, Entity entity, int slot, String t
@Override
@SideOnly(Side.CLIENT)
public ModelBiped getArmorModel(EntityLivingBase entity, ItemStack stack, int armorSlot) {
if (entity instanceof EntityPlayer
&& stack != null
if (entity instanceof EntityPlayer && stack != null
&& stack.stackTagCompound != null
&& stack.stackTagCompound.hasKey("isJumping")) {
ModelWings.getInstance().isJumping = stack.stackTagCompound.getBoolean("isJumping");
Expand Down

0 comments on commit 8f09158

Please sign in to comment.