diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 730151799..212cb0101 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -1,10 +1,14 @@ package mekanism.client; import java.io.File; +import java.io.IOException; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import mekanism.api.Coord4D; +import mekanism.api.EnumColor; import mekanism.api.MekanismConfig.client; import mekanism.api.MekanismConfig.general; import mekanism.api.Pos3D; @@ -71,6 +75,7 @@ import mekanism.client.render.entity.RenderBalloon; import mekanism.client.render.entity.RenderFlame; import mekanism.client.render.entity.RenderObsidianTNTPrimed; import mekanism.client.render.entity.RenderRobit; +import mekanism.client.render.item.FluidTankItemModel; import mekanism.client.render.tileentity.RenderBin; import mekanism.client.render.tileentity.RenderChargepad; import mekanism.client.render.tileentity.RenderChemicalCrystallizer; @@ -101,16 +106,27 @@ import mekanism.client.render.tileentity.RenderThermalEvaporationController; import mekanism.client.render.tileentity.RenderThermoelectricBoiler; import mekanism.common.CommonProxy; import mekanism.common.Mekanism; +import mekanism.common.MekanismBlocks; import mekanism.common.MekanismItems; +import mekanism.common.Tier.BaseTier; +import mekanism.common.Tier.EnergyCubeTier; +import mekanism.common.Tier.GasTankTier; +import mekanism.common.base.IEnergyCube; +import mekanism.common.base.IFactory.RecipeType; import mekanism.common.base.ISideConfiguration; import mekanism.common.base.IUpgradeTile; +import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.block.states.BlockStateMachine.MachineType; +import mekanism.common.block.states.BlockStateOre.EnumOreType; import mekanism.common.entity.EntityBabySkeleton; import mekanism.common.entity.EntityBalloon; import mekanism.common.entity.EntityFlame; import mekanism.common.entity.EntityObsidianTNT; import mekanism.common.entity.EntityRobit; import mekanism.common.inventory.InventoryPersonalChest; +import mekanism.common.item.ItemBlockBasic; +import mekanism.common.item.ItemBlockGasTank; +import mekanism.common.item.ItemBlockMachine; import mekanism.common.item.ItemCraftingFormula; import mekanism.common.item.ItemPortableTeleporter; import mekanism.common.item.ItemSeismicReader; @@ -179,6 +195,7 @@ import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderSkeleton; +import net.minecraft.client.resources.model.IBakedModel; import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.monster.EntitySkeleton; @@ -189,7 +206,9 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; +import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.client.FMLClientHandler; @@ -197,6 +216,7 @@ import net.minecraftforge.fml.client.registry.ClientRegistry; import net.minecraftforge.fml.client.registry.IRenderFactory; import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; @@ -211,6 +231,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ClientProxy extends CommonProxy { public static Map machineResources = new HashMap(); + public static Map basicResources = new HashMap(); + + public static ModelResourceLocation TANK_MODEL = new ModelResourceLocation("mekanism:fluid_tank", "inventory"); @Override public void loadConfiguration() @@ -236,14 +259,6 @@ public class ClientProxy extends CommonProxy } } -/* - @Override - public int getArmorIndex(String string) - { - return RenderingRegistry.addNewArmourRendererPrefix(string); - } -*/ - @Override public void openPersonalChest(EntityPlayer entityplayer, int id, int windowId, boolean isBlock, BlockPos pos) { @@ -329,42 +344,8 @@ public class ClientProxy extends CommonProxy } @Override - public void registerRenderInformation() + public void registerItemRenders() { -//TODO RenderPartTransmitter.init(); -//TODO RenderGlowPanel.init(); - - //Register item handler -//TODO ItemRenderingHandler handler = new ItemRenderingHandler(); - -/*TODO - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.EnergyCube), handler); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.MachineBlock), handler); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), handler); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.Robit, handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.WalkieTalkie, handler); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.GasTank), handler); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.ObsidianTNT), handler); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.BasicBlock), handler); - MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(MekanismBlocks.BasicBlock2), handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.Jetpack, handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.ArmoredJetpack, handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.PartTransmitter, handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.GasMask, handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.ScubaTank, handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.Balloon, handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.FreeRunners, handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.AtomicDisassembler, handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.GlowPanel, handler); - MinecraftForgeClient.registerItemRenderer(MekanismItems.Flamethrower, handler); - - //Register block handlers - RenderingRegistry.registerBlockHandler(new MachineRenderingHandler()); - RenderingRegistry.registerBlockHandler(new BasicRenderingHandler()); - RenderingRegistry.registerBlockHandler(new PlasticRenderingHandler()); - RenderingRegistry.registerBlockHandler(new CTMRenderingHandler()); -*/ // registerItemRender(MekanismItems.PartTransmitter); registerItemRender(MekanismItems.ElectricBow); registerItemRender(MekanismItems.Dust); @@ -428,8 +409,236 @@ public class ClientProxy extends CommonProxy ModelBakery.registerItemVariants(MekanismItems.CraftingFormula, ItemCraftingFormula.MODEL, ItemCraftingFormula.INVALID_MODEL, ItemCraftingFormula.ENCODED_MODEL); + } + + @Override + public void registerBlockRenders() + { + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.ObsidianTNT), 0, new ModelResourceLocation("mekanism:ObsidianTNT", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.SaltBlock), 0, new ModelResourceLocation("mekanism:SaltBlock", "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.CardboardBox), 0, new ModelResourceLocation("mekanism:CardboardBox", "storage=false")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.CardboardBox), 1, new ModelResourceLocation("mekanism:CardboardBox", "storage=true")); - Mekanism.logger.info("Render registrations complete."); + for(MachineType type : MachineType.values()) + { + List modelsToAdd = new ArrayList(); + String resource = "mekanism:" + type.getName(); + RecipeType recipePointer = null; + + if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) + { + recipePointer = RecipeType.values()[0]; + resource = "mekanism:" + type.getName() + "_" + recipePointer.getName(); + } + + while(true) + { + if(machineResources.get(resource) == null) + { + List entries = new ArrayList(); + + if(type.hasActiveTexture()) + { + entries.add("active=false"); + } + + if(type.hasRotations()) + { + entries.add("facing=north"); + } + + String properties = new String(); + + for(int i = 0; i < entries.size(); i++) + { + properties += entries.get(i); + + if(i < entries.size()-1) + { + properties += ","; + } + } + + if(type == MachineType.FLUID_TANK) + { + properties = "inventory"; + } + + ModelResourceLocation model = new ModelResourceLocation(resource, properties); + + machineResources.put(resource, model); + modelsToAdd.add(model); + + if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) + { + if(recipePointer.ordinal() < RecipeType.values().length-1) + { + recipePointer = RecipeType.values()[recipePointer.ordinal()+1]; + resource = "mekanism:" + type.getName() + "_" + recipePointer.getName(); + + continue; + } + } + } + + break; + } + + ModelLoader.registerItemVariants(Item.getItemFromBlock(type.typeBlock.getBlock()), modelsToAdd.toArray(new ModelResourceLocation[] {})); + } + + for(BasicBlockType type : BasicBlockType.values()) + { + List modelsToAdd = new ArrayList(); + String resource = "mekanism:" + type.getName(); + BaseTier tierPointer = null; + + if(type.tiers) + { + tierPointer = BaseTier.values()[0]; + resource = "mekanism:" + type.getName() + "_" + tierPointer.getName(); + } + + while(true) + { + if(machineResources.get(resource) == null) + { + List entries = new ArrayList(); + + if(type.hasActiveTexture()) + { + entries.add("active=false"); + } + + if(type.hasRotations() || type == BasicBlockType.THERMAL_EVAPORATION_CONTROLLER) + { + entries.add("facing=north"); + } + + String properties = new String(); + + for(int i = 0; i < entries.size(); i++) + { + properties += entries.get(i); + + if(i < entries.size()-1) + { + properties += ","; + } + } + + ModelResourceLocation model = new ModelResourceLocation(resource, properties); + + basicResources.put(resource, model); + modelsToAdd.add(model); + + if(type.tiers) + { + if(tierPointer.ordinal() < BaseTier.values().length-1) + { + tierPointer = BaseTier.values()[tierPointer.ordinal()+1]; + resource = "mekanism:" + type.getName() + "_" + tierPointer.getName(); + + continue; + } + } + } + + break; + } + + ModelLoader.registerItemVariants(Item.getItemFromBlock(type.blockType.getBlock()), modelsToAdd.toArray(new ModelResourceLocation[] {})); + } + + for(EnumColor color : EnumColor.DYES) + { + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.PlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=plastic")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.SlickPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=slick")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.GlowPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=glow")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.ReinforcedPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=reinforced")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.RoadPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=road")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.PlasticFence), color.getMetaValue(), new ModelResourceLocation("mekanism:PlasticFence", "inventory")); + } + + for(EnumOreType ore : EnumOreType.values()) + { + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.OreBlock), ore.ordinal(), new ModelResourceLocation("mekanism:OreBlock", "type=" + ore.getName())); + } + + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.EnergyCube), new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) + { + EnergyCubeTier tier = ((IEnergyCube)stack.getItem()).getEnergyCubeTier(stack); + ResourceLocation baseLocation = new ResourceLocation("mekanism", "EnergyCube"); + + return new ModelResourceLocation(baseLocation, "facing=north,tier="+tier); + } + }); + + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.GasTank), new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) + { + GasTankTier tier = GasTankTier.values()[((ItemBlockGasTank)stack.getItem()).getBaseTier(stack).ordinal()]; + ResourceLocation baseLocation = new ResourceLocation("mekanism", "GasTank"); + + return new ModelResourceLocation(baseLocation, "facing=north,tier="+tier); + } + }); + + ItemMeshDefinition machineMesher = new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) + { + MachineType type = MachineType.get(stack); + + if(type != null) + { + String resource = "mekanism:" + type.getName(); + + if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) + { + RecipeType recipe = RecipeType.values()[((ItemBlockMachine)stack.getItem()).getRecipeType(stack)]; + resource = "mekanism:" + type.getName() + "_" + recipe.getName(); + } + + return machineResources.get(resource); + } + + return null; + } + }; + + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock), machineMesher); + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), machineMesher); + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), machineMesher); + + ItemMeshDefinition basicMesher = new ItemMeshDefinition() { + @Override + public ModelResourceLocation getModelLocation(ItemStack stack) + { + BasicBlockType type = BasicBlockType.get(stack); + + if(type != null) + { + String resource = "mekanism:" + type.getName(); + + if(type.tiers) + { + BaseTier tier = ((ItemBlockBasic)stack.getItem()).getBaseTier(stack); + resource = "mekanism:" + type.getName() + "_" + tier.getName(); + } + + return basicResources.get(resource); + } + + return null; + } + }; + + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.BasicBlock), basicMesher); + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.BasicBlock2), basicMesher); } public void registerItemRender(Item item) @@ -642,6 +851,17 @@ public class ClientProxy extends CommonProxy HolidayManager.init(); } + + /* @SubscribeEvent + public void onModelBake(ModelBakeEvent event) throws IOException + { + Object obj = event.modelRegistry.getObject(TANK_MODEL); + + if(obj instanceof IBakedModel) + { + event.modelRegistry.putObject(TANK_MODEL, new FluidTankItemModel((IBakedModel)obj)); + } + }*/ @Override public void preInit() @@ -649,6 +869,7 @@ public class ClientProxy extends CommonProxy MekanismRenderer.init(); MinecraftForge.EVENT_BUS.register(new CTMRegistry()); + MinecraftForge.EVENT_BUS.register(this); //Register entity rendering handlers RenderingRegistry.registerEntityRenderingHandler(EntityObsidianTNT.class, new IRenderFactory() { diff --git a/src/main/java/mekanism/client/render/ctm/CTMRegistry.java b/src/main/java/mekanism/client/render/ctm/CTMRegistry.java index bf0142cc9..d264b9d8d 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMRegistry.java +++ b/src/main/java/mekanism/client/render/ctm/CTMRegistry.java @@ -26,7 +26,7 @@ public class CTMRegistry private IBakedModel baseModel; public static ResourceLocation baseResource = new ResourceLocation("mekanism:block/ctm_block"); - public static String[] ctmTypes = new String[] {"dynamic_tank", "structural_glass", "dynamic_valve", "teleporter", "teleporter_frame", "induction_casing", "induction_port_input", "induction_port_output", + public static String[] ctmTypes = new String[] {"dynamic_tank", "structural_glass", "dynamic_valve", "teleporter", "teleporter_frame", "induction_casing", "induction_port", "induction_port_output", "induction_cell_basic", "induction_cell_advanced", "induction_cell_elite", "induction_cell_ultimate", "induction_provider_basic", "induction_provider_advanced", "induction_provider_elite", "induction_provider_ultimate", "thermal_evaporation_controller", "thermal_evaporation_controller_on", "thermal_evaporation_valve", "superheating_element", "superheating_element_on", "reactor_port", "reactor_neutron_capture", "reactor_logic_adapter", "reactor_laser_focus", "reactor_glass", "reactor_frame", "reactor_controller_on", "reactor_controller_off", "boiler_casing", "boiler_valve", diff --git a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java index 9c514f7a4..267705634 100644 --- a/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java +++ b/src/main/java/mekanism/client/render/entity/RenderObsidianTNTPrimed.java @@ -1,25 +1,23 @@ package mekanism.client.render.entity; -import mekanism.client.model.ModelObsidianTNT; +import mekanism.common.MekanismBlocks; import mekanism.common.entity.EntityObsidianTNT; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; - +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.BlockRendererDispatcher; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderObsidianTNTPrimed extends Render { - private ModelObsidianTNT model = new ModelObsidianTNT(); - public RenderObsidianTNTPrimed(RenderManager renderManager) { super(renderManager); @@ -27,36 +25,27 @@ public class RenderObsidianTNTPrimed extends Render } @Override - public void doRender(EntityObsidianTNT entityobsidiantnt, double x, double y, double z, float f, float f1) + public void doRender(EntityObsidianTNT entityobsidiantnt, double x, double y, double z, float entityYaw, float partialTicks) { + BlockRendererDispatcher renderer = Minecraft.getMinecraft().getBlockRendererDispatcher(); GL11.glPushMatrix(); - GL11.glTranslatef((float)x, (float)y+1.2F, (float)z); - GL11.glScalef(0.8F, 0.8F, 0.8F); - GL11.glRotatef(180, 1, 0, 0); + GL11.glTranslatef((float)x, (float)y+0.5F, (float)z); - if((entityobsidiantnt.fuse - f1) + 1.0F < 10F) - { - float scale = 1.0F - ((entityobsidiantnt.fuse - f1) + 1.0F) / 10F; + if(entityobsidiantnt.fuse - partialTicks + 1.0F < 10.0F) + { + float f = 1.0F - (entityobsidiantnt.fuse - partialTicks + 1.0F) / 10.0F; + f = MathHelper.clamp_float(f, 0.0F, 1.0F); + f = f * f; + f = f * f; + float f1 = 1.0F + f * 0.3F; + GlStateManager.scale(f1, f1, f1); + } - if(scale < 0.0F) - { - scale = 0.0F; - } - - if(scale > 1.0F) - { - scale = 1.0F; - } - - scale *= scale; - scale *= scale; - float renderScale = 1.0F + scale * 0.3F; - GL11.glScalef(renderScale, renderScale, renderScale); - } - - float f3 = (1.0F - ((entityobsidiantnt.fuse - f1) + 1.0F) / 100F) * 0.8F; - bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "ObsidianTNT.png")); - model.render(0.0625F); + float f3 = (1.0F - ((entityobsidiantnt.fuse - partialTicks) + 1.0F) / 100F) * 0.8F; + bindEntityTexture(entityobsidiantnt); + GlStateManager.translate(-0.5F, -0.5F, 0.5F); + renderer.renderBlockBrightness(MekanismBlocks.ObsidianTNT.getDefaultState(), entityobsidiantnt.getBrightness(partialTicks)); + GlStateManager.translate(0.0F, 0.0F, 1.0F); if(entityobsidiantnt.fuse / 5 % 2 == 0) { @@ -65,7 +54,11 @@ public class RenderObsidianTNTPrimed extends Render GL11.glEnable(GL11.GL_BLEND); GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_DST_ALPHA); GL11.glColor4f(1.0F, 1.0F, 1.0F, f3); - model.render(0.0625F); + GlStateManager.doPolygonOffset(-3.0F, -3.0F); + GlStateManager.enablePolygonOffset(); + renderer.renderBlockBrightness(MekanismBlocks.ObsidianTNT.getDefaultState(), 1.0F); + GlStateManager.doPolygonOffset(0.0F, 0.0F); + GlStateManager.disablePolygonOffset(); GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GL11.glDisable(GL11.GL_BLEND); GL11.glEnable(GL11.GL_LIGHTING); diff --git a/src/main/java/mekanism/client/render/item/BakedFluidModel.java b/src/main/java/mekanism/client/render/item/BakedFluidModel.java new file mode 100644 index 000000000..131ced2b8 --- /dev/null +++ b/src/main/java/mekanism/client/render/item/BakedFluidModel.java @@ -0,0 +1,126 @@ +package mekanism.client.render.item; + +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; + +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.util.EnumFacing; + +public class BakedFluidModel implements IBakedModel +{ + public static final int STAGES = 16; + + public static final HashMap[] MODELS = new HashMap[STAGES]; + + static + { + for(int x = 0; x < STAGES; x++) + { + MODELS[x] = new HashMap(); + } + } + + private IBakedModel baseModel; + private String fluidName; + private int fluidLevel; + private boolean cullFluidTop; + + public BakedFluidModel(IBakedModel model, String id, int level, boolean cullTop) + { + baseModel = model; + fluidName = id; + fluidLevel = level; + cullFluidTop = cullTop; + } + + @Override + public List getFaceQuads(EnumFacing facing) + { + List faceQuads = new LinkedList(); + + faceQuads.addAll(baseModel.getFaceQuads(facing)); + + if(fluidLevel > 0 && fluidLevel <= STAGES) + { + HashMap fluidModels = MODELS[fluidLevel - 1]; + + if(fluidModels.containsKey(fluidName)) + { + faceQuads.addAll(fluidModels.get(fluidName).getFaceQuads(facing)); + } + } + + return faceQuads; + } + + @Override + public List getGeneralQuads() + { + List generalQuads = new LinkedList(); + + generalQuads.addAll(baseModel.getGeneralQuads()); + + if(fluidLevel > 0 && fluidLevel <= STAGES) + { + HashMap fluidModels = MODELS[fluidLevel - 1]; + + if(fluidModels.containsKey(fluidName)) + { + // The fluid model needs a separate culling logic from the rest of the tank, + // because the top of the fluid is supposed to be visible if the tank block + // above is empty. (getGeneralQuads() handles quads that don't have a cullface + // annotation in the .json) + + if(cullFluidTop) + { + for(BakedQuad quad : fluidModels.get(fluidName).getGeneralQuads()) + { + if(quad.getFace() != EnumFacing.UP) + { + generalQuads.add(quad); + } + } + } + else { + generalQuads.addAll(fluidModels.get(fluidName).getGeneralQuads()); + } + } + } + + return generalQuads; + } + + @Override + public boolean isAmbientOcclusion() + { + return baseModel.isAmbientOcclusion(); + } + + @Override + public boolean isGui3d() + { + return baseModel.isGui3d(); + } + + @Override + public boolean isBuiltInRenderer() + { + return baseModel.isBuiltInRenderer(); + } + + @Override + public TextureAtlasSprite getParticleTexture() + { + return baseModel.getParticleTexture(); + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() + { + return baseModel.getItemCameraTransforms(); + } +} \ No newline at end of file diff --git a/src/main/java/mekanism/client/render/item/FluidTankItemModel.java b/src/main/java/mekanism/client/render/item/FluidTankItemModel.java new file mode 100644 index 000000000..1a5b38fbe --- /dev/null +++ b/src/main/java/mekanism/client/render/item/FluidTankItemModel.java @@ -0,0 +1,82 @@ +package mekanism.client.render.item; + +import java.util.HashMap; +import java.util.List; + +import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumFacing; +import net.minecraftforge.client.model.ISmartItemModel; + +public class FluidTankItemModel implements ISmartItemModel +{ + public static final int STAGES = 16; + + public static final HashMap[] MODELS = new HashMap[STAGES]; + + static + { + for(int x = 0; x < STAGES; x++) + { + MODELS[x] = new HashMap(); + } + } + + private IBakedModel baseModel; + + public FluidTankItemModel(IBakedModel base) + { + baseModel = base; + } + + @Override + public IBakedModel handleItemState(ItemStack stack) + { + return null; + } + + @Override + public List getFaceQuads(EnumFacing p_177551_1_) + { + throw new UnsupportedOperationException(); + } + + @Override + public List getGeneralQuads() + { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isAmbientOcclusion() + { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isGui3d() + { + throw new UnsupportedOperationException(); + } + + @Override + public boolean isBuiltInRenderer() + { + throw new UnsupportedOperationException(); + } + + @Override + public TextureAtlasSprite getParticleTexture() + { + throw new UnsupportedOperationException(); + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() + { + throw new UnsupportedOperationException(); + } +} diff --git a/src/main/java/mekanism/client/render/tileentity/RenderBin.java b/src/main/java/mekanism/client/render/tileentity/RenderBin.java index 59a9d3989..ba3a0e064 100644 --- a/src/main/java/mekanism/client/render/tileentity/RenderBin.java +++ b/src/main/java/mekanism/client/render/tileentity/RenderBin.java @@ -5,19 +5,15 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.tile.TileEntityBin; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.renderer.OpenGlHelper; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraft.world.EnumSkyBlock; -import net.minecraft.world.World; - -import org.lwjgl.opengl.GL11; - import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import org.lwjgl.opengl.GL11; + @SideOnly(Side.CLIENT) public class RenderBin extends TileEntitySpecialRenderer { @@ -41,8 +37,7 @@ public class RenderBin extends TileEntitySpecialRenderer return; } - doLight(tileEntity.getWorld(), obj); - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 240, 240); + MekanismRenderer.glowOn(); if(itemStack != null) { @@ -70,15 +65,11 @@ public class RenderBin extends TileEntitySpecialRenderer float scale = 0.03125F; float scaler = 0.9F; - GL11.glScalef(scale*scaler, scale*scaler, 0); + GL11.glScalef(scale*scaler, scale*scaler, -0.0001F); GL11.glRotatef(180, 0, 0, 1); - GL11.glDisable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_DEPTH_TEST); - renderItem.renderItemAndEffectIntoGUI(itemStack, 0, 0); - GL11.glEnable(GL11.GL_LIGHTING); GL11.glPopMatrix(); } @@ -87,21 +78,7 @@ public class RenderBin extends TileEntitySpecialRenderer renderText(amount, tileEntity.facing, 0.02F, x, y - 0.31F, z); } - } - - private void doLight(World world, Coord4D obj) - { - if(obj.getBlockState(world).getBlock().isOpaqueCube()) - { - return; - } - - int brightness = world.getLightFromNeighborsFor(EnumSkyBlock.SKY, obj.getPos()); - int lightX = brightness % 65536; - int lightY = brightness / 65536; - float scale = 0.6F; - - OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, lightX * scale, lightY * scale); + MekanismRenderer.glowOff(); } @SuppressWarnings("incomplete-switch") diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index cf0e0a59a..993d5d1d4 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -226,19 +226,14 @@ public class CommonProxy implements IGuiProvider public void openPersonalChest(EntityPlayer entityplayer, int id, int windowId, boolean isBlock, BlockPos pos) {} /** - * Register and load client-only render information. + * Register and load client-only item render information. */ - public void registerRenderInformation() {} - + public void registerItemRenders() {} + /** - * Gets the armor index number from ClientProxy. - * @param string - armor indicator - * @return armor index number + * Register and load client-only block render information. */ - public int getArmorIndex(String string) - { - return 0; - } + public void registerBlockRenders() {} /** * Set and load the mod's common configuration properties. diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index a6352fa8e..f36adf793 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -1379,7 +1379,7 @@ public class Mekanism packetHandler.initialize(); //Load proxy - proxy.registerRenderInformation(); + proxy.registerItemRenders(); proxy.loadUtilities(); //Completion notification diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java index 65e647d23..d2bff9924 100644 --- a/src/main/java/mekanism/common/MekanismBlocks.java +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -5,16 +5,6 @@ import static mekanism.common.block.states.BlockStateBasic.BasicBlock.BASIC_BLOC import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_1; import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_2; import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_3; - -import java.util.ArrayList; -import java.util.List; - -import mekanism.api.EnumColor; -import mekanism.client.ClientProxy; -import mekanism.common.Tier.EnergyCubeTier; -import mekanism.common.Tier.GasTankTier; -import mekanism.common.base.IEnergyCube; -import mekanism.common.base.IFactory.RecipeType; import mekanism.common.block.BlockBasic; import mekanism.common.block.BlockBounding; import mekanism.common.block.BlockCardboardBox; @@ -28,11 +18,8 @@ import mekanism.common.block.BlockPlasticFence; import mekanism.common.block.BlockPlasticFence.PlasticFenceStateMapper; import mekanism.common.block.BlockSalt; import mekanism.common.block.states.BlockStateBasic.BasicBlockStateMapper; -import mekanism.common.block.states.BlockStateBasic.BasicBlockType; import mekanism.common.block.states.BlockStateCardboardBox.CardboardBoxStateMapper; import mekanism.common.block.states.BlockStateMachine.MachineBlockStateMapper; -import mekanism.common.block.states.BlockStateMachine.MachineType; -import mekanism.common.block.states.BlockStateOre.EnumOreType; import mekanism.common.block.states.BlockStatePlastic.PlasticBlockStateMapper; import mekanism.common.block.states.BlockStatePlastic.PlasticBlockType; import mekanism.common.item.ItemBlockBasic; @@ -43,12 +30,7 @@ import mekanism.common.item.ItemBlockMachine; import mekanism.common.item.ItemBlockOre; import mekanism.common.item.ItemBlockPlastic; import net.minecraft.block.Block; -import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.block.statemap.IStateMapper; -import net.minecraft.client.resources.model.ModelResourceLocation; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.common.registry.GameRegistry.ObjectHolder; @@ -118,167 +100,6 @@ public class MekanismBlocks ModelLoader.setCustomStateMapper(PlasticFence, fenceMapper); ModelLoader.setCustomStateMapper(CardboardBox, boxMapper); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.ObsidianTNT), 0, new ModelResourceLocation("mekanism:ObsidianTNT", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.SaltBlock), 0, new ModelResourceLocation("mekanism:SaltBlock", "inventory")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.CardboardBox), 0, new ModelResourceLocation("mekanism:CardboardBox", "storage=false")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.CardboardBox), 1, new ModelResourceLocation("mekanism:CardboardBox", "storage=true")); - - for(MachineType type : MachineType.values()) - { - List modelsToAdd = new ArrayList(); - String resource = "mekanism:" + type.getName(); - RecipeType recipePointer = null; - - if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) - { - recipePointer = RecipeType.values()[0]; - resource = "mekanism:" + type.getName() + "_" + recipePointer.getName(); - } - - while(true) - { - if(ClientProxy.machineResources.get(resource) == null) - { - List entries = new ArrayList(); - - if(type.hasActiveTexture()) - { - entries.add("active=false"); - } - - if(type.hasRotations()) - { - entries.add("facing=north"); - } - - String properties = new String(); - - for(int i = 0; i < entries.size(); i++) - { - properties += entries.get(i); - - if(i < entries.size()-1) - { - properties += ","; - } - } - - ModelResourceLocation model = new ModelResourceLocation(resource, properties); - - ClientProxy.machineResources.put(resource, model); - modelsToAdd.add(model); - - if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) - { - if(recipePointer.ordinal() < RecipeType.values().length-1) - { - recipePointer = RecipeType.values()[recipePointer.ordinal()+1]; - resource = "mekanism:" + type.getName() + "_" + recipePointer.getName(); - - continue; - } - } - } - - break; - } - - ModelLoader.registerItemVariants(Item.getItemFromBlock(type.typeBlock.getBlock()), modelsToAdd.toArray(new ModelResourceLocation[] {})); - } - - for(BasicBlockType type : BasicBlockType.values()) - { - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(type.blockType.getBlock()), type.meta, new ModelResourceLocation("mekanism:" + type.getName(), "inventory")); - } - - for(EnumColor color : EnumColor.DYES) - { - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.PlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=plastic")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.SlickPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=slick")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.GlowPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=glow")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.ReinforcedPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=reinforced")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.RoadPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=road")); - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.PlasticFence), color.getMetaValue(), new ModelResourceLocation("mekanism:PlasticFence", "inventory")); - } - - for(EnumOreType ore : EnumOreType.values()) - { - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(MekanismBlocks.OreBlock), ore.ordinal(), new ModelResourceLocation("mekanism:OreBlock", "type=" + ore.getName())); - } - - ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.EnergyCube), new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - EnergyCubeTier tier = ((IEnergyCube)stack.getItem()).getEnergyCubeTier(stack); - ResourceLocation baseLocation = new ResourceLocation("mekanism", "EnergyCube"); - - return new ModelResourceLocation(baseLocation, "facing=north,tier="+tier); - } - }); - - ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.GasTank), new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - GasTankTier tier = GasTankTier.values()[((ItemBlockGasTank)stack.getItem()).getBaseTier(stack).ordinal()]; - ResourceLocation baseLocation = new ResourceLocation("mekanism", "GasTank"); - - return new ModelResourceLocation(baseLocation, "facing=north,tier="+tier); - } - }); - - ItemMeshDefinition machineMesher = new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - MachineType type = MachineType.get(stack); - - if(type != null) - { - String resource = "mekanism:" + type.getName(); - - if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) - { - RecipeType recipe = RecipeType.values()[((ItemBlockMachine)stack.getItem()).getRecipeType(stack)]; - resource = "mekanism:" + type.getName() + "_" + recipe.getName(); - } - - return ClientProxy.machineResources.get(resource); - } - - return null; - } - }; - - ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock), machineMesher); - ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock2), machineMesher); - ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.MachineBlock3), machineMesher); - - ItemMeshDefinition basicMesher = new ItemMeshDefinition() { - @Override - public ModelResourceLocation getModelLocation(ItemStack stack) - { - MachineType type = MachineType.get(stack); - - if(type != null) - { - String resource = "mekanism:" + type.getName(); - - if(type == MachineType.BASIC_FACTORY || type == MachineType.ADVANCED_FACTORY || type == MachineType.ELITE_FACTORY) - { - RecipeType recipe = RecipeType.values()[((ItemBlockMachine)stack.getItem()).getRecipeType(stack)]; - resource = "mekanism:" + type.getName() + "_" + recipe.getName(); - } - - return ClientProxy.machineResources.get(resource); - } - - return null; - } - }; - - //ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.BasicBlock), basicMesher); - //ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(MekanismBlocks.BasicBlock2), basicMesher); + Mekanism.proxy.registerBlockRenders(); } } diff --git a/src/main/java/mekanism/common/block/BlockBasic.java b/src/main/java/mekanism/common/block/BlockBasic.java index bc1838d31..d97e9dc1d 100644 --- a/src/main/java/mekanism/common/block/BlockBasic.java +++ b/src/main/java/mekanism/common/block/BlockBasic.java @@ -176,6 +176,11 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple state = state.withProperty(BlockStateBasic.tierProperty, ((TileEntityInductionProvider)tile).tier.getBaseTier()); } + if(tile instanceof TileEntityBin) + { + state = state.withProperty(BlockStateBasic.tierProperty, ((TileEntityBin)tile).tier.getBaseTier()); + } + if(tile instanceof TileEntityInductionPort) { state = state.withProperty(BlockStateBasic.activeProperty, ((TileEntityInductionPort)tile).mode); @@ -1008,7 +1013,7 @@ public abstract class BlockBasic extends Block implements ICTMBlock//TODO? imple if(type == BasicBlockType.INDUCTION_PORT) { - return type.getName() + (state.getValue(BlockStateBasic.activeProperty) ? "output" : "input"); + return type.getName() + (state.getValue(BlockStateBasic.activeProperty) ? "_output" : ""); } return null; diff --git a/src/main/java/mekanism/common/block/states/BlockStateBasic.java b/src/main/java/mekanism/common/block/states/BlockStateBasic.java index c0ad482c2..9da1b0b77 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateBasic.java +++ b/src/main/java/mekanism/common/block/states/BlockStateBasic.java @@ -91,7 +91,7 @@ public class BlockStateBasic extends ExtendedBlockState COAL_BLOCK(BasicBlock.BASIC_BLOCK_1, 3, "CharcoalBlock", null, false, Predicates.alwaysFalse(), false, false), REFINED_GLOWSTONE(BasicBlock.BASIC_BLOCK_1, 4, "RefinedGlowstone", null, false, Predicates.alwaysFalse(), false, false), STEEL_BLOCK(BasicBlock.BASIC_BLOCK_1, 5, "SteelBlock", null, false, Predicates.alwaysFalse(), false, false), - BIN(BasicBlock.BASIC_BLOCK_1, 6, "Bin", TileEntityBin.class, false, Plane.HORIZONTAL, true, false), + BIN(BasicBlock.BASIC_BLOCK_1, 6, "Bin", TileEntityBin.class, false, Plane.HORIZONTAL, true, true), TELEPORTER_FRAME(BasicBlock.BASIC_BLOCK_1, 7, "TeleporterFrame", null, false, Predicates.alwaysFalse(), false, false), STEEL_CASING(BasicBlock.BASIC_BLOCK_1, 8, "SteelCasing", null, false, Predicates.alwaysFalse(), false, false), DYNAMIC_TANK(BasicBlock.BASIC_BLOCK_1, 9, "DynamicTank", TileEntityDynamicTank.class, false, Predicates.alwaysFalse(), false, false), diff --git a/src/main/java/mekanism/common/item/ItemBalloon.java b/src/main/java/mekanism/common/item/ItemBalloon.java index 70661630f..a64f2a67c 100644 --- a/src/main/java/mekanism/common/item/ItemBalloon.java +++ b/src/main/java/mekanism/common/item/ItemBalloon.java @@ -21,6 +21,8 @@ import net.minecraft.util.BlockPos; import net.minecraft.util.EnumFacing; import net.minecraft.util.StatCollector; import net.minecraft.world.World; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; public class ItemBalloon extends ItemMekanism implements IMetaItem { @@ -34,7 +36,7 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem @Override public String getTexture(int meta) { - return EnumColor.DYES[meta].getOreDictName() + "Balloon"; + return "Balloon"; } @Override @@ -42,6 +44,14 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem { return EnumColor.DYES.length; } + + @SideOnly(Side.CLIENT) + public int getColorFromItemStack(ItemStack stack, int renderPass) + { + EnumColor dye = getColor(stack); + + return (int)(dye.getColor(0)*255) << 16 | (int)(dye.getColor(1)*255) << 8 | (int)(dye.getColor(2)*255); + } public EnumColor getColor(ItemStack stack) { @@ -74,7 +84,10 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem world.spawnEntityInWorld(new EntityBalloon(world, pos.xCoord-0.5, pos.yCoord-0.25, pos.zCoord-0.5, getColor(itemstack))); } - itemstack.stackSize--; + if(!entityplayer.capabilities.isCreativeMode) + { + itemstack.stackSize--; + } return itemstack; } @@ -242,6 +255,7 @@ public class ItemBalloon extends ItemMekanism implements IMetaItem } stack.stackSize--; + return stack; } } diff --git a/src/main/java/mekanism/tools/common/ToolsItems.java b/src/main/java/mekanism/tools/common/ToolsItems.java index 3c9e42ad9..69a340ab6 100644 --- a/src/main/java/mekanism/tools/common/ToolsItems.java +++ b/src/main/java/mekanism/tools/common/ToolsItems.java @@ -1,6 +1,5 @@ package mekanism.tools.common; -import mekanism.common.Mekanism; import mekanism.tools.item.ItemMekanismArmor; import mekanism.tools.item.ItemMekanismAxe; import mekanism.tools.item.ItemMekanismHoe; @@ -108,60 +107,60 @@ public class ToolsItems GlowstoneShovel = new ItemMekanismShovel(MekanismTools.toolGLOWSTONE).setUnlocalizedName("GlowstoneShovel"); GlowstoneHoe = new ItemMekanismHoe(MekanismTools.toolGLOWSTONE).setUnlocalizedName("GlowstoneHoe"); GlowstoneSword = new ItemMekanismSword(MekanismTools.toolGLOWSTONE).setUnlocalizedName("GlowstoneSword"); - GlowstoneHelmet = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 0).setUnlocalizedName("GlowstoneHelmet"); - GlowstoneChestplate = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 1).setUnlocalizedName("GlowstoneChestplate"); - GlowstoneLeggings = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 2).setUnlocalizedName("GlowstoneLeggings"); - GlowstoneBoots = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, Mekanism.proxy.getArmorIndex("glowstone"), 3).setUnlocalizedName("GlowstoneBoots"); + GlowstoneHelmet = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, 0).setUnlocalizedName("GlowstoneHelmet"); + GlowstoneChestplate = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, 1).setUnlocalizedName("GlowstoneChestplate"); + GlowstoneLeggings = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, 2).setUnlocalizedName("GlowstoneLeggings"); + GlowstoneBoots = new ItemMekanismArmor(MekanismTools.armorGLOWSTONE, 3).setUnlocalizedName("GlowstoneBoots"); BronzePaxel = new ItemMekanismPaxel(MekanismTools.toolBRONZE2).setUnlocalizedName("BronzePaxel"); BronzePickaxe = new ItemMekanismPickaxe(MekanismTools.toolBRONZE).setUnlocalizedName("BronzePickaxe"); BronzeAxe = new ItemMekanismAxe(MekanismTools.toolBRONZE).setUnlocalizedName("BronzeAxe"); BronzeShovel = new ItemMekanismShovel(MekanismTools.toolBRONZE).setUnlocalizedName("BronzeShovel"); BronzeHoe = new ItemMekanismHoe(MekanismTools.toolBRONZE).setUnlocalizedName("BronzeHoe"); BronzeSword = new ItemMekanismSword(MekanismTools.toolBRONZE).setUnlocalizedName("BronzeSword"); - BronzeHelmet = (new ItemMekanismArmor(MekanismTools.armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 0)).setUnlocalizedName("BronzeHelmet"); - BronzeChestplate = (new ItemMekanismArmor(MekanismTools.armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 1)).setUnlocalizedName("BronzeChestplate"); - BronzeLeggings = (new ItemMekanismArmor(MekanismTools.armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 2)).setUnlocalizedName("BronzeLeggings"); - BronzeBoots = (new ItemMekanismArmor(MekanismTools.armorBRONZE, Mekanism.proxy.getArmorIndex("bronze"), 3)).setUnlocalizedName("BronzeBoots"); + BronzeHelmet = (new ItemMekanismArmor(MekanismTools.armorBRONZE, 0)).setUnlocalizedName("BronzeHelmet"); + BronzeChestplate = (new ItemMekanismArmor(MekanismTools.armorBRONZE, 1)).setUnlocalizedName("BronzeChestplate"); + BronzeLeggings = (new ItemMekanismArmor(MekanismTools.armorBRONZE, 2)).setUnlocalizedName("BronzeLeggings"); + BronzeBoots = (new ItemMekanismArmor(MekanismTools.armorBRONZE, 3)).setUnlocalizedName("BronzeBoots"); OsmiumPaxel = new ItemMekanismPaxel(MekanismTools.toolOSMIUM2).setUnlocalizedName("OsmiumPaxel"); OsmiumPickaxe = new ItemMekanismPickaxe(MekanismTools.toolOSMIUM).setUnlocalizedName("OsmiumPickaxe"); OsmiumAxe = new ItemMekanismAxe(MekanismTools.toolOSMIUM).setUnlocalizedName("OsmiumAxe"); OsmiumShovel = new ItemMekanismShovel(MekanismTools.toolOSMIUM).setUnlocalizedName("OsmiumShovel"); OsmiumHoe = new ItemMekanismHoe(MekanismTools.toolOSMIUM).setUnlocalizedName("OsmiumHoe"); OsmiumSword = new ItemMekanismSword(MekanismTools.toolOSMIUM).setUnlocalizedName("OsmiumSword"); - OsmiumHelmet = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, Mekanism.proxy.getArmorIndex("osmium"), 0)).setUnlocalizedName("OsmiumHelmet"); - OsmiumChestplate = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, Mekanism.proxy.getArmorIndex("osmium"), 1)).setUnlocalizedName("OsmiumChestplate"); - OsmiumLeggings = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, Mekanism.proxy.getArmorIndex("osmium"), 2)).setUnlocalizedName("OsmiumLeggings"); - OsmiumBoots = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, Mekanism.proxy.getArmorIndex("osmium"), 3)).setUnlocalizedName("OsmiumBoots"); + OsmiumHelmet = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, 0)).setUnlocalizedName("OsmiumHelmet"); + OsmiumChestplate = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, 1)).setUnlocalizedName("OsmiumChestplate"); + OsmiumLeggings = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, 2)).setUnlocalizedName("OsmiumLeggings"); + OsmiumBoots = (new ItemMekanismArmor(MekanismTools.armorOSMIUM, 3)).setUnlocalizedName("OsmiumBoots"); ObsidianPaxel = new ItemMekanismPaxel(MekanismTools.toolOBSIDIAN2).setUnlocalizedName("ObsidianPaxel"); ObsidianPickaxe = new ItemMekanismPickaxe(MekanismTools.toolOBSIDIAN).setUnlocalizedName("ObsidianPickaxe"); ObsidianAxe = new ItemMekanismAxe(MekanismTools.toolOBSIDIAN).setUnlocalizedName("ObsidianAxe"); ObsidianShovel = new ItemMekanismShovel(MekanismTools.toolOBSIDIAN).setUnlocalizedName("ObsidianShovel"); ObsidianHoe = new ItemMekanismHoe(MekanismTools.toolOBSIDIAN).setUnlocalizedName("ObsidianHoe"); ObsidianSword = new ItemMekanismSword(MekanismTools.toolOBSIDIAN).setUnlocalizedName("ObsidianSword"); - ObsidianHelmet = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 0)).setUnlocalizedName("ObsidianHelmet"); - ObsidianChestplate = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 1)).setUnlocalizedName("ObsidianChestplate"); - ObsidianLeggings = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 2)).setUnlocalizedName("ObsidianLeggings"); - ObsidianBoots = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, Mekanism.proxy.getArmorIndex("obsidian"), 3)).setUnlocalizedName("ObsidianBoots"); + ObsidianHelmet = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, 0)).setUnlocalizedName("ObsidianHelmet"); + ObsidianChestplate = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, 1)).setUnlocalizedName("ObsidianChestplate"); + ObsidianLeggings = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, 2)).setUnlocalizedName("ObsidianLeggings"); + ObsidianBoots = (new ItemMekanismArmor(MekanismTools.armorOBSIDIAN, 3)).setUnlocalizedName("ObsidianBoots"); LazuliPaxel = new ItemMekanismPaxel(MekanismTools.toolLAZULI2).setUnlocalizedName("LazuliPaxel"); LazuliPickaxe = new ItemMekanismPickaxe(MekanismTools.toolLAZULI).setUnlocalizedName("LazuliPickaxe"); LazuliAxe = new ItemMekanismAxe(MekanismTools.toolLAZULI).setUnlocalizedName("LazuliAxe"); LazuliShovel = new ItemMekanismShovel(MekanismTools.toolLAZULI).setUnlocalizedName("LazuliShovel"); LazuliHoe = new ItemMekanismHoe(MekanismTools.toolLAZULI).setUnlocalizedName("LazuliHoe"); LazuliSword = new ItemMekanismSword(MekanismTools.toolLAZULI).setUnlocalizedName("LazuliSword"); - LazuliHelmet = (new ItemMekanismArmor(MekanismTools.armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 0)).setUnlocalizedName("LazuliHelmet"); - LazuliChestplate = (new ItemMekanismArmor(MekanismTools.armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 1)).setUnlocalizedName("LazuliChestplate"); - LazuliLeggings = (new ItemMekanismArmor(MekanismTools.armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 2)).setUnlocalizedName("LazuliLeggings"); - LazuliBoots = (new ItemMekanismArmor(MekanismTools.armorLAZULI, Mekanism.proxy.getArmorIndex("lazuli"), 3)).setUnlocalizedName("LazuliBoots"); + LazuliHelmet = (new ItemMekanismArmor(MekanismTools.armorLAZULI, 0)).setUnlocalizedName("LazuliHelmet"); + LazuliChestplate = (new ItemMekanismArmor(MekanismTools.armorLAZULI, 1)).setUnlocalizedName("LazuliChestplate"); + LazuliLeggings = (new ItemMekanismArmor(MekanismTools.armorLAZULI, 2)).setUnlocalizedName("LazuliLeggings"); + LazuliBoots = (new ItemMekanismArmor(MekanismTools.armorLAZULI, 3)).setUnlocalizedName("LazuliBoots"); SteelPaxel = new ItemMekanismPaxel(MekanismTools.toolSTEEL2).setUnlocalizedName("SteelPaxel"); SteelPickaxe = new ItemMekanismPickaxe(MekanismTools.toolSTEEL).setUnlocalizedName("SteelPickaxe"); SteelAxe = new ItemMekanismAxe(MekanismTools.toolSTEEL).setUnlocalizedName("SteelAxe"); SteelShovel = new ItemMekanismShovel(MekanismTools.toolSTEEL).setUnlocalizedName("SteelShovel"); SteelHoe = new ItemMekanismHoe(MekanismTools.toolSTEEL).setUnlocalizedName("SteelHoe"); SteelSword = new ItemMekanismSword(MekanismTools.toolSTEEL).setUnlocalizedName("SteelSword"); - SteelHelmet = new ItemMekanismArmor(MekanismTools.armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 0).setUnlocalizedName("SteelHelmet"); - SteelChestplate = new ItemMekanismArmor(MekanismTools.armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 1).setUnlocalizedName("SteelChestplate"); - SteelLeggings = new ItemMekanismArmor(MekanismTools.armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 2).setUnlocalizedName("SteelLeggings"); - SteelBoots = new ItemMekanismArmor(MekanismTools.armorSTEEL, Mekanism.proxy.getArmorIndex("steel"), 3).setUnlocalizedName("SteelBoots"); + SteelHelmet = new ItemMekanismArmor(MekanismTools.armorSTEEL, 0).setUnlocalizedName("SteelHelmet"); + SteelChestplate = new ItemMekanismArmor(MekanismTools.armorSTEEL, 1).setUnlocalizedName("SteelChestplate"); + SteelLeggings = new ItemMekanismArmor(MekanismTools.armorSTEEL, 2).setUnlocalizedName("SteelLeggings"); + SteelBoots = new ItemMekanismArmor(MekanismTools.armorSTEEL, 3).setUnlocalizedName("SteelBoots"); } public static void setHarvestLevels() diff --git a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java index 4c969acb6..83cf2d13c 100644 --- a/src/main/java/mekanism/tools/item/ItemMekanismArmor.java +++ b/src/main/java/mekanism/tools/item/ItemMekanismArmor.java @@ -21,9 +21,9 @@ import net.minecraftforge.fml.relauncher.SideOnly; public class ItemMekanismArmor extends ItemArmor { - public ItemMekanismArmor(ArmorMaterial enumarmormaterial, int renderIndex, int armorType) + public ItemMekanismArmor(ArmorMaterial enumarmormaterial, int renderIndex) { - super(enumarmormaterial, renderIndex, armorType); + super(enumarmormaterial, renderIndex, 0); setCreativeTab(Mekanism.tabMekanism); } @@ -33,14 +33,6 @@ public class ItemMekanismArmor extends ItemArmor list.add(LangUtils.localize("tooltip.hp") + ": " + (itemstack.getMaxDamage() - itemstack.getItemDamage())); } -/* - @Override - public void registerIcons(IIconRegister register) - { - itemIcon = register.registerIcon("mekanism:" + getUnlocalizedName().replace("item.", "")); - } -*/ - @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { diff --git a/src/main/resources/assets/mekanism/blockstates/PlasticFence.json b/src/main/resources/assets/mekanism/blockstates/PlasticFence.json index 9755c3c56..e4caedf61 100755 --- a/src/main/resources/assets/mekanism/blockstates/PlasticFence.json +++ b/src/main/resources/assets/mekanism/blockstates/PlasticFence.json @@ -15,6 +15,20 @@ "east=true,north=false,south=true,west=true": { "model": "mekanism:plastic_fence_nse", "y": 90, "uvlock": true }, "east=false,north=true,south=true,west=true": { "model": "mekanism:plastic_fence_nse", "y": 180, "uvlock": true }, "east=true,north=true,south=false,west=true": { "model": "mekanism:plastic_fence_nse", "y": 270, "uvlock": true }, - "east=true,north=true,south=true,west=true": { "model": "mekanism:plastic_fence_nsew", "uvlock": true } + "east=true,north=true,south=true,west=true": { "model": "mekanism:plastic_fence_nsew", "uvlock": true }, + "inventory": { + "model": "mekanism:plastic_fence_inventory", + "uvlock": true, + "transform": { + "thirdperson": { + "rotation": [ 0, 0, 180 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + }, + "gui": { + "rotation": [ 0, 90, 0 ] + } + } + } } } diff --git a/src/main/resources/assets/mekanism/blockstates/bin_advanced.json b/src/main/resources/assets/mekanism/blockstates/bin_advanced.json new file mode 100644 index 000000000..b16f0e1a5 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/bin_advanced.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/bin/BinAdvancedFront", + "west": "mekanism:blocks/bin/BinAdvancedRight", + "east": "mekanism:blocks/bin/BinAdvancedLeft", + "south": "mekanism:blocks/bin/BinAdvancedBack", + "up": "mekanism:blocks/bin/BinAdvancedTop", + "down": "mekanism:blocks/bin/BinAdvancedBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/bin/BinAdvancedFrontOn", + "west": "mekanism:blocks/bin/BinAdvancedRightOn", + "east": "mekanism:blocks/bin/BinAdvancedLeftOn", + "south": "mekanism:blocks/bin/BinAdvancedBackOn", + "up": "mekanism:blocks/bin/BinAdvancedTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/bin.json b/src/main/resources/assets/mekanism/blockstates/bin_basic.json similarity index 89% rename from src/main/resources/assets/mekanism/blockstates/bin.json rename to src/main/resources/assets/mekanism/blockstates/bin_basic.json index d7bf345b5..2aff352be 100644 --- a/src/main/resources/assets/mekanism/blockstates/bin.json +++ b/src/main/resources/assets/mekanism/blockstates/bin_basic.json @@ -25,8 +25,7 @@ "west": "mekanism:blocks/bin/BinBasicRightOn", "east": "mekanism:blocks/bin/BinBasicLeftOn", "south": "mekanism:blocks/bin/BinBasicBackOn", - "up": "mekanism:blocks/bin/BinBasicTopOn", - "down": "mekanism:blocks/bin/BinBasicBottomOn" + "up": "mekanism:blocks/bin/BinBasicTopOn" } }, "false": {} diff --git a/src/main/resources/assets/mekanism/blockstates/bin_elite.json b/src/main/resources/assets/mekanism/blockstates/bin_elite.json new file mode 100644 index 000000000..640a12e8c --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/bin_elite.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/bin/BinEliteFront", + "west": "mekanism:blocks/bin/BinEliteRight", + "east": "mekanism:blocks/bin/BinEliteLeft", + "south": "mekanism:blocks/bin/BinEliteBack", + "up": "mekanism:blocks/bin/BinEliteTop", + "down": "mekanism:blocks/bin/BinEliteBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/bin/BinEliteFrontOn", + "west": "mekanism:blocks/bin/BinEliteRightOn", + "east": "mekanism:blocks/bin/BinEliteLeftOn", + "south": "mekanism:blocks/bin/BinEliteBackOn", + "up": "mekanism:blocks/bin/BinEliteTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/bin_ultimate.json b/src/main/resources/assets/mekanism/blockstates/bin_ultimate.json new file mode 100644 index 000000000..7f9b40808 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/bin_ultimate.json @@ -0,0 +1,36 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:machine", + "textures": { + "front": "mekanism:blocks/bin/BinUltimateFront", + "west": "mekanism:blocks/bin/BinUltimateRight", + "east": "mekanism:blocks/bin/BinUltimateLeft", + "south": "mekanism:blocks/bin/BinUltimateBack", + "up": "mekanism:blocks/bin/BinUltimateTop", + "down": "mekanism:blocks/bin/BinUltimateBottom" + } + }, + "variants": { + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "active": { + "true": { + "textures": { + "front": "mekanism:blocks/bin/BinUltimateFrontOn", + "west": "mekanism:blocks/bin/BinUltimateRightOn", + "east": "mekanism:blocks/bin/BinUltimateLeftOn", + "south": "mekanism:blocks/bin/BinUltimateBackOn", + "up": "mekanism:blocks/bin/BinUltimateTopOn" + } + }, + "false": {} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/fluid_tank.json b/src/main/resources/assets/mekanism/blockstates/fluid_tank.json index a3725d3ab..d8af24a61 100644 --- a/src/main/resources/assets/mekanism/blockstates/fluid_tank.json +++ b/src/main/resources/assets/mekanism/blockstates/fluid_tank.json @@ -9,7 +9,11 @@ "true": {"textures": {"all": "mekanism:blocks/models/fluid_tank_on"}}, "false": {"textures": {"all": "mekanism:blocks/models/fluid_tank"}} }, - "inventory": [{}] + "inventory": [{ + "textures": { + "all": "mekanism:blocks/models/fluid_tank" + } + }] } } diff --git a/src/main/resources/assets/mekanism/blockstates/induction_port.json b/src/main/resources/assets/mekanism/blockstates/induction_port.json index 891b0dad2..20d9509fc 100644 --- a/src/main/resources/assets/mekanism/blockstates/induction_port.json +++ b/src/main/resources/assets/mekanism/blockstates/induction_port.json @@ -3,7 +3,7 @@ "defaults": { "model": "cube_all", "textures": { - "all": "mekanism:blocks/InductionPort" + "all": "mekanism:blocks/ctm/induction_port" } }, "variants": { diff --git a/src/main/resources/assets/mekanism/blockstates/security_desk.json b/src/main/resources/assets/mekanism/blockstates/security_desk.json index d4be63785..1ebc7df52 100644 --- a/src/main/resources/assets/mekanism/blockstates/security_desk.json +++ b/src/main/resources/assets/mekanism/blockstates/security_desk.json @@ -11,10 +11,6 @@ "east": {"y": 90}, "west": {"y": -90} }, - "active": { - "true": {}, - "false": {} - }, "inventory": [{}] } } diff --git a/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json b/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json index 5e49fc919..61ab2f43f 100644 --- a/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json +++ b/src/main/resources/assets/mekanism/blockstates/thermal_evaporation_controller.json @@ -9,6 +9,12 @@ }, "variants": { "normal": [{}], + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, "inventory": [{}] } } diff --git a/src/main/resources/assets/mekanism/models/block/chemical_washer.json b/src/main/resources/assets/mekanism/models/block/chemical_washer.json index 17b65abf1..dd61e61d6 100644 --- a/src/main/resources/assets/mekanism/models/block/chemical_washer.json +++ b/src/main/resources/assets/mekanism/models/block/chemical_washer.json @@ -302,6 +302,6 @@ ], "textures": { "all": "mekanism:blocks/models/chemical_washer", - "particle": "..." + "particle": "mekanism:blocks/SteelCasing" } } diff --git a/src/main/resources/assets/mekanism/models/block/fluid_tank/fluid_0.json b/src/main/resources/assets/mekanism/models/block/fluid_tank/fluid_0.json new file mode 100644 index 000000000..3fd9e69a0 --- /dev/null +++ b/src/main/resources/assets/mekanism/models/block/fluid_tank/fluid_0.json @@ -0,0 +1,18 @@ +{ + "textures": { + "fluid" : "blocks/water_still" + }, + "elements": [{ + "name": "Fluid", + "from": [ 0.0005, 0.0005, 0.0005 ], + "to": [ 15.9995, 0.9995, 15.9995 ], + "faces": { + "north": { "texture": "#fluid", "uv": [ 0.0005, 15.0, 15.9995, 15.9995 ], "cullface": "north" }, + "east": { "texture": "#fluid", "uv": [ 0.0005, 15.0, 15.9995, 15.9995 ], "cullface": "east" }, + "south": { "texture": "#fluid", "uv": [ 0.0005, 15.0, 15.9995, 15.9995 ], "cullface": "south" }, + "west": { "texture": "#fluid", "uv": [ 0.0005, 15.0, 15.9995, 15.9995 ], "cullface": "west" }, + "up": { "texture": "#fluid", "uv": [ 0.0005, 0.0005, 15.9995, 15.9995 ] }, + "down": { "texture": "#fluid", "uv": [ 0.0005, 0.0005, 15.9995, 15.9995 ], "cullface": "down" } + } + }] +} \ No newline at end of file diff --git a/src/main/resources/assets/mekanism/models/block/metallurgic_infuser.json b/src/main/resources/assets/mekanism/models/block/metallurgic_infuser.json index bd21bfaf8..7536cee52 100644 --- a/src/main/resources/assets/mekanism/models/block/metallurgic_infuser.json +++ b/src/main/resources/assets/mekanism/models/block/metallurgic_infuser.json @@ -224,6 +224,6 @@ ], "textures": { "all": "mekanism:blocks/models/metallurgic_infuser", - "particle": "..." + "particle": "mekanism:blocks/SteelCasing" } } diff --git a/src/main/resources/assets/mekanism/models/block/security_desk.json b/src/main/resources/assets/mekanism/models/block/security_desk.json index 4c616be43..9bc379c52 100644 --- a/src/main/resources/assets/mekanism/models/block/security_desk.json +++ b/src/main/resources/assets/mekanism/models/block/security_desk.json @@ -133,6 +133,6 @@ ], "textures": { "all": "mekanism:blocks/models/security_desk", - "particle": "..." + "particle": "mekanism:blocks/SteelCasing" } } diff --git a/src/main/resources/assets/mekanism/models/entity/balloon.json b/src/main/resources/assets/mekanism/models/entity/balloon.json index 3ed2673d9..2334f36db 100755 --- a/src/main/resources/assets/mekanism/models/entity/balloon.json +++ b/src/main/resources/assets/mekanism/models/entity/balloon.json @@ -2,8 +2,8 @@ "elements": [ { "__comment": "String", - "from": [7.5, 8.5, 7.5], - "to": [8.5, 19.5, 8.5], + "from": [7.85, 8.5, 7.85], + "to": [8.15, 19.5, 8.15], "faces": { "down": {"uv": [9, 0, 9.25, 0.25], "texture": "#all"}, "up": {"uv": [8.75, 0, 9, 0.25], "texture": "#all"}, @@ -18,12 +18,12 @@ "from": [7.5, 19.5, 7.5], "to": [8.5, 20.5, 8.5], "faces": { - "down": {"uv": [5, 2.25, 5.25, 2.5], "texture": "#all"}, - "up": {"uv": [4.75, 2.25, 5, 2.5], "texture": "#all"}, - "north": {"uv": [4.75, 2.5, 5, 2.75], "texture": "#all"}, - "south": {"uv": [5.25, 2.5, 5.5, 2.75], "texture": "#all"}, - "west": {"uv": [5, 2.5, 5.25, 2.75], "texture": "#all"}, - "east": {"uv": [4.5, 2.5, 4.75, 2.75], "texture": "#all"} + "down": {"uv": [5, 2.25, 5.25, 2.5], "texture": "#all", "tintindex": 0}, + "up": {"uv": [4.75, 2.25, 5, 2.5], "texture": "#all", "tintindex": 0}, + "north": {"uv": [4.75, 2.5, 5, 2.75], "texture": "#all", "tintindex": 0}, + "south": {"uv": [5.25, 2.5, 5.5, 2.75], "texture": "#all", "tintindex": 0}, + "west": {"uv": [5, 2.5, 5.25, 2.75], "texture": "#all", "tintindex": 0}, + "east": {"uv": [4.5, 2.5, 4.75, 2.75], "texture": "#all", "tintindex": 0} } }, { @@ -31,12 +31,12 @@ "from": [6, 20.5, 6], "to": [10, 25.5, 10], "faces": { - "down": {"uv": [6.5, 0, 7.5, 1], "texture": "#all"}, - "up": {"uv": [5.5, 0, 6.5, 1], "texture": "#all"}, - "north": {"uv": [5.5, 1, 6.5, 2.25], "texture": "#all"}, - "south": {"uv": [7.5, 1, 8.5, 2.25], "texture": "#all"}, - "west": {"uv": [6.5, 1, 7.5, 2.25], "texture": "#all"}, - "east": {"uv": [4.5, 1, 5.5, 2.25], "texture": "#all"} + "down": {"uv": [6.5, 0, 7.5, 1], "texture": "#all", "tintindex": 0}, + "up": {"uv": [5.5, 0, 6.5, 1], "texture": "#all", "tintindex": 0}, + "north": {"uv": [5.5, 1, 6.5, 2.25], "texture": "#all", "tintindex": 0}, + "south": {"uv": [7.5, 1, 8.5, 2.25], "texture": "#all", "tintindex": 0}, + "west": {"uv": [6.5, 1, 7.5, 2.25], "texture": "#all", "tintindex": 0}, + "east": {"uv": [4.5, 1, 5.5, 2.25], "texture": "#all", "tintindex": 0} } }, { @@ -44,12 +44,12 @@ "from": [6, 21, 5.5], "to": [10, 25, 10.5], "faces": { - "down": {"uv": [2.25, 2, 3.25, 3.25], "texture": "#all"}, - "up": {"uv": [1.25, 2, 2.25, 3.25], "texture": "#all"}, - "north": {"uv": [1.25, 3.25, 2.25, 4.25], "texture": "#all"}, - "south": {"uv": [3.5, 3.25, 4.5, 4.25], "texture": "#all"}, - "west": {"uv": [2.25, 3.25, 3.5, 4.25], "texture": "#all"}, - "east": {"uv": [0, 3.25, 1.25, 4.25], "texture": "#all"} + "down": {"uv": [2.25, 2, 3.25, 3.25], "texture": "#all", "tintindex": 0}, + "up": {"uv": [1.25, 2, 2.25, 3.25], "texture": "#all", "tintindex": 0}, + "north": {"uv": [1.25, 3.25, 2.25, 4.25], "texture": "#all", "tintindex": 0}, + "south": {"uv": [3.5, 3.25, 4.5, 4.25], "texture": "#all", "tintindex": 0}, + "west": {"uv": [2.25, 3.25, 3.5, 4.25], "texture": "#all", "tintindex": 0}, + "east": {"uv": [0, 3.25, 1.25, 4.25], "texture": "#all", "tintindex": 0} } }, { @@ -57,17 +57,17 @@ "from": [5.5, 21, 6], "to": [10.5, 25, 10], "faces": { - "down": {"uv": [2.25, 0, 3.5, 1], "texture": "#all"}, - "up": {"uv": [1, 0, 2.25, 1], "texture": "#all"}, - "north": {"uv": [1, 1, 2.25, 2], "texture": "#all"}, - "south": {"uv": [3.25, 1, 4.5, 2], "texture": "#all"}, - "west": {"uv": [2.25, 1, 3.25, 2], "texture": "#all"}, - "east": {"uv": [0, 1, 1, 2], "texture": "#all"} + "down": {"uv": [2.25, 0, 3.5, 1], "texture": "#all", "tintindex": 0}, + "up": {"uv": [1, 0, 2.25, 1], "texture": "#all", "tintindex": 0}, + "north": {"uv": [1, 1, 2.25, 2], "texture": "#all", "tintindex": 0}, + "south": {"uv": [3.25, 1, 4.5, 2], "texture": "#all", "tintindex": 0}, + "west": {"uv": [2.25, 1, 3.25, 2], "texture": "#all", "tintindex": 0}, + "east": {"uv": [0, 1, 1, 2], "texture": "#all", "tintindex": 0} } } ], "textures": { - "all": "...", + "all": "mekanism:entities/Balloon", "particle": "..." } } diff --git a/src/main/resources/assets/mekanism/models/item/Balloon.json b/src/main/resources/assets/mekanism/models/item/Balloon.json index f65c531c4..124a9e243 100644 --- a/src/main/resources/assets/mekanism/models/item/Balloon.json +++ b/src/main/resources/assets/mekanism/models/item/Balloon.json @@ -2,9 +2,17 @@ "parent": "mekanism:entity/balloon", "display": { "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] + "rotation": [ -150, 0, 10 ], + "translation": [ 0, 1.5, -0.4 ], + "scale": [ 1.8, 1.8, 1.8 ] + }, + "firstperson": { + "translation": [ 0, -2, 0 ], + "scale": [ 1.8, 1.8, 1.8 ] + }, + "gui": { + "translation": [ 0, -7.4, 0 ], + "scale": [ 1.5, 1.5, 1.5 ] } } } diff --git a/src/main/resources/assets/mekanism/textures/blocks/SalinationBlock.png b/src/main/resources/assets/mekanism/textures/blocks/SalinationBlock.png deleted file mode 100644 index 7023484ed..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/SalinationBlock.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SalinationController.png b/src/main/resources/assets/mekanism/textures/blocks/SalinationController.png deleted file mode 100644 index b0d3b7707..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/SalinationController.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png b/src/main/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png deleted file mode 100644 index aee804efd..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png.mcmeta b/src/main/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png.mcmeta deleted file mode 100644 index efc331201..000000000 --- a/src/main/resources/assets/mekanism/textures/blocks/SalinationControllerOn.png.mcmeta +++ /dev/null @@ -1,5 +0,0 @@ -{ - "animation": { - "frametime": 10 - } -} diff --git a/src/main/resources/assets/mekanism/textures/blocks/SalinationValve.png b/src/main/resources/assets/mekanism/textures/blocks/SalinationValve.png deleted file mode 100644 index 3fd06552d..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/SalinationValve.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/SteelBlock_Oxidized.png b/src/main/resources/assets/mekanism/textures/blocks/SteelBlock_Oxidized.png deleted file mode 100644 index 06621f301..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/SteelBlock_Oxidized.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/Teleporter.png b/src/main/resources/assets/mekanism/textures/blocks/Teleporter.png deleted file mode 100644 index 46b046fff..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/Teleporter.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/TeleporterFrame.png b/src/main/resources/assets/mekanism/textures/blocks/TeleporterFrame.png deleted file mode 100644 index 702e2a971..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/TeleporterFrame.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/TeleporterFront.png b/src/main/resources/assets/mekanism/textures/blocks/TeleporterFront.png deleted file mode 100644 index 66e5f8391..000000000 Binary files a/src/main/resources/assets/mekanism/textures/blocks/TeleporterFront.png and /dev/null differ diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port_input-ctm.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port-ctm.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port_input-ctm.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port-ctm.png diff --git a/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port_input.png b/src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port.png similarity index 100% rename from src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port_input.png rename to src/main/resources/assets/mekanism/textures/blocks/ctm/induction_port.png diff --git a/src/main/resources/assets/mekanism/textures/entities/Balloon.png b/src/main/resources/assets/mekanism/textures/entities/Balloon.png new file mode 100644 index 000000000..c482ae1ec Binary files /dev/null and b/src/main/resources/assets/mekanism/textures/entities/Balloon.png differ