Add CircuitBoard to colour.properties and Fix #1468 [1.10.2-5.2.14.283] Server side crash

This commit is contained in:
Nedelosk committed 2016-10-18 21:00:16 +02:00
1 parent b135593733
commit aca6ed1fd8
5 files changed
+25 -16

No files matched your search

@@ -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);
@@ -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");
}
}
@@ -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 {
@@ -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 {