aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/forestry/Forestry.java
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-03-04 12:58:47 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-03-04 12:58:47 +1000
commitae21012d216df71f31aed6fbc9d76215fc24ceed (patch)
treecc89accbe6ce5c04b72ed3c5e46b2a185f88be6a /src/Java/gtPlusPlus/xmod/forestry/Forestry.java
parentba89972a22a316030f8c3bd99974f915b1d7aefc (diff)
downloadGT5-Unofficial-ae21012d216df71f31aed6fbc9d76215fc24ceed.tar.gz
GT5-Unofficial-ae21012d216df71f31aed6fbc9d76215fc24ceed.tar.bz2
GT5-Unofficial-ae21012d216df71f31aed6fbc9d76215fc24ceed.zip
+ New texture for the slow builders ring.
+ Added the Alkalus Disk. $ Fixed Frame Box Assembler Recipes. $ Fixed Missing 7Li material. $ Fixed Tiered Tanks not showing their capacity in the tooltip. $ Fixed tooltips for alloys containing Bronze or Steel. $ Fixed Clay Pipe Extruder Recipes. - Removed a handful of Plasma cells for misc. materials. % Changed the Industrial Coke Oven's tooltip, to better describe the input/output requirements. % Cleaned up The Entire Project.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/forestry/Forestry.java')
-rw-r--r--src/Java/gtPlusPlus/xmod/forestry/Forestry.java66
1 files changed, 33 insertions, 33 deletions
diff --git a/src/Java/gtPlusPlus/xmod/forestry/Forestry.java b/src/Java/gtPlusPlus/xmod/forestry/Forestry.java
index 698e6a8d01..8f5b36f6e3 100644
--- a/src/Java/gtPlusPlus/xmod/forestry/Forestry.java
+++ b/src/Java/gtPlusPlus/xmod/forestry/Forestry.java
@@ -2,10 +2,6 @@ package gtPlusPlus.xmod.forestry;
import static cpw.mods.fml.common.registry.GameRegistry.findBlock;
import static cpw.mods.fml.common.registry.GameRegistry.findItem;
-import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
@@ -16,6 +12,10 @@ import cpw.mods.fml.common.Mod.CustomProperty;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
@ChildMod(parent = CORE.MODID, mod = @Mod(modid = "Gregtech++|CompatForestry",
name = "GT++ Compat: Forestry",
@@ -27,12 +27,12 @@ public class Forestry {
private static final String name = "Forestry";
@EventHandler
- public void load(FMLInitializationEvent e) {
+ public void load(final FMLInitializationEvent e) {
try {
initForestry();
- } catch (Throwable $) {
- ModContainer This = FMLCommonHandler.instance().findContainerFor(this);
+ } catch (final Throwable $) {
+ final ModContainer This = FMLCommonHandler.instance().findContainerFor(this);
LogManager.getLogger(This.getModId()).log(Level.ERROR, "There was a problem loading " + This.getName(), $);
}
}
@@ -43,47 +43,45 @@ public class Forestry {
item = findItem(name, "sapling");
Block block = findBlock(name, "saplingGE");
- if (item != null && block != null) {
+ if ((item != null) && (block != null)) {
//ForestrySapling sapling = new ForestrySapling(item, block);
//MFRRegistry.registerPlantable(sapling);
//MFRRegistry.registerFertilizable(sapling);
- } else
- //Utils.LOG_WARNING("Forestry sapling/block null!");
-
- block = findBlock(name, "soil");
+ } else {
+ block = findBlock(name, "soil");
+ }
if (block != null) {
//ForestryBogEarth bog = new ForestryBogEarth(block);
//MFRRegistry.registerPlantable(bog);
//MFRRegistry.registerFertilizable(bog);
//MFRRegistry.registerHarvestable(bog);
//MFRRegistry.registerFruit(bog);
- } else
- //Utils.LOG_WARNING("Forestry bog earth null!");
-
- for (int i = 1; true; ++i) {
- block = findBlock(name, "log" + i);
- l: if (block == null) {
- if (i > 1)
- Utils.LOG_WARNING("Forestry logs null at " + i + ".");
- else {
- block = findBlock(name, "logs");
- if (block != null) {
- break l;
+ } else {
+ for (int i = 1; true; ++i) {
+ block = findBlock(name, "log" + i);
+ l: if (block == null) {
+ if (i > 1) {
+ Utils.LOG_WARNING("Forestry logs null at " + i + ".");
+ } else {
+ block = findBlock(name, "logs");
+ if (block != null) {
+ break l;
+ }
+ Utils.LOG_WARNING("Forestry logs null!");
}
- Utils.LOG_WARNING("Forestry logs null!");
+ break;
}
- break;
+ //MFRRegistry.registerHarvestable(new HarvestableWood(block));
+ //MFRRegistry.registerFruitLogBlock(block);
}
- //MFRRegistry.registerHarvestable(new HarvestableWood(block));
- //MFRRegistry.registerFruitLogBlock(block);
}
for (int i = 1; true; ++i) {
block = findBlock(name, "fireproofLog" + i);
l: if (block == null) {
- if (i > 1)
+ if (i > 1) {
Utils.LOG_WARNING("Forestry logs null at " + i + ".");
- else {
+ } else {
block = findBlock(name, "logsFireproof");
if (block != null) {
break l;
@@ -102,8 +100,9 @@ public class Forestry {
//MFRRegistry.registerFertilizable(leaf);
//MFRRegistry.registerHarvestable(leaf);
//MFRRegistry.registerFruit(leaf);
- } else
+ } else {
Utils.LOG_WARNING("Forestry leaves null!");
+ }
block = findBlock(name, "pods");
item = findItem(name, "grafterProven");
@@ -112,12 +111,13 @@ public class Forestry {
//MFRRegistry.registerFertilizable(pod);
//MFRRegistry.registerHarvestable(pod);
//MFRRegistry.registerFruit(pod);
- } else
+ } else {
Utils.LOG_WARNING("Forestry pods null!");
+ }
}
@EventHandler
- public static void postInit(FMLPostInitializationEvent e) {
+ public static void postInit(final FMLPostInitializationEvent e) {
//MFRRegistry.registerLiquidDrinkHandler("bioethanol", new DrinkHandlerBiofuel());
//TileEntityUnifier.updateUnifierLiquids();
}