diff --git a/src/main/java/mekanism/api/gas/GasTank.java b/src/main/java/mekanism/api/gas/GasTank.java index c21cd6552..a5d4c20b3 100644 --- a/src/main/java/mekanism/api/gas/GasTank.java +++ b/src/main/java/mekanism/api/gas/GasTank.java @@ -90,7 +90,7 @@ public class GasTank { if(stored == null) { - stored = amount.copy(); + stored = amount.copy().withAmount(getStored()+toFill); } else { stored.amount = Math.min(getMaxGas(), getStored()+amount.amount); diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index e0ead22a7..e670bf0f4 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -1,5 +1,6 @@ package mekanism.client.render; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -16,7 +17,6 @@ import mekanism.client.render.tileentity.RenderPortableTank; import mekanism.client.render.tileentity.RenderSalinationController; import mekanism.common.ObfuscatedNames; import mekanism.common.base.ISpecialBounds; -import mekanism.common.block.BlockMachine.MachineType; import mekanism.common.util.MekanismUtils; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; @@ -152,7 +152,7 @@ public class MekanismRenderer } } - public static void loadDynamicTextures(IIconRegister register, String name, IIcon def, IIcon[] textures) + public static void loadDynamicTextures(IIconRegister register, String name, IIcon[] textures, DefIcon... defaults) { for(ForgeDirection side : ForgeDirection.VALID_DIRECTIONS) { @@ -168,15 +168,61 @@ public class MekanismRenderer textures[side.ordinal()+6] = register.registerIcon(texOn); } else { - textures[side.ordinal()+6] = register.registerIcon(tex); + boolean found = false; + + for(DefIcon def : defaults) + { + if(def.icons.contains(side.ordinal()+6)) + { + textures[side.ordinal()+6] = def.defIcon; + found = true; + } + } + + if(!found) + { + textures[side.ordinal()+6] = register.registerIcon(tex); + } } } else { - textures[side.ordinal()] = def; - textures[side.ordinal()+6] = def; + for(DefIcon def : defaults) + { + if(def.icons.contains(side.ordinal())) + { + textures[side.ordinal()] = def.defIcon; + } + + if(def.icons.contains(side.ordinal()+6)) + { + textures[side.ordinal()+6] = def.defIcon; + } + } } } } + + public static class DefIcon + { + public IIcon defIcon; + + public List icons = new ArrayList(); + + public DefIcon(IIcon icon, int... is) + { + defIcon = icon; + + for(int i : is) + { + icons.add(i); + } + } + + public static DefIcon getAll(IIcon icon) + { + return new DefIcon(icon, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11); + } + } public static class Model3D { diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java index 6ed0e83fa..9e9d7764a 100644 --- a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java +++ b/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java @@ -227,6 +227,7 @@ public class MachineRenderingHandler implements ISimpleBlockRenderingHandler solarNeutronActivator.renderAll(); } else { + GL11.glRotatef(-90F, 0.0F, 1.0F, 0.0F); MekanismRenderer.renderItem(renderer, metadata, block); } diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index 8ce0e677f..20146ee49 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -519,7 +519,15 @@ public class ItemRenderingHandler implements IItemRenderer else { if(item.getItem() instanceof ItemBlockMachine) { - RenderingRegistry.instance().renderInventoryBlock((RenderBlocks)data[0], Block.getBlockFromItem(item.getItem()), item.getItemDamage(), ClientProxy.MACHINE_RENDER_ID); + MachineType machine = MachineType.get(item); + + if(machine == MachineType.BASIC_FACTORY || machine == MachineType.ADVANCED_FACTORY || machine == MachineType.ELITE_FACTORY) + { + MekanismRenderer.renderCustomItem(((RenderBlocks)data[0]), item); + } + else { + RenderingRegistry.instance().renderInventoryBlock((RenderBlocks)data[0], Block.getBlockFromItem(item.getItem()), item.getItemDamage(), ClientProxy.MACHINE_RENDER_ID); + } } else if(item.getItem() instanceof ItemBlockBasic) { diff --git a/src/main/java/mekanism/common/base/IFactory.java b/src/main/java/mekanism/common/base/IFactory.java index 03fe46711..2ac91b89e 100644 --- a/src/main/java/mekanism/common/base/IFactory.java +++ b/src/main/java/mekanism/common/base/IFactory.java @@ -44,13 +44,13 @@ public interface IFactory public static enum RecipeType { - SMELTING("smelting", "smelter", MachineType.ENERGIZED_SMELTER.getStack(), false, false, Recipe.ENERGIZED_SMELTER), - ENRICHING("enriching", "enrichment", MachineType.ENRICHMENT_CHAMBER.getStack(), false, false, Recipe.ENRICHMENT_CHAMBER), - CRUSHING("crushing", "crusher", MachineType.CRUSHER.getStack(), false, false, Recipe.CRUSHER), - COMPRESSING("compressing", "compressor", MachineType.OSMIUM_COMPRESSOR.getStack(), true, false, Recipe.OSMIUM_COMPRESSOR), - COMBINING("combining", "combiner", MachineType.COMBINER.getStack(), true, false, Recipe.COMBINER), - PURIFYING("purifying", "purifier", MachineType.PURIFICATION_CHAMBER.getStack(), true, true, Recipe.PURIFICATION_CHAMBER), - INJECTING("injecting", "injection", MachineType.CHEMICAL_INJECTION_CHAMBER.getStack(), true, true, Recipe.CHEMICAL_INJECTION_CHAMBER); + SMELTING("Smelting", "smelter", MachineType.ENERGIZED_SMELTER.getStack(), false, false, Recipe.ENERGIZED_SMELTER), + ENRICHING("Enriching", "enrichment", MachineType.ENRICHMENT_CHAMBER.getStack(), false, false, Recipe.ENRICHMENT_CHAMBER), + CRUSHING("Crushing", "crusher", MachineType.CRUSHER.getStack(), false, false, Recipe.CRUSHER), + COMPRESSING("Compressing", "compressor", MachineType.OSMIUM_COMPRESSOR.getStack(), true, false, Recipe.OSMIUM_COMPRESSOR), + COMBINING("Combining", "combiner", MachineType.COMBINER.getStack(), true, false, Recipe.COMBINER), + PURIFYING("Purifying", "purifier", MachineType.PURIFICATION_CHAMBER.getStack(), true, true, Recipe.PURIFICATION_CHAMBER), + INJECTING("Injecting", "injection", MachineType.CHEMICAL_INJECTION_CHAMBER.getStack(), true, true, Recipe.CHEMICAL_INJECTION_CHAMBER); private String name; private ResourceLocation sound; @@ -185,8 +185,13 @@ public interface IFactory { return stack; } + + public String getUnlocalizedName() + { + return name; + } - public String getName() + public String getLocalizedName() { return MekanismUtils.localize("gui.factory." + name); } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index 1dcf95780..666127fe8 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -190,7 +190,6 @@ public class BlockBasic extends Block implements IBlockCTM, ICustomBlockIcon ctms[4][1] = new CTMData("ctm/InductionProviderAdvanced", this, Arrays.asList(3, 4)).registerIcons(register).setRenderConvexConnections(); ctms[4][2] = new CTMData("ctm/InductionProviderElite", this, Arrays.asList(3, 4)).registerIcons(register).setRenderConvexConnections(); ctms[4][3] = new CTMData("ctm/InductionProviderUltimate", this, Arrays.asList(3, 4)).registerIcons(register).setRenderConvexConnections(); - //TODO @unpairedbracket, mind fixing this? icons[0][0] = ctms[0][0].mainTextureData.icon; icons[1][0] = ctms[1][0].mainTextureData.icon; diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index c679aad62..d223e9ab5 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -15,6 +15,8 @@ import mekanism.api.MekanismConfig.usage; import mekanism.api.energy.IEnergizedItem; import mekanism.api.energy.IStrictEnergyStorage; import mekanism.client.render.MekanismRenderer; +import mekanism.client.render.MekanismRenderer.DefIcon; +import mekanism.client.render.MekanismRenderer.ICustomBlockIcon; import mekanism.common.ItemAttacher; import mekanism.common.Mekanism; import mekanism.common.MekanismBlocks; @@ -154,9 +156,10 @@ import dan200.computercraft.api.peripheral.IPeripheralProvider; * */ @Interface(iface = "dan200.computercraft.api.peripheral.IPeripheralProvider", modid = "ComputerCraft") -public class BlockMachine extends BlockContainer implements ISpecialBounds, IPeripheralProvider +public class BlockMachine extends BlockContainer implements ISpecialBounds, IPeripheralProvider, ICustomBlockIcon { public IIcon[][] icons = new IIcon[16][16]; + public IIcon[][][] factoryIcons = new IIcon[4][16][16]; public IIcon BASE_ICON; @@ -176,32 +179,63 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer public void registerBlockIcons(IIconRegister register) { BASE_ICON = register.registerIcon("mekanism:SteelCasing"); + DefIcon def = DefIcon.getAll(BASE_ICON); switch(blockType) { case MACHINE_BLOCK_1: - MekanismRenderer.loadDynamicTextures(register, MachineType.ENRICHMENT_CHAMBER.name, BASE_ICON, icons[0]); - MekanismRenderer.loadDynamicTextures(register, MachineType.OSMIUM_COMPRESSOR.name, BASE_ICON, icons[1]); - MekanismRenderer.loadDynamicTextures(register, MachineType.COMBINER.name, BASE_ICON, icons[2]); - MekanismRenderer.loadDynamicTextures(register, MachineType.CRUSHER.name, BASE_ICON, icons[3]); - MekanismRenderer.loadDynamicTextures(register, BaseTier.BASIC.getName() + MachineType.BASIC_FACTORY.name, register.registerIcon("mekanism:BasicFactorySide"), icons[5]); - MekanismRenderer.loadDynamicTextures(register, BaseTier.ADVANCED.getName() + MachineType.ADVANCED_FACTORY.name, register.registerIcon("mekanism:AdvancedFactorySide"), icons[6]); - MekanismRenderer.loadDynamicTextures(register, BaseTier.ELITE.getName() + MachineType.ELITE_FACTORY.name, register.registerIcon("mekanism:EliteFactorySide"), icons[7]); - MekanismRenderer.loadDynamicTextures(register, MachineType.PURIFICATION_CHAMBER.name, BASE_ICON, icons[9]); - MekanismRenderer.loadDynamicTextures(register, MachineType.ENERGIZED_SMELTER.name, BASE_ICON, icons[10]); + MekanismRenderer.loadDynamicTextures(register, MachineType.ENRICHMENT_CHAMBER.name, icons[0], def); + MekanismRenderer.loadDynamicTextures(register, MachineType.OSMIUM_COMPRESSOR.name, icons[1], def); + MekanismRenderer.loadDynamicTextures(register, MachineType.COMBINER.name, icons[2], def); + MekanismRenderer.loadDynamicTextures(register, MachineType.CRUSHER.name, icons[3], def); + + for(RecipeType type : RecipeType.values()) + { + MekanismRenderer.loadDynamicTextures(register, BaseTier.BASIC.getName() + type.getUnlocalizedName() + MachineType.BASIC_FACTORY.name, factoryIcons[0][type.ordinal()], new DefIcon(register.registerIcon("mekanism:BasicFactoryFront"), 2), + new DefIcon(register.registerIcon("mekanism:BasicFactoryTop"), 1), new DefIcon(register.registerIcon("mekanism:BasicFactoryBottom"), 0), new DefIcon(register.registerIcon("mekanism:BasicFactorySide"), 3, 4, 5)); + MekanismRenderer.loadDynamicTextures(register, BaseTier.ADVANCED.getName() + type.getUnlocalizedName() + MachineType.ADVANCED_FACTORY.name, factoryIcons[1][type.ordinal()], new DefIcon(register.registerIcon("mekanism:AdvancedFactoryFront"), 2), + new DefIcon(register.registerIcon("mekanism:BasicFactoryTop"), 1), new DefIcon(register.registerIcon("mekanism:AdvancedFactoryBottom"), 0), new DefIcon(register.registerIcon("mekanism:AdvancedFactorySide"), 3, 4, 5)); + MekanismRenderer.loadDynamicTextures(register, BaseTier.ELITE.getName() + type.getUnlocalizedName() + MachineType.ELITE_FACTORY.name, factoryIcons[2][type.ordinal()], new DefIcon(register.registerIcon("mekanism:EliteFactoryFront"), 2), + new DefIcon(register.registerIcon("mekanism:BasicFactoryTop"), 1), new DefIcon(register.registerIcon("mekanism:EliteFactoryBottom"), 0), new DefIcon(register.registerIcon("mekanism:EliteFactorySide"), 3, 4, 5)); + } + + MekanismRenderer.loadDynamicTextures(register, MachineType.PURIFICATION_CHAMBER.name, icons[9], def); + MekanismRenderer.loadDynamicTextures(register, MachineType.ENERGIZED_SMELTER.name, icons[10], def); icons[11][0] = register.registerIcon("mekanism:Teleporter"); break; case MACHINE_BLOCK_2: - MekanismRenderer.loadDynamicTextures(register, MachineType.CHEMICAL_INJECTION_CHAMBER.name, BASE_ICON, icons[3]); - MekanismRenderer.loadDynamicTextures(register, MachineType.PRECISION_SAWMILL.name, BASE_ICON, icons[5]); + MekanismRenderer.loadDynamicTextures(register, MachineType.CHEMICAL_INJECTION_CHAMBER.name, icons[3], def); + MekanismRenderer.loadDynamicTextures(register, MachineType.PRECISION_SAWMILL.name, icons[5], def); break; case MACHINE_BLOCK_3: icons[0][0] = register.registerIcon("mekanism:AmbientAccumulator"); icons[2][0] = BASE_ICON; - MekanismRenderer.loadDynamicTextures(register, MachineType.OREDICTIONIFICATOR.name, register.registerIcon("mekanism:OredictionificatorSide"), icons[3]); + MekanismRenderer.loadDynamicTextures(register, MachineType.OREDICTIONIFICATOR.name, icons[3], DefIcon.getAll(register.registerIcon("mekanism:OredictionificatorSide"))); break; } } + + @Override + public IIcon getIcon(ItemStack stack, int side) + { + MachineType type = MachineType.get(stack); + ItemBlockMachine item = (ItemBlockMachine)stack.getItem(); + + if(type == MachineType.BASIC_FACTORY) + { + return factoryIcons[0][item.getRecipeType(stack)][side]; + } + else if(type == MachineType.ADVANCED_FACTORY) + { + return factoryIcons[1][item.getRecipeType(stack)][side]; + } + else if(type == MachineType.ELITE_FACTORY) + { + return factoryIcons[2][item.getRecipeType(stack)][side]; + } + + return getIcon(side, stack.getItemDamage()); + } @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase entityliving, ItemStack itemstack) @@ -361,12 +395,9 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer case 1: case 2: case 3: - case 5: - case 6: - case 7: case 9: case 10: - return icons[meta][side == 3 ? 2 : (side == 2 ? 3 : side)]; + return icons[meta][side]; default: return icons[meta][0] != null ? icons[meta][0] : BASE_ICON; } @@ -375,7 +406,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer { case 3: case 5: - return icons[meta][side == 3 ? 2 : (side == 2 ? 3 : side)]; + return icons[meta][side]; default: return icons[meta][0] != null ? icons[meta][0] : BASE_ICON; } @@ -383,7 +414,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer switch(meta) { case 3: - return icons[meta][side == 3 ? 2 : (side == 2 ? 3 : side)]; + return icons[meta][side]; default: return icons[meta][0] != null ? icons[meta][0] : BASE_ICON; } @@ -408,13 +439,17 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer case 1: case 2: case 3: - case 5: - case 6: - case 7: case 9: case 10: boolean active = MekanismUtils.isActive(world, x, y, z); return icons[meta][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)]; + case 5: + case 6: + case 7: + TileEntityFactory factory = (TileEntityFactory)tileEntity; + active = MekanismUtils.isActive(world, x, y, z); + + return factoryIcons[factory.tier.ordinal()][factory.recipeType.ordinal()][MekanismUtils.getBaseOrientation(side, tileEntity.facing)+(active ? 6 : 0)]; default: return icons[meta][0]; } @@ -624,6 +659,7 @@ public class BlockMachine extends BlockContainer implements ISpecialBounds, IPer return false; } } + return false; } diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index e771f7c5c..95e40fb65 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -152,7 +152,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec String tier = type == MachineType.BASIC_FACTORY ? BaseTier.BASIC.getLocalizedName() : (type == MachineType.ADVANCED_FACTORY ? BaseTier.ADVANCED.getLocalizedName() : BaseTier.ELITE.getLocalizedName()); - return tier + " " + RecipeType.values()[getRecipeType(itemstack)].getName() + " " + super.getItemStackDisplayName(itemstack); + return tier + " " + RecipeType.values()[getRecipeType(itemstack)].getLocalizedName() + " " + super.getItemStackDisplayName(itemstack); } return super.getItemStackDisplayName(itemstack); @@ -169,6 +169,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec if(type == MachineType.PORTABLE_TANK) { FluidStack fluidStack = getFluidStack(itemstack); + if(fluidStack != null) { list.add(EnumColor.PINK + LangUtils.localizeFluidStack(fluidStack) + ": " + EnumColor.GREY + getFluidStack(itemstack).amount + "mB"); @@ -182,7 +183,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec { if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) { - list.add(EnumColor.INDIGO + MekanismUtils.localize("tooltip.recipeType") + ": " + EnumColor.GREY + RecipeType.values()[getRecipeType(itemstack)].getName()); + list.add(EnumColor.INDIGO + MekanismUtils.localize("tooltip.recipeType") + ": " + EnumColor.GREY + RecipeType.values()[getRecipeType(itemstack)].getLocalizedName()); } if(type == MachineType.ELECTRIC_CHEST) diff --git a/src/main/java/mekanism/common/tile/TileEntityFactory.java b/src/main/java/mekanism/common/tile/TileEntityFactory.java index f631f9f7c..f3a15fc96 100644 --- a/src/main/java/mekanism/common/tile/TileEntityFactory.java +++ b/src/main/java/mekanism/common/tile/TileEntityFactory.java @@ -795,7 +795,7 @@ public class TileEntityFactory extends TileEntityNoisyElectricBlock implements I @Override public String getInventoryName() { - return tier.getBaseTier().getLocalizedName() + " " + recipeType.getName() + " " + super.getInventoryName(); + return tier.getBaseTier().getLocalizedName() + " " + recipeType.getLocalizedName() + " " + super.getInventoryName(); } @Override diff --git a/src/main/resources/assets/mekanism/lang/en_US.lang b/src/main/resources/assets/mekanism/lang/en_US.lang index a9ab62d4b..9a8272eaf 100644 --- a/src/main/resources/assets/mekanism/lang/en_US.lang +++ b/src/main/resources/assets/mekanism/lang/en_US.lang @@ -482,15 +482,17 @@ gui.configuration.strictInput=Strict Input gui.rotaryCondensentrator.toggleOperation=Toggle operation gui.factory.secondaryEnergy=Secondary energy -gui.factory.smelting=Smelting -gui.factory.enriching=Enriching -gui.factory.crushing=Crushing -gui.factory.compressing=Compressing -gui.factory.combining=Combining -gui.factory.purifying=Purifying -gui.factory.injecting=Injecting gui.factory.autoSort=Auto-sort +//Recipe types +gui.factory.Smelting=Smelting +gui.factory.Enriching=Enriching +gui.factory.Crushing=Crushing +gui.factory.Compressing=Compressing +gui.factory.Combining=Combining +gui.factory.Purifying=Purifying +gui.factory.Injecting=Injecting + gui.seismicReader.short=S. Reader gui.seismicReader.solids=Solids gui.seismicReader.fluids=Fluids