aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-07-27 11:05:53 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-07-27 11:05:53 +1000
commit70fb3475418db0048c39db1479b62a92be041314 (patch)
tree1c807ac6fa57ba0a82ed6db7f92a6513c950303f
parentbe6a82cfa41d0917339168062af8881f4820f258 (diff)
downloadGT5-Unofficial-70fb3475418db0048c39db1479b62a92be041314.tar.gz
GT5-Unofficial-70fb3475418db0048c39db1479b62a92be041314.tar.bz2
GT5-Unofficial-70fb3475418db0048c39db1479b62a92be041314.zip
+ Updated Tooltips on all GT5u related blocks.
+ Added Config options for TC Shard OreDicting, IC2 Recipe Removal and Alternative battery Alloy. $ Fixed the Industrial Centrifuge not handling recipes properly. $ Fixed the Industrial Centrifuge stopping when it's recipe time was < 1. % Moved Config related variables to their own inner class within CORE.java
-rw-r--r--src/Java/miscutil/MiscUtils.java42
-rw-r--r--src/Java/miscutil/core/common/compat/COMPAT_IC2.java49
-rw-r--r--src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java7
-rw-r--r--src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java4
-rw-r--r--src/Java/miscutil/core/item/ModItems.java20
-rw-r--r--src/Java/miscutil/core/item/init/ItemsIngots.java1
-rw-r--r--src/Java/miscutil/core/item/init/ItemsPlates.java3
-rw-r--r--src/Java/miscutil/core/lib/CORE.java24
-rw-r--r--src/Java/miscutil/core/lib/LoadedMods.java3
-rw-r--r--src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java3
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java4
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java4
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java3
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSafeBlock.java4
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java163
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java7
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialElectrolyzer.java4
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java4
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java4
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialWireMill.java4
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIronBlastFurnace.java6
-rw-r--r--src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java4
22 files changed, 178 insertions, 189 deletions
diff --git a/src/Java/miscutil/MiscUtils.java b/src/Java/miscutil/MiscUtils.java
index 103eae53da..3e717b729c 100644
--- a/src/Java/miscutil/MiscUtils.java
+++ b/src/Java/miscutil/MiscUtils.java
@@ -1,5 +1,13 @@
package miscutil;
+import static miscutil.core.lib.CORE.DEBUG;
+import static miscutil.core.lib.CORE.configSwitches.disableCentrifugeFormation;
+import static miscutil.core.lib.CORE.configSwitches.disableEnderIOIntegration;
+import static miscutil.core.lib.CORE.configSwitches.disableIC2Recipes;
+import static miscutil.core.lib.CORE.configSwitches.disableStaballoyBlastFurnaceRecipe;
+import static miscutil.core.lib.CORE.configSwitches.enableAlternativeBatteryAlloy;
+import static miscutil.core.lib.CORE.configSwitches.enableSolarGenerators;
+import static miscutil.core.lib.CORE.configSwitches.enableThaumcraftShardUnification;
import gregtech.api.util.GT_Config;
import java.awt.event.ActionEvent;
@@ -39,29 +47,35 @@ implements ActionListener
public void handleConfigFile(FMLPreInitializationEvent event) {
Configuration config = new Configuration(event.getSuggestedConfigurationFile());
- boolean EIO = false;
+ config.load();
- config.load();
- CORE.DEBUG = config.getBoolean("debugMode", "debug", false, "Enables all sorts of debug logging. (Don't use unless told to, breaks other things.)");
- CORE.disableEnderIOIntegration = config.getBoolean("disableEnderIO", "debug", false, "Disables EnderIO Integration.");
- CORE.disableStaballoyBlastFurnaceRecipe = config.getBoolean("disableStaballoyBlastFurnaceRecipe", "debug", false, "Disables Staballoy Blast Furnace Recipe.");
- CORE.disableCentrifugeFormation = config.getBoolean("disableCentrifuge", "debug", true, "Keeps the Items around, just stops the multiblock forming. (It's broken currently, needs in depth testing)");
- CORE.enableSolarGenerators = config.getBoolean("enableSolarGenerators", "machines", false, "These may be overpowered, Consult a local electrician.");
- config.save();
+ //Debug
+ DEBUG = config.getBoolean("debugMode", "debug", false, "Enables all sorts of debug logging. (Don't use unless told to, breaks other things.)");
+ disableEnderIOIntegration = config.getBoolean("disableEnderIO", "debug", false, "Disables EnderIO Integration.");
+ disableStaballoyBlastFurnaceRecipe = config.getBoolean("disableStaballoyBlastFurnaceRecipe", "debug", false, "Disables Staballoy Blast Furnace Recipe.");
+ disableCentrifugeFormation = config.getBoolean("disableCentrifuge", "debug", true, "Keeps the Items around, just stops the multiblock forming. (It's broken currently, needs in depth testing)");
+
+ //Machines
+ enableSolarGenerators = config.getBoolean("enableSolarGenerators", "machines", false, "These may be overpowered, Consult a local electrician.");
+ enableThaumcraftShardUnification = config.getBoolean("enableThaumcraftShardUnification", "machines", false, "Allows the use of TC shards across many recipes by oreDicting them into a common group.");
+ enableAlternativeBatteryAlloy = config.getBoolean("enableAlternativeBatteryAlloy", "machines", false, "Adds a non-Antimony using Battery Alloy. Not Balanced at all..");
+ disableIC2Recipes = config.getBoolean("disableIC2Recipes", "machines", false, "Alkaluscraft Related - Removes IC2 Cables Except glass fibre. Few other Misc Tweaks.");
+
+ config.save();
}
-
-
-
+
+
+
//Pre-Init
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event)
{
Utils.LOG_INFO("Loading "+CORE.name+" V"+CORE.VERSION);
-
+
FMLCommonHandler.instance().bus().register(new LoginEventHandler());
- System.out.println("Login Handler Initialized");
-
+ System.out.println("Login Handler Initialized");
+
handleConfigFile(event);
proxy.registerTileEntities();
proxy.registerRenderThings();
diff --git a/src/Java/miscutil/core/common/compat/COMPAT_IC2.java b/src/Java/miscutil/core/common/compat/COMPAT_IC2.java
index cff1e58c27..abea1c87f1 100644
--- a/src/Java/miscutil/core/common/compat/COMPAT_IC2.java
+++ b/src/Java/miscutil/core/common/compat/COMPAT_IC2.java
@@ -2,6 +2,7 @@ package miscutil.core.common.compat;
import static miscutil.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
+import miscutil.core.lib.CORE.configSwitches;
import miscutil.core.lib.LoadedMods;
import miscutil.core.recipe.ShapedRecipeObject;
import miscutil.core.util.item.UtilsItems;
@@ -12,7 +13,7 @@ public class COMPAT_IC2 {
private static ItemStack itemCropnalyzer = UtilsItems.simpleMetaStack("IC2:itemCropnalyzer", 0, 1);
private static ItemStack itemSolarHelmet = UtilsItems.simpleMetaStack("IC2:itemSolarHelmet", 0, 1);
-
+
public static ShapedRecipeObject Cropnalyzer = new ShapedRecipeObject(
"ore:cableGt02Copper", "ore:cableGt02Copper", null,
"minecraft:redstone", "ore:blockGlass", "minecraft:redstone",
@@ -23,33 +24,39 @@ public class COMPAT_IC2 {
"ore:plateIron", "gregtech:gt.metaitem.01:32750", "ore:plateIron",
"ore:craftingWireCopper", "ore:craftingWireCopper", "ore:craftingWireCopper",
itemSolarHelmet);
-
-
-
+
+
+
public static void OreDict(){
//Get ItemStacks for results
/*itemCropnalyzer = UtilsItems.getItemStack("IC2:itemCropnalyzer", 1);
itemSolarHelmet = UtilsItems.getItemStack("IC2:itemSolarHelmet", 1); */
run();
}
-
+
private static final void run(){
- if (LoadedMods.Gregtech){
- //Fuck these right off.
- RemoveRecipeQueue.add("IC2:itemCable");
- RemoveRecipeQueue.add("IC2:itemCable:1");
- RemoveRecipeQueue.add("IC2:itemCable:2");
- RemoveRecipeQueue.add("IC2:itemCable:3");
- RemoveRecipeQueue.add("IC2:itemCable:5");
- RemoveRecipeQueue.add("IC2:itemCable:6");
- RemoveRecipeQueue.add("IC2:itemCable:10");
- RemoveRecipeQueue.add("IC2:itemCable:13");
- //RemoveRecipeQueue.add(itemCropnalyzer);
- //RemoveRecipeQueue.add(itemSolarHelmet);
-
- //AddRecipeQueue.add(Cropnalyzer);
- //AddRecipeQueue.add(SolarHelmet);
+
+ if (configSwitches.disableIC2Recipes){
+
+
+
+ if (LoadedMods.Gregtech){
+ //Fuck these right off.
+ RemoveRecipeQueue.add("IC2:itemCable");
+ RemoveRecipeQueue.add("IC2:itemCable:1");
+ RemoveRecipeQueue.add("IC2:itemCable:2");
+ RemoveRecipeQueue.add("IC2:itemCable:3");
+ RemoveRecipeQueue.add("IC2:itemCable:5");
+ RemoveRecipeQueue.add("IC2:itemCable:6");
+ RemoveRecipeQueue.add("IC2:itemCable:10");
+ RemoveRecipeQueue.add("IC2:itemCable:13");
+ //RemoveRecipeQueue.add(itemCropnalyzer);
+ //RemoveRecipeQueue.add(itemSolarHelmet);
+
+ //AddRecipeQueue.add(Cropnalyzer);
+ //AddRecipeQueue.add(SolarHelmet);
+ }
}
}
-
+
}
diff --git a/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java b/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java
index 3fbf3e409e..5e63ac5604 100644
--- a/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java
+++ b/src/Java/miscutil/core/common/compat/COMPAT_Thaumcraft.java
@@ -2,6 +2,7 @@ package miscutil.core.common.compat;
import gregtech.api.util.GT_OreDictUnificator;
import miscutil.core.item.ModItems;
+import miscutil.core.lib.CORE.configSwitches;
import miscutil.core.lib.LoadedMods;
import miscutil.core.util.item.UtilsItems;
import net.minecraft.item.ItemStack;
@@ -9,7 +10,9 @@ import net.minecraft.item.ItemStack;
public class COMPAT_Thaumcraft {
public static void OreDict(){
- run();
+ if (configSwitches.enableThaumcraftShardUnification){
+ run();
+ }
}
private static final void run(){
@@ -24,7 +27,7 @@ public class COMPAT_Thaumcraft {
GT_OreDictUnificator.registerOre("gemInfusedAnything", UtilsItems.getItemStack("Thaumcraft:ItemShard:"+i, 1));
//System.out.println("TC Shard registration count is: "+i);
}
-
+
if (LoadedMods.ForbiddenMagic){
for(int i=0; i<=6; i++){
//Utils.LOG_INFO(""+i);
diff --git a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java
index 5f6def23cf..d9320646f7 100644
--- a/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java
+++ b/src/Java/miscutil/core/handler/registration/gregtech/GregtechSolarGenerators.java
@@ -1,6 +1,6 @@
package miscutil.core.handler.registration.gregtech;
-import miscutil.core.lib.CORE;
+import miscutil.core.lib.CORE.configSwitches;
import miscutil.core.lib.LoadedMods;
import miscutil.core.util.Utils;
import miscutil.core.xmod.gregtech.api.enums.GregtechItemList;
@@ -10,7 +10,7 @@ public class GregtechSolarGenerators
{
public static void run()
{
- if (LoadedMods.Gregtech && CORE.enableSolarGenerators){
+ if (LoadedMods.Gregtech && configSwitches.enableSolarGenerators){
Utils.LOG_INFO("MiscUtils: Gregtech5u Content | Registering Solar Generator Blocks.");
run1();
}
diff --git a/src/Java/miscutil/core/item/ModItems.java b/src/Java/miscutil/core/item/ModItems.java
index 0b51a67f12..231f68edf3 100644
--- a/src/Java/miscutil/core/item/ModItems.java
+++ b/src/Java/miscutil/core/item/ModItems.java
@@ -21,6 +21,7 @@ import miscutil.core.item.tool.misc.SandstoneHammer;
import miscutil.core.item.tool.staballoy.StaballoyAxe;
import miscutil.core.item.tool.staballoy.StaballoyPickaxe;
import miscutil.core.lib.CORE;
+import miscutil.core.lib.CORE.configSwitches;
import miscutil.core.lib.LoadedMods;
import miscutil.core.util.Utils;
import miscutil.core.util.debug.DEBUG_INIT;
@@ -112,7 +113,7 @@ public final class ModItems {
public static BaseItemHotFood itemHotFoodRaisinToast;
public static BaseItemFood itemFoodCurriedSausages;
public static BaseItemHotFood itemHotFoodCurriedSausages;
-
+
//@SuppressWarnings("unused")
public static final void init(){
@@ -123,7 +124,7 @@ public final class ModItems {
if (CORE.DEBUG){
DEBUG_INIT.registerItems();
}
-
+
ItemsDusts.load();
ItemsIngots.load();
ItemsPlates.load();
@@ -251,6 +252,13 @@ public final class ModItems {
}
+ //Special Item Handling Case
+ if (configSwitches.enableAlternativeBatteryAlloy) {
+ ModItems.itemIngotBatteryAlloy = new BaseItemIngot("itemIngotBatteryAlloy", "Battery Alloy", Utils.rgbtoHexValue(35, 228, 141));
+ ModItems.itemPlateBatteryAlloy = new BaseItemPlate("itemPlateBatteryAlloy", "Battery Alloy", Utils.rgbtoHexValue(35, 228, 141));
+ }
+
+
//UtilsItems.generateSpawnEgg("ic2", "boatcarbon", Utils.generateSingularRandomHexValue(), Utils.generateSingularRandomHexValue());
@@ -264,11 +272,11 @@ public final class ModItems {
GameRegistry.registerItem(itemStaballoyPickaxe, itemStaballoyPickaxe.getUnlocalizedName());
itemStaballoyAxe = new StaballoyAxe("itemStaballoyAxe", STABALLOY).setCreativeTab(AddToCreativeTab.tabTools);
GameRegistry.registerItem(itemStaballoyAxe, itemStaballoyAxe.getUnlocalizedName());
-
+
//Sandstone Hammer
itemSandstoneHammer = new SandstoneHammer("itemSandstoneHammer").setCreativeTab(AddToCreativeTab.tabTools);
GameRegistry.registerItem(itemSandstoneHammer, itemSandstoneHammer.getUnlocalizedName());
-
+
//Buffer Cores!
Item itemBufferCore;
for(int i=1; i<=10; i++){
@@ -277,7 +285,7 @@ public final class ModItems {
GameRegistry.registerItem(itemBufferCore, itemBufferCore.getUnlocalizedName()+i);
//System.out.println("Buffer Core registration count is: "+i);
}
-
+
itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMachines).setTextureName(CORE.MODID + ":itemStickyRubber");
GameRegistry.registerItem(itemStickyRubber, "itemStickyRubber");
GT_OreDictUnificator.registerOre("ingotRubber", UtilsItems.getItemStack(CORE.MODID+":itemStickyRubber", 1));
@@ -290,6 +298,6 @@ public final class ModItems {
-
+
}
} \ No newline at end of file
diff --git a/src/Java/miscutil/core/item/init/ItemsIngots.java b/src/Java/miscutil/core/item/init/ItemsIngots.java
index 9afb364c44..981dfecf47 100644
--- a/src/Java/miscutil/core/item/init/ItemsIngots.java
+++ b/src/Java/miscutil/core/item/init/ItemsIngots.java
@@ -20,7 +20,6 @@ public class ItemsIngots {
ModItems.itemIngotTantalloy60 = new BaseItemIngot("itemIngotTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166));
ModItems.itemIngotTantalloy61 = new BaseItemIngot("itemIngotTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196));
ModItems.itemIngotBloodSteel = new BaseItemIngot("itemIngotBloodSteel", "Blood Steel", Utils.rgbtoHexValue(142, 28, 0));
- ModItems.itemIngotBatteryAlloy = new BaseItemIngot("itemIngotBatteryAlloy", "Battery Alloy", Utils.rgbtoHexValue(35, 228, 141));
//Hot Ingots
diff --git a/src/Java/miscutil/core/item/init/ItemsPlates.java b/src/Java/miscutil/core/item/init/ItemsPlates.java
index c92b77e506..878b6cbb4d 100644
--- a/src/Java/miscutil/core/item/init/ItemsPlates.java
+++ b/src/Java/miscutil/core/item/init/ItemsPlates.java
@@ -15,8 +15,7 @@ public class ItemsPlates {
ModItems.itemPlateStaballoy = new BaseItemPlate("itemPlateStaballoy", "Staballoy", Utils.rgbtoHexValue(68, 75, 66));
ModItems.itemPlateBloodSteel = new BaseItemPlate("itemPlateBloodSteel", "Blood Steel", Utils.rgbtoHexValue(142, 28, 0));
ModItems.itemPlateTantalloy60 = new BaseItemPlate("itemPlateTantalloy60", "Tantalloy-60", Utils.rgbtoHexValue(68, 75, 166));
- ModItems.itemPlateTantalloy61 = new BaseItemPlate("itemPlateTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196));
- ModItems.itemPlateBatteryAlloy = new BaseItemPlate("itemPlateBatteryAlloy", "Battery Alloy", Utils.rgbtoHexValue(35, 228, 141));
+ ModItems.itemPlateTantalloy61 = new BaseItemPlate("itemPlateTantalloy61", "Tantalloy-61", Utils.rgbtoHexValue(122, 135, 196));
}
diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java
index 425f51be5d..702e5e00f3 100644
--- a/src/Java/miscutil/core/lib/CORE.java
+++ b/src/Java/miscutil/core/lib/CORE.java
@@ -9,6 +9,7 @@ import miscutil.core.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials;
import miscutil.core.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder;
import miscutil.core.xmod.gregtech.common.Meta_GT_Proxy;
import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.common.config.Configuration;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -33,12 +34,8 @@ public class CORE {
public static List<Runnable> GT_BlockIconload = new ArrayList<Runnable>();
public static final Class<AddToCreativeTab> TAB = AddToCreativeTab.class;
public static Configuration Config;
-
- public static boolean disableEnderIOIntegration = false;
- public static boolean disableStaballoyBlastFurnaceRecipe = false;
- public static boolean disableCentrifugeFormation = true;
- public static boolean enableSolarGenerators = false;
-
+ public static final String GT_Tooltip = "Added by: " + EnumChatFormatting.DARK_GREEN+"Alkalus "+EnumChatFormatting.GRAY+"- "+EnumChatFormatting.RED+"[GT++]";
+
/**
* A List containing all the Materials, which are somehow in use by GT and therefor receive a specific Set of Items.
*/
@@ -72,4 +69,19 @@ public class CORE {
//public static final Materials2[] MiscGeneratedMaterials = new Materials2[1000];
+ public static class configSwitches {
+
+ //Debug
+ public static boolean disableEnderIOIntegration = false;
+ public static boolean disableStaballoyBlastFurnaceRecipe = false;
+ public static boolean disableCentrifugeFormation = true;
+
+ //Machine Related
+ public static boolean enableSolarGenerators = false;
+ public static boolean enableAlternativeBatteryAlloy = false;
+ public static boolean enableThaumcraftShardUnification = false;
+ public static boolean disableIC2Recipes = false;
+
+ }
+
}
diff --git a/src/Java/miscutil/core/lib/LoadedMods.java b/src/Java/miscutil/core/lib/LoadedMods.java
index 86cc8e94a9..6b25b197fe 100644
--- a/src/Java/miscutil/core/lib/LoadedMods.java
+++ b/src/Java/miscutil/core/lib/LoadedMods.java
@@ -1,5 +1,6 @@
package miscutil.core.lib;
+import miscutil.core.lib.CORE.configSwitches;
import miscutil.core.util.Utils;
import miscutil.core.xmod.gregtech.api.enums.GregtechTextures;
import miscutil.core.xmod.gregtech.recipes.GregtechRecipeAdder;
@@ -53,7 +54,7 @@ public class LoadedMods {
totalMods++;
}
- if (Loader.isModLoaded("EnderIO") == true && !CORE.disableEnderIOIntegration){
+ if (Loader.isModLoaded("EnderIO") == true && !configSwitches.disableEnderIOIntegration){
EnderIO = true;
Utils.LOG_INFO("Components enabled for: EnderIO");
totalMods++;
diff --git a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java
index cb963c1b23..e83c680740 100644
--- a/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/miscutil/core/recipe/RECIPES_GREGTECH.java
@@ -8,6 +8,7 @@ import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import miscutil.core.item.ModItems;
import miscutil.core.lib.CORE;
+import miscutil.core.lib.CORE.configSwitches;
import miscutil.core.util.Utils;
import miscutil.core.util.fluid.FluidUtils;
import miscutil.core.util.item.UtilsItems;
@@ -154,7 +155,7 @@ public class RECIPES_GREGTECH {
private static void blastFurnaceRecipes(){
Utils.LOG_INFO("Registering Blast Furnace Recipes.");
- if (!CORE.disableStaballoyBlastFurnaceRecipe){
+ if (!configSwitches.disableStaballoyBlastFurnaceRecipe){
GT_Values.RA.addBlastRecipe(
UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 11028, 1),
UtilsItems.simpleMetaStack("gregtech:gt.metaitem.01", 11098, 1),
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java
index 9b7d23d5bf..bd4eb2f9b3 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaCondensor.java
@@ -7,12 +7,12 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_ModHandler;
+import miscutil.core.lib.CORE;
import miscutil.core.util.Utils;
import miscutil.core.xmod.gregtech.api.gui.CONTAINER_SteamCondenser;
import miscutil.core.xmod.gregtech.api.gui.GUI_SteamCondenser;
import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaBoilerBase;
import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.EnumChatFormatting;
import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.IFluidHandler;
@@ -31,7 +31,7 @@ public class GregtechMetaCondensor extends GregtechMetaBoilerBase{
@Override
public String[] getDescription() {
- return new String[] {mDescription, "Added by: " + EnumChatFormatting.DARK_GREEN+"Alkalus"};
+ return new String[] {mDescription, CORE.GT_Tooltip};
}
public ITexture[][][] getTextureSet(ITexture[] aTextures)
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
index 5a9c00e77d..9034a27e70 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaEnergyBuffer.java
@@ -12,13 +12,13 @@ import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_Utility;
import ic2.api.item.IElectricItem;
+import miscutil.core.lib.CORE;
import miscutil.core.util.Utils;
import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaTileEntity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
@@ -41,7 +41,7 @@ public class GregtechMetaEnergyBuffer extends GregtechMetaTileEntity {
@Override
public String[] getDescription() {
- return new String[] {mDescription, "Added by: " + EnumChatFormatting.DARK_GREEN+"Alkalus"};
+ return new String[] {mDescription, CORE.GT_Tooltip};
}
/*
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
index 4bcfbf7949..59001bb8cf 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaPipeEntity_Cable.java
@@ -21,6 +21,7 @@ import ic2.api.energy.tile.IEnergySink;
import java.util.ArrayList;
import java.util.Arrays;
+import miscutil.core.lib.CORE;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.tileentity.TileEntity;
@@ -222,7 +223,7 @@ public class GregtechMetaPipeEntity_Cable extends GT_MetaPipeEntity_Cable implem
"Max Voltage: " + EnumChatFormatting.GREEN + mVoltage + " (" + VN[GT_Utility.getTier(mVoltage)] + ")" + EnumChatFormatting.GRAY,
"Max Amperage: " + EnumChatFormatting.YELLOW + mAmperage + EnumChatFormatting.GRAY,
"Loss/Meter/Ampere: " + EnumChatFormatting.RED + mCableLossPerMeter + EnumChatFormatting.GRAY + " EU-Volt",
- "Added by:" + EnumChatFormatting.DARK_GREEN+" Alkalus"
+ CORE.GT_Tooltip
};
}
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSafeBlock.java b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSafeBlock.java
index d2a1a8e230..37c57be0e6 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSafeBlock.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/metatileentity/implementations/GregtechMetaSafeBlock.java
@@ -6,18 +6,18 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_Utility;
+import miscutil.core.lib.CORE;
import miscutil.core.xmod.gregtech.api.gui.CONTAINER_SafeBlock;
import miscutil.core.xmod.gregtech.api.gui.GUI_SafeBlock;
import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechMetaSafeBlockBase;
import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.EnumChatFormatting;
public class GregtechMetaSafeBlock
extends GregtechMetaSafeBlockBase {
@Override
public String[] getDescription() {
- return new String[] {mDescription, "Added by: " + EnumChatFormatting.DARK_GREEN+"Alkalus"};
+ return new String[] {mDescription, CORE.GT_Tooltip};
}
public GregtechMetaSafeBlock(int aID, String aName, String aNameRegional, int aTier) {
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
index 7e2c552eed..7a252d9bfb 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
@@ -9,12 +9,14 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance;
import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Utility;
import java.util.ArrayList;
import java.util.List;
import miscutil.core.block.ModBlocks;
import miscutil.core.lib.CORE;
+import miscutil.core.lib.CORE.configSwitches;
import miscutil.core.util.Utils;
import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine;
import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
@@ -74,7 +76,8 @@ extends GregtechMeta_MultiBlockBase {
"1x Input Bus",
"1x Output Bus",
"1x [EV] Energy Hatch (Can be higher Tier) [Blue]",
- "Centrifuge Casings for the rest (16 at least)",};
+ "Centrifuge Casings for the rest (16 at least)",
+ CORE.GT_Tooltip};
}
@@ -108,73 +111,59 @@ extends GregtechMeta_MultiBlockBase {
/*if (!isCorrectMachinePart(mInventory[1])) {
return false;
}*/
+
+ Utils.LOG_INFO("Centrifuge Debug - 1");
GT_Recipe.GT_Recipe_Map map = getRecipeMap();
if (map == null) {
+ Utils.LOG_INFO("Centrifuge Debug - False - No recipe map");
return false;
}
+ Utils.LOG_INFO("Centrifuge Debug - 2");
ArrayList<ItemStack> tInputList = getStoredInputs();
- int tTier = 0;
- if (mInventory[1].getUnlocalizedName().endsWith("1")) {
- tTier = 1;
- }
- if (mInventory[1].getUnlocalizedName().endsWith("2")) {
- tTier = 2;
- }
- if (mInventory[1].getUnlocalizedName().endsWith("3")) {
- tTier = 3;
- }
- if (mInventory[1].getUnlocalizedName().endsWith("4")) {
- tTier = 4;
- }
- if (mInventory[1].getUnlocalizedName().endsWith("5")) {
- tTier = 5;
- }
- if (mInventory[1].getUnlocalizedName().endsWith("6")) {
- tTier = 6;
- }
- if (mInventory[1].getUnlocalizedName().endsWith("7")) {
- tTier = 7;
- }
- if (mInventory[1].getUnlocalizedName().endsWith("8")) {
- tTier = 8;
- }
+ long tVoltage = getMaxInputVoltage();
+ byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
+ Utils.LOG_INFO("Centrifuge Debug - Tier variable: "+tTier);
ItemStack[] tInputs = (ItemStack[]) tInputList.toArray(new ItemStack[tInputList.size()]);
ArrayList<FluidStack> tFluidList = getStoredFluids();
FluidStack[] tFluids = (FluidStack[]) tFluidList.toArray(new FluidStack[tFluidList.size()]);
if (tInputList.size() > 0 || tFluids.length > 0) {
GT_Recipe tRecipe = map.findRecipe(getBaseMetaTileEntity(), mLastRecipe, false, gregtech.api.enums.GT_Values.V[tTier], tFluids, tInputs);
if (tRecipe != null) {
+ Utils.LOG_INFO("Recipe was not invalid");
mLastRecipe = tRecipe;
this.mEUt = 0;
this.mOutputItems = null;
this.mOutputFluids = null;
- int machines = Math.min(16, mInventory[1].stackSize);
- int i = 0;
- for (; i < machines; i++) {
- if (!tRecipe.isRecipeInputEqual(true, tFluids, tInputs)) {
- if (i == 0) {
- return false;
- }
- break;
- }
+ if (!tRecipe.isRecipeInputEqual(true, tFluids, tInputs)) {
+
+ Utils.LOG_INFO("False: 1");
+ return false;
}
+
this.mMaxProgresstime = tRecipe.mDuration;
this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
this.mEfficiencyIncrease = 10000;
+ Utils.LOG_INFO("Centrifuge Debug - 2 - Max Progress Time: "+this.mMaxProgresstime);
if (tRecipe.mEUt <= 16) {
+ Utils.LOG_INFO("Centrifuge Debug - Using < 16eu/t");
this.mEUt = (tRecipe.mEUt * (1 << tTier - 1) * (1 << tTier - 1));
this.mMaxProgresstime = (tRecipe.mDuration / (1 << tTier - 1));
+ Utils.LOG_INFO("Centrifuge Debug - 3.1 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt + " Obscure GT Value "+gregtech.api.enums.GT_Values.V[(tTier - 1)]);
} else {
+ Utils.LOG_INFO("Centrifuge Debug - using > 16eu/t");
this.mEUt = tRecipe.mEUt;
this.mMaxProgresstime = tRecipe.mDuration;
+ Utils.LOG_INFO("Centrifuge Debug - 3.2 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt + " Obscure GT Value "+gregtech.api.enums.GT_Values.V[(tTier - 1)]);
while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) {
this.mEUt *= 4;
this.mMaxProgresstime /= 2;
+ Utils.LOG_INFO("Centrifuge Debug - 4 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt);
}
}
- this.mEUt *= i;
+ this.mEUt *= 1;
if (this.mEUt > 0) {
this.mEUt = (-this.mEUt);
+ Utils.LOG_INFO("Centrifuge Debug - 5 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt);
}
ItemStack[] tOut = new ItemStack[tRecipe.mOutputs.length];
for (int h = 0; h < tRecipe.mOutputs.length; h++) {
@@ -185,7 +174,7 @@ extends GregtechMeta_MultiBlockBase {
if (tRecipe.getFluidOutput(0) != null) tFOut = tRecipe.getFluidOutput(0).copy();
for (int f = 0; f < tOut.length; f++) {
if (tRecipe.mOutputs[f] != null && tOut[f] != null) {
- for (int g = 0; g < i; g++) {
+ for (int g = 0; g < 1; g++) {
if (getBaseMetaTileEntity().getRandomNumber(10000) < tRecipe.getOutputChance(f))
tOut[f].stackSize += tRecipe.mOutputs[f].stackSize;
}
@@ -193,9 +182,14 @@ extends GregtechMeta_MultiBlockBase {
}
if (tFOut != null) {
int tSize = tFOut.amount;
- tFOut.amount = tSize * i;
+ tFOut.amount = tSize * 6;
}
this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
+ this.mMaxProgresstime /= 4;
+ if (this.mMaxProgresstime <= 0){
+ this.mMaxProgresstime++;
+ }
+ Utils.LOG_INFO("Centrifuge Debug - 6 - Max Progress Time: "+this.mMaxProgresstime+" EU/t"+this.mEUt);
List<ItemStack> overStacks = new ArrayList<ItemStack>();
for (int f = 0; f < tOut.length; f++) {
if (tOut[f].getMaxStackSize() < tOut[f].stackSize) {
@@ -220,82 +214,13 @@ extends GregtechMeta_MultiBlockBase {
this.mOutputItems = tOut;
this.mOutputFluids = new FluidStack[]{tFOut};
updateSlots();
- Utils.LOG_WARNING("Centrifuge: True");
- return true;
- }
- }
- Utils.LOG_WARNING("Centrifuge: False");
- return false;
- }
-
- /*public boolean checkRecipe(ItemStack aStack) {
- ArrayList<ItemStack> tInputList = getStoredInputs();
- Utils.LOG_WARNING("Stored Input Items: "+tInputList.size());
- for (int i = 0; i < tInputList.size() - 1; i++) {
- for (int j = i + 1; j < tInputList.size(); j++) {
- if (GT_Utility.areStacksEqual((ItemStack) tInputList.get(i), (ItemStack) tInputList.get(j))) {
- if (((ItemStack) tInputList.get(i)).stackSize >= ((ItemStack) tInputList.get(j)).stackSize) {
- tInputList.remove(j--);
- } else {
- tInputList.remove(i--);
- break;
- }
- }
- }
- }
- ItemStack[] tInputs = (ItemStack[]) Arrays.copyOfRange(tInputList.toArray(new ItemStack[tInputList.size()]), 0, 2);
-
- ArrayList<FluidStack> tFluidList = getStoredFluids();
- Utils.LOG_WARNING("Stored Input Fluids: "+tFluidList.size());
- for (int i = 0; i < tFluidList.size() - 1; i++) {
- for (int j = i + 1; j < tFluidList.size(); j++) {
- if (GT_Utility.areFluidsEqual((FluidStack) tFluidList.get(i), (FluidStack) tFluidList.get(j))) {
- if (((FluidStack) tFluidList.get(i)).amount >= ((FluidStack) tFluidList.get(j)).amount) {
- Utils.LOG_WARNING("Removing j from tFluidList");
- tFluidList.remove(j--);
- } else {
- Utils.LOG_WARNING("Removing i from tFluidList");
- tFluidList.remove(i--);
- break;
- }
- }
- }
- }
- FluidStack[] tFluids = (FluidStack[]) Arrays.copyOfRange(tFluidList.toArray(new FluidStack[tInputList.size()]), 0, 1);
- Utils.LOG_WARNING("Size:"+tInputList.size());
- if (tInputList.size() > 0 || tFluidList.size() > 0) {
- Utils.LOG_WARNING("Input size > 0");
- long tVoltage = getMaxInputVoltage();
- byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
- GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.findRecipe(getBaseMetaTileEntity(), false, gregtech.api.enums.GT_Values.V[tTier], tFluids, tInputs);
- if ((tRecipe != null) && (0 >= tRecipe.mSpecialValue) && (tRecipe.isRecipeInputEqual(true, tFluids, tInputs))) {
- this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
- this.mEfficiencyIncrease = 10000;
- if (tRecipe.mEUt <= 16) {
- this.mEUt = (tRecipe.mEUt * (1 << tTier - 1) * (1 << tTier - 1));
- this.mMaxProgresstime = (tRecipe.mDuration / (1 << tTier - 1));
- } else {
- this.mEUt = tRecipe.mEUt;
- this.mMaxProgresstime = tRecipe.mDuration;
- while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) {
- this.mEUt *= 4;
- this.mMaxProgresstime /= 2;
- }
- }
- if (this.mEUt > 0) {
- this.mEUt = (-this.mEUt);
- }
- this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
- this.mOutputItems = new ItemStack[]{tRecipe.getOutput(0)};
- this.mOutputFluids = new FluidStack[]{tRecipe.getFluidOutput(0)};
- updateSlots();
- Utils.LOG_WARNING("Centrifuge: True");
- return true;
- }
- }
- Utils.LOG_WARNING("Centrifuge: False");
- return false;
- }*/
+ Utils.LOG_INFO("Centrifuge: True");
+ return true;
+ }
+ }
+ Utils.LOG_INFO("Centrifuge: Recipe was invalid.");
+ return false;
+ }
@SuppressWarnings("static-method")
public Block getCasingBlock() {
@@ -314,7 +239,7 @@ extends GregtechMeta_MultiBlockBase {
@Override
public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
- if (CORE.disableCentrifugeFormation){
+ if (configSwitches.disableCentrifugeFormation){
EntityPlayerMP player = MinecraftServer.getServer().getConfigurationManager().func_152612_a(this.getBaseMetaTileEntity().getOwnerName());
if (!player.getEntityWorld().isRemote && isDisabled == false)
Utils.messagePlayer(player, "This Multiblock is disabled via the config. [Only re-enable if you're bugtesting.]");
@@ -324,7 +249,7 @@ extends GregtechMeta_MultiBlockBase {
int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
int yDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetY;
int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
- //Utils.LOG_WARNING("X:"+xDir+" Y:"+yDir+" Z:"+zDir);
+ //Utils.LOG_INFO("X:"+xDir+" Y:"+yDir+" Z:"+zDir);
if (!aBaseMetaTileEntity.getAirOffset(xDir, 0, zDir)) {
return false;
}
@@ -335,14 +260,14 @@ extends GregtechMeta_MultiBlockBase {
if ((h != 0) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))) {
IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j);
- //Utils.LOG_WARNING("X:"+tTileEntity.getXCoord()+" Y:"+tTileEntity.getYCoord()+" Z:"+tTileEntity.getZCoord());
+ //Utils.LOG_INFO("X:"+tTileEntity.getXCoord()+" Y:"+tTileEntity.getYCoord()+" Z:"+tTileEntity.getZCoord());
if ((!addMaintenanceToMachineList(tTileEntity, 57)) && (!addInputToMachineList(tTileEntity, 57)) && (!addOutputToMachineList(tTileEntity, 57)) && (!addEnergyInputToMachineList(tTileEntity, 57))) {
//Maintenance Hatch
if ((tTileEntity != null) && (tTileEntity.getMetaTileEntity() != null)) {
if (tTileEntity.getXCoord() == aBaseMetaTileEntity.getXCoord() && tTileEntity.getYCoord() == aBaseMetaTileEntity.getYCoord() && tTileEntity.getZCoord() == (aBaseMetaTileEntity.getZCoord()+2)) {
if ((tTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Maintenance)) {
- Utils.LOG_WARNING("MAINT HATCH IN CORRECT PLACE");
+ Utils.LOG_INFO("MAINT HATCH IN CORRECT PLACE");
this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) tTileEntity.getMetaTileEntity());
((GT_MetaTileEntity_Hatch) tTileEntity.getMetaTileEntity()).mMachineBlock = getCasingTextureIndex();
} else {
@@ -350,7 +275,7 @@ extends GregtechMeta_MultiBlockBase {
}
}
else {
- Utils.LOG_WARNING("MAINT HATCH IN WRONG PLACE");
+ Utils.LOG_INFO("MAINT HATCH IN WRONG PLACE");
}
}
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java
index cbdbf56d85..5becb4c59b 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCokeOven.java
@@ -13,6 +13,8 @@ import java.util.ArrayList;
import java.util.Arrays;
import miscutil.core.block.ModBlocks;
+import miscutil.core.lib.CORE;
+import miscutil.core.util.Utils;
import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine;
import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
import miscutil.core.xmod.gregtech.api.util.GregtechRecipe;
@@ -50,7 +52,8 @@ public class GregtechMetaTileEntityIndustrialCokeOven
"1x Energy Hatch (one of bottom)",
"1x Maintenance Hatch (one of bottom)",
"1x Muffler Hatch (top middle)",
- "Structural Coke Oven Casings for the rest"};
+ "Structural Coke Oven Casings for the rest",
+ CORE.GT_Tooltip};
}
@Override
@@ -138,9 +141,11 @@ public class GregtechMetaTileEntityIndustrialCokeOven
this.mOutputItems = new ItemStack[]{tRecipe.getOutput(0)};
this.mOutputFluids = new FluidStack[]{tRecipe.getFluidOutput(0)};
updateSlots();
+ Utils.LOG_INFO("Coke oven: True");
return true;
}
}
+ Utils.LOG_INFO("Coke oven: False");
return false;
}
/*public boolean checkRecipe(ItemStack aStack) {
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialElectrolyzer.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialElectrolyzer.java
index 8150c51deb..1eba8022b7 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialElectrolyzer.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialElectrolyzer.java
@@ -16,6 +16,7 @@ import java.util.Arrays;
import java.util.List;
import miscutil.core.block.ModBlocks;
+import miscutil.core.lib.CORE;
import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine;
import net.minecraft.block.Block;
import net.minecraft.entity.player.InventoryPlayer;
@@ -52,7 +53,8 @@ extends GT_MetaTileEntity_MultiBlockBase {
"1x Energy Hatch (anywhere)",
"1x Maintenance Hatch (anywhere)",
"1x Muffler (anywhere)",
- "Electrolyzer Casings for the rest (16 at least!)"};
+ "Electrolyzer Casings for the rest (16 at least!)",
+ CORE.GT_Tooltip};
}
@Override
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java
index 77694bac8a..3476fd8b5e 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialMacerator.java
@@ -15,6 +15,7 @@ import java.util.Arrays;
import java.util.Random;
import miscutil.core.block.ModBlocks;
+import miscutil.core.lib.CORE;
import miscutil.core.util.Utils;
import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine;
import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
@@ -50,7 +51,8 @@ extends GregtechMeta_MultiBlockBase {
"3x Output Bus (Any casing besides bottom layer)",
"1x Maintenance Hatch (Any casing)",
"1x Energy Hatch (Any casing)",
- "Maceration Stack Casings for the rest (26 at least!)"};
+ "Maceration Stack Casings for the rest (26 at least!)",
+ CORE.GT_Tooltip};
}
@Override
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java
index 602eebbe3b..2f473d23d0 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java
@@ -15,6 +15,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import miscutil.core.block.ModBlocks;
+import miscutil.core.lib.CORE;
import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine;
import net.minecraft.block.Block;
import net.minecraft.entity.player.InventoryPlayer;
@@ -47,7 +48,8 @@ extends GT_MetaTileEntity_MultiBlockBase {
"1x Energy Hatch (anywhere)",
"1x Maintenance Hatch (anywhere)",
"1x Muffler (anywhere)",
- "Material Press Machine Casings for the rest (16 at least!)"};
+ "Material Press Machine Casings for the rest (16 at least!)",
+ CORE.GT_Tooltip};
}
@Override
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialWireMill.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialWireMill.java
index 35d128fe65..6151d85d7c 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialWireMill.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialWireMill.java
@@ -14,6 +14,7 @@ import gregtech.api.util.GT_Utility;
import java.util.ArrayList;
import miscutil.core.block.ModBlocks;
+import miscutil.core.lib.CORE;
import miscutil.core.util.Utils;
import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine;
import net.minecraft.block.Block;
@@ -44,7 +45,8 @@ extends GT_MetaTileEntity_MultiBlockBase {
"2x Output Bus (side centered)",
"1x Energy Hatch (top or bottom centered)",
"1x Maintenance Hatch (back centered)",
- "Wire Factory Casings for the rest (32 at least!)"
+ "Wire Factory Casings for the rest (32 at least!)",
+ CORE.GT_Tooltip
};
}
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIronBlastFurnace.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIronBlastFurnace.java
index 6b60c40a48..3f651f9c3a 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIronBlastFurnace.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIronBlastFurnace.java
@@ -12,6 +12,7 @@ import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
import miscutil.core.block.ModBlocks;
+import miscutil.core.lib.CORE;
import miscutil.core.xmod.gregtech.api.gui.CONTAINER_IronBlastFurnace;
import miscutil.core.xmod.gregtech.api.gui.GUI_IronBlastFurnace;
import net.minecraft.entity.player.EntityPlayer;
@@ -44,7 +45,10 @@ public class GregtechMetaTileEntityIronBlastFurnace
@Override
public String[] getDescription() {
- return new String[]{"Slowly, Skip the Bronze age, Get some Steel!", "Multiblock: 3x3x5 hollow with opening on top", "40 Iron Plated Bricks required"};
+ return new String[]{"Slowly, Skip the Bronze age, Get some Steel!",
+ "Multiblock: 3x3x5 hollow with opening on top",
+ "40 Iron Plated Bricks required",
+ CORE.GT_Tooltip};
}
@Override
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java
index 63185dee9d..692ec16922 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityMassFabricator.java
@@ -16,6 +16,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import miscutil.core.block.ModBlocks;
+import miscutil.core.lib.CORE;
import miscutil.core.util.Utils;
import miscutil.core.util.item.UtilsItems;
import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine;
@@ -60,7 +61,8 @@ public class GregtechMetaTileEntityMassFabricator extends GT_MetaTileEntity_Mult
"1x Muffler Hatch (Centered 3x1x3 area in Top layer)",
"1x Energy Hatch (Any bottom layer casing)",
"24x IC2 Reinforced Glass for the walls",
- "Matter Fabricator Casings for the edges & top (40 at least!)"};
+ "Matter Fabricator Casings for the edges & top (40 at least!)",
+ CORE.GT_Tooltip};
}
@Override