From 1786a3c069e8490b8a663eb088668c5489373f2f Mon Sep 17 00:00:00 2001 From: Sebastian Hartte Date: Tue, 18 Oct 2016 08:43:38 +0200 Subject: [PATCH] Fixes #2451: Removed dependency from ModelResourceLocation for Server. --- src/main/java/appeng/items/parts/PartType.java | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/main/java/appeng/items/parts/PartType.java b/src/main/java/appeng/items/parts/PartType.java index c6852408..b0af3a56 100644 --- a/src/main/java/appeng/items/parts/PartType.java +++ b/src/main/java/appeng/items/parts/PartType.java @@ -32,6 +32,8 @@ import com.google.common.collect.ImmutableList; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; import appeng.api.parts.IPart; import appeng.api.util.AEColor; @@ -69,6 +71,7 @@ import appeng.parts.reporting.PartPatternTerminal; import appeng.parts.reporting.PartSemiDarkPanel; import appeng.parts.reporting.PartStorageMonitor; import appeng.parts.reporting.PartTerminal; +import appeng.util.Platform; public enum PartType @@ -84,6 +87,7 @@ public enum PartType } @Override + @SideOnly( Side.CLIENT ) protected List createItemModels( String baseName ) { return Arrays.stream( AEColor.values() ) @@ -101,6 +105,7 @@ public enum PartType } @Override + @SideOnly( Side.CLIENT ) protected List createItemModels( String baseName ) { return Arrays.stream( AEColor.values() ) @@ -118,6 +123,7 @@ public enum PartType } @Override + @SideOnly( Side.CLIENT ) protected List createItemModels( String baseName ) { return Arrays.stream( AEColor.values() ) @@ -135,6 +141,7 @@ public enum PartType } @Override + @SideOnly( Side.CLIENT ) protected List createItemModels( String baseName ) { return Arrays.stream( AEColor.values() ) @@ -242,7 +249,8 @@ public enum PartType private final Set integrations; private final Class myPart; private final GuiText extraName; - private final List itemModels; + @SideOnly( Side.CLIENT ) + private List itemModels; private final Set models; private Constructor constructor; @@ -258,7 +266,10 @@ public enum PartType this.integrations = Collections.unmodifiableSet( integrations ); this.myPart = c; this.extraName = en; - this.itemModels = createItemModels( itemModel ); + if ( Platform.isClient() ) + { + this.itemModels = createItemModels( itemModel ); + } if( c != null ) { this.models = new HashSet<>( PartModelsHelper.createModels( c ) ); @@ -269,11 +280,13 @@ public enum PartType } } + @SideOnly( Side.CLIENT ) protected List createItemModels( String baseName ) { return ImmutableList.of( modelFromBaseName( baseName ) ); } + @SideOnly( Side.CLIENT ) private static ModelResourceLocation modelFromBaseName( String baseName ) { return new ModelResourceLocation( new ResourceLocation( AppEng.MOD_ID, "part/" + baseName ), "inventory" ); @@ -323,6 +336,7 @@ public enum PartType this.constructor = constructor; } + @SideOnly( Side.CLIENT ) public List getItemModels() { return itemModels;