From 55df74e2408f5f89b51038d1d2d1219a47019f03 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Thu, 28 Apr 2016 00:31:06 +0100 Subject: [PATCH] Improve handling of energy cube item model Use custom mesh definition now, it makes more sense. --- .../java/mekanism/client/ClientProxy.java | 2 - .../model/item/EnergyCubeItemModel.java | 75 ------------ src/main/java/mekanism/common/Mekanism.java | 18 --- .../java/mekanism/common/MekanismBlocks.java | 111 ++++-------------- .../mekanism/blockstates/EnergyCube.json | 10 +- 5 files changed, 30 insertions(+), 186 deletions(-) delete mode 100644 src/main/java/mekanism/client/model/item/EnergyCubeItemModel.java diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 228d45bfd..a86eca204 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -449,8 +449,6 @@ public class ClientProxy extends CommonProxy registerItemRender(MekanismItems.FactoryInstaller); registerItemRender(MekanismItems.OtherDust); - MekanismBlocks.registerRender(); - OBJLoader.instance.addDomain("mekanism"); Mekanism.logger.info("Render registrations complete."); diff --git a/src/main/java/mekanism/client/model/item/EnergyCubeItemModel.java b/src/main/java/mekanism/client/model/item/EnergyCubeItemModel.java deleted file mode 100644 index 3decada31..000000000 --- a/src/main/java/mekanism/client/model/item/EnergyCubeItemModel.java +++ /dev/null @@ -1,75 +0,0 @@ -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/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 298f5eaaa..3811d2a83 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -29,7 +29,6 @@ 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; @@ -89,8 +88,6 @@ 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; @@ -103,7 +100,6 @@ 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; @@ -112,8 +108,6 @@ 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; @@ -1558,16 +1552,4 @@ 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 89c6746cc..4198f2acb 100644 --- a/src/main/java/mekanism/common/MekanismBlocks.java +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -5,6 +5,9 @@ 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 mekanism.common.Tier.EnergyCubeTier; +import mekanism.common.base.IEnergyCube; import mekanism.common.block.BlockBasic; import mekanism.common.block.BlockBounding; import mekanism.common.block.BlockCardboardBox; @@ -32,11 +35,13 @@ import mekanism.common.item.ItemBlockOre; import mekanism.common.item.ItemBlockPlastic; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.ItemMeshDefinition; import net.minecraft.client.renderer.ItemModelMesher; import net.minecraft.client.renderer.block.statemap.IStateMapper; import net.minecraft.client.resources.model.ModelBakery; import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraft.world.gen.structure.StructureVillagePieces.Road; import net.minecraftforge.client.model.ModelLoader; @@ -109,96 +114,30 @@ public class MekanismBlocks ModelLoader.setCustomStateMapper(GlowPlasticBlock, plasticMapper); ModelLoader.setCustomStateMapper(ReinforcedPlasticBlock, plasticMapper); ModelLoader.setCustomStateMapper(RoadPlasticBlock, plasticMapper); + + for(MachineType type : BlockStateMachine.MachineType.values()) + { + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(type.typeBlock.getBlock()), type.meta, new ModelResourceLocation("mekanism:" + type.getName(), "inventory")); + } + + for(BasicBlockType type : BasicBlockType.values()) + { + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(type.blockType.getBlock()), type.meta, new ModelResourceLocation("mekanism:" + type.getName(), "inventory")); + } + + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(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); + } + }); } @SideOnly(Side.CLIENT) public static void registerRender() { - ItemModelMesher mesher = Minecraft.getMinecraft().getRenderItem().getItemModelMesher(); - - for(MachineType type : BlockStateMachine.MachineType.values()) - { - mesher.register(Item.getItemFromBlock(type.typeBlock.getBlock()), type.meta, new ModelResourceLocation("mekanism:" + type.getName(), "inventory")); - } - - for(BasicBlockType type : BasicBlockType.values()) - { - 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"), - new ResourceLocation("mekanism", "combiner"), - new ResourceLocation("mekanism", "crusher"), - new ResourceLocation("mekanism", "digital_miner"), - new ResourceLocation("mekanism", "basic_factory"), - new ResourceLocation("mekanism", "advanced_factory"), - new ResourceLocation("mekanism", "elite_factory"), - new ResourceLocation("mekanism", "metallurgic_infuser"), - new ResourceLocation("mekanism", "purification_chamber"), - new ResourceLocation("mekanism", "energized_smelter"), - new ResourceLocation("mekanism", "teleporter"), - new ResourceLocation("mekanism", "electric_pump"), - new ResourceLocation("mekanism", "electric_chest"), - new ResourceLocation("mekanism", "chargepad"), - new ResourceLocation("mekanism", "logistical_sorter") - ); - - ModelBakery.registerItemVariants(Item.getItemFromBlock(MachineBlock2), - new ResourceLocation("mekanism", "rotary_condensentrator"), - new ResourceLocation("mekanism", "chemical_oxidiser"), - new ResourceLocation("mekanism", "chemical_infuser"), - new ResourceLocation("mekanism", "chemical_injection_chamber"), - new ResourceLocation("mekanism", "electrolytic_separator"), - new ResourceLocation("mekanism", "precision_sawmill"), - new ResourceLocation("mekanism", "chemical_dissolution_chamber"), - new ResourceLocation("mekanism", "chemical_washer"), - new ResourceLocation("mekanism", "chemical_crystallizer"), - new ResourceLocation("mekanism", "seismic_vibrator"), - new ResourceLocation("mekanism", "pressurized_reaction_chamber"), - new ResourceLocation("mekanism", "portable_tank"), - new ResourceLocation("mekanism", "fluidic_plenisher"), - new ResourceLocation("mekanism", "laser"), - new ResourceLocation("mekanism", "laser_amplifier"), - new ResourceLocation("mekanism", "laser_tractor_bean") - ); - - ModelBakery.registerItemVariants(Item.getItemFromBlock(MachineBlock3), - new ResourceLocation("mekanism", "entangled_block"), - new ResourceLocation("mekanism", "solar_neutron_activator"), - new ResourceLocation("mekanism", "ambient_accumulator"), - new ResourceLocation("mekanism", "oredictionificator") - ); - - ModelBakery.registerItemVariants(Item.getItemFromBlock(BasicBlock), - new ResourceLocation("mekanism", "osmium_block"), - new ResourceLocation("mekanism", "bronze_block"), - new ResourceLocation("mekanism", "refined_obsidian"), - new ResourceLocation("mekanism", "coal_block"), - new ResourceLocation("mekanism", "refined_glowstone"), - new ResourceLocation("mekanism", "steel_block"), - new ResourceLocation("mekanism", "bin"), - new ResourceLocation("mekanism", "teleporter_frame"), - new ResourceLocation("mekanism", "steel_casing"), - new ResourceLocation("mekanism", "dynamic_tank"), - new ResourceLocation("mekanism", "dynamic_glass"), - new ResourceLocation("mekanism", "dynamic_valve"), - new ResourceLocation("mekanism", "copper_block"), - new ResourceLocation("mekanism", "tin_block"), - new ResourceLocation("mekanism", "solar_evaporation_controller"), - new ResourceLocation("mekanism", "solar_evaporation_valve") - ); - - ModelBakery.registerItemVariants(Item.getItemFromBlock(BasicBlock2), - new ResourceLocation("mekanism", "solar_evaporation_block"), - new ResourceLocation("mekanism", "induction_casing"), - new ResourceLocation("mekanism", "induction_port"), - new ResourceLocation("mekanism", "induction_cell"), - new ResourceLocation("mekanism", "induction_provider") - ); - } } diff --git a/src/main/resources/assets/mekanism/blockstates/EnergyCube.json b/src/main/resources/assets/mekanism/blockstates/EnergyCube.json index 141cb562a..4731325db 100644 --- a/src/main/resources/assets/mekanism/blockstates/EnergyCube.json +++ b/src/main/resources/assets/mekanism/blockstates/EnergyCube.json @@ -13,11 +13,11 @@ "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"}} + "basic": {"textures": {"all": "mekanism:blocks/models/energy_cube"}}, + "advanced": {"textures": {"all": "mekanism:blocks/models/energy_cube"}}, + "elite": {"textures": {"all": "mekanism:blocks/models/energy_cube"}}, + "ultimate": {"textures": {"all": "mekanism:blocks/models/energy_cube"}}, + "creative": {"textures": {"all": "mekanism:blocks/models/energy_cube"}} }, "inventory": [{}] }