summaryrefslogtreecommitdiff
path: root/src/main/java/com/sosnitzka/taiga/proxy
diff options
context:
space:
mode:
authorGiovanni Harting <539@idlegandalf.com>2016-07-25 15:22:42 +0200
committerGiovanni Harting <539@idlegandalf.com>2016-07-25 15:23:49 +0200
commitbb9bc335ff2c70cc2f9b017949713461aaa9ebff (patch)
treede1998390655a8767b9408c1dc91fac2f8dfbabe /src/main/java/com/sosnitzka/taiga/proxy
parent93d45ceaeb5f813063a58022a9d56955be06fa47 (diff)
first attempt ti implement a config file, does not function atm
Diffstat (limited to 'src/main/java/com/sosnitzka/taiga/proxy')
-rw-r--r--src/main/java/com/sosnitzka/taiga/proxy/ClientProxy.java8
-rw-r--r--src/main/java/com/sosnitzka/taiga/proxy/CommonProxy.java (renamed from src/main/java/com/sosnitzka/taiga/proxy/ServerProxy.java)7
2 files changed, 13 insertions, 2 deletions
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/ServerProxy.java b/src/main/java/com/sosnitzka/taiga/proxy/CommonProxy.java
index b9f9e70..c3b2e64 100644
--- a/src/main/java/com/sosnitzka/taiga/proxy/ServerProxy.java
+++ b/src/main/java/com/sosnitzka/taiga/proxy/CommonProxy.java
@@ -1,9 +1,10 @@
package com.sosnitzka.taiga.proxy;
+import com.sosnitzka.taiga.TAIGAConfiguration;
import net.minecraftforge.fluids.Fluid;
import slimeknights.tconstruct.library.materials.Material;
-public class ServerProxy {
+public class CommonProxy {
public void registerModels() {
@@ -15,4 +16,8 @@ public class ServerProxy {
public void registerFluidModels(Fluid fluid) {
}
+
+ public void initConfig() {
+ TAIGAConfiguration.preInit();
+ }
}