This commit is contained in:
Nedelosk committed 2017-03-18 22:58:25 +01:00
1 parent 4825f402fc
commit 490feb915f
4 files changed
+4 -5

No files matched your search

@@ -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;
@@ -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<B extends Block & IMultipassBlock<K>, K> extends ModelBlockCached<B, K> {
@@ -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<ItemStack, Float> mutagen : AlvearyMutator.getMutagens()) {
@@ -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");