Move Block, Item and Tile info to API.

kiljacken · Aug 6, 2013 · 33c94bc · 33c94bc
1 parent 8590bf7
commit 33c94bc
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 61 deletions.
diff --git a/aestuscraft_common/dk/kiljacken/aestuscraft/api/info/BlockInfo.java b/aestuscraft_common/dk/kiljacken/aestuscraft/api/info/BlockInfo.java
@@ -0,0 +1,26 @@
+/**
+ * AestusCraft
+ * 
+ * BlockInfo.java
+ *
+ * @author Kiljacken
+ * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
+ */
+package dk.kiljacken.aestuscraft.api.info;
+
+public class BlockInfo {
+    public static int HEAT_CONDUCTOR_ID = 2500;
+    public static final String HEAT_CONDUCTOR_NAME = "heatConductor";
+
+    public static int FUEL_BURNER_ID = 2501;
+    public static final String FUEL_BURNER_NAME = "fuelBurner";
+
+    public static int FRICTION_HEATER_ID = 2502;
+    public static final String FRICTION_HEATER_NAME = "frictionHeater";
+
+    public static int INSULATED_FURNACE_ID = 2511;
+    public static final String INSULATED_FURNACE_NAME = "insulatedFurnace";
+
+    public static int HEATED_FLOORING_ID = 2512;
+    public static final String HEATED_FLOORING_NAME = "heatedFlooring";
+}
diff --git a/...cken/aestuscraft/core/items/ItemInfo.java → ...jacken/aestuscraft/api/info/ItemInfo.java b/...cken/aestuscraft/core/items/ItemInfo.java → ...jacken/aestuscraft/api/info/ItemInfo.java
@@ -6,7 +6,7 @@
  * @author Kiljacken
  * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
-package dk.kiljacken.aestuscraft.core.items;
+package dk.kiljacken.aestuscraft.api.info;
 
 public class ItemInfo {
     public static int NETWORK_DEBUGGER_ID = 25001;

diff --git a/...cken/aestuscraft/core/tiles/TileInfo.java → ...jacken/aestuscraft/api/info/TileInfo.java b/...cken/aestuscraft/core/tiles/TileInfo.java → ...jacken/aestuscraft/api/info/TileInfo.java
@@ -6,7 +6,7 @@
  * @author Kiljacken
  * @license Lesser GNU Public License v3 (http://www.gnu.org/licenses/lgpl.html)
  */
-package dk.kiljacken.aestuscraft.core.tiles;
+package dk.kiljacken.aestuscraft.api.info;
 
 public class TileInfo {
     public static final String FUEL_BURNER_NAME = "tile.fuelBurner.name";

diff --git a/aestuscraft_common/dk/kiljacken/aestuscraft/core/Config.java b/aestuscraft_common/dk/kiljacken/aestuscraft/core/Config.java
@@ -12,8 +12,8 @@
 
 import net.minecraftforge.common.Configuration;
 import dk.kiljacken.aestuscraft.AestusCraft;
-import dk.kiljacken.aestuscraft.core.blocks.BlockInfo;
-import dk.kiljacken.aestuscraft.core.items.ItemInfo;
+import dk.kiljacken.aestuscraft.api.info.BlockInfo;
+import dk.kiljacken.aestuscraft.api.info.ItemInfo;
 import dk.kiljacken.aestuscraft.core.tiles.TileFrictionHeater;
 import dk.kiljacken.aestuscraft.core.tiles.TileFuelBurner;
 import dk.kiljacken.aestuscraft.core.tiles.TileHeatedFlooring;
@@ -27,13 +27,13 @@ public Config(File file) {
             configuration.load();
 
             // Block Ids
-            BlockInfo.BLOCK_HEAT_CONDUCTOR_ID = configuration.getBlock(BlockInfo.BLOCK_HEAT_CONDUCTOR_NAME, BlockInfo.BLOCK_HEAT_CONDUCTOR_ID).getInt();
+            BlockInfo.HEAT_CONDUCTOR_ID = configuration.getBlock(BlockInfo.HEAT_CONDUCTOR_NAME, BlockInfo.HEAT_CONDUCTOR_ID).getInt();
 
-            BlockInfo.BLOCK_FUEL_BURNER_ID = configuration.getBlock(BlockInfo.BLOCK_FUEL_BURNER_NAME, BlockInfo.BLOCK_FUEL_BURNER_ID).getInt();
-            BlockInfo.BLOCK_FRICTION_HEATER_ID = configuration.getBlock(BlockInfo.BLOCK_FRICTION_HEATER_NAME, BlockInfo.BLOCK_FRICTION_HEATER_ID).getInt();
+            BlockInfo.FUEL_BURNER_ID = configuration.getBlock(BlockInfo.FUEL_BURNER_NAME, BlockInfo.FUEL_BURNER_ID).getInt();
+            BlockInfo.FRICTION_HEATER_ID = configuration.getBlock(BlockInfo.FRICTION_HEATER_NAME, BlockInfo.FRICTION_HEATER_ID).getInt();
 
-            BlockInfo.BLOCK_INSULATED_FURNACE_ID = configuration.getBlock(BlockInfo.BLOCK_INSULATED_FURNACE_NAME, BlockInfo.BLOCK_INSULATED_FURNACE_ID).getInt();
-            BlockInfo.BLOCK_HEATED_FLOORING_ID = configuration.getBlock(BlockInfo.BLOCK_HEATED_FLOORING_NAME, BlockInfo.BLOCK_HEATED_FLOORING_ID).getInt();
+            BlockInfo.INSULATED_FURNACE_ID = configuration.getBlock(BlockInfo.INSULATED_FURNACE_NAME, BlockInfo.INSULATED_FURNACE_ID).getInt();
+            BlockInfo.HEATED_FLOORING_ID = configuration.getBlock(BlockInfo.HEATED_FLOORING_NAME, BlockInfo.HEATED_FLOORING_ID).getInt();
 
             // Item Ids
             ItemInfo.NETWORK_DEBUGGER_ID = configuration.getItem(ItemInfo.NETWORK_DEBUGGER_NAME, ItemInfo.NETWORK_DEBUGGER_ID).getInt() - 256;

diff --git a/aestuscraft_common/dk/kiljacken/aestuscraft/core/Content.java b/aestuscraft_common/dk/kiljacken/aestuscraft/core/Content.java
@@ -14,19 +14,19 @@
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.registry.GameRegistry;
 import dk.kiljacken.aestuscraft.AestusCraft;
+import dk.kiljacken.aestuscraft.api.info.BlockInfo;
+import dk.kiljacken.aestuscraft.api.info.ItemInfo;
+import dk.kiljacken.aestuscraft.api.info.TileInfo;
 import dk.kiljacken.aestuscraft.core.blocks.BlockFrictionHeater;
 import dk.kiljacken.aestuscraft.core.blocks.BlockFuelBurner;
 import dk.kiljacken.aestuscraft.core.blocks.BlockHeatConductor;
 import dk.kiljacken.aestuscraft.core.blocks.BlockHeatedFlooring;
-import dk.kiljacken.aestuscraft.core.blocks.BlockInfo;
 import dk.kiljacken.aestuscraft.core.blocks.BlockInsulatedFurnace;
-import dk.kiljacken.aestuscraft.core.items.ItemInfo;
 import dk.kiljacken.aestuscraft.core.items.ItemNetworkDebugger;
 import dk.kiljacken.aestuscraft.core.tiles.TileFrictionHeater;
 import dk.kiljacken.aestuscraft.core.tiles.TileFuelBurner;
 import dk.kiljacken.aestuscraft.core.tiles.TileHeatConductor;
 import dk.kiljacken.aestuscraft.core.tiles.TileHeatedFlooring;
-import dk.kiljacken.aestuscraft.core.tiles.TileInfo;
 import dk.kiljacken.aestuscraft.core.tiles.TileInsulatedFurnace;
 
 public class Content {
@@ -44,20 +44,20 @@ public class Content {
      * Registers all blocks and tile entities
      */
     public void registerBlocks() {
-        blockConductor = Registry.registerBlock(new BlockHeatConductor(BlockInfo.BLOCK_HEAT_CONDUCTOR_ID), BlockInfo.BLOCK_HEAT_CONDUCTOR_NAME);
+        blockConductor = Registry.registerBlock(new BlockHeatConductor(BlockInfo.HEAT_CONDUCTOR_ID), BlockInfo.HEAT_CONDUCTOR_NAME);
         GameRegistry.registerTileEntity(TileHeatConductor.class, TileInfo.HEAT_CONDUCTOR_NAME);
 
-        blockFuelBurner = Registry.registerBlock(new BlockFuelBurner(BlockInfo.BLOCK_FUEL_BURNER_ID), BlockInfo.BLOCK_FUEL_BURNER_NAME);
+        blockFuelBurner = Registry.registerBlock(new BlockFuelBurner(BlockInfo.FUEL_BURNER_ID), BlockInfo.FUEL_BURNER_NAME);
         GameRegistry.registerTileEntity(TileFuelBurner.class, TileInfo.FUEL_BURNER_NAME);
 
-        blockInsulatedFurnace = Registry.registerBlock(new BlockInsulatedFurnace(BlockInfo.BLOCK_INSULATED_FURNACE_ID), BlockInfo.BLOCK_INSULATED_FURNACE_NAME);
+        blockInsulatedFurnace = Registry.registerBlock(new BlockInsulatedFurnace(BlockInfo.INSULATED_FURNACE_ID), BlockInfo.INSULATED_FURNACE_NAME);
         GameRegistry.registerTileEntity(TileInsulatedFurnace.class, TileInfo.INSULATED_FURNACE_NAME);
 
-        blockHeatedFlooring = Registry.registerBlock(new BlockHeatedFlooring(BlockInfo.BLOCK_HEATED_FLOORING_ID), BlockInfo.BLOCK_HEATED_FLOORING_NAME);
+        blockHeatedFlooring = Registry.registerBlock(new BlockHeatedFlooring(BlockInfo.HEATED_FLOORING_ID), BlockInfo.HEATED_FLOORING_NAME);
         GameRegistry.registerTileEntity(TileHeatedFlooring.class, TileInfo.HEATED_FLOORING_NAME);
 
         if (Loader.isModLoaded("BuildCraft|Energy")) {
-            blockFrictionHeater = Registry.registerBlock(new BlockFrictionHeater(BlockInfo.BLOCK_FRICTION_HEATER_ID), BlockInfo.BLOCK_FRICTION_HEATER_NAME);
+            blockFrictionHeater = Registry.registerBlock(new BlockFrictionHeater(BlockInfo.FRICTION_HEATER_ID), BlockInfo.FRICTION_HEATER_NAME);
             GameRegistry.registerTileEntity(TileFrictionHeater.class, TileInfo.FRICTION_HEATER_NAME);
         }
 

diff --git a/aestuscraft_common/dk/kiljacken/aestuscraft/core/blocks/BlockInfo.java b/aestuscraft_common/dk/kiljacken/aestuscraft/core/blocks/BlockInfo.java
diff --git a/aestuscraft_common/dk/kiljacken/aestuscraft/core/proxy/ClientProxy.java b/aestuscraft_common/dk/kiljacken/aestuscraft/core/proxy/ClientProxy.java
@@ -17,7 +17,7 @@
 import cpw.mods.fml.client.registry.ClientRegistry;
 import cpw.mods.fml.client.registry.RenderingRegistry;
 import dk.kiljacken.aestuscraft.api.heat.IHeatContainer;
-import dk.kiljacken.aestuscraft.core.blocks.BlockInfo;
+import dk.kiljacken.aestuscraft.api.info.BlockInfo;
 import dk.kiljacken.aestuscraft.core.client.gui.GuiFuelBurner;
 import dk.kiljacken.aestuscraft.core.client.gui.GuiIds;
 import dk.kiljacken.aestuscraft.core.client.gui.GuiInsulatedFurnace;
@@ -65,6 +65,6 @@ public void initRendering() {
         RenderIds.HEAT_CONDUCTOR = RenderingRegistry.getNextAvailableRenderId();
 
         ClientRegistry.bindTileEntitySpecialRenderer(TileHeatConductor.class, new ConductorRenderer());
-        MinecraftForgeClient.registerItemRenderer(BlockInfo.BLOCK_HEAT_CONDUCTOR_ID, new ConductorRenderer());
+        MinecraftForgeClient.registerItemRenderer(BlockInfo.HEAT_CONDUCTOR_ID, new ConductorRenderer());
     }
 }
diff --git a/aestuscraft_common/dk/kiljacken/aestuscraft/core/tiles/TileFrictionHeater.java b/aestuscraft_common/dk/kiljacken/aestuscraft/core/tiles/TileFrictionHeater.java
@@ -8,7 +8,7 @@
  */
 package dk.kiljacken.aestuscraft.core.tiles;
 
-import dk.kiljacken.aestuscraft.core.blocks.BlockInfo;
+import dk.kiljacken.aestuscraft.api.info.BlockInfo;
 import dk.kiljacken.aestuscraft.library.nbt.NBTUtil.NBTValue;
 import dk.kiljacken.aestuscraft.library.nbt.handlers.BooleanNBTHandler;
 import net.minecraft.world.World;
@@ -58,7 +58,7 @@ public void updateEntity() {
             if (m_UpdateTicks == 0) {
                 m_Active = m_RecievedEnergy;
 
-                worldObj.addBlockEvent(xCoord, yCoord, zCoord, BlockInfo.BLOCK_FRICTION_HEATER_ID, 0, m_Active ? 1 : 0);
+                worldObj.addBlockEvent(xCoord, yCoord, zCoord, BlockInfo.FRICTION_HEATER_ID, 0, m_Active ? 1 : 0);
 
                 m_UpdateTicks = 100;
                 m_RecievedEnergy = false;

diff --git a/aestuscraft_common/dk/kiljacken/aestuscraft/core/tiles/TileFuelBurner.java b/aestuscraft_common/dk/kiljacken/aestuscraft/core/tiles/TileFuelBurner.java
@@ -14,7 +14,8 @@
 import net.minecraft.tileentity.TileEntityFurnace;
 import net.minecraft.util.Vec3;
 import dk.kiljacken.aestuscraft.api.heat.IHeatNetwork;
-import dk.kiljacken.aestuscraft.core.blocks.BlockInfo;
+import dk.kiljacken.aestuscraft.api.info.BlockInfo;
+import dk.kiljacken.aestuscraft.api.info.TileInfo;
 import dk.kiljacken.aestuscraft.library.nbt.NBTUtil.NBTValue;
 import dk.kiljacken.aestuscraft.library.nbt.handlers.BooleanNBTHandler;
 import dk.kiljacken.aestuscraft.library.nbt.handlers.ItemStackNBTHandler;
@@ -62,8 +63,8 @@ public void updateEntity() {
                 fuelStack.stackSize--;
 
                 m_Active = true;
-                worldObj.addBlockEvent(xCoord, yCoord, zCoord, BlockInfo.BLOCK_FRICTION_HEATER_ID, 0, m_Active ? 1 : 0);
-                worldObj.addBlockEvent(xCoord, yCoord, zCoord, BlockInfo.BLOCK_FRICTION_HEATER_ID, 2, m_FuelTicks);
+                worldObj.addBlockEvent(xCoord, yCoord, zCoord, BlockInfo.FRICTION_HEATER_ID, 0, m_Active ? 1 : 0);
+                worldObj.addBlockEvent(xCoord, yCoord, zCoord, BlockInfo.FRICTION_HEATER_ID, 2, m_FuelTicks);
 
                 if (fuelStack.stackSize <= 0) {
                     m_InventoryStacks[SLOT_FUEL] = fuelStack.getItem().getContainerItemStack(fuelStack);
@@ -84,13 +85,13 @@ public void updateEntity() {
                     m_FuelTicksLeft--;
                     setHeatLevel(getHeatLevel() + HEAT_PER_FUEL);
                     // TODO: Limit fuel ticks events?
-                    worldObj.addBlockEvent(xCoord, yCoord, zCoord, BlockInfo.BLOCK_FRICTION_HEATER_ID, 1, m_FuelTicksLeft);
+                    worldObj.addBlockEvent(xCoord, yCoord, zCoord, BlockInfo.FRICTION_HEATER_ID, 1, m_FuelTicksLeft);
 
                     if (m_FuelTicksLeft == 0) {
                         m_FuelTicks = 0;
                         m_Active = false;
 
-                        worldObj.addBlockEvent(xCoord, yCoord, zCoord, BlockInfo.BLOCK_FRICTION_HEATER_ID, 0, m_Active ? 1 : 0);
+                        worldObj.addBlockEvent(xCoord, yCoord, zCoord, BlockInfo.FRICTION_HEATER_ID, 0, m_Active ? 1 : 0);
                     }
                 }
             }

diff --git a/aestuscraft_common/dk/kiljacken/aestuscraft/core/tiles/TileHeatConductor.java b/aestuscraft_common/dk/kiljacken/aestuscraft/core/tiles/TileHeatConductor.java
@@ -21,7 +21,7 @@
 import dk.kiljacken.aestuscraft.api.heat.IHeatConsumer;
 import dk.kiljacken.aestuscraft.api.heat.IHeatNetwork;
 import dk.kiljacken.aestuscraft.api.heat.IHeatProducer;
-import dk.kiljacken.aestuscraft.core.blocks.BlockInfo;
+import dk.kiljacken.aestuscraft.api.info.BlockInfo;
 import dk.kiljacken.aestuscraft.library.nbt.NBTUtil.NBTValue;
 
 public class TileHeatConductor extends BaseTile implements IHeatConductor {
@@ -81,7 +81,7 @@ public void updateEntity() {
 
             getNetwork().refresh();
 
-            worldObj.addBlockEvent(xCoord, yCoord, zCoord, BlockInfo.BLOCK_HEAT_CONDUCTOR_ID, 0, m_ConnectedSides);
+            worldObj.addBlockEvent(xCoord, yCoord, zCoord, BlockInfo.HEAT_CONDUCTOR_ID, 0, m_ConnectedSides);
 
             m_ShouldUpdate = false;
         }

diff --git a/aestuscraft_common/dk/kiljacken/aestuscraft/core/tiles/TileHeatedFlooring.java b/aestuscraft_common/dk/kiljacken/aestuscraft/core/tiles/TileHeatedFlooring.java
@@ -9,13 +9,14 @@
 package dk.kiljacken.aestuscraft.core.tiles;
 
 import net.minecraft.block.Block;
-import dk.kiljacken.aestuscraft.core.blocks.BlockInfo;
+import dk.kiljacken.aestuscraft.api.info.BlockInfo;
 import dk.kiljacken.aestuscraft.library.ConnectedTextureHelper;
 import dk.kiljacken.aestuscraft.library.WorkAdaptingDelay;
 import dk.kiljacken.aestuscraft.library.WorkAdaptingDelay.WorkAdaptingDelayNBTHandler;
 import dk.kiljacken.aestuscraft.library.nbt.NBTUtil.NBTValue;
 
 // TODO Make heated flooring act like conductors?
+// TODO Add damaging and a way to activate it
 public class TileHeatedFlooring extends HeatConsumerBaseTile {
     public static float HEAT_PER_REMOVED_SNOW = 1.0f;
 
@@ -60,7 +61,7 @@ public void updateEntity() {
 
                 if (connetedSides != m_ConnectedSides) {
                     m_ConnectedSides = connetedSides;
-                    worldObj.addBlockEvent(xCoord, yCoord, zCoord, BlockInfo.BLOCK_HEATED_FLOORING_ID, 0, m_ConnectedSides);
+                    worldObj.addBlockEvent(xCoord, yCoord, zCoord, BlockInfo.HEATED_FLOORING_ID, 0, m_ConnectedSides);
                 }
 
                 m_ShouldUpdate = false;

diff --git a/aestuscraft_common/dk/kiljacken/aestuscraft/core/tiles/TileInsulatedFurnace.java b/aestuscraft_common/dk/kiljacken/aestuscraft/core/tiles/TileInsulatedFurnace.java
@@ -13,7 +13,8 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.FurnaceRecipes;
 import net.minecraft.util.Vec3;
-import dk.kiljacken.aestuscraft.core.blocks.BlockInfo;
+import dk.kiljacken.aestuscraft.api.info.BlockInfo;
+import dk.kiljacken.aestuscraft.api.info.TileInfo;
 import dk.kiljacken.aestuscraft.library.nbt.NBTUtil.NBTValue;
 import dk.kiljacken.aestuscraft.library.nbt.handlers.BooleanNBTHandler;
 import dk.kiljacken.aestuscraft.library.nbt.handlers.ItemStackNBTHandler;
@@ -55,18 +56,18 @@ public void updateEntity() {
             if (m_BurnTicksLeft == 0 && canSmelt) {
                 m_BurnTicksLeft = 200;
                 m_Active = true;
-                worldObj.addBlockEvent(xCoord, yCoord, zCoord, BlockInfo.BLOCK_INSULATED_FURNACE_ID, 0, m_Active ? 1 : 0);
+                worldObj.addBlockEvent(xCoord, yCoord, zCoord, BlockInfo.INSULATED_FURNACE_ID, 0, m_Active ? 1 : 0);
             } else if (m_BurnTicksLeft > 0 && !canSmelt) {
                 m_BurnTicksLeft = 0;
                 m_Active = false;
-                worldObj.addBlockEvent(xCoord, yCoord, zCoord, BlockInfo.BLOCK_INSULATED_FURNACE_ID, 0, m_Active ? 1 : 0);
+                worldObj.addBlockEvent(xCoord, yCoord, zCoord, BlockInfo.INSULATED_FURNACE_ID, 0, m_Active ? 1 : 0);
             }
 
             if (m_BurnTicksLeft > 0 && getHeatLevel() > HEAT_PER_BURN_TICK) {
                 setHeatLevel(getHeatLevel() - HEAT_PER_BURN_TICK);
                 m_BurnTicksLeft--;
                 // TODO: Limit burn ticks events?
-                worldObj.addBlockEvent(xCoord, yCoord, zCoord, BlockInfo.BLOCK_INSULATED_FURNACE_ID, 1, m_BurnTicksLeft);
+                worldObj.addBlockEvent(xCoord, yCoord, zCoord, BlockInfo.INSULATED_FURNACE_ID, 1, m_BurnTicksLeft);
 
                 if (m_BurnTicksLeft == 0) {
                     if (canSmelt1) {
@@ -87,7 +88,7 @@ public void updateEntity() {
                     canSmelt = canSmelt1 | canSmelt2 | canSmelt3;
                     if (!canSmelt) {
                         m_Active = false;
-                        worldObj.addBlockEvent(xCoord, yCoord, zCoord, BlockInfo.BLOCK_INSULATED_FURNACE_ID, 0, m_Active ? 1 : 0);
+                        worldObj.addBlockEvent(xCoord, yCoord, zCoord, BlockInfo.INSULATED_FURNACE_ID, 0, m_Active ? 1 : 0);
                     }
                 }
             }