Rework proxy classes

Sunconure11 · Feb 24, 2018 · cbde129 · cbde129
1 parent 09102a1
commit cbde129
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 37 deletions.
diff --git a/src/main/java/info/ata4/minecraft/dragon/client/ClientProxy.java b/src/main/java/info/ata4/minecraft/dragon/client/ClientProxy.java
@@ -30,36 +30,26 @@
  */
 public class ClientProxy extends CommonProxy {
 
+		@Override
+		public void onPreInit(FMLPreInitializationEvent event) {
+			super.onPreInit(event);
 
-	@Override
-	public void onPreInit(FMLPreInitializationEvent event) {
-		super.onPreInit(event);
+			// register dragon entity renderer
+			RenderingRegistry.registerEntityRenderingHandler(EntityTameableDragon.class, DragonRenderer::new);
 
-		// register dragon entity renderer
-		RenderingRegistry.registerEntityRenderingHandler(EntityTameableDragon.class, DragonRenderer::new);
-
-		// register item renderer for dragon egg block variants
-		ResourceLocation eggModelItemLoc = new ResourceLocation(DragonMounts.AID, "dragon_egg");
-		Item itemBlockDragonEgg = Item.REGISTRY.getObject(eggModelItemLoc);
-		EnumDragonBreed.META_MAPPING.forEach((breed, meta) -> {
-			ModelResourceLocation eggModelLoc = new ModelResourceLocation(DragonMounts.AID + ":dragon_egg", "breed=" + breed.getName());
-			if (itemBlockDragonEgg != null) {
-				ModelLoader.setCustomModelResourceLocation(itemBlockDragonEgg, meta, eggModelLoc);
-			}
-		});
-	}
+		}
 
-	@Override
-	public void onInit(FMLInitializationEvent evt) {
-		super.onInit(evt);
-	}
+		@Override
+		public void onInit(FMLInitializationEvent evt) {
+			super.onInit(evt);
+		}
 
-	@Override
-	public void onPostInit(FMLPostInitializationEvent event) {
-		super.onPostInit(event);
+		@Override
+		public void onPostInit(FMLPostInitializationEvent event) {
+			super.onPostInit(event);
 
-		if (DragonMounts.instance.getConfig().isDebug()) {
-			MinecraftForge.EVENT_BUS.register(new GuiDragonDebug());
+			if (DragonMounts.instance.getConfig().isDebug()) {
+				MinecraftForge.EVENT_BUS.register(new GuiDragonDebug());
+			}
 		}
 	}
-}
diff --git a/src/main/java/info/ata4/minecraft/dragon/server/CommonProxy.java b/src/main/java/info/ata4/minecraft/dragon/server/CommonProxy.java
@@ -28,20 +28,19 @@ public class CommonProxy {
 
 	private final int ENTITY_TRACKING_RANGE = 80;
 	private final int ENTITY_UPDATE_FREQ = 3;
-	private final int ENTITY_ID = 0;
+	private final int ENTITY_ID = 1;
 	private final boolean ENTITY_SEND_VELO_UPDATES = true;
 
-	public void onPreInit(FMLPreInitializationEvent event) {
-	}
+	public void onPreInit(FMLPreInitializationEvent event) {}
 
-	public void onInit(FMLInitializationEvent evt) {
-		registerEntities();
 
+	public void onInit(FMLInitializationEvent evt) {
 		MinecraftForge.EVENT_BUS.register(new DragonEggBlockHandler());
-		MinecraftForge.EVENT_BUS.register(new DragonMountsMountHandler());
 	}
 
 	public void onPostInit(FMLPostInitializationEvent event) {
+		registerEntities();
+
 	}
 
 	public void onServerStarting(FMLServerStartingEvent evt) {
@@ -50,13 +49,11 @@ public void onServerStarting(FMLServerStartingEvent evt) {
 		cmdman.registerCommand(new CommandDragon());
 	}
 
-	public void onServerStopped(FMLServerStoppedEvent evt) {
-	}
+	public void onServerStopped(FMLServerStoppedEvent evt) {}
 
 	private void registerEntities() {
-		ResourceLocation res = new ResourceLocation(DragonMounts.AID, "dragon");
-		EntityRegistry.registerModEntity(res, EntityTameableDragon.class, "DragonMount",
+		EntityRegistry.registerModEntity(new ResourceLocation(DragonMounts.ID, "dragon"), EntityTameableDragon.class, "DragonMount",
 				ENTITY_ID, DragonMounts.instance, ENTITY_TRACKING_RANGE, ENTITY_UPDATE_FREQ,
 				ENTITY_SEND_VELO_UPDATES);
 	}
-}
+}