aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/recipe
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-12-20 23:39:49 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-12-20 23:39:49 +1000
commit5715a32d2901922503fd850f3a68503fb77467c3 (patch)
tree7e12520fbc23844e99493d55af4410a785538e35 /src/Java/gtPlusPlus/core/recipe
parent2a4795f65d98ff60a177d7d6a5552fd687d9f6e8 (diff)
downloadGT5-Unofficial-5715a32d2901922503fd850f3a68503fb77467c3.tar.gz
GT5-Unofficial-5715a32d2901922503fd850f3a68503fb77467c3.tar.bz2
GT5-Unofficial-5715a32d2901922503fd850f3a68503fb77467c3.zip
- Disabled some logging.
% Minor Project Clean-up, added missing Override annotations to 100+ methods & removed pointless casts. % Moved Logging to it's own class. $ Fixed Multi-block handling of Pollution. $ Fixed the GT 5.09 material enabler system. (From My Side, it's still borked on GTs). + Added a Dynamic Proxy invocation for IMaterialHandler. + Added an AutoMap data type, which is a Auto-incremental ID'd Hashmap wrapper.
Diffstat (limited to 'src/Java/gtPlusPlus/core/recipe')
-rw-r--r--src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java4
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java54
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_General.java10
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java30
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java4
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java8
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java8
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java18
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java4
-rw-r--r--src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java4
-rw-r--r--src/Java/gtPlusPlus/core/recipe/common/CI.java7
11 files changed, 76 insertions, 75 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java b/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java
index f9db59ddb4..62c17817b6 100644
--- a/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java
+++ b/src/Java/gtPlusPlus/core/recipe/Gregtech_Recipe_Adder.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.recipe;
import gregtech.api.enums.GT_Values;
import gregtech.api.util.GT_ModHandler;
-import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.util.item.ItemUtils;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@@ -79,7 +79,7 @@ public class Gregtech_Recipe_Adder {
}
private static void addBlastFurnaceRecipe(final ItemStack input1, final ItemStack input2, final ItemStack output1, final ItemStack output2, final int tempRequired){
- Utils.LOG_INFO("Registering Blast Furnace Recipes.");
+ Logger.INFO("Registering Blast Furnace Recipes.");
GT_Values.RA.addBlastRecipe(
input1,
input2,
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index de1812d05a..a9d2bcef32 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -11,6 +11,7 @@ import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
import gregtech.api.util.HotFuel;
import gregtech.api.util.ThermalFuel;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.lib.CORE;
@@ -18,7 +19,6 @@ import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.material.ALLOY;
import gtPlusPlus.core.material.nuclear.NUCLIDE;
import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.fluid.FluidUtils;
import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
@@ -33,7 +33,7 @@ import net.minecraftforge.fluids.FluidStack;
public class RECIPES_GREGTECH {
public static void run(){
- Utils.LOG_INFO("Loading Recipes through GregAPI for Industrial Multiblocks.");
+ Logger.INFO("Loading Recipes through GregAPI for Industrial Multiblocks.");
execute();
}
@@ -380,7 +380,7 @@ public class RECIPES_GREGTECH {
}
private static void cokeOvenRecipes(){
- Utils.LOG_INFO("Loading Recipes for Industrial Coking Oven.");
+ Logger.INFO("Loading Recipes for Industrial Coking Oven.");
//Wood to Charcoal
AddGregtechRecipe.addCokeAndPyrolyseRecipes(
@@ -417,7 +417,7 @@ public class RECIPES_GREGTECH {
}
private static void matterFabRecipes(){
- Utils.LOG_INFO("Loading Recipes for Matter Fabricator.");
+ Logger.INFO("Loading Recipes for Matter Fabricator.");
try {
@@ -426,7 +426,7 @@ public class RECIPES_GREGTECH {
Materials.UUMatter.getFluid(1L), //Fluid Output
800, //Time in ticks
32); //EU
- }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+ }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
try {
CORE.RA.addMatterFabricatorRecipe(
@@ -434,12 +434,12 @@ public class RECIPES_GREGTECH {
Materials.UUMatter.getFluid(1L), //Fluid Output
3200, //Time in ticks
32); //EU
- }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+ }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
}
private static void dehydratorRecipes(){
- Utils.LOG_INFO("Loading Recipes for Chemical Dehydrator.");
+ Logger.INFO("Loading Recipes for Chemical Dehydrator.");
try {
//Makes Lithium Carbonate
@@ -456,7 +456,7 @@ public class RECIPES_GREGTECH {
}, //Output Array of Items - Upto 9
30*20, //Time in ticks
30); //EU
- }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+ }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
try {
ItemStack cells = ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:itemCellEmpty", "Empty Fluid Cells", 0, 12);
@@ -482,7 +482,7 @@ public class RECIPES_GREGTECH {
75*20, //Time in ticks
1000); //EU
- }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+ }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
try {
CORE.RA.addDehydratorRecipe(
@@ -499,7 +499,7 @@ public class RECIPES_GREGTECH {
150*20, //Time in ticks
2000); //EU
- }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+ }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
try {
CORE.RA.addDehydratorRecipe(
@@ -516,7 +516,7 @@ public class RECIPES_GREGTECH {
300*20, //Time in ticks
4000); //EU
- }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+ }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
//Raisins from Grapes
try {
@@ -534,7 +534,7 @@ public class RECIPES_GREGTECH {
10*20, //Time in ticks
8); //EU
- }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+ }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
//Calcium Hydroxide
if ((ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1).getItem() != ModItems.AAA_Broken) || LoadedMods.IHL){
@@ -553,7 +553,7 @@ public class RECIPES_GREGTECH {
120*20, //Time in ticks
120); //EU
- }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+ }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
//2 LiOH + CaCO3
try {
@@ -572,7 +572,7 @@ public class RECIPES_GREGTECH {
120*20, //Time in ticks
1000); //EU
- }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+ }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
//LiOH Liquid to Dust
try {
@@ -590,7 +590,7 @@ public class RECIPES_GREGTECH {
1*20, //Time in ticks
64); //EU
- }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+ }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
//Zirconium Chloride -> TetraFluoride
try {
@@ -610,7 +610,7 @@ public class RECIPES_GREGTECH {
120*20, //Time in ticks
500); //EU
- }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+ }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
//CaF2 + H2SO4 → CaSO4(solid) + 2 HF
try {
@@ -634,7 +634,7 @@ public class RECIPES_GREGTECH {
10*60*20, //Time in ticks
230); //EU
- }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+ }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
//Be(OH)2 + 2 (NH4)HF2 → (NH4)2BeF4 + 2 H2O
try {
@@ -654,7 +654,7 @@ public class RECIPES_GREGTECH {
64); //EU
- }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+ }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
//(NH4)2BeF4 → 2 NH3 + 2 HF + BeF2
try {
@@ -673,7 +673,7 @@ public class RECIPES_GREGTECH {
5*60*20, //Time in ticks
120); //EU
- }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+ }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
}
@@ -682,7 +682,7 @@ public class RECIPES_GREGTECH {
private static void lftrRecipes(){
try {
- }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+ }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
try {
//Fli2BeF4 + Thorium TetraFluoride = Uranium233
CORE.RA.addLFTRRecipe(
@@ -692,7 +692,7 @@ public class RECIPES_GREGTECH {
300*60*20, //Time in ticks
3500); //EU
- }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+ }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
try {
//Fli2BeF4 + Uranium235 = 1x Uranium233
CORE.RA.addLFTRRecipe(
@@ -701,7 +701,7 @@ public class RECIPES_GREGTECH {
FluidUtils.getFluidStack("molten.uraniumhexafluoride", 3*144), //Output Array of Items - Upto 9,
120*60*20, //Time in ticks
8000); //EU
- }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+ }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
try {
//Fli2BeF4 + Uranium233 TetraFluoride = Uranium233
CORE.RA.addLFTRRecipe(
@@ -711,7 +711,7 @@ public class RECIPES_GREGTECH {
420*60*20, //Time in ticks
4000); //EU
- }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+ }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
}
private static void fissionFuelRecipes(){
@@ -768,7 +768,7 @@ public class RECIPES_GREGTECH {
60*60*20, //Duration
500);
- }catch (final NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+ }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
}
private static void assemblerRecipes(){
@@ -790,7 +790,7 @@ public class RECIPES_GREGTECH {
}
private static void distilleryRecipes(){
- Utils.LOG_INFO("Registering Distillery/Distillation Tower Recipes.");
+ Logger.INFO("Registering Distillery/Distillation Tower Recipes.");
GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 4L, new Object[0]), FluidUtils.getFluidStack("air", 1000), FluidUtils.getFluidStack("helium", 1), 400, 30, false);
GT_Values.RA.addDistillationTowerRecipe(FluidUtils.getFluidStack("air", 20000), FluidUtils.getFluidStackArray("helium", 25), ItemUtils.getSimpleStack(ModItems.itemHydrogenBlob, 1), 200, 60);
@@ -834,7 +834,7 @@ public class RECIPES_GREGTECH {
}
private static void addFuels(){
- Utils.LOG_INFO("Registering New Fuels.");
+ Logger.INFO("Registering New Fuels.");
GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketFire_water", 0, 1), null, 120, 0);
GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketRocket_fuel", 0, 1), null, 112, 0);
GT_Values.RA.addFuel(ItemUtils.simpleMetaStack("EnderIO:bucketHootch", 0, 1), null, 36, 0);
@@ -883,7 +883,7 @@ public class RECIPES_GREGTECH {
}
private static void extractorRecipes(){
- Utils.LOG_INFO("Registering Extractor Recipes.");
+ Logger.INFO("Registering Extractor Recipes.");
GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Sodium.get(1L, new Object[0]), ItemList.Battery_Hull_HV.get(4L, new Object[0]));
GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Cadmium.get(1L, new Object[0]), ItemList.Battery_Hull_HV.get(4L, new Object[0]));
GT_ModHandler.addExtractionRecipe(GregtechItemList.Battery_RE_EV_Lithium.get(1L, new Object[0]), ItemList.Battery_Hull_HV.get(4L, new Object[0]));
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index 16cef8bc27..9e9482932d 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -5,12 +5,12 @@ import static gtPlusPlus.core.util.item.ItemUtils.getSimpleStack;
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.api.enums.ItemList;
import gregtech.api.util.GT_ModHandler;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.recipe.RecipeUtils;
import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
@@ -98,7 +98,7 @@ public class RECIPES_General {
"stickWood", "treeSapling", "stickWood",
"stickWood", "dustBone", "stickWood",
ItemUtils.getSimpleStack(BOP_Block_Registrator.sapling_Rainforest))){
- Utils.LOG_INFO("Added a recipe for Rainforest oak Saplings.");
+ Logger.INFO("Added a recipe for Rainforest oak Saplings.");
}
if (!CORE.GTNH) {
@@ -110,7 +110,7 @@ public class RECIPES_General {
ironBars, "frameGtWroughtIron", ironBars,
ironBars, ironBars, ironBars,
ItemUtils.getSimpleStack(ModBlocks.blockFishTrap))){
- Utils.LOG_INFO("Added a recipe for the Fish Trap.");
+ Logger.INFO("Added a recipe for the Fish Trap.");
}
} else {
//Steel Bars
@@ -121,7 +121,7 @@ public class RECIPES_General {
steelBars, "frameGtWroughtIron", steelBars,
steelBars, steelBars, steelBars,
ItemUtils.getSimpleStack(ModBlocks.blockFishTrap))) {
- Utils.LOG_INFO("Added a recipe for the Fish Trap.");
+ Logger.INFO("Added a recipe for the Fish Trap.");
}
}
@@ -131,7 +131,7 @@ public class RECIPES_General {
"gemFlawlessRuby", ItemList.Credit_Greg_Naquadah.get(1), "gemFlawlessSapphire",
"gemExquisiteEmerald", "gemFlawlessEmerald", "gemExquisiteSapphire",
ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk))){
- Utils.LOG_INFO("Added a recipe for The Alkalus Disk.");
+ Logger.INFO("Added a recipe for The Alkalus Disk.");
}
final String fancyGems[] = new String[]{"gemExquisiteDiamond", "gemExquisiteEmerald", "gemExquisiteRuby", "gemExquisiteSapphire"};
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
index 4f5cfd74e6..889af1753d 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
@@ -4,8 +4,8 @@ import gregtech.api.enums.*;
import gregtech.api.interfaces.IOreRecipeRegistrator;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import net.minecraft.item.ItemStack;
@@ -24,22 +24,22 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.YttriumBariumCuprate, 2L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GregtechItemList.Circuit_Parts_Wiring_IV.get(1L, new Object[0]), 64, 480);
}
else {
- Utils.LOG_INFO("foilYttriumBariumCuprate does not exist within Gregtech, please report this issue to Blood-asp on github.");
- Utils.LOG_INFO("This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
+ Logger.INFO("foilYttriumBariumCuprate does not exist within Gregtech, please report this issue to Blood-asp on github.");
+ Logger.INFO("This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
}
if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilVanadiumGallium", 1) != null){
GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.VanadiumGallium, 2L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GregtechItemList.Circuit_Parts_Wiring_IV.get(1L, new Object[0]), 64, 480);
}
else {
- Utils.LOG_INFO("foilVanadiumGallium does not exist within Gregtech, please report this issue to Blood-asp on github.");
- Utils.LOG_INFO("This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
+ Logger.INFO("foilVanadiumGallium does not exist within Gregtech, please report this issue to Blood-asp on github.");
+ Logger.INFO("This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
}
if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilNiobiumTitanium", 1) != null){
GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.NiobiumTitanium, 2L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GregtechItemList.Circuit_Parts_Wiring_IV.get(1L, new Object[0]), 64, 480);
}
else {
- Utils.LOG_INFO("foilNiobiumTitanium does not exist within Gregtech, please report this issue to Blood-asp on github.");
- Utils.LOG_INFO("This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
+ Logger.INFO("foilNiobiumTitanium does not exist within Gregtech, please report this issue to Blood-asp on github.");
+ Logger.INFO("This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
}
}
@@ -50,8 +50,8 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Osmium, 2L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GregtechItemList.Circuit_Parts_Wiring_LuV.get(1L, new Object[0]), 64, 1024);
}
else {
- Utils.LOG_INFO("foilOsmium does not exist within Gregtech, please report this issue to Blood-asp on github.");
- Utils.LOG_INFO("This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
+ Logger.INFO("foilOsmium does not exist within Gregtech, please report this issue to Blood-asp on github.");
+ Logger.INFO("This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
}
}
@@ -63,8 +63,8 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Naquadah, 2L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GregtechItemList.Circuit_Parts_Wiring_ZPM.get(1L, new Object[0]), 64, 2000);
}
else {
- Utils.LOG_INFO("foilNaquadah does not exist within Gregtech, please report this issue to Blood-asp on github.");
- Utils.LOG_INFO("This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
+ Logger.INFO("foilNaquadah does not exist within Gregtech, please report this issue to Blood-asp on github.");
+ Logger.INFO("This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
}
}
} else if (aOreDictName.equals(OreDictNames.craftingLensWhite.toString())) {
@@ -72,15 +72,15 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lithium, 2L), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemUtils.getItemStackOfAmountFromOreDict("plateDoubleLithium7", 1), 4*60*20, 2000);
}
else {
- Utils.LOG_INFO("plateLithium does not exist within Gregtech, please report this issue to Blood-asp on github.");
- Utils.LOG_INFO("This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
+ Logger.INFO("plateLithium does not exist within Gregtech, please report this issue to Blood-asp on github.");
+ Logger.INFO("This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
}
if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustLithium", 1) != null){
GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Lithium, 3L), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 1), 2*60*20, 2000);
}
else {
- Utils.LOG_INFO("dustLithium does not exist within Gregtech, please report this issue to Blood-asp on github.");
- Utils.LOG_INFO("This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
+ Logger.INFO("dustLithium does not exist within Gregtech, please report this issue to Blood-asp on github.");
+ Logger.INFO("This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
}
}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java
index 8f7304588d..bf3bf2ac9a 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MTWRAPPER.java
@@ -2,7 +2,7 @@ package gtPlusPlus.core.recipe;
import java.util.ArrayList;
-import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.recipe.RecipeUtils;
import gtPlusPlus.core.util.wrapper.var;
@@ -99,7 +99,7 @@ public class RECIPES_MTWRAPPER {
k.getClass();
k.printStackTrace();
k.getLocalizedMessage();
- Utils.LOG_WARNING("@@@: Invalid Recipe detected for: "+((var) item_Output).getsanitizedName());
+ Logger.WARNING("@@@: Invalid Recipe detected for: "+((var) item_Output).getsanitizedName());
MT_RECIPES_FAILED++;
}
}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
index 14921c645e..6f72c9c03b 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
@@ -2,9 +2,9 @@ package gtPlusPlus.core.recipe;
import gregtech.api.enums.*;
import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.recipe.RecipeUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -94,7 +94,7 @@ public class RECIPES_MachineComponents {
public static String smallGearTier10 = "gearGtSmallNeutronium";
public static final void RECIPES_LOAD(){
- Utils.LOG_INFO("Loading Recipes for the Various Circuits and Machine components.");
+ Logger.INFO("Loading Recipes for the Various Circuits and Machine components.");
if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
run();
}
@@ -284,7 +284,7 @@ public class RECIPES_MachineComponents {
onlyULVComponents();
- Utils.LOG_INFO("Done loading recipes for the Various machine components.");
+ Logger.INFO("Done loading recipes for the Various machine components.");
}
@@ -383,7 +383,7 @@ public class RECIPES_MachineComponents {
private static void GregtechMachinePhase(){
if (CORE.ConfigSwitches.enableCustomCircuits && !CORE.GTNH){
- Utils.LOG_INFO("Adding Gregtech machine recipes for the circuits.");
+ Logger.INFO("Adding Gregtech machine recipes for the circuits.");
GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 1L), GregtechItemList.Circuit_Parts_Wiring_IV.get(4L, new Object[0]), GregtechItemList.Circuit_Board_IV.get(1L, new Object[0]), 32, 256);
GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 1L), GregtechItemList.Circuit_Parts_Wiring_LuV.get(4L, new Object[0]), GregtechItemList.Circuit_Board_LuV.get(1L, new Object[0]), 64, 512);
GT_Values.RA.addFormingPressRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Silicon, 2L), GregtechItemList.Circuit_Parts_Wiring_ZPM.get(4L, new Object[0]), GregtechItemList.Circuit_Board_ZPM.get(1L, new Object[0]), 96, 1024);
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index f2f9135194..097802b32b 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -2,12 +2,12 @@ package gtPlusPlus.core.recipe;
import gregtech.api.enums.*;
import gregtech.api.util.GT_ModHandler;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.recipe.RecipeUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -183,7 +183,7 @@ public class RECIPES_Machines {
public static final void RECIPES_LOAD(){
run();
- Utils.LOG_INFO("Loading Recipes for the Various machine blocks.");
+ Logger.INFO("Loading Recipes for the Various machine blocks.");
}
private static void run(){
@@ -547,7 +547,7 @@ public class RECIPES_Machines {
//Tiered Tanks
if (CORE.ConfigSwitches.enableMachine_FluidTanks){
- Utils.LOG_WARNING("Is New Horizons Loaded? "+CORE.GTNH);
+ Logger.WARNING("Is New Horizons Loaded? "+CORE.GTNH);
if (!CORE.GTNH){
RecipeUtils.addShapedGregtechRecipe(
CI.component_Plate[1], CI.component_Plate[1], CI.component_Plate[1],
@@ -1119,6 +1119,6 @@ public class RECIPES_Machines {
}
- Utils.LOG_INFO("Done loading recipes for the Various machine blocks.");
+ Logger.INFO("Done loading recipes for the Various machine blocks.");
}
}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
index 446f1a1414..e421fd2601 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
@@ -6,10 +6,10 @@ import gregtech.api.enums.*;
import gregtech.api.interfaces.IOreRecipeRegistrator;
import gregtech.api.util.*;
import gregtech.common.GT_Proxy;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.recipe.common.CI;
-import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.recipe.RecipeUtils;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
@@ -23,7 +23,7 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator {
@Override
public void registerOre(final OrePrefixes aPrefix, final Materials aMaterial, final String aOreDictName, final String aModName, final ItemStack aStack) {
if (aOreDictName.equals(OreDictNames.craftingLensRed.toString())) {
- Utils.LOG_INFO("[Old Feature - Circuits] Adding recipes for old circuits. (Part 2)");
+ Logger.INFO("[Old Feature - Circuits] Adding recipes for old circuits. (Part 2)");
GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Copper, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GregtechItemList.Old_Circuit_Parts_Wiring_Basic.get(1L, new Object[0]), 64, 30);
GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.AnnealedCopper, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GregtechItemList.Old_Circuit_Parts_Wiring_Basic.get(1L, new Object[0]), 64, 30);
GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Gold, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GregtechItemList.Old_Circuit_Parts_Wiring_Advanced.get(1L, new Object[0]), 64, 120);
@@ -32,20 +32,20 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator {
}
else if (aOreDictName.equals(OreDictNames.craftingLensGreen.toString())) {
- Utils.LOG_INFO("[Old Feature - Circuits] Adding recipes for old circuits. (Part 3)");
+ Logger.INFO("[Old Feature - Circuits] Adding recipes for old circuits. (Part 3)");
GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Olivine, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite.get(1L, new Object[0]), 256, 480);
GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Emerald, 1L), GT_Utility.copyAmount(0L, new Object[]{aStack}), GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Elite.get(1L, new Object[0]), 256, 480);
}
else if (aOreDictName.equals(OreDictNames.craftingLensBlue.toString()) || aOreDictName.equals(OreDictNames.craftingLensCyan.toString()) || aOreDictName.equals(OreDictNames.craftingLensLightBlue.toString())) {
- Utils.LOG_INFO("[Old Feature - Circuits] Adding recipes for old circuits. (Part 4)");
+ Logger.INFO("[Old Feature - Circuits] Adding recipes for old circuits. (Part 4)");
GT_Values.RA.addLaserEngraverRecipe(ItemList.IC2_LapotronCrystal.getWildcard(1L, new Object[0]), GT_Utility.copyAmount(0L, new Object[]{aStack}), GregtechItemList.Old_Circuit_Parts_Crystal_Chip_Master.get(3L, new Object[0]), 256, 480);
}
}
private static boolean addCircuitRecipes(){
- Utils.LOG_INFO("[Old Feature - Circuits] Adding recipes for old circuits. (Part 1)");
+ Logger.INFO("[Old Feature - Circuits] Adding recipes for old circuits. (Part 1)");
GT_ModHandler.addShapelessCraftingRecipe(GregtechItemList.Old_Circuit_Primitive.get(1L, new Object[0]), new Object[]{GT_ModHandler.getIC2Item("casingadviron", 1L), OrePrefixes.wireGt01.get(Materials.RedAlloy), OrePrefixes.wireGt01.get(Materials.RedAlloy), OrePrefixes.wireGt01.get(Materials.Tin)});
GT_ModHandler.addCraftingRecipe(GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]), new Object[]{"WWW", "CPC", "WWW", 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W', OreDictNames.craftingWireCopper, 'P', OrePrefixes.plate.get(Materials.Steel)});
GT_ModHandler.addCraftingRecipe(GregtechItemList.Old_Circuit_Basic.get(1L, new Object[0]), new Object[]{"WCW", "WPW", "WCW", 'C', OrePrefixes.circuit.get(Materials.Primitive), 'W', OreDictNames.craftingWireCopper, 'P', OrePrefixes.plate.get(Materials.Steel)});
@@ -101,7 +101,7 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator {
}
private static boolean removeNewCircuits(){
- Utils.LOG_INFO("[Old Feature - Circuits] Overriding .28+ circuit values in the GT5u Itemlist with values from GT++.");
+ Logger.INFO("[Old Feature - Circuits] Overriding .28+ circuit values in the GT5u Itemlist with values from GT++.");
ItemList.Circuit_Primitive.set(GregtechItemList.Old_Circuit_Primitive.get(1));
ItemList.Circuit_Basic.set(GregtechItemList.Old_Circuit_Basic.get(1));
@@ -275,7 +275,7 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator {
private static boolean hideCircuitsNEI(){
Boolean isNEILoaded = Loader.isModLoaded("NotEnoughItems");
if (isNEILoaded && !CORE.ConfigSwitches.showHiddenNEIItems){
- Utils.LOG_INFO("[Old Feature - Circuits] Hiding .28+ circuits in NEI.");
+ Logger.INFO("[Old Feature - Circuits] Hiding .28+ circuits in NEI.");
String[] CircuitToHide = {
"Circuit_Board_Basic",
"Circuit_Board_Advanced",
@@ -373,8 +373,8 @@ public class RECIPES_Old_Circuits implements IOreRecipeRegistrator {
try {
API.hideItem(ItemList.valueOf(component).get(1L, new Object[0]));
} catch (IllegalArgumentException I){
- Utils.LOG_INFO("Could not find "+component+" in the Gregtech item list.");
- Utils.LOG_INFO("This is NOT an error, simply a notification.");
+ Logger.INFO("Could not find "+component+" in the Gregtech item list.");
+ Logger.INFO("This is NOT an error, simply a notification.");
}
}
}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java
index c1f88d91d0..55cc086121 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Shapeless.java
@@ -1,7 +1,7 @@
package gtPlusPlus.core.recipe;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.util.Utils;
import net.minecraft.item.ItemStack;
public class RECIPES_Shapeless {
@@ -21,7 +21,7 @@ public class RECIPES_Shapeless {
public static final void RECIPES_LOAD(){
//run();
- Utils.LOG_INFO("Loading Shapeless Recipes.");
+ Logger.INFO("Loading Shapeless Recipes.");
}
private static void run(){
diff --git a/src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java b/src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java
index 9719416766..61c1f463fc 100644
--- a/src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java
+++ b/src/Java/gtPlusPlus/core/recipe/ShapedRecipeObject.java
@@ -1,6 +1,6 @@
package gtPlusPlus.core.recipe;
-import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.util.recipe.RecipeUtils;
import net.minecraft.item.ItemStack;
@@ -32,7 +32,7 @@ public class ShapedRecipeObject {
this.object_H = input_H;
this.object_I = input_I;
this.object_OUTPUT = input_Output;
- Utils.LOG_SPECIFIC_WARNING("ShapedRecipeObject", "New object created.", 36);
+ Logger.SPECIFIC_WARNING("ShapedRecipeObject", "New object created.", 36);
}
public void buildRecipe(){
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index 2d857ca25a..9159025922 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -2,6 +2,7 @@ package gtPlusPlus.core.recipe.common;
import gregtech.api.enums.*;
import gregtech.api.util.GT_ModHandler;
+import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.material.ALLOY;
@@ -389,18 +390,18 @@ public class CI {
if (material instanceof Materials){
//return (ItemStack) type.get(material);
String materialName = ((Materials) material).mDefaultLocalName;
- Utils.LOG_INFO("Searching for a component named "+type.name()+materialName);
+ Logger.INFO("Searching for a component named "+type.name()+materialName);
//return ItemUtils.getItemStackOfAmountFromOreDict(type.name()+materialName, 1);
return (type.name()+materialName);
}
else {
String materialName = (Utils.sanitizeString(((Material) material).getLocalizedName()));
- Utils.LOG_INFO("Searching for a component named "+type.name()+materialName);
+ Logger.INFO("Searching for a component named "+type.name()+materialName);
//return ItemUtils.getItemStackOfAmountFromOreDict(type.name()+materialName, 1);
return (type.name()+materialName);
}
}
- Utils.LOG_INFO("[Components] Failed getting a tiered component. "+type.name()+" | "+tier);
+ Logger.INFO("[Components] Failed getting a tiered component. "+type.name()+" | "+tier);
return null;
}