From 490feb915fe3ebb1da253022ba90cc622f524f8e Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Sat, 18 Mar 2017 22:58:25 +0100 Subject: [PATCH] Clean Up --- .../java/binnie/core/machines/base/TileEntityMachineBase.java | 1 + src/main/java/binnie/core/models/ModelMutlipass.java | 2 -- src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java | 2 +- src/main/java/binnie/extratrees/genetics/EnumSaplingType.java | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java b/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java index 721727e1..e9233f57 100644 --- a/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java +++ b/src/main/java/binnie/core/machines/base/TileEntityMachineBase.java @@ -26,6 +26,7 @@ import javax.annotation.Nullable; public class TileEntityMachineBase extends TileEntity implements IInventoryMachine, ITankMachine, IPoweredMachine, ITickable { + @Override public IInventoryMachine getInventory() { final IInventoryMachine inv = Machine.getInterface(IInventoryMachine.class, this); return (inv == null || inv == this) ? new DefaultMachineInventory() : inv; diff --git a/src/main/java/binnie/core/models/ModelMutlipass.java b/src/main/java/binnie/core/models/ModelMutlipass.java index be2e2370..fe4912ef 100644 --- a/src/main/java/binnie/core/models/ModelMutlipass.java +++ b/src/main/java/binnie/core/models/ModelMutlipass.java @@ -18,8 +18,6 @@ import net.minecraftforge.common.property.IExtendedBlockState; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; -import javax.annotation.Nullable; - @SideOnly(Side.CLIENT) public class ModelMutlipass, K> extends ModelBlockCached { diff --git a/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java b/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java index 2d461954..72906fb0 100644 --- a/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java +++ b/src/main/java/binnie/extrabees/gui/WindowAlvearyMutator.java @@ -43,7 +43,7 @@ public class WindowAlvearyMutator extends Window { new ControlText(this, new IArea(0, 52, this.w(), 16), "Possible Mutagens:", TextJustification.MiddleCenter).setColour(5592405); final int size = AlvearyMutator.getMutagens().size(); final int w = size * 18; - NumberFormat numberFormat = DecimalFormat.getNumberInstance(MinecraftForgeClient.getLocale()); + NumberFormat numberFormat = NumberFormat.getNumberInstance(MinecraftForgeClient.getLocale()); if (size > 0) { int x = (this.w() - w) / 2; for (final Pair mutagen : AlvearyMutator.getMutagens()) { diff --git a/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java b/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java index fa8f21a5..2f34022c 100644 --- a/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java +++ b/src/main/java/binnie/extratrees/genetics/EnumSaplingType.java @@ -42,8 +42,8 @@ public enum EnumSaplingType { @Override public void registerModels(Item item, IModelManager manager, EnumGermlingType type) { if (type == EnumGermlingType.SAPLING) { - germlingModel = manager.getModelLocation("extratrees", "saplings/tree" + name()); - ModelBakery.registerItemVariants(item, new ResourceLocation("extratrees", "saplings/tree" + name())); + germlingModel = manager.getModelLocation("extratrees", "saplings/tree_" + name()); + ModelBakery.registerItemVariants(item, new ResourceLocation("extratrees", "saplings/tree_" + name())); } if (type == EnumGermlingType.POLLEN) { pollenModel = manager.getModelLocation("pollen");