From aca6ed1fd8d55492c7ff010aa07fcca63bef3769 Mon Sep 17 00:00:00 2001 From: Nedelosk Date: Tue, 18 Oct 2016 21:00:16 +0200 Subject: [PATCH] Add CircuitBoard to colour.properties and Fix #1468 [1.10.2-5.2.14.283] Server side crash --- src/main/java/forestry/core/PluginCore.java | 3 --- .../core/circuits/EnumCircuitBoardType.java | 24 ++++++++++--------- .../core/render/ColourProperties.java | 1 - .../plugins/compat/PluginMalisisDoors.java | 1 - .../config/forestry/colour.properties | 12 ++++++++++ 5 files changed, 25 insertions(+), 16 deletions(-) diff --git a/src/main/java/forestry/core/PluginCore.java b/src/main/java/forestry/core/PluginCore.java index a2def8580..c13544fe2 100644 --- a/src/main/java/forestry/core/PluginCore.java +++ b/src/main/java/forestry/core/PluginCore.java @@ -71,7 +71,6 @@ import forestry.core.network.PacketRegistryCore; import forestry.core.proxy.Proxies; import forestry.core.recipes.RecipeUtil; import forestry.core.recipes.ShapedRecipeCustom; -import forestry.core.render.ColourProperties; import forestry.core.render.TextureManager; import forestry.core.utils.ClimateUtil; import forestry.core.utils.ForestryModEnvWarningCallable; @@ -130,8 +129,6 @@ public class PluginCore extends BlankForestryPlugin { super.preInit(); GameProfileDataSerializer.register(); - //load colour properties - ColourProperties.INSTANCE.getClass(); MinecraftForge.EVENT_BUS.register(this); diff --git a/src/main/java/forestry/core/circuits/EnumCircuitBoardType.java b/src/main/java/forestry/core/circuits/EnumCircuitBoardType.java index a236666be..8bc802981 100755 --- a/src/main/java/forestry/core/circuits/EnumCircuitBoardType.java +++ b/src/main/java/forestry/core/circuits/EnumCircuitBoardType.java @@ -10,31 +10,33 @@ ******************************************************************************/ package forestry.core.circuits; +import forestry.core.render.ColourProperties; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + public enum EnumCircuitBoardType { - BASIC(1, 0x191919, 0x6dcff6), - ENHANCED(2, 0x191919, 0xcb7c32), - REFINED(3, 0x191919, 0xc9c9c9), - INTRICATE(4, 0x191919, 0xe2cb6b); + BASIC(1), + ENHANCED(2), + REFINED(3), + INTRICATE(4); private final int sockets; - private final int primaryColor; - private final int secondaryColor; - EnumCircuitBoardType(int sockets, int primaryColor, int secondaryColor) { + EnumCircuitBoardType(int sockets) { this.sockets = sockets; - this.primaryColor = primaryColor; - this.secondaryColor = secondaryColor; } public int getSockets() { return sockets; } + @SideOnly(Side.CLIENT) public int getPrimaryColor() { - return primaryColor; + return ColourProperties.INSTANCE.get("item.circuit." + name().toLowerCase() + ".primary"); } + @SideOnly(Side.CLIENT) public int getSecondaryColor() { - return secondaryColor; + return ColourProperties.INSTANCE.get("item.circuit." + name().toLowerCase() + ".secondary"); } } diff --git a/src/main/java/forestry/core/render/ColourProperties.java b/src/main/java/forestry/core/render/ColourProperties.java index b036f3b2b..7ebfe2282 100644 --- a/src/main/java/forestry/core/render/ColourProperties.java +++ b/src/main/java/forestry/core/render/ColourProperties.java @@ -18,7 +18,6 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.resources.IReloadableResourceManager; import net.minecraft.client.resources.IResourceManager; import net.minecraft.client.resources.IResourceManagerReloadListener; -import net.minecraftforge.client.model.ModelLoaderRegistry; import forestry.core.utils.Log; public class ColourProperties implements IResourceManagerReloadListener { diff --git a/src/main/java/forestry/plugins/compat/PluginMalisisDoors.java b/src/main/java/forestry/plugins/compat/PluginMalisisDoors.java index 561f429fc..0e61bce20 100644 --- a/src/main/java/forestry/plugins/compat/PluginMalisisDoors.java +++ b/src/main/java/forestry/plugins/compat/PluginMalisisDoors.java @@ -6,7 +6,6 @@ import forestry.core.utils.ModUtil; import forestry.plugins.BlankForestryPlugin; import forestry.plugins.ForestryPlugin; import forestry.plugins.ForestryPluginUids; -import net.minecraft.item.ItemStack; @ForestryPlugin(pluginID = ForestryPluginUids.MALISIS_DOORES, name = "malisisdoors", author = "nedelosk", url = Constants.URL, unlocalizedDescription = "for.plugin.malisisDoors.description") public class PluginMalisisDoors extends BlankForestryPlugin { diff --git a/src/main/resources/config/forestry/colour.properties b/src/main/resources/config/forestry/colour.properties index 23fe2e7c6..f3ba3fec6 100755 --- a/src/main/resources/config/forestry/colour.properties +++ b/src/main/resources/config/forestry/colour.properties @@ -48,3 +48,15 @@ ledger.farm.background=2ca22c ledger.farm.header=e1c92f ledger.farm.subheader=aaafb8 ledger.farm.text=000000 + +item.circuit.basic.primary=191919 +item.circuit.basic.secondary=6dcff6 + +item.circuit.enhanced.primary=191919 +item.circuit.enhanced.secondary=cb7c32 + +item.circuit.refined.primary=191919 +item.circuit.refined.secondary=c9c9c9 + +item.circuit.intricate.primary=191919 +item.circuit.intricate.secondary=e2cb6b