Refactored mod base classes

MC-U-Team · Jan 2, 2019 · 87d5e35 · 87d5e35
1 parent fcde21c
commit 87d5e35
Show file tree

Hide file tree

Showing 17 changed files with 131 additions and 214 deletions.
diff --git a/build.gradle b/build.gradle
@@ -56,7 +56,7 @@ minecraft {
 
 	replace '${version}', project.version
 	replace '${mcversion}', project.minecraft.version
-	replaceIn "info/u_team/useful_railroads/UsefulRailroadsConstants.java"
+	replaceIn "info/u_team/draw_bridge/DrawBridgeConstants.java"
 }
 
 def normalManifest = {

diff --git a/src/main/java/info/u_team/draw_bridge/DrawBridgeConstants.java b/src/main/java/info/u_team/draw_bridge/DrawBridgeConstants.java
@@ -0,0 +1,19 @@
+package info.u_team.draw_bridge;
+
+import org.apache.logging.log4j.*;
+
+public class DrawBridgeConstants {
+
+	public static final String MODID = "drawbridge";
+	public static final String NAME = "Draw Bridge";
+	public static final String VERSION = "${version}";
+	public static final String MCVERSION = "${mcversion}";
+	public static final String DEPENDENCIES = "required:forge@[14.23.4.2745,);required-after:uteamcore@[2.1.0.89,)";
+	public static final String UPDATEURL = "https://api.u-team.info/update/drawbridge.json";
+
+	public static final String COMMONPROXY = "info.u_team.draw_bridge.proxy.CommonProxy";
+	public static final String CLIENTPROXY = "info.u_team.draw_bridge.proxy.ClientProxy";
+
+	public static final Logger LOGGER = LogManager.getLogger(NAME);
+
+}
diff --git a/src/main/java/info/u_team/draw_bridge/DrawBridgeMod.java b/src/main/java/info/u_team/draw_bridge/DrawBridgeMod.java
@@ -0,0 +1,37 @@
+package info.u_team.draw_bridge;
+
+import static info.u_team.draw_bridge.DrawBridgeConstants.*;
+
+import info.u_team.draw_bridge.proxy.*;
+import net.minecraftforge.fml.common.*;
+import net.minecraftforge.fml.common.Mod.*;
+import net.minecraftforge.fml.common.event.*;;
+
+@Mod(modid = MODID, name = NAME, version = VERSION, acceptedMinecraftVersions = MCVERSION, dependencies = DEPENDENCIES, updateJSON = UPDATEURL)
+public class DrawBridgeMod {
+
+	@Instance
+	private static DrawBridgeMod instance;
+
+	public static DrawBridgeMod getInstance() {
+		return instance;
+	}
+
+	@SidedProxy(serverSide = COMMONPROXY, clientSide = CLIENTPROXY)
+	private static CommonProxy proxy;
+
+	@EventHandler
+	public void preinit(FMLPreInitializationEvent event) {
+		proxy.preinit(event);
+	}
+
+	@EventHandler
+	public void init(FMLInitializationEvent event) {
+		proxy.init(event);
+	}
+
+	@EventHandler
+	public void postinit(FMLPostInitializationEvent event) {
+		proxy.postinit(event);
+	}
+}
diff --git a/src/main/java/info/u_team/draw_bridge/proxy/ClientProxy.java b/src/main/java/info/u_team/draw_bridge/proxy/ClientProxy.java
@@ -0,0 +1,28 @@
+package info.u_team.draw_bridge.proxy;
+
+import info.u_team.u_team_core.registry.*;
+import info.uteam.drawbridges.model.DBMModelLoader;
+import info.uteam.drawbridges.tiles.*;
+import net.minecraftforge.client.model.ModelLoaderRegistry;
+import net.minecraftforge.fml.common.event.*;
+
+public class ClientProxy extends CommonProxy {
+
+	@Override
+	public void preinit(FMLPreInitializationEvent event) {
+		super.preinit(event);
+		ModelLoaderRegistry.registerLoader(new DBMModelLoader());
+	}
+
+	@Override
+	public void init(FMLInitializationEvent event) {
+		super.init(event);
+		ClientRegistry.registerSpecialTileEntityRenderer(DBMDrawbridgeTile.class, new SpecialDrawbridgeRender());
+	}
+
+	@Override
+	public void postinit(FMLPostInitializationEvent event) {
+		super.postinit(event);
+	}
+
+}
diff --git a/src/main/java/info/u_team/draw_bridge/proxy/CommonProxy.java b/src/main/java/info/u_team/draw_bridge/proxy/CommonProxy.java
@@ -0,0 +1,20 @@
+package info.u_team.draw_bridge.proxy;
+
+import info.uteam.drawbridges.init.*;
+import net.minecraftforge.fml.common.event.*;
+
+public class CommonProxy {
+
+	public void preinit(FMLPreInitializationEvent event) {
+		DBMBlocks.preinit();
+		DBMGuis.preinit();
+	}
+
+	public void init(FMLInitializationEvent event) {
+		DBMCreativeTabs.init();
+	}
+
+	public void postinit(FMLPostInitializationEvent event) {
+	}
+
+}
diff --git a/src/main/java/info/uteam/drawbridges/DBMConstants.java b/src/main/java/info/uteam/drawbridges/DBMConstants.java
diff --git a/src/main/java/info/uteam/drawbridges/DBMMain.java b/src/main/java/info/uteam/drawbridges/DBMMain.java
diff --git a/src/main/java/info/uteam/drawbridges/block/DBMDrawbridge.java b/src/main/java/info/uteam/drawbridges/block/DBMDrawbridge.java
@@ -16,9 +16,9 @@
 
 package info.uteam.drawbridges.block;
 
+import info.u_team.draw_bridge.DrawBridgeConstants;
 import info.u_team.u_team_core.block.UBlockTileEntity;
 import info.u_team.u_team_core.tileentity.UTileEntityProvider;
-import info.uteam.drawbridges.DBMConstants;
 import info.uteam.drawbridges.container.DBMDrawbridgeContainer;
 import info.uteam.drawbridges.gui.DBMDrawbridgeGui;
 import info.uteam.drawbridges.init.*;
@@ -53,7 +53,7 @@ public class DBMDrawbridge extends UBlockTileEntity {
 	 */
 	public DBMDrawbridge(String name, Material materialIn) {
 		super(name, materialIn, DBMCreativeTabs.dbm_tab, new UTileEntityProvider(
-				new ResourceLocation(DBMConstants.MODID, "draw_bridge"), true, DBMDrawbridgeTile.class));
+				new ResourceLocation(DrawBridgeConstants.MODID, "draw_bridge"), true, DBMDrawbridgeTile.class));
 		gui = DBMGuis.addContainer(DBMDrawbridgeContainer.class);
 		if (FMLCommonHandler.instance().getSide() == Side.CLIENT) {
 			DBMGuis.addGuiContainer(DBMDrawbridgeGui.class, gui);
@@ -72,7 +72,7 @@ public DBMDrawbridge(String name, Material materialIn) {
 	@Override
 	public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn,
 			EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
-		playerIn.openGui(DBMConstants.MODID, gui, worldIn, pos.getX(), pos.getY(), pos.getZ());
+		playerIn.openGui(DrawBridgeConstants.MODID, gui, worldIn, pos.getX(), pos.getY(), pos.getZ());
 		return true;
 	}
 

diff --git a/src/main/java/info/uteam/drawbridges/gui/DBMDrawbridgeGui.java b/src/main/java/info/uteam/drawbridges/gui/DBMDrawbridgeGui.java
@@ -16,9 +16,9 @@
 
 package info.uteam.drawbridges.gui;
 
+import info.u_team.draw_bridge.DrawBridgeConstants;
 import info.u_team.u_team_core.container.UContainer;
 import info.u_team.u_team_core.gui.UGuiContainer;
-import info.uteam.drawbridges.DBMConstants;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.ResourceLocation;
 
@@ -28,7 +28,7 @@
  */
 public class DBMDrawbridgeGui extends UGuiContainer {
 
-	public static final ResourceLocation BACKGROUND = new ResourceLocation(DBMConstants.MODID,
+	public static final ResourceLocation BACKGROUND = new ResourceLocation(DrawBridgeConstants.MODID,
 			"textures/gui/drawbridge_gui.png");
 
 	/**

diff --git a/src/main/java/info/uteam/drawbridges/handler/DBMGuiHandler.java b/src/main/java/info/uteam/drawbridges/handler/DBMGuiHandler.java
@@ -16,9 +16,9 @@
 
 package info.uteam.drawbridges.handler;
 
+import info.u_team.draw_bridge.DrawBridgeConstants;
 import info.u_team.u_team_core.container.UContainer;
 import info.u_team.u_team_core.gui.UGuiContainer;
-import info.uteam.drawbridges.DBMConstants;
 import info.uteam.drawbridges.init.DBMGuis;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.math.BlockPos;
@@ -37,7 +37,7 @@ public Object getServerGuiElement(int ID, EntityPlayer player, World world, int
 			return DBMGuis.getContainer(ID).getConstructor(EntityPlayer.class, World.class, BlockPos.class)
 					.newInstance(player, world, new BlockPos(x, y, z));
 		} catch (Exception ex) {
-			DBMConstants.LOGGER.error("Some gui container seems to be wrong.", ex);
+			DrawBridgeConstants.LOGGER.error("Some gui container seems to be wrong.", ex);
 			return null;
 		}
 	}
@@ -54,7 +54,7 @@ public Object getClientGuiElement(int ID, EntityPlayer player, World world, int
 				return gui.getConstructor(UContainer.class).newInstance(container);
 			}
 		} catch (Exception ex) {
-			DBMConstants.LOGGER.error("Some gui seems to be wrong.", ex);
+			DrawBridgeConstants.LOGGER.error("Some gui seems to be wrong.", ex);
 			return null;
 		}
 	}

diff --git a/src/main/java/info/uteam/drawbridges/init/DBMBlocks.java b/src/main/java/info/uteam/drawbridges/init/DBMBlocks.java
@@ -16,9 +16,9 @@
 
 package info.uteam.drawbridges.init;
 
+import info.u_team.draw_bridge.DrawBridgeConstants;
 import info.u_team.u_team_core.registry.BlockRegistry;
 import info.u_team.u_team_core.util.RegistryUtil;
-import info.uteam.drawbridges.DBMConstants;
 import info.uteam.drawbridges.block.DBMDrawbridge;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
@@ -32,7 +32,7 @@ public class DBMBlocks {
 	public static final Block draw_bridge = new DBMDrawbridge("drawbridge", Material.IRON);
 
 	public static void preinit() {
-		BlockRegistry.register(DBMConstants.MODID, RegistryUtil.getRegistryEntries(Block.class, DBMBlocks.class));
+		BlockRegistry.register(DrawBridgeConstants.MODID, RegistryUtil.getRegistryEntries(Block.class, DBMBlocks.class));
 	}
 
 }
diff --git a/src/main/java/info/uteam/drawbridges/init/DBMCreativeTabs.java b/src/main/java/info/uteam/drawbridges/init/DBMCreativeTabs.java
@@ -16,16 +16,16 @@
 
 package info.uteam.drawbridges.init;
 
+import info.u_team.draw_bridge.DrawBridgeConstants;
 import info.u_team.u_team_core.creativetab.UCreativeTab;
-import info.uteam.drawbridges.DBMConstants;
 
 /**
  * @author MrTroble
  *
  */
 public class DBMCreativeTabs {
 
-	public static final UCreativeTab dbm_tab = new UCreativeTab(DBMConstants.MODID, "dbm_tab");
+	public static final UCreativeTab dbm_tab = new UCreativeTab(DrawBridgeConstants.MODID, "dbm_tab");
 
 	public static void init() {
 		dbm_tab.setIcon(DBMBlocks.draw_bridge);

diff --git a/src/main/java/info/uteam/drawbridges/init/DBMGuis.java b/src/main/java/info/uteam/drawbridges/init/DBMGuis.java
@@ -18,9 +18,9 @@
 
 import java.util.*;
 
+import info.u_team.draw_bridge.DrawBridgeConstants;
 import info.u_team.u_team_core.container.UContainer;
 import info.u_team.u_team_core.gui.UGuiContainer;
-import info.uteam.drawbridges.DBMConstants;
 import info.uteam.drawbridges.handler.DBMGuiHandler;
 import net.minecraftforge.fml.common.network.NetworkRegistry;
 import net.minecraftforge.fml.relauncher.*;
@@ -35,7 +35,7 @@ public class DBMGuis {
 	private static final List<Class<? extends UContainer>> container_list = new ArrayList<Class<? extends UContainer>>();
 
 	public static void preinit() {
-		NetworkRegistry.INSTANCE.registerGuiHandler(DBMConstants.MODID, new DBMGuiHandler());
+		NetworkRegistry.INSTANCE.registerGuiHandler(DrawBridgeConstants.MODID, new DBMGuiHandler());
 	}
 
 	public static int addContainer(Class<? extends UContainer> container) {

diff --git a/src/main/java/info/uteam/drawbridges/proxy/DBMClientProxy.java b/src/main/java/info/uteam/drawbridges/proxy/DBMClientProxy.java