From 7ddb7f5e8ed9fe60b730183c7a04f3bce3b8f815 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Wed, 24 Jan 2018 18:38:51 +1000 Subject: $ Several 5.08 compat fixes. $ Fixed pollution, which was causing all multiblocks to fail. This was pointed out in #191 by @CodeWarrior0, however I decided to re-do it myself to better handle the .08 compat. $ Fixed all multiblocks being broken as fuck. Fixes #190, fixes #186 and also fixes #176. - Removed some useless logging from the mining explosives. --- .../core/recipe/RECIPES_Old_Circuits.java | 33 +++++++++++----------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'src/Java/gtPlusPlus/core/recipe') diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java index e8d37a34d2..a36e541c4a 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java @@ -120,31 +120,30 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator { */ //Basic - ItemList.Circuit_Microprocessor.set(GregtechItemList.Old_Circuit_Basic.get(1)); + ItemList.valueOf("Circuit_Microprocessor").set(GregtechItemList.Old_Circuit_Basic.get(1)); //Good - ItemList.Circuit_Integrated.set(GregtechItemList.Old_Circuit_Good.get(1)); + ItemList.valueOf("Circuit_Integrated").set(GregtechItemList.Old_Circuit_Good.get(1)); //Advanced - ItemList.Circuit_Nanoprocessor.set(GregtechItemList.Old_Circuit_Advanced.get(1)); + ItemList.valueOf("Circuit_Nanoprocessor").set(GregtechItemList.Old_Circuit_Advanced.get(1)); //Data - ItemList.Circuit_Quantumprocessor.set(GregtechItemList.Old_Circuit_Data.get(1)); - ItemList.Circuit_Nanocomputer.set(GregtechItemList.Old_Circuit_Data.get(1)); + ItemList.valueOf("Circuit_Quantumprocessor").set(GregtechItemList.Old_Circuit_Data.get(1)); + ItemList.valueOf("Circuit_Nanocomputer").set(GregtechItemList.Old_Circuit_Data.get(1)); //Elite - ItemList.Circuit_Crystalprocessor.set(GregtechItemList.Old_Circuit_Elite.get(1)); - ItemList.Circuit_Quantumcomputer.set(GregtechItemList.Old_Circuit_Elite.get(1)); - ItemList.Circuit_Elitenanocomputer.set(GregtechItemList.Old_Circuit_Elite.get(1)); + ItemList.valueOf("Circuit_Crystalprocessor").set(GregtechItemList.Old_Circuit_Elite.get(1)); + ItemList.valueOf("Circuit_Quantumcomputer").set(GregtechItemList.Old_Circuit_Elite.get(1)); + ItemList.valueOf("Circuit_Elitenanocomputer").set(GregtechItemList.Old_Circuit_Elite.get(1)); //Master - ItemList.Circuit_Neuroprocessor.set(GregtechItemList.Old_Circuit_Master.get(1)); - ItemList.Circuit_Masterquantumcomputer.set(GregtechItemList.Old_Circuit_Master.get(1)); + ItemList.valueOf("Circuit_Neuroprocessor").set(GregtechItemList.Old_Circuit_Master.get(1)); + ItemList.valueOf("Circuit_Masterquantumcomputer").set(GregtechItemList.Old_Circuit_Master.get(1)); //Ultimate - ItemList.Circuit_Wetwarecomputer.set(GregtechItemList.Old_Circuit_Ultimate.get(1)); - ItemList.Circuit_Ultimatecrystalcomputer.set(GregtechItemList.Old_Circuit_Ultimate.get(1)); - ItemList.Circuit_Quantummainframe.set(GregtechItemList.Old_Circuit_Ultimate.get(1)); + ItemList.valueOf("Circuit_Wetwarecomputer").set(GregtechItemList.Old_Circuit_Ultimate.get(1)); + ItemList.valueOf("Circuit_Ultimatecrystalcomputer").set(GregtechItemList.Old_Circuit_Ultimate.get(1)); + ItemList.valueOf("Circuit_Quantummainframe").set(GregtechItemList.Old_Circuit_Ultimate.get(1)); //Superconductor - ItemList.Circuit_Wetwaresupercomputer.set(GregtechItemList.Circuit_IV.get(1)); - ItemList.Circuit_Crystalmainframe.set(GregtechItemList.Circuit_IV.get(1)); + ItemList.valueOf("Circuit_Wetwaresupercomputer").set(GregtechItemList.Circuit_IV.get(1)); + ItemList.valueOf("Circuit_Crystalmainframe").set(GregtechItemList.Circuit_IV.get(1)); //Infinite - ItemList.Circuit_Wetwaremainframe.set(GregtechItemList.Circuit_LuV.get(1)); - + ItemList.valueOf("Circuit_Wetwaremainframe").set(GregtechItemList.Circuit_LuV.get(1)); //set data orbs and sticks to their new replacements ItemList.Tool_DataStick.set(GregtechItemList.Old_Tool_DataStick.get(1)); -- cgit