diff --git a/src/main/java/mekanism/api/Coord4D.java b/src/main/java/mekanism/api/Coord4D.java index 10bb887fd..4dbaf23be 100644 --- a/src/main/java/mekanism/api/Coord4D.java +++ b/src/main/java/mekanism/api/Coord4D.java @@ -169,7 +169,7 @@ public class Coord4D extends BlockPos * Writes this Coord4D's data to an ArrayList for packet transfer. * @param data - the ArrayList to add the data to */ - public void write(ArrayList data) + public void write(ArrayList data) { data.add(getX()); data.add(getY()); diff --git a/src/main/java/mekanism/api/gas/Gas.java b/src/main/java/mekanism/api/gas/Gas.java index 1ede05f48..7e8aff3ec 100644 --- a/src/main/java/mekanism/api/gas/Gas.java +++ b/src/main/java/mekanism/api/gas/Gas.java @@ -1,5 +1,10 @@ package mekanism.api.gas; +import mekanism.client.render.MekanismRenderer; +import mekanism.client.render.MekanismRenderer.FluidType; + +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -19,7 +24,9 @@ public class Gas private Fluid fluid; - private ResourceLocation icon; + private ResourceLocation iconLocation; + + private TextureAtlasSprite sprite; private boolean visible = true; @@ -40,7 +47,7 @@ public class Gas public Gas(Fluid f) { unlocalizedName = name = f.getName(); - icon = f.getStill(); + iconLocation = f.getStill(); fluid = f; from_fluid = true; } @@ -115,8 +122,22 @@ public class Gas { return this.getFluid().getStill(); } - - return icon; + + return iconLocation; + } + + /** + * Gets the Sprite associated with this Gas. + * @return associated IIcon + */ + public TextureAtlasSprite getSprite() + { + if(from_fluid) + { + return MekanismRenderer.getFluidTexture(fluid, FluidType.STILL); + } + + return sprite; } /** @@ -124,16 +145,11 @@ public class Gas * @param i - IIcon to associate with this Gas * @return this Gas object */ - public Gas setIcon(ResourceLocation i) + public Gas setIcon(TextureMap map, String location) { - icon = i; + iconLocation = new ResourceLocation(location); -/* - if(hasFluid()) - { - fluid.setIcons(getIcon()); - } -*/ + sprite = map.registerSprite(iconLocation); from_fluid = false; diff --git a/src/main/java/mekanism/api/infuse/InfuseType.java b/src/main/java/mekanism/api/infuse/InfuseType.java index d93726043..1735f0dc1 100644 --- a/src/main/java/mekanism/api/infuse/InfuseType.java +++ b/src/main/java/mekanism/api/infuse/InfuseType.java @@ -2,6 +2,7 @@ package mekanism.api.infuse; import mekanism.common.Resource; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.util.ResourceLocation; import net.minecraft.util.StatCollector; @@ -17,6 +18,8 @@ public final class InfuseType /** This infuse GUI's icon */ public ResourceLocation icon; + + public TextureAtlasSprite sprite; /** The location of this infuse GUI's icon */ public String textureLocation; diff --git a/src/main/java/mekanism/client/model/item/EnergyCubeItemModel.java b/src/main/java/mekanism/client/model/item/EnergyCubeItemModel.java new file mode 100644 index 000000000..3decada31 --- /dev/null +++ b/src/main/java/mekanism/client/model/item/EnergyCubeItemModel.java @@ -0,0 +1,75 @@ +package mekanism.client.model.item; + +import java.util.List; + +import mekanism.common.Tier.EnergyCubeTier; +import mekanism.common.base.IEnergyCube; + +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 EnergyCubeItemModel implements ISmartItemModel { + + public IBakedModel[] models; + + public EnergyCubeItemModel(IBakedModel[] models) + { + this.models = models; + } + + @Override + public IBakedModel handleItemState(ItemStack stack) { + EnergyCubeTier tier = ((IEnergyCube)stack.getItem()).getEnergyCubeTier(stack); + if(tier.ordinal() < models.length) return models[tier.ordinal()]; + return models[0]; + } + + @Override + public List getFaceQuads(EnumFacing side) + { + return models[0].getFaceQuads(side); + } + + @Override + public List getGeneralQuads() + { + return models[0].getGeneralQuads(); + } + + @Override + public boolean isAmbientOcclusion() + { + return models[0].isAmbientOcclusion(); + } + + @Override + public boolean isGui3d() + { + return models[0].isGui3d(); + } + + @Override + public boolean isBuiltInRenderer() + { + return models[0].isBuiltInRenderer(); + } + + @Override + public TextureAtlasSprite getParticleTexture() + { + return models[0].getParticleTexture(); + } + + @Override + public ItemCameraTransforms getItemCameraTransforms() + { + return models[0].getItemCameraTransforms(); + } +} \ No newline at end of file diff --git a/src/main/java/mekanism/client/render/MekanismRenderer.java b/src/main/java/mekanism/client/render/MekanismRenderer.java index 030d6a095..e67bb4135 100644 --- a/src/main/java/mekanism/client/render/MekanismRenderer.java +++ b/src/main/java/mekanism/client/render/MekanismRenderer.java @@ -50,10 +50,18 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import com.google.common.collect.Maps; + @SideOnly(Side.CLIENT) public class MekanismRenderer { //private static RenderBlocks renderBlocks = new RenderBlocks(); + + public enum FluidType + { + STILL, + FLOWING; + } public static TextureAtlasSprite[] colors = new TextureAtlasSprite[256]; @@ -76,75 +84,132 @@ public class MekanismRenderer { MinecraftForge.EVENT_BUS.register(new MekanismRenderer()); } + + public static TextureAtlasSprite missingIcon; + + public static Map> textureMap = new HashMap>(); -/* + @SubscribeEvent public void onStitch(TextureStitchEvent.Pre event) { - if(event.map.getGlTextureId()*/ -/*TODO Is this right?*//* - == 0) +/* + if(event.map.locationBlocksTexture) { - for(EnumColor color : EnumColor.values()) - { - colors[color.ordinal()] = event.map.registerSprite(new ResourceLocation("mekanism:overlay/overlay_" + color.unlocalizedName)); - } - - for(TransmissionType type : TransmissionType.values()) - { - overlays.put(type, event.map.registerSprite(new ResourceLocation("mekanism:overlay/" + type.getTransmission() + "Overlay"))); - } - - energyIcon = event.map.registerSprite("mekanism:LiquidEnergy"); - heatIcon = event.map.registerSprite("mekanism:LiquidHeat"); - - GasRegistry.getGas("hydrogen").setIcon(event.map.registerSprite("mekanism:LiquidHydrogen")); - GasRegistry.getGas("oxygen").setIcon(event.map.registerSprite("mekanism:LiquidOxygen")); - GasRegistry.getGas("water").setIcon(event.map.registerSprite("mekanism:LiquidSteam")); - GasRegistry.getGas("chlorine").setIcon(event.map.registerSprite("mekanism:LiquidChlorine")); - GasRegistry.getGas("sulfurDioxideGas").setIcon(event.map.registerSprite("mekanism:LiquidSulfurDioxide")); - GasRegistry.getGas("sulfurTrioxideGas").setIcon(event.map.registerSprite("mekanism:LiquidSulfurTrioxide")); - GasRegistry.getGas("sulfuricAcid").setIcon(event.map.registerSprite("mekanism:LiquidSulfuricAcid")); - GasRegistry.getGas("hydrogenChloride").setIcon(event.map.registerSprite("mekanism:LiquidHydrogenChloride")); - GasRegistry.getGas("liquidOsmium").setIcon(event.map.registerSprite("mekanism:LiquidOsmium")); - GasRegistry.getGas("liquidStone").setIcon(event.map.registerSprite("mekanism:LiquidStone")); - GasRegistry.getGas("ethene").setIcon(event.map.registerSprite("mekanism:LiquidEthene")); - GasRegistry.getGas("brine").setIcon(event.map.registerSprite("mekanism:LiquidBrine")); - GasRegistry.getGas("sodium").setIcon(event.map.registerSprite("mekanism:LiquidSodium")); - GasRegistry.getGas("deuterium").setIcon(event.map.registerSprite("mekanism:LiquidDeuterium")); - GasRegistry.getGas("tritium").setIcon(event.map.registerSprite("mekanism:LiquidTritium")); - GasRegistry.getGas("fusionFuelDT").setIcon(event.map.registerSprite("mekanism:LiquidDT")); - GasRegistry.getGas("steam").setIcon(event.map.registerSprite("mekanism:LiquidSteam")); - GasRegistry.getGas("lithium").setIcon(event.map.registerSprite("mekanism:LiquidLithium")); - for(Gas gas : GasRegistry.getRegisteredGasses()) +*/ + initFluidTextures(event.map); + + for(EnumColor color : EnumColor.values()) + { + colors[color.ordinal()] = event.map.registerSprite(new ResourceLocation("mekanism:overlay/overlay_" + color.unlocalizedName)); + } + + for(TransmissionType type : TransmissionType.values()) + { + overlays.put(type, event.map.registerSprite(new ResourceLocation("mekanism:overlay/" + type.getTransmission() + "Overlay"))); + } + + energyIcon = event.map.registerSprite(new ResourceLocation("mekanism:LiquidEnergy")); + heatIcon = event.map.registerSprite(new ResourceLocation("mekanism:LiquidHeat")); + + GasRegistry.getGas("hydrogen").setIcon(event.map, "mekanism:LiquidHydrogen"); + GasRegistry.getGas("oxygen").setIcon(event.map,"mekanism:LiquidOxygen"); + GasRegistry.getGas("water").setIcon(event.map,"mekanism:LiquidSteam"); + GasRegistry.getGas("chlorine").setIcon(event.map,"mekanism:LiquidChlorine"); + GasRegistry.getGas("sulfurDioxideGas").setIcon(event.map,"mekanism:LiquidSulfurDioxide"); + GasRegistry.getGas("sulfurTrioxideGas").setIcon(event.map,"mekanism:LiquidSulfurTrioxide"); + GasRegistry.getGas("sulfuricAcid").setIcon(event.map,"mekanism:LiquidSulfuricAcid"); + GasRegistry.getGas("hydrogenChloride").setIcon(event.map,"mekanism:LiquidHydrogenChloride"); + GasRegistry.getGas("liquidOsmium").setIcon(event.map,"mekanism:LiquidOsmium"); + GasRegistry.getGas("liquidStone").setIcon(event.map,"mekanism:LiquidStone"); + GasRegistry.getGas("ethene").setIcon(event.map,"mekanism:LiquidEthene"); + GasRegistry.getGas("brine").setIcon(event.map,"mekanism:LiquidBrine"); + GasRegistry.getGas("sodium").setIcon(event.map,"mekanism:LiquidSodium"); + GasRegistry.getGas("deuterium").setIcon(event.map,"mekanism:LiquidDeuterium"); + GasRegistry.getGas("tritium").setIcon(event.map,"mekanism:LiquidTritium"); + GasRegistry.getGas("fusionFuelDT").setIcon(event.map,"mekanism:LiquidDT"); + GasRegistry.getGas("steam").setIcon(event.map,"mekanism:LiquidSteam"); + GasRegistry.getGas("lithium").setIcon(event.map,"mekanism:LiquidLithium"); + + for(Gas gas : GasRegistry.getRegisteredGasses()) + { + if(gas instanceof OreGas) { - if(gas instanceof OreGas) + if(gas.getUnlocalizedName().contains("clean")) { - if(gas.getUnlocalizedName().contains("clean")) - { - gas.setIcon(event.map.registerSprite("mekanism:LiquidCleanOre")); - } - else { - gas.setIcon(event.map.registerSprite("mekanism:LiquidOre")); - } + gas.setIcon(event.map,"mekanism:LiquidCleanOre"); + } + else { + gas.setIcon(event.map,"mekanism:LiquidOre"); } } + } - FluidRegistry.getFluid("brine").setIcons(event.map.registerSprite("mekanism:LiquidBrine")); - FluidRegistry.getFluid("heavywater").setIcons(event.map.registerSprite("mekanism:LiquidHeavyWater")); +/* + if(RenderPartTransmitter.getInstance() != null) + { + RenderPartTransmitter.getInstance().resetDisplayInts(); + } +*/ - if(RenderPartTransmitter.getInstance() != null) - { - RenderPartTransmitter.getInstance().resetDisplayInts(); + RenderDynamicTank.resetDisplayInts(); + RenderSalinationController.resetDisplayInts(); + RenderPortableTank.resetDisplayInts(); +/* + } +*/ + } + + public static void initFluidTextures(TextureMap map) { + missingIcon = map.getMissingSprite(); + + textureMap.clear(); + + for (FluidType type : FluidType.values()) { + textureMap.put(type, new HashMap()); + } + + for (Fluid fluid : FluidRegistry.getRegisteredFluids().values()) { + // TextureAtlasSprite toUse = null; + + if (fluid.getFlowing() != null) { + String flow = fluid.getFlowing().toString(); + TextureAtlasSprite sprite; + if (map.getTextureExtry(flow) != null) { + sprite = map.getTextureExtry(flow); + } else { + sprite = map.registerSprite(fluid.getStill()); + } + // toUse = sprite; + textureMap.get(FluidType.FLOWING).put(fluid, sprite); } - - RenderDynamicTank.resetDisplayInts(); - RenderSalinationController.resetDisplayInts(); - RenderPortableTank.resetDisplayInts(); + + if (fluid.getStill() != null) { + String still = fluid.getStill().toString(); + TextureAtlasSprite sprite; + if (map.getTextureExtry(still) != null) { + sprite = map.getTextureExtry(still); + } else { + sprite = map.registerSprite(fluid.getStill()); + } + // toUse = sprite; + textureMap.get(FluidType.STILL).put(fluid, sprite); + } + // if (toUse != null) { + // textureMap.get(FluidType.FROZEN).put(fluid, toUse); + // } } } -*/ + + + public static TextureAtlasSprite getFluidTexture(Fluid fluid, FluidType type) { + if (fluid == null || type == null) { + return missingIcon; + } + Map map = textureMap.get(type); + return map.containsKey(fluid) ? map.get(fluid) : missingIcon; + } public static boolean blockIconExists(String texture) //Credit to CoFHCore { diff --git a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java index 68fe3428d..3f70637f9 100644 --- a/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java +++ b/src/main/java/mekanism/client/render/item/ItemRenderingHandler.java @@ -1,77 +1,12 @@ package mekanism.client.render.item; -import mekanism.api.EnumColor; -import mekanism.api.energy.IEnergizedItem; -import mekanism.client.ClientProxy; -import mekanism.client.MekanismClient; -import mekanism.client.model.ModelArmoredJetpack; -import mekanism.client.model.ModelAtomicDisassembler; -import mekanism.client.model.ModelEnergyCube; -import mekanism.client.model.ModelEnergyCube.ModelEnergyCore; -import mekanism.client.model.ModelFlamethrower; -import mekanism.client.model.ModelFreeRunners; -import mekanism.client.model.ModelGasMask; -import mekanism.client.model.ModelGasTank; -import mekanism.client.model.ModelJetpack; -import mekanism.client.model.ModelObsidianTNT; -import mekanism.client.model.ModelPortableTank; -import mekanism.client.model.ModelRobit; -import mekanism.client.model.ModelScubaTank; -import mekanism.client.render.MekanismRenderer; -import mekanism.client.render.RenderGlowPanel; -import mekanism.client.render.RenderPartTransmitter; -import mekanism.client.render.entity.RenderBalloon; -import mekanism.client.render.tileentity.RenderBin; -import mekanism.client.render.tileentity.RenderPortableTank; -import mekanism.common.MekanismBlocks; -import mekanism.common.MekanismItems; -import mekanism.common.Tier.EnergyCubeTier; -import mekanism.common.base.IEnergyCube; -import mekanism.common.block.BlockMachine.MachineType; -import mekanism.common.inventory.InventoryBin; -import mekanism.common.item.ItemAtomicDisassembler; -import mekanism.common.item.ItemBalloon; -import mekanism.common.item.ItemBlockBasic; -import mekanism.common.item.ItemBlockMachine; -import mekanism.common.item.ItemFlamethrower; -import mekanism.common.item.ItemFreeRunners; -import mekanism.common.item.ItemGasMask; -import mekanism.common.item.ItemRobit; -import mekanism.common.item.ItemScubaTank; -import mekanism.common.item.ItemWalkieTalkie; -import mekanism.common.multipart.ItemGlowPanel; -import mekanism.common.multipart.ItemPartTransmitter; -import mekanism.common.multipart.TransmitterType; -import mekanism.common.tile.TileEntityBin; -import mekanism.common.tile.TileEntityPortableTank; -import mekanism.common.util.MekanismUtils; -import mekanism.common.util.MekanismUtils.ResourceType; -import net.minecraft.block.Block; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.model.ModelChest; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.RenderHelper; -import net.minecraft.client.renderer.entity.RenderItem; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraftforge.client.IItemRenderer; -import net.minecraftforge.common.util.ForgeDirection; -import net.minecraftforge.fluids.Fluid; - -import org.lwjgl.opengl.GL11; - -import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @SideOnly(Side.CLIENT) -public class ItemRenderingHandler implements IItemRenderer +public class ItemRenderingHandler// implements IItemRenderer { + /* public ModelRobit robit = new ModelRobit(); public ModelChest electricChest = new ModelChest(); public ModelEnergyCube energyCube = new ModelEnergyCube(); @@ -173,7 +108,7 @@ public class ItemRenderingHandler implements IItemRenderer { RenderingRegistry.instance().renderInventoryBlock((RenderBlocks)data[0], MekanismBlocks.BasicBlock, item.getItemDamage(), ClientProxy.BASIC_RENDER_ID); - if(binRenderer == null || binRenderer.func_147498_b()/*getFontRenderer()*/ == null) + if(binRenderer == null || binRenderer.func_147498_b()/*getFontRenderer()* / == null) { return; } @@ -223,7 +158,7 @@ public class ItemRenderingHandler implements IItemRenderer GL11.glDisable(GL11.GL_LIGHTING); - renderItem.renderItemAndEffectIntoGUI(binRenderer.func_147498_b()/*getFontRenderer()*/, renderEngine, itemStack, 0, 0); + renderItem.renderItemAndEffectIntoGUI(binRenderer.func_147498_b()/*getFontRenderer()* /, renderEngine, itemStack, 0, 0); GL11.glEnable(GL11.GL_LIGHTING); GL11.glPopMatrix(); @@ -537,4 +472,5 @@ public class ItemRenderingHandler implements IItemRenderer } } } + */ } diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 527c44205..0eea5ab64 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -29,6 +29,7 @@ import mekanism.api.transmitters.DynamicNetwork.NetworkClientRequest; import mekanism.api.transmitters.DynamicNetwork.TransmittersAddedEvent; import mekanism.api.transmitters.TransmitterNetworkRegistry; import mekanism.client.ClientTickHandler; +import mekanism.client.model.item.EnergyCubeItemModel; import mekanism.common.EnergyNetwork.EnergyTransferEvent; import mekanism.common.FluidNetwork.FluidTransferEvent; import mekanism.common.Tier.BaseTier; @@ -83,6 +84,9 @@ import mekanism.common.tile.TileEntityThermoelectricValve; import mekanism.common.util.MekanismUtils; import mekanism.common.voice.VoiceServerManager; import mekanism.common.world.GenHandler; + +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.entity.EnumCreatureType; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -95,6 +99,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.biome.WorldChunkManager; +import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.config.Configuration; @@ -103,6 +108,8 @@ import net.minecraftforge.event.world.ChunkEvent; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.RecipeSorter; import net.minecraftforge.oredict.RecipeSorter.Category; @@ -1460,4 +1467,16 @@ public class Mekanism proxy.onConfigSync(false); } } + + @SubscribeEvent + @SideOnly(Side.CLIENT) + public void registerModels(ModelBakeEvent event) { + ModelResourceLocation mrl = new ModelResourceLocation("mekanism:energy_cube", "inventory"); + IBakedModel b = event.modelRegistry.getObject(new ModelResourceLocation("mekanism:EnergyCube", "facing=north,tier=basic")); + IBakedModel a = event.modelRegistry.getObject(new ModelResourceLocation("mekanism:EnergyCube", "facing=north,tier=advanced")); + IBakedModel e = event.modelRegistry.getObject(new ModelResourceLocation("mekanism:EnergyCube", "facing=north,tier=elite")); + IBakedModel u = event.modelRegistry.getObject(new ModelResourceLocation("mekanism:EnergyCube", "facing=north,tier=ultimate")); + IBakedModel c = event.modelRegistry.getObject(new ModelResourceLocation("mekanism:EnergyCube", "facing=north,tier=creative")); + event.modelRegistry.putObject(mrl, new EnergyCubeItemModel(new IBakedModel[]{b, a, e, u, c})); + } } diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java index 04e70ad39..4455705ff 100644 --- a/src/main/java/mekanism/common/MekanismBlocks.java +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -1,5 +1,6 @@ package mekanism.common; +import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.block.BlockBasic; import mekanism.common.block.BlockBounding; import mekanism.common.block.BlockCardboardBox; @@ -111,6 +112,8 @@ public class MekanismBlocks mesher.register(Item.getItemFromBlock(type.blockType.getBlock()), type.meta, new ModelResourceLocation("mekanism:" + type.getName(), "inventory")); } + mesher.register(Item.getItemFromBlock(EnergyCube), 0, new ModelResourceLocation("mekanism:energy_cube", "inventory")); + ModelBakery.registerItemVariants(Item.getItemFromBlock(MachineBlock), new ResourceLocation("mekanism", "enrichment_chamber"), new ResourceLocation("mekanism", "osmium_compressor"), @@ -120,7 +123,7 @@ public class MekanismBlocks new ResourceLocation("mekanism", "basic_factory"), new ResourceLocation("mekanism", "advanced_factory"), new ResourceLocation("mekanism", "elite_factory"), - new ResourceLocation("mekanism", "metallurgic_infuser"), + //new ResourceLocation("mekanism", "metallurgic_infuser"), new ResourceLocation("mekanism", "purification_chamber"), new ResourceLocation("mekanism", "energized_smelter"), new ResourceLocation("mekanism", "teleporter"), diff --git a/src/main/java/mekanism/common/PacketHandler.java b/src/main/java/mekanism/common/PacketHandler.java index eb437355e..a990ad36c 100644 --- a/src/main/java/mekanism/common/PacketHandler.java +++ b/src/main/java/mekanism/common/PacketHandler.java @@ -81,6 +81,8 @@ import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; import net.minecraftforge.fml.relauncher.Side; +import scala.tools.nsc.Global.Run; + /** * Mekanism packet handler. As always, use packets sparingly! * @author AidanBrady @@ -201,6 +203,10 @@ public class PacketHandler { encode(((ArrayList)data).toArray(), output); } + else + { + throw new RuntimeException("Un-encodable data passed to encode(): " + data); + } } } catch(Exception e) { Mekanism.logger.error("Error while encoding packet data."); diff --git a/src/main/java/mekanism/common/block/BlockBounding.java b/src/main/java/mekanism/common/block/BlockBounding.java index b99a50adf..aac40beb4 100644 --- a/src/main/java/mekanism/common/block/BlockBounding.java +++ b/src/main/java/mekanism/common/block/BlockBounding.java @@ -1,10 +1,12 @@ package mekanism.common.block; +import mekanism.common.block.states.BlockStateBounding; import mekanism.common.tile.TileEntityAdvancedBoundingBlock; import mekanism.common.tile.TileEntityBoundingBlock; import net.minecraft.block.Block; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; @@ -26,6 +28,26 @@ public class BlockBounding extends Block setResistance(8F); } + public BlockState createBlockState() + { + return new BlockStateBounding(this); + } + + @Override + public IBlockState getStateFromMeta(int meta) + { + boolean isAdvanced = meta > 0; + + return this.getDefaultState().withProperty(BlockStateBounding.advancedProperty, isAdvanced); + } + + @Override + public int getMetaFromState(IBlockState state) + { + boolean isAdvanced = state.getValue(BlockStateBounding.advancedProperty); + return isAdvanced ? 1 : 0; + } + /* @Override @SideOnly(Side.CLIENT) @@ -115,15 +137,13 @@ public class BlockBounding extends Block @Override public TileEntity createTileEntity(World world, IBlockState state) { - if(getMetaFromState(state) == 0) - { - return new TileEntityBoundingBlock(); - } - else if(getMetaFromState(state) == 1) + if(state.getValue(BlockStateBounding.advancedProperty)) { return new TileEntityAdvancedBoundingBlock(); } - - return null; + else + { + return new TileEntityBoundingBlock(); + } } } diff --git a/src/main/java/mekanism/common/block/BlockEnergyCube.java b/src/main/java/mekanism/common/block/BlockEnergyCube.java index faa800a1d..789c515cb 100644 --- a/src/main/java/mekanism/common/block/BlockEnergyCube.java +++ b/src/main/java/mekanism/common/block/BlockEnergyCube.java @@ -1,5 +1,8 @@ package mekanism.common.block; +import java.util.List; +import java.util.Random; + import buildcraft.api.tools.IToolWrench; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; @@ -9,6 +12,8 @@ import mekanism.common.MekanismBlocks; import mekanism.common.Tier.EnergyCubeTier; import mekanism.common.base.IEnergyCube; import mekanism.common.base.ISustainedInventory; +import mekanism.common.block.states.BlockStateEnergyCube; +import mekanism.common.block.states.BlockStateFacing; import mekanism.common.item.ItemBlockEnergyCube; import mekanism.common.tile.TileEntityBasicBlock; import mekanism.common.tile.TileEntityEnergyCube; @@ -17,6 +22,7 @@ import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.block.state.BlockState; import net.minecraft.block.state.IBlockState; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; @@ -26,15 +32,12 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.EnumFacing.AxisDirection; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; -import buildcraft.api.tools.IToolWrench; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; /** * Block class for handling multiple energy cube block IDs. @@ -56,6 +59,45 @@ public class BlockEnergyCube extends BlockContainer setCreativeTab(Mekanism.tabMekanism); } + @Override + public BlockState createBlockState() + { + return new BlockStateEnergyCube(this); + } + + @Override + public int getMetaFromState(IBlockState state) + { + return 0; + } + + @Override + public IBlockState getStateFromMeta(int meta) + { + return getDefaultState(); + } + + @Override + public IBlockState getActualState(IBlockState state, IBlockAccess worldIn, BlockPos pos) + { + TileEntity tile = worldIn.getTileEntity(pos); + if(tile instanceof TileEntityEnergyCube) + { + TileEntityEnergyCube cube = (TileEntityEnergyCube)tile; + if(cube.facing != null) + { + state = state.withProperty(BlockStateFacing.facingProperty, cube.facing); + } + + if(cube.tier != null) + { + state = state.withProperty(BlockStateEnergyCube.typeProperty, cube.tier); + } + } + + return state; + } + /* @Override @SideOnly(Side.CLIENT) @@ -220,7 +262,7 @@ public class BlockEnergyCube extends BlockContainer @Override public int getRenderType() { - return -1; + return 3; } @Override diff --git a/src/main/java/mekanism/common/block/BlockGasTank.java b/src/main/java/mekanism/common/block/BlockGasTank.java index 688b2f6e7..a5694b98d 100644 --- a/src/main/java/mekanism/common/block/BlockGasTank.java +++ b/src/main/java/mekanism/common/block/BlockGasTank.java @@ -21,17 +21,11 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.BlockPos; +import net.minecraft.util.EnumFacing; import net.minecraft.util.MathHelper; import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; import buildcraft.api.tools.IToolWrench; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -import buildcraft.api.tools.IToolWrench; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; public class BlockGasTank extends BlockContainer { diff --git a/src/main/java/mekanism/common/block/BlockMachine.java b/src/main/java/mekanism/common/block/BlockMachine.java index 177171d6c..8766d139d 100644 --- a/src/main/java/mekanism/common/block/BlockMachine.java +++ b/src/main/java/mekanism/common/block/BlockMachine.java @@ -163,7 +163,7 @@ public abstract class BlockMachine extends BlockContainer implements ISpecialBou { MachineType type = MachineType.get(getMachineBlock(), meta&0xF); - return this.getDefaultState().withProperty(getProperty(), type); + return getDefaultState().withProperty(getProperty(), type); } @Override diff --git a/src/main/java/mekanism/common/block/states/BlockStateEnergyCube.java b/src/main/java/mekanism/common/block/states/BlockStateEnergyCube.java index 4324da397..bdc4e0809 100644 --- a/src/main/java/mekanism/common/block/states/BlockStateEnergyCube.java +++ b/src/main/java/mekanism/common/block/states/BlockStateEnergyCube.java @@ -12,7 +12,7 @@ import net.minecraft.block.properties.PropertyEnum; */ public class BlockStateEnergyCube extends BlockStateFacing { - public static final PropertyEnum typeProperty = PropertyEnum.create("tier", Tier.EnergyCubeTier.class); + public static final PropertyEnum typeProperty = PropertyEnum.create("tier", Tier.EnergyCubeTier.class); public BlockStateEnergyCube(BlockEnergyCube block) { diff --git a/src/main/java/mekanism/common/content/miner/MItemStackFilter.java b/src/main/java/mekanism/common/content/miner/MItemStackFilter.java index 8dee7b9b2..8808c0ef6 100644 --- a/src/main/java/mekanism/common/content/miner/MItemStackFilter.java +++ b/src/main/java/mekanism/common/content/miner/MItemStackFilter.java @@ -61,7 +61,7 @@ public class MItemStackFilter extends MinerFilter } @Override - public void write(ArrayList data) + public void write(ArrayList data) { data.add(0); diff --git a/src/main/java/mekanism/common/content/miner/MMaterialFilter.java b/src/main/java/mekanism/common/content/miner/MMaterialFilter.java index 5fb478ab1..3121a5de8 100644 --- a/src/main/java/mekanism/common/content/miner/MMaterialFilter.java +++ b/src/main/java/mekanism/common/content/miner/MMaterialFilter.java @@ -54,7 +54,7 @@ public class MMaterialFilter extends MinerFilter } @Override - public void write(ArrayList data) + public void write(ArrayList data) { data.add(2); diff --git a/src/main/java/mekanism/common/content/miner/MModIDFilter.java b/src/main/java/mekanism/common/content/miner/MModIDFilter.java index afa592e96..8af8abc1a 100644 --- a/src/main/java/mekanism/common/content/miner/MModIDFilter.java +++ b/src/main/java/mekanism/common/content/miner/MModIDFilter.java @@ -46,7 +46,7 @@ public class MModIDFilter extends MinerFilter } @Override - public void write(ArrayList data) + public void write(ArrayList data) { data.add(3); diff --git a/src/main/java/mekanism/common/content/miner/MOreDictFilter.java b/src/main/java/mekanism/common/content/miner/MOreDictFilter.java index 99347eca1..322cef314 100644 --- a/src/main/java/mekanism/common/content/miner/MOreDictFilter.java +++ b/src/main/java/mekanism/common/content/miner/MOreDictFilter.java @@ -46,7 +46,7 @@ public class MOreDictFilter extends MinerFilter } @Override - public void write(ArrayList data) + public void write(ArrayList data) { data.add(1); diff --git a/src/main/java/mekanism/common/content/miner/MinerFilter.java b/src/main/java/mekanism/common/content/miner/MinerFilter.java index 483075d5b..d9e2b7999 100644 --- a/src/main/java/mekanism/common/content/miner/MinerFilter.java +++ b/src/main/java/mekanism/common/content/miner/MinerFilter.java @@ -40,7 +40,7 @@ public abstract class MinerFilter } } - public void write(ArrayList data) + public void write(ArrayList data) { data.add(requireStack); diff --git a/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java b/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java index 2e716dd07..91e029d09 100644 --- a/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TItemStackFilter.java @@ -81,7 +81,7 @@ public class TItemStackFilter extends TransporterFilter } @Override - public void write(ArrayList data) + public void write(ArrayList data) { data.add(0); diff --git a/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java b/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java index ffb24e9a9..cfbe0e2a5 100644 --- a/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TMaterialFilter.java @@ -61,7 +61,7 @@ public class TMaterialFilter extends TransporterFilter } @Override - public void write(ArrayList data) + public void write(ArrayList data) { data.add(2); diff --git a/src/main/java/mekanism/common/content/transporter/TModIDFilter.java b/src/main/java/mekanism/common/content/transporter/TModIDFilter.java index 92ae3b9b4..40d3d77ea 100644 --- a/src/main/java/mekanism/common/content/transporter/TModIDFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TModIDFilter.java @@ -52,7 +52,7 @@ public class TModIDFilter extends TransporterFilter } @Override - public void write(ArrayList data) + public void write(ArrayList data) { data.add(3); diff --git a/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java b/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java index 8f54ea554..432d102f1 100644 --- a/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TOreDictFilter.java @@ -52,7 +52,7 @@ public class TOreDictFilter extends TransporterFilter } @Override - public void write(ArrayList data) + public void write(ArrayList data) { data.add(1); diff --git a/src/main/java/mekanism/common/content/transporter/TransporterFilter.java b/src/main/java/mekanism/common/content/transporter/TransporterFilter.java index 7d927cc7c..925504919 100644 --- a/src/main/java/mekanism/common/content/transporter/TransporterFilter.java +++ b/src/main/java/mekanism/common/content/transporter/TransporterFilter.java @@ -47,7 +47,7 @@ public abstract class TransporterFilter } } - public void write(ArrayList data) + public void write(ArrayList data) { if(color != null) { diff --git a/src/main/java/mekanism/common/frequency/Frequency.java b/src/main/java/mekanism/common/frequency/Frequency.java index cfedb1c8a..142bb7744 100644 --- a/src/main/java/mekanism/common/frequency/Frequency.java +++ b/src/main/java/mekanism/common/frequency/Frequency.java @@ -109,7 +109,7 @@ public class Frequency publicFreq = nbtTags.getBoolean("publicFreq"); } - public void write(ArrayList data) + public void write(ArrayList data) { data.add(name); data.add(owner); diff --git a/src/main/java/mekanism/common/network/PacketTileEntity.java b/src/main/java/mekanism/common/network/PacketTileEntity.java index d2b2ac4ea..c455d02bf 100644 --- a/src/main/java/mekanism/common/network/PacketTileEntity.java +++ b/src/main/java/mekanism/common/network/PacketTileEntity.java @@ -41,13 +41,13 @@ public class PacketTileEntity implements IMessageHandler parameters; public ByteBuf storedBuffer = null; public TileEntityMessage() {} - public TileEntityMessage(Coord4D coord, ArrayList params) + public TileEntityMessage(Coord4D coord, ArrayList params) { coord4D = coord; parameters = params; diff --git a/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java b/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java index 44b706879..cfffa8835 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityBasicMachine.java @@ -167,7 +167,7 @@ public abstract class TileEntityBasicMachine, data.add(operatingTicks); data.add(isActive); data.add(ticksRequired); - data.add(controlType); + data.add(controlType.ordinal()); return data; } diff --git a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java index 9e110fe4b..0bbd4eb4a 100644 --- a/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java +++ b/src/main/java/mekanism/common/tile/TileEntityDigitalMiner.java @@ -651,7 +651,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I for(int i = 0; i < tagList.tagCount(); i++) { - filters.add(MinerFilter.readFromNBT((NBTTagCompound)tagList.getCompoundTagAt(i))); + filters.add(MinerFilter.readFromNBT(tagList.getCompoundTagAt(i))); } } } @@ -867,7 +867,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I data.add(running); data.add(silkTouch); data.add(numPowering); - data.add(searcher.state); + data.add(searcher.state.ordinal()); if(searcher.state == State.SEARCHING) { @@ -877,7 +877,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I data.add(getSize()); } - data.add(controlType); + data.add(controlType.ordinal()); data.add(inverse); if(missingStack != null) @@ -945,7 +945,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I data.add(running); data.add(silkTouch); data.add(numPowering); - data.add(searcher.state); + data.add(searcher.state.ordinal()); if(searcher.state == State.SEARCHING) { @@ -955,7 +955,7 @@ public class TileEntityDigitalMiner extends TileEntityElectricBlock implements I data.add(getSize()); } - data.add(controlType); + data.add(controlType.ordinal()); data.add(inverse); if(missingStack != null) diff --git a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java index 46a2def00..1265e1d92 100644 --- a/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java +++ b/src/main/java/mekanism/common/tile/TileEntityMetallurgicInfuser.java @@ -197,10 +197,10 @@ public class TileEntityMetallurgicInfuser extends TileEntityNoisyElectricBlock i public void upgrade(RecipeType type) { - worldObj.setBlockToAir(xCoord, yCoord, zCoord); - worldObj.setBlock(xCoord, yCoord, zCoord, MekanismBlocks.MachineBlock, 5, 3); + worldObj.setBlockToAir(getPos()); + worldObj.setBlockState(getPos(), MekanismBlocks.MachineBlock.getStateFromMeta(5), 3); - TileEntityFactory factory = (TileEntityFactory)worldObj.getTileEntity(xCoord, yCoord, zCoord); + TileEntityFactory factory = (TileEntityFactory)worldObj.getTileEntity(getPos()); //Basic factory.facing = facing; diff --git a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java index 756f26751..755ff0c33 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentConfig.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentConfig.java @@ -206,7 +206,7 @@ public class TileComponentConfig implements ITileComponent for(TransmissionType type : transmissions) { - data.add(type); + data.add(type.ordinal()); } for(TransmissionType type : transmissions) diff --git a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java index 94e941f01..4197592c7 100644 --- a/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java +++ b/src/main/java/mekanism/common/tile/component/TileComponentUpgrade.java @@ -193,13 +193,13 @@ public class TileComponentUpgrade implements ITileComponent } @Override - public void write(ArrayList data) + public void write(ArrayList data) { data.add(upgrades.size()); for(Map.Entry entry : upgrades.entrySet()) { - data.add(entry.getKey()); + data.add(entry.getKey().ordinal()); data.add(entry.getValue()); } diff --git a/src/main/resources/assets/mekanism/blockstates/EnergyCube.json b/src/main/resources/assets/mekanism/blockstates/EnergyCube.json new file mode 100644 index 000000000..141cb562a --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/EnergyCube.json @@ -0,0 +1,25 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:energy_cube" + }, + "variants": { + "facing": { + "up": {"x": -90}, + "down": {"x": 90}, + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "tier": { + "basic": {"textures": {"all": "mekanism:blocks/models/energy_cube_basic"}}, + "advanced": {"textures": {"all": "mekanism:blocks/models/energy_cube_advanced"}}, + "elite": {"textures": {"all": "mekanism:blocks/models/energy_cube_elite"}}, + "ultimate": {"textures": {"all": "mekanism:blocks/models/energy_cube_ultimate"}}, + "creative": {"textures": {"all": "mekanism:blocks/models/energy_cube_creative"}} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/blockstates/enrichment_chamber.json b/src/main/resources/assets/mekanism/blockstates/enrichment_chamber.json new file mode 100644 index 000000000..58d4eca02 --- /dev/null +++ b/src/main/resources/assets/mekanism/blockstates/enrichment_chamber.json @@ -0,0 +1,17 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "mekanism:enrichment_chamber" + }, + "variants": { + "normal": [{}], + "facing": { + "north": {}, + "south": {"y": 180}, + "east": {"y": 90}, + "west": {"y": -90} + }, + "inventory": [{}] + } +} + diff --git a/src/main/resources/assets/mekanism/models/block/energy_cube.json b/src/main/resources/assets/mekanism/models/block/energy_cube.json index 7f1bfbf26..e37a0c54d 100644 --- a/src/main/resources/assets/mekanism/models/block/energy_cube.json +++ b/src/main/resources/assets/mekanism/models/block/energy_cube.json @@ -2,8 +2,8 @@ "elements": [ { "__comment": "Corner8", - "from": [13, 12, 13], - "to": [16, 15, 16], + "from": [13, 13, 13], + "to": [16, 16, 16], "faces": { "down": {"uv": [1.5, 4.25, 2.25, 5], "texture": "#all"}, "up": {"uv": [0.75, 4.25, 1.5, 5], "texture": "#all"}, @@ -15,8 +15,8 @@ }, { "__comment": "Connection", - "from": [3, 4, 0], - "to": [13, 10, 1], + "from": [3, 5, 0], + "to": [13, 11, 1], "faces": { "down": {"uv": [2.75, 1.75, 5.25, 2], "texture": "#all"}, "up": {"uv": [0.25, 1.75, 2.75, 2], "texture": "#all"}, @@ -28,8 +28,8 @@ }, { "__comment": "HoriPole4", - "from": [3, -1, 0], - "to": [13, 2, 3], + "from": [3, 0, 0], + "to": [13, 3, 3], "faces": { "down": {"uv": [3.25, 0, 5.75, 0.75], "texture": "#all"}, "up": {"uv": [0.75, 0, 3.25, 0.75], "texture": "#all"}, @@ -41,8 +41,8 @@ }, { "__comment": "Corner5", - "from": [13, 12, 0], - "to": [16, 15, 3], + "from": [13, 13, 0], + "to": [16, 16, 3], "faces": { "down": {"uv": [1.5, 4.25, 2.25, 5], "texture": "#all"}, "up": {"uv": [0.75, 4.25, 1.5, 5], "texture": "#all"}, @@ -54,8 +54,8 @@ }, { "__comment": "HoriPole6", - "from": [3, 12, 13], - "to": [13, 15, 16], + "from": [3, 13, 13], + "to": [13, 16, 16], "faces": { "down": {"uv": [3.25, 0, 5.75, 0.75], "texture": "#all"}, "up": {"uv": [0.75, 0, 3.25, 0.75], "texture": "#all"}, @@ -67,8 +67,8 @@ }, { "__comment": "HoriPole5", - "from": [13, 12, 3], - "to": [16, 15, 13], + "from": [13, 13, 3], + "to": [16, 16, 13], "faces": { "down": {"uv": [10, 0, 10.75, 2.5], "texture": "#all"}, "up": {"uv": [9.25, 0, 10, 2.5], "texture": "#all"}, @@ -80,8 +80,8 @@ }, { "__comment": "Frame4", - "from": [13, 2, 0], - "to": [16, 12, 3], + "from": [13, 3, 0], + "to": [16, 13, 3], "faces": { "down": {"uv": [1.5, 6, 2.25, 6.75], "texture": "#all"}, "up": {"uv": [0.75, 6, 1.5, 6.75], "texture": "#all"}, @@ -91,23 +91,10 @@ "east": {"uv": [0, 6.75, 0.75, 9.25], "texture": "#all"} } }, - { - "__comment": "cube", - "from": [0, 15, 0], - "to": [16, 31, 16], - "faces": { - "down": {"uv": [16, 0, 24, 8], "texture": "#all"}, - "up": {"uv": [8, 0, 16, 8], "texture": "#all"}, - "north": {"uv": [8, 8, 16, 16], "texture": "#all"}, - "south": {"uv": [24, 8, 32, 16], "texture": "#all"}, - "west": {"uv": [16, 8, 24, 16], "texture": "#all"}, - "east": {"uv": [0, 8, 8, 16], "texture": "#all"} - } - }, { "__comment": "Corner7", - "from": [0, 12, 13], - "to": [3, 15, 16], + "from": [0, 13, 13], + "to": [3, 16, 16], "faces": { "down": {"uv": [1.5, 4.25, 2.25, 5], "texture": "#all"}, "up": {"uv": [0.75, 4.25, 1.5, 5], "texture": "#all"}, @@ -119,8 +106,8 @@ }, { "__comment": "Corner2", - "from": [0, -1, 0], - "to": [3, 2, 3], + "from": [0, 0, 0], + "to": [3, 3, 3], "faces": { "down": {"uv": [1.5, 4.25, 2.25, 5], "texture": "#all"}, "up": {"uv": [0.75, 4.25, 1.5, 5], "texture": "#all"}, @@ -132,8 +119,8 @@ }, { "__comment": "HoriPole7", - "from": [0, 12, 3], - "to": [3, 15, 13], + "from": [0, 13, 3], + "to": [3, 16, 13], "faces": { "down": {"uv": [10, 0, 10.75, 2.5], "texture": "#all"}, "up": {"uv": [9.25, 0, 10, 2.5], "texture": "#all"}, @@ -145,8 +132,8 @@ }, { "__comment": "Corner6", - "from": [0, 12, 0], - "to": [3, 15, 3], + "from": [0, 13, 0], + "to": [3, 16, 3], "faces": { "down": {"uv": [1.5, 4.25, 2.25, 5], "texture": "#all"}, "up": {"uv": [0.75, 4.25, 1.5, 5], "texture": "#all"}, @@ -158,8 +145,8 @@ }, { "__comment": "HoriPole1", - "from": [13, -1, 3], - "to": [16, 2, 13], + "from": [13, 0, 3], + "to": [16, 3, 13], "faces": { "down": {"uv": [10, 0, 10.75, 2.5], "texture": "#all"}, "up": {"uv": [9.25, 0, 10, 2.5], "texture": "#all"}, @@ -171,8 +158,8 @@ }, { "__comment": "HoriPole3", - "from": [0, -1, 3], - "to": [3, 2, 13], + "from": [0, 0, 3], + "to": [3, 3, 13], "faces": { "down": {"uv": [10, 0, 10.75, 2.5], "texture": "#all"}, "up": {"uv": [9.25, 0, 10, 2.5], "texture": "#all"}, @@ -184,8 +171,8 @@ }, { "__comment": "HoriPole2", - "from": [3, -1, 13], - "to": [13, 2, 16], + "from": [3, 0, 13], + "to": [13, 3, 16], "faces": { "down": {"uv": [3.25, 0, 5.75, 0.75], "texture": "#all"}, "up": {"uv": [0.75, 0, 3.25, 0.75], "texture": "#all"}, @@ -197,8 +184,8 @@ }, { "__comment": "Frame3", - "from": [0, 2, 0], - "to": [3, 12, 3], + "from": [0, 3, 0], + "to": [3, 13, 3], "faces": { "down": {"uv": [1.5, 6, 2.25, 6.75], "texture": "#all"}, "up": {"uv": [0.75, 6, 1.5, 6.75], "texture": "#all"}, @@ -210,8 +197,8 @@ }, { "__comment": "Corner1", - "from": [13, -1, 0], - "to": [16, 2, 3], + "from": [13, 0, 0], + "to": [16, 3, 3], "faces": { "down": {"uv": [1.5, 4.25, 2.25, 5], "texture": "#all"}, "up": {"uv": [0.75, 4.25, 1.5, 5], "texture": "#all"}, @@ -223,8 +210,8 @@ }, { "__comment": "Frame2", - "from": [0, 2, 13], - "to": [3, 12, 16], + "from": [0, 3, 13], + "to": [3, 13, 16], "faces": { "down": {"uv": [1.5, 6, 2.25, 6.75], "texture": "#all"}, "up": {"uv": [0.75, 6, 1.5, 6.75], "texture": "#all"}, @@ -236,8 +223,8 @@ }, { "__comment": "HoriPole8", - "from": [3, 12, 0], - "to": [13, 15, 3], + "from": [3, 13, 0], + "to": [13, 16, 3], "faces": { "down": {"uv": [3.25, 0, 5.75, 0.75], "texture": "#all"}, "up": {"uv": [0.75, 0, 3.25, 0.75], "texture": "#all"}, @@ -249,8 +236,8 @@ }, { "__comment": "Frame1", - "from": [13, 2, 13], - "to": [16, 12, 16], + "from": [13, 3, 13], + "to": [16, 13, 16], "faces": { "down": {"uv": [1.5, 6, 2.25, 6.75], "texture": "#all"}, "up": {"uv": [0.75, 6, 1.5, 6.75], "texture": "#all"}, @@ -262,8 +249,8 @@ }, { "__comment": "Corner4", - "from": [0, -1, 13], - "to": [3, 2, 16], + "from": [0, 0, 13], + "to": [3, 3, 16], "faces": { "down": {"uv": [1.5, 4.25, 2.25, 5], "texture": "#all"}, "up": {"uv": [0.75, 4.25, 1.5, 5], "texture": "#all"}, @@ -275,8 +262,8 @@ }, { "__comment": "Corner3", - "from": [13, -1, 13], - "to": [16, 2, 16], + "from": [13, 0, 13], + "to": [16, 3, 16], "faces": { "down": {"uv": [1.5, 4.25, 2.25, 5], "texture": "#all"}, "up": {"uv": [0.75, 4.25, 1.5, 5], "texture": "#all"}, @@ -288,7 +275,7 @@ } ], "textures": { - "all": "...", - "particle": "..." + "all": "mekanism:blocks/models/energy_cube_basic", + "particle": "mekanism:blocks/SteelCasing" } } diff --git a/src/main/resources/assets/mekanism/models/block/laser.json b/src/main/resources/assets/mekanism/models/block/laser.json index 7d1e0fc10..c37eac781 100644 --- a/src/main/resources/assets/mekanism/models/block/laser.json +++ b/src/main/resources/assets/mekanism/models/block/laser.json @@ -2,8 +2,8 @@ "elements": [ { "__comment": "RightOuterRail", - "from": [14, 3, 1], - "to": [15, 5, 15], + "from": [14, 4, 1], + "to": [15, 6, 15], "faces": { "down": {"uv": [9.25, 7.25, 9.5, 10.75], "texture": "#all"}, "up": {"uv": [9, 7.25, 9.25, 10.75], "texture": "#all"}, @@ -15,8 +15,8 @@ }, { "__comment": "LaserDecor2", - "from": [5, 4.3, 6], - "to": [6, 8.3, 10], + "from": [5, 5.3, 6], + "to": [6, 9.3, 10], "faces": { "down": {"uv": [12.25, 4.5, 12.5, 5.5], "texture": "#all"}, "up": {"uv": [12, 4.5, 12.25, 5.5], "texture": "#all"}, @@ -28,8 +28,8 @@ }, { "__comment": "LaserDecor", - "from": [10, 4.3, 6], - "to": [11, 8.3, 10], + "from": [10, 5.3, 6], + "to": [11, 9.3, 10], "faces": { "down": {"uv": [12.25, 4.5, 12.5, 5.5], "texture": "#all"}, "up": {"uv": [12, 4.5, 12.25, 5.5], "texture": "#all"}, @@ -41,8 +41,8 @@ }, { "__comment": "LeftInnerRail", - "from": [3, 3, 1], - "to": [4, 5, 15], + "from": [3, 4, 1], + "to": [4, 6, 15], "faces": { "down": {"uv": [9.25, 7.25, 9.5, 10.75], "texture": "#all"}, "up": {"uv": [9, 7.25, 9.25, 10.75], "texture": "#all"}, @@ -54,8 +54,8 @@ }, { "__comment": "LowerCache", - "from": [2, 3, 3], - "to": [14, 4, 13], + "from": [2, 4, 3], + "to": [14, 5, 13], "faces": { "down": {"uv": [5.5, 4.5, 8.5, 7], "texture": "#all"}, "up": {"uv": [2.5, 4.5, 5.5, 7], "texture": "#all"}, @@ -67,8 +67,8 @@ }, { "__comment": "LaserCable2", - "from": [9, 5.5, 4], - "to": [10, 11.5, 5], + "from": [9, 6.5, 4], + "to": [10, 12.5, 5], "faces": { "down": {"uv": [5, 10.75, 5.25, 11], "texture": "#all"}, "up": {"uv": [4.75, 10.75, 5, 11], "texture": "#all"}, @@ -80,8 +80,8 @@ }, { "__comment": "LeftBottomDecor", - "from": [0, -1, 3], - "to": [1, 3, 13], + "from": [0, 0, 3], + "to": [1, 4, 13], "faces": { "down": {"uv": [2.75, 7.25, 3, 9.75], "texture": "#all"}, "up": {"uv": [2.5, 7.25, 2.75, 9.75], "texture": "#all"}, @@ -93,8 +93,8 @@ }, { "__comment": "LaserCable4", - "from": [6, 5.5, 4], - "to": [7, 11.5, 5], + "from": [6, 6.5, 4], + "to": [7, 12.5, 5], "faces": { "down": {"uv": [5, 10.75, 5.25, 11], "texture": "#all"}, "up": {"uv": [4.75, 10.75, 5, 11], "texture": "#all"}, @@ -106,8 +106,8 @@ }, { "__comment": "LaserTip", - "from": [7, 10.5, 7], - "to": [9, 13.5, 9], + "from": [7, 11.5, 7], + "to": [9, 14.5, 9], "faces": { "down": {"uv": [8.5, 11.25, 9, 11.75], "texture": "#all"}, "up": {"uv": [8, 11.25, 8.5, 11.75], "texture": "#all"}, @@ -119,8 +119,8 @@ }, { "__comment": "LaserCable1", - "from": [9, 10.5, 5], - "to": [10, 11.5, 8], + "from": [9, 11.5, 5], + "to": [10, 12.5, 8], "faces": { "down": {"uv": [6.5, 11.25, 6.75, 12], "texture": "#all"}, "up": {"uv": [6.25, 11.25, 6.5, 12], "texture": "#all"}, @@ -132,8 +132,8 @@ }, { "__comment": "RightInnerRail", - "from": [12, 3, 1], - "to": [13, 5, 15], + "from": [12, 4, 1], + "to": [13, 6, 15], "faces": { "down": {"uv": [9.25, 7.25, 9.5, 10.75], "texture": "#all"}, "up": {"uv": [9, 7.25, 9.25, 10.75], "texture": "#all"}, @@ -145,8 +145,8 @@ }, { "__comment": "RightTopDecor", - "from": [15, 3, 4], - "to": [16, 4, 12], + "from": [15, 4, 4], + "to": [16, 5, 12], "faces": { "down": {"uv": [2.25, 10.75, 2.5, 12.75], "texture": "#all"}, "up": {"uv": [2, 10.75, 2.25, 12.75], "texture": "#all"}, @@ -158,8 +158,8 @@ }, { "__comment": "Base", - "from": [1, -1, 1], - "to": [15, 3, 15], + "from": [1, 0, 1], + "to": [15, 4, 15], "faces": { "down": {"uv": [7, 0, 10.5, 3.5], "texture": "#all"}, "up": {"uv": [3.5, 0, 7, 3.5], "texture": "#all"}, @@ -171,8 +171,8 @@ }, { "__comment": "HigherCache", - "from": [2, 4.5, 3], - "to": [14, 5.5, 13], + "from": [2, 5.5, 3], + "to": [14, 6.5, 13], "faces": { "down": {"uv": [5.5, 4.5, 8.5, 7], "texture": "#all"}, "up": {"uv": [2.5, 4.5, 5.5, 7], "texture": "#all"}, @@ -184,8 +184,8 @@ }, { "__comment": "LaserCable3", - "from": [6, 10.5, 5], - "to": [7, 11.5, 8], + "from": [6, 11.5, 5], + "to": [7, 12.5, 8], "faces": { "down": {"uv": [6.5, 11.25, 6.75, 12], "texture": "#all"}, "up": {"uv": [6.25, 11.25, 6.5, 12], "texture": "#all"}, @@ -197,8 +197,8 @@ }, { "__comment": "RightBottomDecor", - "from": [15, -1, 3], - "to": [16, 3, 13], + "from": [15, 0, 3], + "to": [16, 4, 13], "faces": { "down": {"uv": [2.75, 7.25, 3, 9.75], "texture": "#all"}, "up": {"uv": [2.5, 7.25, 2.75, 9.75], "texture": "#all"}, @@ -210,8 +210,8 @@ }, { "__comment": "LeftOuterRail", - "from": [1, 3, 1], - "to": [2, 5, 15], + "from": [1, 4, 1], + "to": [2, 6, 15], "faces": { "down": {"uv": [9.25, 7.25, 9.5, 10.75], "texture": "#all"}, "up": {"uv": [9, 7.25, 9.25, 10.75], "texture": "#all"}, @@ -223,8 +223,8 @@ }, { "__comment": "LeftTopDecor", - "from": [0, 3, 4], - "to": [1, 4, 12], + "from": [0, 4, 4], + "to": [1, 5, 12], "faces": { "down": {"uv": [2.25, 10.75, 2.5, 12.75], "texture": "#all"}, "up": {"uv": [2, 10.75, 2.25, 12.75], "texture": "#all"}, @@ -236,8 +236,8 @@ }, { "__comment": "LaserBase", - "from": [5, 5.5, 5], - "to": [11, 10.5, 11], + "from": [5, 6.5, 5], + "to": [11, 11.5, 11], "faces": { "down": {"uv": [3, 13, 4.5, 14.5], "texture": "#all"}, "up": {"uv": [1.5, 13, 3, 14.5], "texture": "#all"}, diff --git a/src/main/resources/assets/mekanism/models/block/obsidian_tnt.json b/src/main/resources/assets/mekanism/models/block/obsidian_tnt.json index d6ca86fcf..278593942 100644 --- a/src/main/resources/assets/mekanism/models/block/obsidian_tnt.json +++ b/src/main/resources/assets/mekanism/models/block/obsidian_tnt.json @@ -263,6 +263,6 @@ ], "textures": { "all": "mekanism:blocks/models/obsidian_tnt", - "particle": "mekanims:blocks/RefinedObsidian" + "particle": "mekanism:blocks/RefinedObsidian" } } diff --git a/src/main/resources/assets/mekanism/models/block/robit.json b/src/main/resources/assets/mekanism/models/entity/robit.json similarity index 100% rename from src/main/resources/assets/mekanism/models/block/robit.json rename to src/main/resources/assets/mekanism/models/entity/robit.json diff --git a/src/main/resources/assets/mekanism/models/item/EnergyCube.json b/src/main/resources/assets/mekanism/models/item/EnergyCube.json new file mode 100644 index 000000000..16ad0ee6f --- /dev/null +++ b/src/main/resources/assets/mekanism/models/item/EnergyCube.json @@ -0,0 +1,11 @@ +{ + "parent": "mekanism:block/energy_cube", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} + diff --git a/src/main/resources/assets/mekanism/models/item/Robit.json b/src/main/resources/assets/mekanism/models/item/Robit.json index e0e0a0d33..9381d138c 100644 --- a/src/main/resources/assets/mekanism/models/item/Robit.json +++ b/src/main/resources/assets/mekanism/models/item/Robit.json @@ -1,7 +1,10 @@ { - "parent": "mekanism:item/standard_item", - "textures": { - "layer0": "mekanism:items/Robit" + "parent": "mekanism:entity/robit", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } } } - diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeAdvanced.png b/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_advanced.png similarity index 100% rename from src/main/resources/assets/mekanism/render/EnergyCubeAdvanced.png rename to src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_advanced.png diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeBasic.png b/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_basic.png similarity index 100% rename from src/main/resources/assets/mekanism/render/EnergyCubeBasic.png rename to src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_basic.png diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeCreative.png b/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_creative.png similarity index 100% rename from src/main/resources/assets/mekanism/render/EnergyCubeCreative.png rename to src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_creative.png diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeElite.png b/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_elite.png similarity index 100% rename from src/main/resources/assets/mekanism/render/EnergyCubeElite.png rename to src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_elite.png diff --git a/src/main/resources/assets/mekanism/render/EnergyCubeUltimate.png b/src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_ultimate.png similarity index 100% rename from src/main/resources/assets/mekanism/render/EnergyCubeUltimate.png rename to src/main/resources/assets/mekanism/textures/blocks/models/energy_cube_ultimate.png