aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-08-23 15:24:35 +1000
committerAlkalus <draknyte1@hotmail.com>2017-08-23 15:24:35 +1000
commita39d264c0d3014fea0f73d20618093268420faaa (patch)
tree5a3a0c64e1a989f0af1f4074ebe293cb963f07c0 /src
parent2a6fdef4a3c4e7c2049c92182b84c7a1d973d01a (diff)
downloadGT5-Unofficial-a39d264c0d3014fea0f73d20618093268420faaa.tar.gz
GT5-Unofficial-a39d264c0d3014fea0f73d20618093268420faaa.tar.bz2
GT5-Unofficial-a39d264c0d3014fea0f73d20618093268420faaa.zip
+ Added LFTR block recipes.
+ Added LFTR Control Circuit. $ Changed Material logging. Fixes #126.
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/GTplusplus.java6
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java6
-rw-r--r--src/Java/gtPlusPlus/core/item/base/CoreItem.java20
-rw-r--r--src/Java/gtPlusPlus/core/material/Material.java64
-rw-r--r--src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java6
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java16
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java57
-rw-r--r--src/Java/gtPlusPlus/core/recipe/common/CI.java10
-rw-r--r--src/Java/gtPlusPlus/core/util/Utils.java4
-rw-r--r--src/resources/assets/miscutils/textures/items/itemCircuitLFTR.pngbin0 -> 181 bytes
10 files changed, 133 insertions, 56 deletions
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index bd64028027..bd79aeb764 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -31,6 +31,7 @@ import gtPlusPlus.core.handler.Recipes.RegistrationHandler;
import gtPlusPlus.core.handler.events.LoginEventHandler;
import gtPlusPlus.core.item.general.RF2EU_Battery;
import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.material.gregtech.CustomGTMaterials;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
@@ -207,6 +208,11 @@ public class GTplusplus implements ActionListener {
FMLCommonHandler.instance().bus().register(new LoginEventHandler());
Utils.LOG_INFO("Login Handler Initialized");
+ //Early load materials
+ try {
+ CustomGTMaterials.run();
+ } catch (Throwable t){}
+
if (CORE.configSwitches.enableOldGTcircuits && CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
removeCircuitRecipeMap(); //Bye shitty recipes.
}
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 3a242ea10b..fbfb8ed1fa 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -217,6 +217,8 @@ public final class ModItems {
public static Item itemCoalCoke;
+ public static CoreItem itemCircuitLFTR;
+
@@ -480,6 +482,10 @@ public final class ModItems {
dustLi2BeF4 = ItemUtils.generateSpecialUseDusts("Li2BeF4", "Li2BeF4 Fuel Compound", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/FLiBe
fluidFLiBeSalt = FluidUtils.generateFluid("Li2BeF4", "Li2BeF4", 7430, new short[]{255, 255, 255, 100});
+ //LFTR Control Circuit
+ itemCircuitLFTR = new CoreItem("itemCircuitLFTR", ""+EnumChatFormatting.GREEN+"Thorium Reactor Control Circuit", AddToCreativeTab.tabMisc, 1, 0, "Helps your LFTR not explode", EnumRarity.epic, EnumChatFormatting.GREEN, false, null);
+
+
//Zirconium
//Cinter Pellet.
itemZirconiumChlorideCinterPellet = new CoreItem("itemZirconiumPellet", "Zirconium Pellet ["+StringUtils.subscript("ZrCl4")+"]", tabMisc).setTextureName(CORE.MODID + ":itemShard");
diff --git a/src/Java/gtPlusPlus/core/item/base/CoreItem.java b/src/Java/gtPlusPlus/core/item/base/CoreItem.java
index 62fc5c0160..951d2050f5 100644
--- a/src/Java/gtPlusPlus/core/item/base/CoreItem.java
+++ b/src/Java/gtPlusPlus/core/item/base/CoreItem.java
@@ -132,6 +132,26 @@ public class CoreItem extends Item
GameRegistry.registerItem(this, unlocalizedName);
}
+ //6
+ /*
+ * Name, Tab, Stack, Dmg, Description, Rarity, Text Colour, Effect
+ */
+ public CoreItem(final String unlocalizedName, final String displayName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String description, final EnumRarity regRarity, final EnumChatFormatting colour, final boolean Effect, final ItemStack OverrideItem)
+ {
+ this.setUnlocalizedName(unlocalizedName);
+ this.itemName = displayName;
+ this.setTextureName(CORE.MODID + ":" + unlocalizedName);
+ this.setCreativeTab(creativeTab);
+ this.setMaxStackSize(stackSize);
+ this.setMaxDamage(maxDmg);
+ this.rarity = regRarity;
+ this.itemDescription = description;
+ this.descColour = colour;
+ this.hasEffect = Effect;
+ this.turnsInto = OverrideItem;
+ GameRegistry.registerItem(this, unlocalizedName);
+ }
+
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) {
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index c7d50c55b2..d4d306d5af 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -228,11 +228,11 @@ public class Material {
this.vChemicalFormula = this.getToolTip(chemicalSymbol, OrePrefixes.dust.mMaterialAmount / M, true);
}
else if (!this.vChemicalSymbol.equals("")){
- Utils.LOG_MACHINE_INFO("materialInput is null, using a valid chemical symbol.");
+ Utils.LOG_WARNING("materialInput is null, using a valid chemical symbol.");
this.vChemicalFormula = this.vChemicalSymbol;
}
else{
- Utils.LOG_MACHINE_INFO("MaterialInput == null && chemicalSymbol probably equals nothing");
+ Utils.LOG_WARNING("MaterialInput == null && chemicalSymbol probably equals nothing");
this.vChemicalFormula = "??";
}
@@ -268,13 +268,13 @@ public class Material {
}
}
- Utils.LOG_MACHINE_INFO("Creating a Material instance for "+materialName);
- Utils.LOG_MACHINE_INFO("Formula: "+this.vChemicalFormula + " Smallest Stack: "+this.smallestStackSizeWhenProcessing+" Smallest Ratio:"+ratio);
- Utils.LOG_MACHINE_INFO("Protons: "+this.vProtons);
- Utils.LOG_MACHINE_INFO("Neutrons: "+this.vNeutrons);
- Utils.LOG_MACHINE_INFO("Mass: "+this.vMass+"/units");
- Utils.LOG_MACHINE_INFO("Melting Point: "+this.meltingPointC+"C.");
- Utils.LOG_MACHINE_INFO("Boiling Point: "+this.boilingPointC+"C.");
+ Utils.LOG_WARNING("Creating a Material instance for "+materialName);
+ Utils.LOG_WARNING("Formula: "+this.vChemicalFormula + " Smallest Stack: "+this.smallestStackSizeWhenProcessing+" Smallest Ratio:"+ratio);
+ Utils.LOG_WARNING("Protons: "+this.vProtons);
+ Utils.LOG_WARNING("Neutrons: "+this.vNeutrons);
+ Utils.LOG_WARNING("Mass: "+this.vMass+"/units");
+ Utils.LOG_WARNING("Melting Point: "+this.meltingPointC+"C.");
+ Utils.LOG_WARNING("Boiling Point: "+this.boilingPointC+"C.");
}
public final String getLocalizedName(){
@@ -428,21 +428,21 @@ public class Material {
if (!this.vMaterialInput.isEmpty()){
final ItemStack[] temp = new ItemStack[this.vMaterialInput.size()];
for (int i=0;i<this.vMaterialInput.size();i++){
- //Utils.LOG_MACHINE_INFO("i:"+i);
+ //Utils.LOG_WARNING("i:"+i);
ItemStack testNull = null;
try {
testNull = this.vMaterialInput.get(i).getValidStack();
} catch (final Throwable r){
- Utils.LOG_MACHINE_INFO("Failed gathering material stack for "+this.localizedName+".");
- Utils.LOG_MACHINE_INFO("What Failed: Length:"+this.vMaterialInput.size()+" current:"+i);
+ Utils.LOG_WARNING("Failed gathering material stack for "+this.localizedName+".");
+ Utils.LOG_WARNING("What Failed: Length:"+this.vMaterialInput.size()+" current:"+i);
}
try {
if (testNull != null){
- //Utils.LOG_MACHINE_INFO("not null");
+ //Utils.LOG_WARNING("not null");
temp[i] = this.vMaterialInput.get(i).getValidStack();
}
} catch (final Throwable r){
- Utils.LOG_MACHINE_INFO("Failed setting slot "+i+", using "+this.localizedName);
+ Utils.LOG_WARNING("Failed setting slot "+i+", using "+this.localizedName);
}
}
return temp;
@@ -490,9 +490,9 @@ public class Material {
public final long[] getSmallestRatio(final ArrayList<MaterialStack> tempInput){
if (tempInput != null){
if (!tempInput.isEmpty()){
- Utils.LOG_MACHINE_INFO("length: "+tempInput.size());
- Utils.LOG_MACHINE_INFO("(inputs != null): "+(tempInput != null));
- //Utils.LOG_MACHINE_INFO("length: "+inputs.length);
+ Utils.LOG_WARNING("length: "+tempInput.size());
+ Utils.LOG_WARNING("(inputs != null): "+(tempInput != null));
+ //Utils.LOG_WARNING("length: "+inputs.length);
final long[] tempRatio = new long[tempInput.size()];
for (int x=0;x<tempInput.size();x++){
//tempPercentage = tempPercentage+inputs[x].percentageToUse;
@@ -509,7 +509,7 @@ public class Material {
for (int r=0;r<tempRatio.length;r++){
tempRatioStringThing1 = tempRatioStringThing1 + tempRatio[r] +" : ";
}
- Utils.LOG_MACHINE_INFO("Default Ratio: "+tempRatioStringThing1);
+ Utils.LOG_WARNING("Default Ratio: "+tempRatioStringThing1);
String tempRatioStringThing = "";
int tempSmallestCraftingUseSize = 0;
@@ -518,7 +518,7 @@ public class Material {
tempSmallestCraftingUseSize = (int) (tempSmallestCraftingUseSize + smallestRatio[r]);
}
//this.smallestStackSizeWhenProcessing = tempSmallestCraftingUseSize;
- Utils.LOG_MACHINE_INFO("Smallest Ratio: "+tempRatioStringThing);
+ Utils.LOG_WARNING("Smallest Ratio: "+tempRatioStringThing);
return smallestRatio;
}
}
@@ -530,7 +530,7 @@ public class Material {
if (!aShowQuestionMarks && (this.vChemicalFormula.equals("?")||this.vChemicalFormula.equals("??"))) {
return "";
}
- Utils.LOG_MACHINE_INFO("===============| Calculating Atomic Formula for "+this.localizedName+" |===============");
+ Utils.LOG_WARNING("===============| Calculating Atomic Formula for "+this.localizedName+" |===============");
if (!chemSymbol.equals("")) {
return chemSymbol;
}
@@ -573,13 +573,13 @@ public class Material {
return StringUtils.subscript(dummyFormula);
//return dummyFormula;
}
- Utils.LOG_MACHINE_INFO("dummyFormulaArray <= 0");
+ Utils.LOG_WARNING("dummyFormulaArray <= 0");
}
- Utils.LOG_MACHINE_INFO("dummyFormulaArray == null");
+ Utils.LOG_WARNING("dummyFormulaArray == null");
}
- Utils.LOG_MACHINE_INFO("tempInput.length <= 0");
+ Utils.LOG_WARNING("tempInput.length <= 0");
}
- Utils.LOG_MACHINE_INFO("tempInput == null");
+ Utils.LOG_WARNING("tempInput == null");
return "??";
}
@@ -593,7 +593,7 @@ public class Material {
} catch (final Throwable e){}
if (Materials.get(this.localizedName).mFluid == null){
- Utils.LOG_MACHINE_INFO("Generating our own fluid.");
+ Utils.LOG_WARNING("Generating our own fluid.");
//Generate a Cell if we need to
if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cell"+this.getUnlocalizedName(), 1) == null){
@@ -639,7 +639,7 @@ public class Material {
return this.generatePlasma();
}
}
- Utils.LOG_MACHINE_INFO("Getting the fluid from a GT material instead.");
+ Utils.LOG_WARNING("Getting the fluid from a GT material instead.");
return Materials.get(this.localizedName).mFluid;
}
@@ -648,11 +648,11 @@ public class Material {
if ((isValid != Materials._NULL) && (isValid != null) && (isValid != Materials.Clay) && (isValid != Materials.Clay)
&& (isValid != Materials.Phosphorus) && (isValid != Materials.Steel) && (isValid != Materials.Bronze)){
if (isValid.mPlasma != null){
- Utils.LOG_MACHINE_INFO("Using a pre-defined Plasma from GT.");
+ Utils.LOG_WARNING("Using a pre-defined Plasma from GT.");
return isValid.mPlasma;
}
}
- Utils.LOG_MACHINE_INFO("Generating our own Plasma.");
+ Utils.LOG_WARNING("Generating our own Plasma.");
return FluidUtils.addGTPlasma(this);
//return null;
}
@@ -660,9 +660,9 @@ public class Material {
final public FluidStack getFluid(final int fluidAmount) {
- Utils.LOG_MACHINE_INFO("Attempting to get "+fluidAmount+"L of "+this.vMoltenFluid.getName());
+ //Utils.LOG_WARNING("Attempting to get "+fluidAmount+"L of "+this.vMoltenFluid.getName());
final FluidStack moltenFluid = new FluidStack(this.vMoltenFluid, fluidAmount);
- Utils.LOG_MACHINE_INFO("Info: "+moltenFluid.getFluid().getName()+" Info: "+moltenFluid.amount+" Info: "+moltenFluid.getFluidID());
+ //Utils.LOG_WARNING("Info: "+moltenFluid.getFluid().getName()+" Info: "+moltenFluid.amount+" Info: "+moltenFluid.getFluidID());
return moltenFluid;
}
@@ -672,10 +672,10 @@ public class Material {
for (MaterialStack part : this.vMaterialInput){
int incrementor = part.getStackMaterial().getMeltingPointC();
meltingPoint += incrementor;
- Utils.LOG_MACHINE_INFO("Melting Point for "+this.getLocalizedName()+" increased to "+ incrementor);
+ Utils.LOG_WARNING("Melting Point for "+this.getLocalizedName()+" increased to "+ incrementor);
}
int divisor = (this.vMaterialInput.size()>0 ? this.vMaterialInput.size() : 1);
- Utils.LOG_MACHINE_INFO("Dividing "+meltingPoint+" / "+divisor+" to get average melting point.");
+ Utils.LOG_WARNING("Dividing "+meltingPoint+" / "+divisor+" to get average melting point.");
meltingPoint = (meltingPoint/divisor);
return meltingPoint;
}
diff --git a/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java b/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java
index 1d8927e87a..2b9cec5ff1 100644
--- a/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java
+++ b/src/Java/gtPlusPlus/core/material/gregtech/CustomGTMaterials.java
@@ -39,9 +39,13 @@ public class CustomGTMaterials {
public static Materials Geikielite = materialBuilder(1234, TextureSet.SET_SHINY, new int[]{1,2,3}, "Geikielite", Dyes.dyeBlack, Arrays.asList(new MaterialStack(Titanium, 1), new MaterialStack(Magnesium, 1), new MaterialStack(Oxygen, 3)));
public static Materials Zirconolite = materialBuilder(1235, TextureSet.SET_METALLIC, new int[]{1,2,3}, "Zirconolite", Dyes.dyeBlack, Arrays.asList(new MaterialStack(Calcium, 1), new MaterialStack(Zirconium, 1), new MaterialStack(Titanium, 2), new MaterialStack(Oxygen, 7)));
+ public static final void run(){
+ Utils.LOG_INFO("Trying to initialise custom materials.");
+ }
+
private final static boolean registerMaterial(Materials r){
Custom_GT_Materials.add(r);
- Utils.LOG_INFO("Registered new Gregtech material - "+r.mName);
+ Utils.LOG_INFO("[Custom] Registered new Gregtech material - "+r.mName);
return true;
}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
index c6d03b345b..fb3aa64564 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_MachineComponents.java
@@ -93,10 +93,6 @@ public class RECIPES_MachineComponents {
public static String smallGearTier9 = "gearGtSmallOsmium";
public static String smallGearTier10 = "gearGtSmallNeutronium";
- //Crafting Tools
- public static String craftingToolWrench = "craftingToolWrench";
- public static String craftingToolScrewdriver = "craftingToolScrewdriver";
-
public static final void RECIPES_LOAD(){
Utils.LOG_INFO("Loading Recipes for the Various Circuits and Machine components.");
if (!CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){
@@ -135,22 +131,22 @@ public class RECIPES_MachineComponents {
//Electric Pump
RecipeUtils.addShapedGregtechRecipe(
cableTier7, rotorTier7, itemRubberRing,
- craftingToolScrewdriver, pipeTier7, craftingToolWrench,
+ CI.craftingToolScrewdriver, pipeTier7, CI.craftingToolWrench,
itemRubberRing, CI.electricMotor_LuV, cableTier7,
CI.electricPump_LuV);
RecipeUtils.addShapedGregtechRecipe(
cableTier8, rotorTier8, itemRubberRing,
- craftingToolScrewdriver, pipeTier8, craftingToolWrench,
+ CI.craftingToolScrewdriver, pipeTier8, CI.craftingToolWrench,
itemRubberRing, CI.electricMotor_ZPM, cableTier8,
CI.electricPump_ZPM);
RecipeUtils.addShapedGregtechRecipe(
cableTier9, rotorTier9, itemRubberRing,
- craftingToolScrewdriver, pipeTier9, craftingToolWrench,
+ CI.craftingToolScrewdriver, pipeTier9, CI.craftingToolWrench,
itemRubberRing, CI.electricMotor_UV, cableTier9,
CI.electricPump_UV);
RecipeUtils.addShapedGregtechRecipe(
cableTier10, rotorTier10, itemRubberRing,
- craftingToolScrewdriver, pipeTier10, craftingToolWrench,
+ CI.craftingToolScrewdriver, pipeTier10, CI.craftingToolWrench,
itemRubberRing, CI.electricMotor_MAX, cableTier10,
CI.electricPump_MAX);
@@ -301,7 +297,7 @@ public class RECIPES_MachineComponents {
RecipeUtils.addShapedGregtechRecipe(
cableTier0, rotorTier0, itemRubberRing,
- craftingToolScrewdriver, pipeTier0, craftingToolWrench,
+ CI.craftingToolScrewdriver, pipeTier0, CI.craftingToolWrench,
itemRubberRing, CI.electricMotor_ULV, cableTier0,
CI.electricPump_ULV);
@@ -350,7 +346,7 @@ public class RECIPES_MachineComponents {
CI.electricMotor_MAX);
RecipeUtils.addShapedGregtechRecipe(
cableTier10, rotorTier10, itemRubberRing,
- craftingToolScrewdriver, pipeTier10, craftingToolWrench,
+ CI.craftingToolScrewdriver, pipeTier10, CI.craftingToolWrench,
itemRubberRing, CI.electricMotor_MAX, cableTier10,
CI.electricPump_MAX);
RecipeUtils.addShapedGregtechRecipe(
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index effff15171..1818666e63 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -74,8 +74,13 @@ public class RECIPES_Machines {
//Thermal Boiler
public static ItemStack RECIPE_ThermalBoilerController;
public static ItemStack RECIPE_ThermalBoilerCasing;
-
-
+
+ //Thorium Reactor
+ public static ItemStack RECIPE_LFTRController;
+ public static ItemStack RECIPE_LFTROuterCasing;
+ public static ItemStack RECIPE_LFTRInnerCasing;
+
+
//Buffer Cores
public static ItemStack RECIPE_BufferCore_ULV = ItemUtils.getItemStack("miscutils:item.itemBufferCore1", 1);
public static ItemStack RECIPE_BufferCore_LV = ItemUtils.getItemStack("miscutils:item.itemBufferCore2", 1);
@@ -222,7 +227,7 @@ public class RECIPES_Machines {
private static void runModRecipes(){
if (LoadedMods.Gregtech){
-
+
//Computer Cube
RecipeUtils.addShapedGregtechRecipe(
CI.getDataOrb(),ItemList.Cover_Screen.get(1),"circuitMaster",
@@ -756,7 +761,7 @@ public class RECIPES_Machines {
"plateTitanium",CI.machineHull_EV,"plateTitanium",
RECIPE_TesseractTerminal);
}
-
+
if (CORE.configSwitches.enableMachine_SimpleWasher){
ItemStack plateWrought = ItemUtils.getItemStackOfAmountFromOreDict("plateWroughtIron", 1);
ItemStack washerPipe;
@@ -773,7 +778,7 @@ public class RECIPES_Machines {
plateWrought, CI.machineCasing_ULV, plateWrought,
GregtechItemList.SimpleDustWasher.get(1));
}
-
+
if (CORE.configSwitches.enableMachine_Pollution){
RecipeUtils.addShapedGregtechRecipe(
"plateCarbon", "plateCarbon", "plateCarbon",
@@ -781,39 +786,67 @@ public class RECIPES_Machines {
"plateCarbon", "plateCarbon", "plateCarbon",
ItemUtils.simpleMetaStack(ModItems.itemAirFilter, 0, 1));
}
-
+
if (CORE.configSwitches.enableMachine_ThermalBoiler){
RECIPE_ThermalBoilerController = GregtechItemList.GT4_Thermal_Boiler.get(1);
RECIPE_ThermalBoilerCasing = GregtechItemList.Casing_ThermalContainment.get(4);
ItemStack centrifugeHV = ItemList.Machine_HV_Centrifuge.get(1);
-
+
RecipeUtils.addShapedGregtechRecipe(
"craftingGeothermalGenerator", centrifugeHV, "craftingGeothermalGenerator",
"gearTitanium", "circuitElite", "gearTitanium",
"craftingGeothermalGenerator", centrifugeHV, "craftingGeothermalGenerator",
RECIPE_ThermalBoilerController);
-
+
RecipeUtils.addShapedGregtechRecipe(
"craftingGeothermalGenerator", centrifugeHV, "craftingGeothermalGenerator",
"gearTungstenSteel", "circuitElite", "gearTungstenSteel",
"craftingGeothermalGenerator", centrifugeHV, "craftingGeothermalGenerator",
RECIPE_ThermalBoilerController);
-
+
RecipeUtils.addShapedGregtechRecipe(
"plateStainlessSteel", "plateStainlessSteel", "plateStainlessSteel",
"circuitAdvanced", CI.machineCasing_HV, "circuitAdvanced",
"plateStainlessSteel", "plateStainlessSteel", "plateStainlessSteel",
RECIPE_ThermalBoilerCasing);
-
+
//Lava Filter Recipe
GT_Values.RA.addAssemblerRecipe(ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:itemPartCarbonMesh", "RawCarbonMesh", 0, 8), GT_Values.NI, ItemUtils.getSimpleStack(ModItems.itemLavaFilter), 80*20, 16);
}
-
+ if (CORE.configSwitches.enableMultiblock_LiquidFluorideThoriumReactor){
- }
+ //Thorium Reactor
+ RECIPE_LFTRController = GregtechItemList.ThoriumReactor.get(1);
+ RECIPE_LFTRInnerCasing = GregtechItemList.Casing_Reactor_II.get(1); //Zeron
+ RECIPE_LFTROuterCasing = GregtechItemList.Casing_Reactor_I.get(1); //Hastelloy
+
+ ItemStack controlCircuit = ItemUtils.getSimpleStack(ModItems.itemCircuitLFTR);
+ RecipeUtils.addShapedGregtechRecipe(
+ controlCircuit, "cableGt12NaquadahAlloy", controlCircuit,
+ "plateDoubleHastelloyN", ItemList.Cover_Screen.get(1), "plateDoubleHastelloyN",
+ "plateThorium232", CI.machineCasing_UV, "plateThorium232",
+ RECIPE_LFTRController);
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateDoubleZeron100", CI.craftingToolScrewdriver, "plateDoubleZeron100",
+ "gearTalonite", CI.fieldGenerator_ULV, "gearTalonite",
+ "plateDoubleZeron100", CI.craftingToolHammer_Hard, "plateDoubleZeron100",
+ RECIPE_LFTRInnerCasing);
+ ItemStack IC2HeatPlate = ItemUtils.getCorrectStacktype("IC2:ic2.reactorPlatingHeat", 1);
+ RecipeUtils.addShapedGregtechRecipe(
+ "plateDoubleHastelloyN", IC2HeatPlate, "plateDoubleHastelloyN",
+ IC2HeatPlate, "frameGtHastelloyC276", IC2HeatPlate,
+ "plateDoubleHastelloyN", IC2HeatPlate, "plateDoubleHastelloyN",
+ RECIPE_LFTROuterCasing);
+
+ //LFTR Control Circuit
+ ItemStack circuitT5 = ItemList.Circuit_Master.get(1);
+ GT_Values.RA.addAssemblerRecipe(circuitT5, CI.fieldGenerator_MV, controlCircuit, 240*20, 240);
+
+ }
+ }
Utils.LOG_INFO("Done loading recipes for the Various machine blocks.");
}
} \ No newline at end of file
diff --git a/src/Java/gtPlusPlus/core/recipe/common/CI.java b/src/Java/gtPlusPlus/core/recipe/common/CI.java
index 37f9dca0e6..46f7f6e0e9 100644
--- a/src/Java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/Java/gtPlusPlus/core/recipe/common/CI.java
@@ -143,6 +143,16 @@ public class CI {
public static String[] component_Plate;
public static String[] component_Rod;
public static String[] component_Ingot;
+
+ //Crafting Tools
+ public static String craftingToolWrench = "craftingToolWrench";
+ public static String craftingToolHammer_Hard = "craftingToolHardHammer";
+ public static String craftingToolHammer_Soft = "craftingToolSoftHammer";
+ public static String craftingToolScrewdriver = "craftingToolScrewdriver";
+ public static String craftingToolFile = "craftingToolFile";
+ public static String craftingToolKnife = "craftingToolKnife";
+ public static String craftingToolCrowbar = "craftingToolCrowbar";
+ public static String craftingToolWireCutter = "craftingToolWirecutter";
public static void Init(){
diff --git a/src/Java/gtPlusPlus/core/util/Utils.java b/src/Java/gtPlusPlus/core/util/Utils.java
index 471fcadb62..0653420e5b 100644
--- a/src/Java/gtPlusPlus/core/util/Utils.java
+++ b/src/Java/gtPlusPlus/core/util/Utils.java
@@ -22,6 +22,7 @@ import gtPlusPlus.core.proxy.ClientProxy;
import gtPlusPlus.core.util.fluid.FluidUtils;
import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.math.MathUtils;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
import ic2.core.Ic2Items;
import ic2.core.init.InternalName;
import ic2.core.item.resources.ItemCell;
@@ -179,7 +180,8 @@ public class Utils {
//Non-Dev Comments
public static void LOG_MACHINE_INFO(final String s){
if (CORE.configSwitches.MACHINE_INFO || ClientProxy.playerName.toLowerCase().contains("draknyte1")){
- modLogger.info("Machine Info: "+s);
+ String name1 = gtPlusPlus.core.util.reflect.ReflectionUtils.getMethodName(2);
+ modLogger.info("Machine Info: "+s+" | "+name1);
}
}
diff --git a/src/resources/assets/miscutils/textures/items/itemCircuitLFTR.png b/src/resources/assets/miscutils/textures/items/itemCircuitLFTR.png
new file mode 100644
index 0000000000..723f62e278
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/itemCircuitLFTR.png
Binary files differ