From bb9bc335ff2c70cc2f9b017949713461aaa9ebff Mon Sep 17 00:00:00 2001
From: Giovanni Harting <539@idlegandalf.com>
Date: Mon, 25 Jul 2016 15:22:42 +0200
Subject: first attempt ti implement a config file, does not function atm

---
 .../com/sosnitzka/taiga/proxy/ClientProxy.java     |  8 +++++++-
 .../com/sosnitzka/taiga/proxy/CommonProxy.java     | 23 ++++++++++++++++++++++
 .../com/sosnitzka/taiga/proxy/ServerProxy.java     | 18 -----------------
 3 files changed, 30 insertions(+), 19 deletions(-)
 create mode 100644 src/main/java/com/sosnitzka/taiga/proxy/CommonProxy.java
 delete mode 100644 src/main/java/com/sosnitzka/taiga/proxy/ServerProxy.java

(limited to 'src/main/java/com/sosnitzka/taiga/proxy')

diff --git a/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java b/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java
index 9a245cb..13a65d8 100644
--- a/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java
+++ b/src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java
@@ -3,6 +3,7 @@ package com.sosnitzka.taiga.proxy;
 import com.sosnitzka.taiga.Blocks;
 import com.sosnitzka.taiga.Items;
 import com.sosnitzka.taiga.TAIGA;
+import com.sosnitzka.taiga.TAIGAConfiguration;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
@@ -24,7 +25,7 @@ import java.lang.reflect.Field;
 
 import static com.sosnitzka.taiga.MaterialTraits.*;
 
-public class ClientProxy extends ServerProxy {
+public class ClientProxy extends CommonProxy {
 
     private static void registerBlockModel(Block block) {
         registerItemModel(Item.getItemFromBlock(block));
@@ -112,6 +113,11 @@ public class ClientProxy extends ServerProxy {
         }
     }
 
+    @Override
+    public void initConfig() {
+        TAIGAConfiguration.clientPreInit();
+    }
+
     public static class FluidStateMapper extends StateMapperBase implements ItemMeshDefinition {
 
         public final Fluid fluid;
diff --git a/src/main/java/com/sosnitzka/taiga/proxy/CommonProxy.java b/src/main/java/com/sosnitzka/taiga/proxy/CommonProxy.java
new file mode 100644
index 0000000..c3b2e64
--- /dev/null
+++ b/src/main/java/com/sosnitzka/taiga/proxy/CommonProxy.java
@@ -0,0 +1,23 @@
+package com.sosnitzka.taiga.proxy;
+
+import com.sosnitzka.taiga.TAIGAConfiguration;
+import net.minecraftforge.fluids.Fluid;
+import slimeknights.tconstruct.library.materials.Material;
+
+public class CommonProxy {
+
+    public void registerModels() {
+
+    }
+
+    public void setRenderInfo(Material material) {
+
+    }
+
+    public void registerFluidModels(Fluid fluid) {
+    }
+
+    public void initConfig() {
+        TAIGAConfiguration.preInit();
+    }
+}
diff --git a/src/main/java/com/sosnitzka/taiga/proxy/ServerProxy.java b/src/main/java/com/sosnitzka/taiga/proxy/ServerProxy.java
deleted file mode 100644
index b9f9e70..0000000
--- a/src/main/java/com/sosnitzka/taiga/proxy/ServerProxy.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.sosnitzka.taiga.proxy;
-
-import net.minecraftforge.fluids.Fluid;
-import slimeknights.tconstruct.library.materials.Material;
-
-public class ServerProxy {
-
-    public void registerModels() {
-
-    }
-
-    public void setRenderInfo(Material material) {
-
-    }
-
-    public void registerFluidModels(Fluid fluid) {
-    }
-}
-- 
cgit v1.2.3