diff --git a/src/main/java/appeng/client/ClientHelper.java b/src/main/java/appeng/client/ClientHelper.java index b6d924d77..8ad051fd5 100644 --- a/src/main/java/appeng/client/ClientHelper.java +++ b/src/main/java/appeng/client/ClientHelper.java @@ -115,6 +115,7 @@ public class ClientHelper extends ServerHelper // } for( IAEFeature feature : Api.INSTANCE.definitions().getFeatureRegistry().getRegisteredFeatures() ) { + feature.handler().registerModel(); if( feature instanceof AEBaseBlock ) { Minecraft.getMinecraft().getBlockColors().registerBlockColorHandler( new AEBaseBlockColor(), (Block) feature ); diff --git a/src/main/java/appeng/core/features/AEBlockFeatureHandler.java b/src/main/java/appeng/core/features/AEBlockFeatureHandler.java index deeda0a4e..2d4bc89d8 100644 --- a/src/main/java/appeng/core/features/AEBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/AEBlockFeatureHandler.java @@ -23,14 +23,16 @@ import java.util.EnumSet; import com.google.common.base.Optional; -import net.minecraft.item.Item; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.ModelBakery; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import appeng.api.definitions.IBlockDefinition; import appeng.block.AEBaseBlock; import appeng.core.AppEng; -import appeng.core.CommonHelper; import appeng.core.CreativeTab; @@ -41,6 +43,8 @@ public final class AEBlockFeatureHandler implements IFeatureHandler private final boolean enabled; private final BlockDefinition definition; + private ResourceLocation registryName; + public AEBlockFeatureHandler( final EnumSet features, final AEBaseBlock featured, final Optional subName ) { final ActivityState state = new FeaturedActiveChecker( features ).getActivityState(); @@ -70,20 +74,29 @@ public final class AEBlockFeatureHandler implements IFeatureHandler if( this.enabled ) { final String name = this.extractor.get(); - this.featured.setRegistryName( AppEng.MOD_ID, name ); this.featured.setCreativeTab( CreativeTab.instance ); this.featured.setUnlocalizedName( "appliedenergistics2." + name ); this.featured.setBlockTextureName( name ); - GameRegistry.register( this.featured ); + registryName = new ResourceLocation( AppEng.MOD_ID, name ); + GameRegistry.register( this.featured.setRegistryName( registryName ) ); // register the block/item conversion... if( this.definition.maybeItem().isPresent() ) { - final Item featuredItem = this.definition.maybeItem().get(); - featuredItem.setRegistryName( AppEng.MOD_ID, name ); - GameRegistry.register( featuredItem ); + GameRegistry.register( this.definition.maybeItem().get().setRegistryName( registryName ) ); + } + + if( side == Side.CLIENT ) + { + ModelBakery.registerItemVariants( this.definition.maybeItem().get(), registryName ); } } } + + @Override + public void registerModel() + { + Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( this.definition.maybeItem().get(), 0, new ModelResourceLocation( registryName, "normal" ) ); + } } diff --git a/src/main/java/appeng/core/features/AECableBusFeatureHandler.java b/src/main/java/appeng/core/features/AECableBusFeatureHandler.java index 01e6e6b75..13acff78b 100644 --- a/src/main/java/appeng/core/features/AECableBusFeatureHandler.java +++ b/src/main/java/appeng/core/features/AECableBusFeatureHandler.java @@ -23,14 +23,18 @@ import java.util.EnumSet; import com.google.common.base.Optional; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.ModelBakery; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.common.registry.GameData; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import appeng.api.definitions.ITileDefinition; import appeng.block.AEBaseTileBlock; import appeng.block.networking.BlockCableBus; +import appeng.core.AppEng; import appeng.core.CommonHelper; import appeng.core.CreativeTab; import appeng.util.Platform; @@ -43,6 +47,8 @@ public final class AECableBusFeatureHandler implements IFeatureHandler private final boolean enabled; private final TileDefinition definition; + private ResourceLocation registryName; + public AECableBusFeatureHandler( final EnumSet features, final BlockCableBus featured, final Optional subName ) { final ActivityState state = new FeaturedActiveChecker( features ).getActivityState(); @@ -83,17 +89,22 @@ public final class AECableBusFeatureHandler implements IFeatureHandler CommonHelper.proxy.bindTileEntitySpecialRenderer( this.featured.getTileEntityClass(), this.featured ); } - final String registryName = "tile." + name; + registryName = new ResourceLocation( AppEng.MOD_ID, "tile." + name ); // Bypass the forge magic with null to register our own itemblock later. - GameRegistry.registerBlock( this.featured, null, registryName ); - GameRegistry.registerItem( this.definition.maybeItem().get(), registryName ); + GameRegistry.register( this.featured.setRegistryName( registryName ) ); + GameRegistry.register( this.definition.maybeItem().get().setRegistryName( registryName ) ); - // register the block/item conversion... - if( this.featured != null && this.definition.maybeItem().isPresent() ) + if( side == Side.CLIENT ) { - GameData.getBlockItemMap().put( this.featured, this.definition.maybeItem().get() ); + ModelBakery.registerItemVariants( this.definition.maybeItem().get(), registryName ); } } } + + @Override + public void registerModel() + { + Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( this.definition.maybeItem().get(), 0, new ModelResourceLocation( registryName, "normal" ) ); + } } diff --git a/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java b/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java index a8852f0a8..9b45ae2f9 100644 --- a/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/AETileBlockFeatureHandler.java @@ -23,8 +23,10 @@ import java.util.EnumSet; import com.google.common.base.Optional; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.ModelBakery; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.common.registry.GameData; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; @@ -44,6 +46,8 @@ public final class AETileBlockFeatureHandler implements IFeatureHandler private final boolean enabled; private final TileDefinition definition; + private ResourceLocation registryName; + public AETileBlockFeatureHandler( final EnumSet features, final AEBaseTileBlock featured, final Optional subName ) { final ActivityState state = new FeaturedActiveChecker( features ).getActivityState(); @@ -81,20 +85,24 @@ public final class AETileBlockFeatureHandler implements IFeatureHandler CommonHelper.proxy.bindTileEntitySpecialRenderer( this.featured.getTileEntityClass(), this.featured ); } - final ResourceLocation registryName = new ResourceLocation( AppEng.MOD_ID, "tile." + name ); + registryName = new ResourceLocation( AppEng.MOD_ID, "tile." + name ); - // Bypass the forge magic with null to register our own itemblock later. GameRegistry.register( this.featured.setRegistryName( registryName ) ); GameRegistry.register( this.definition.maybeItem().get().setRegistryName( registryName ) ); AEBaseTile.registerTileItem( this.featured.getTileEntityClass(), new BlockStackSrc( this.featured, 0, ActivityState.from( this.isFeatureAvailable() ) ) ); - // register the block/item conversion... - if( this.definition.maybeItem().isPresent() ) - { - GameData.getBlockItemMap().put( this.featured, this.definition.maybeItem().get() ); - } - GameRegistry.registerTileEntity( this.featured.getTileEntityClass(), this.featured.toString() ); + + if( side == Side.CLIENT ) + { + ModelBakery.registerItemVariants( this.definition.maybeItem().get(), registryName ); + } } } + + @Override + public void registerModel() + { + Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( this.definition.maybeItem().get(), 0, new ModelResourceLocation( registryName, "normal" ) ); + } } diff --git a/src/main/java/appeng/core/features/IFeatureHandler.java b/src/main/java/appeng/core/features/IFeatureHandler.java index 4aba9b480..3189732bd 100644 --- a/src/main/java/appeng/core/features/IFeatureHandler.java +++ b/src/main/java/appeng/core/features/IFeatureHandler.java @@ -20,6 +20,7 @@ package appeng.core.features; import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.definitions.IItemDefinition; @@ -31,4 +32,7 @@ public interface IFeatureHandler IItemDefinition getDefinition(); void register( Side side ); + + @SideOnly( Side.CLIENT ) + void registerModel(); } diff --git a/src/main/java/appeng/core/features/ItemFeatureHandler.java b/src/main/java/appeng/core/features/ItemFeatureHandler.java index f2ef6c404..76890bd73 100644 --- a/src/main/java/appeng/core/features/ItemFeatureHandler.java +++ b/src/main/java/appeng/core/features/ItemFeatureHandler.java @@ -23,13 +23,16 @@ import java.util.EnumSet; import com.google.common.base.Optional; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.ModelBakery; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import appeng.api.definitions.IItemDefinition; import appeng.core.AppEng; -import appeng.core.CommonHelper; import appeng.core.CreativeTab; import appeng.core.CreativeTabFacade; import appeng.items.parts.ItemFacade; @@ -42,6 +45,8 @@ public final class ItemFeatureHandler implements IFeatureHandler private final boolean enabled; private final ItemDefinition definition; + private ResourceLocation registryName; + public ItemFeatureHandler( final EnumSet features, final Item item, final IAEFeature featured, final Optional subName ) { final ActivityState state = new FeaturedActiveChecker( features ).getActivityState(); @@ -93,12 +98,19 @@ public final class ItemFeatureHandler implements IFeatureHandler name = "ItemMultiPart"; } - // "item." + - GameRegistry.register( this.item.setRegistryName( AppEng.MOD_ID, name ) ); + registryName = new ResourceLocation( AppEng.MOD_ID, name ); + GameRegistry.register( this.item.setRegistryName( registryName ) ); + + if( side == Side.CLIENT ) + { + ModelBakery.registerItemVariants( item, registryName ); + } } } - private void configureIcon( final Item item, final int meta, final String name ) + @Override + public void registerModel() { + Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( item, 0, new ModelResourceLocation( registryName, "inventory" ) ); } } diff --git a/src/main/java/appeng/core/features/StairBlockFeatureHandler.java b/src/main/java/appeng/core/features/StairBlockFeatureHandler.java index 45190ceb5..315d227fa 100644 --- a/src/main/java/appeng/core/features/StairBlockFeatureHandler.java +++ b/src/main/java/appeng/core/features/StairBlockFeatureHandler.java @@ -24,14 +24,17 @@ import java.util.EnumSet; import com.google.common.base.Optional; import net.minecraft.block.BlockStairs; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.ModelBakery; +import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; +import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import appeng.api.definitions.IBlockDefinition; import appeng.core.AppEng; -import appeng.core.CommonHelper; import appeng.core.CreativeTab; @@ -42,6 +45,8 @@ public class StairBlockFeatureHandler implements IFeatureHandler private final boolean enabled; private final BlockDefinition definition; + private ResourceLocation registryName; + public StairBlockFeatureHandler( final EnumSet features, final BlockStairs stairs, final Optional subName ) { final ActivityState state = new FeaturedActiveChecker( features ).getActivityState(); @@ -73,7 +78,21 @@ public class StairBlockFeatureHandler implements IFeatureHandler this.stairs.setCreativeTab( CreativeTab.instance ); this.stairs.setUnlocalizedName( "appliedenergistics2." + name ); - GameRegistry.register( this.stairs.setRegistryName( AppEng.MOD_ID, name ) ); + registryName = new ResourceLocation( AppEng.MOD_ID, name ); + Item item; + GameRegistry.register( this.stairs.setRegistryName( registryName ) ); + GameRegistry.register( item = new ItemBlock( stairs ).setRegistryName( registryName ) ); + + if( side == Side.CLIENT ) + { + ModelBakery.registerItemVariants( item, registryName ); + } } } + + @Override + public void registerModel() + { + Minecraft.getMinecraft().getRenderItem().getItemModelMesher().register( this.definition.maybeItem().get(), 0, new ModelResourceLocation( registryName, "inventory" ) ); + } }