From f12ae9a63f561fdedaaccd6c24d9f5b88dc09c14 Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Sat, 22 Oct 2016 16:38:18 +0200 Subject: [PATCH] Add Naquadah fuel rods and fix some Assemblyline recipes Naquadah fuel = Mox with 10x runtime. --- .../java/gregtech/api/enums/ItemList.java | 2 +- .../java/gregtech/api/enums/OrePrefixes.java | 1 - .../java/gregtech/common/GT_RecipeAdder.java | 3 +++ .../basic/GT_MetaTileEntity_Scanner.java | 19 +++++++++++------- .../postload/GT_MachineRecipeLoader.java | 1 + .../GT_Loader_Item_Block_And_Fluid.java | 16 +++++++++++++++ .../textures/items/gt.Double_Naquadahcell.png | Bin 0 -> 328 bytes .../items/gt.Double_NaquadahcellDep.png | Bin 0 -> 328 bytes .../textures/items/gt.Naquadahcell.png | Bin 0 -> 288 bytes .../textures/items/gt.NaquadahcellDep.png | Bin 0 -> 288 bytes .../textures/items/gt.Quad_Naquadahcell.png | Bin 0 -> 469 bytes .../items/gt.Quad_NaquadahcellDep.png | Bin 0 -> 469 bytes 12 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.Double_Naquadahcell.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.Double_NaquadahcellDep.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.Naquadahcell.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.NaquadahcellDep.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.Quad_Naquadahcell.png create mode 100644 src/main/resources/assets/gregtech/textures/items/gt.Quad_NaquadahcellDep.png diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index 43df5d61..a453349e 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -639,7 +639,7 @@ public enum ItemList implements IItemContainer { ModularBasicHelmet, ModularBasicChestplate, ModularBasicLeggings, ModularBasicBoots, ModularElectric1Helmet, ModularElectric1Chestplate, ModularElectric1Leggings, ModularElectric1Boots, ModularElectric2Helmet, ModularElectric2Chestplate, ModularElectric2Leggings, ModularElectric2Boots, Block_Powderbarrel, GelledToluene, - FluidRegulator_LV, FluidRegulator_MV, FluidRegulator_HV, FluidRegulator_EV, FluidRegulator_IV, FluidRegulator_LuV, FluidRegulator_ZPM, FluidRegulator_UV, FluidFilter, CuringOven, Machine_Multi_Assemblyline, Machine_Multi_DieselEngine, QuantumEye, QuantumStar, Gravistar, Block_SSFUEL, Block_MSSFUEL, SFMixture, MSFMixture; + FluidRegulator_LV, FluidRegulator_MV, FluidRegulator_HV, FluidRegulator_EV, FluidRegulator_IV, FluidRegulator_LuV, FluidRegulator_ZPM, FluidRegulator_UV, FluidFilter, CuringOven, Machine_Multi_Assemblyline, Machine_Multi_DieselEngine, QuantumEye, QuantumStar, Gravistar, Block_SSFUEL, Block_MSSFUEL, SFMixture, MSFMixture, Depleted_Naquadah_1, Depleted_Naquadah_2, Depleted_Naquadah_4, NaquadahCell_1, NaquadahCell_2, NaquadahCell_4; public static final ItemList[] DYE_ONLY_ITEMS = {Color_00, Color_01, Color_02, Color_03, Color_04, Color_05, Color_06, Color_07, Color_08, Color_09, Color_10, Color_11, Color_12, Color_13, Color_14, Color_15}, SPRAY_CAN_DYES = {Spray_Color_00, Spray_Color_01, Spray_Color_02, Spray_Color_03, Spray_Color_04, Spray_Color_05, Spray_Color_06, Spray_Color_07, Spray_Color_08, Spray_Color_09, Spray_Color_10, Spray_Color_11, Spray_Color_12, Spray_Color_13, Spray_Color_14, Spray_Color_15}, SPRAY_CAN_DYES_USED = {Spray_Color_Used_00, Spray_Color_Used_01, Spray_Color_Used_02, Spray_Color_Used_03, Spray_Color_Used_04, Spray_Color_Used_05, Spray_Color_Used_06, Spray_Color_Used_07, Spray_Color_Used_08, Spray_Color_Used_09, Spray_Color_Used_10, Spray_Color_Used_11, Spray_Color_Used_12, Spray_Color_Used_13, Spray_Color_Used_14, Spray_Color_Used_15}, TRANSFORMERS = {Transformer_LV_ULV, Transformer_MV_LV, Transformer_HV_MV, Transformer_EV_HV, Transformer_IV_EV, Transformer_LuV_IV, Transformer_ZPM_LuV, Transformer_UV_ZPM, Transformer_MAX_UV}, MACHINE_HULLS = {Hull_ULV, Hull_LV, Hull_MV, Hull_HV, Hull_EV, Hull_IV, Hull_LuV, Hull_ZPM, Hull_UV, Hull_MAX}, HATCHES_DYNAMO = {Hatch_Dynamo_ULV, Hatch_Dynamo_LV, Hatch_Dynamo_MV, Hatch_Dynamo_HV, Hatch_Dynamo_EV, Hatch_Dynamo_IV, Hatch_Dynamo_LuV, Hatch_Dynamo_ZPM, Hatch_Dynamo_UV, Hatch_Dynamo_MAX}, HATCHES_ENERGY = {Hatch_Energy_ULV, Hatch_Energy_LV, Hatch_Energy_MV, Hatch_Energy_HV, Hatch_Energy_EV, Hatch_Energy_IV, Hatch_Energy_LuV, Hatch_Energy_ZPM, Hatch_Energy_UV, Hatch_Energy_MAX}, HATCHES_INPUT = {Hatch_Input_ULV, Hatch_Input_LV, Hatch_Input_MV, Hatch_Input_HV, Hatch_Input_EV, Hatch_Input_IV, Hatch_Input_LuV, Hatch_Input_ZPM, Hatch_Input_UV, Hatch_Input_MAX}, HATCHES_INPUT_BUS = {Hatch_Input_Bus_ULV, Hatch_Input_Bus_LV, Hatch_Input_Bus_MV, Hatch_Input_Bus_HV, Hatch_Input_Bus_EV, Hatch_Input_Bus_IV, Hatch_Input_Bus_LuV, Hatch_Input_Bus_ZPM, Hatch_Input_Bus_UV, Hatch_Input_Bus_MAX}, HATCHES_OUTPUT = {Hatch_Output_ULV, Hatch_Output_LV, Hatch_Output_MV, Hatch_Output_HV, Hatch_Output_EV, Hatch_Output_IV, Hatch_Output_LuV, Hatch_Output_ZPM, Hatch_Output_UV, Hatch_Output_MAX}, HATCHES_OUTPUT_BUS = {Hatch_Output_Bus_ULV, Hatch_Output_Bus_LV, Hatch_Output_Bus_MV, Hatch_Output_Bus_HV, Hatch_Output_Bus_EV, Hatch_Output_Bus_IV, Hatch_Output_Bus_LuV, Hatch_Output_Bus_ZPM, Hatch_Output_Bus_UV, Hatch_Output_Bus_MAX}, HATCHES_MUFFLER = {Hatch_Muffler_LV, Hatch_Muffler_LV, Hatch_Muffler_MV, Hatch_Muffler_HV, Hatch_Muffler_EV, Hatch_Muffler_IV, Hatch_Muffler_LuV, Hatch_Muffler_ZPM, Hatch_Muffler_UV, Hatch_Muffler_MAX}; diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index 7113a39f..5c1eb410 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -642,7 +642,6 @@ public enum OrePrefixes { if (aMaterial.mBlastFurnaceTemp <= 1750) ingotHot.mDisabledItems.add(aMaterial); //Moved HotIngot code from GT_MetaGenerated_Item_01 so all this is in once place if (!enableUnusedSprings && (aMaterial != Materials.Titanium)) spring.mDisabledItems.add(aMaterial); if (!enableUnusedSmallSprings) springSmall.mDisabledItems.add(aMaterial); - if (!enableUnusedRounds && (aMaterial != Materials.HSSE || aMaterial == Materials.Neutronium || aMaterial == Materials.HSSG)) round.mDisabledItems.add(aMaterial); if (!enableUnusedCrates) { if (!(aMaterial == Materials.DamascusSteel || aMaterial == Materials.Steel || aMaterial == Materials.Bronze || aMaterial == Materials.Manganese)) crateGtIngot.mDisabledItems.add(aMaterial); diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java index 88e459a9..3825e7cb 100644 --- a/src/main/java/gregtech/common/GT_RecipeAdder.java +++ b/src/main/java/gregtech/common/GT_RecipeAdder.java @@ -782,6 +782,9 @@ public class GT_RecipeAdder if ((aDuration = GregTech_API.sRecipeFile.get("assemblingline", aOutput, aDuration)) <= 0) { return false; } + for(ItemStack tItem : aInputs){ + if(tItem==null)System.out.println("addAssemblylineRecipe"+aResearchItem.getDisplayName()); + } GT_Recipe.GT_Recipe_Map.sScannerFakeRecipes.addFakeRecipe(false, new ItemStack[]{aResearchItem}, new ItemStack[]{aOutput}, new ItemStack[]{ItemList.Tool_DataStick.getWithName(1L, "Research result", new Object[0])}, null, null, aResearchTime, 30, 0); GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes.add(new GT_Recipe_AssemblyLine( aResearchItem, aResearchTime, aInputs, aFluidInputs, aOutput, aDuration, aEUt)); diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java index 88951bfa..9a6cda5d 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java @@ -22,6 +22,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; +import scala.tools.nsc.symtab.SymbolLoadersStats; public class GT_MetaTileEntity_Scanner extends GT_MetaTileEntity_BasicMachine { @@ -38,6 +39,7 @@ public class GT_MetaTileEntity_Scanner } public int checkRecipe() { + System.out.println("1"); ItemStack aStack = getInputAt(0); if (getOutputAt(0) != null) { this.mOutputBlocked += 1; @@ -151,29 +153,31 @@ public class GT_MetaTileEntity_Scanner } } if(ItemList.Tool_DataStick.isStackEqual(getSpecialSlot(), false, true)&& aStack !=null){ + System.out.println("2"); for(GT_Recipe.GT_Recipe_AssemblyLine tRecipe:GT_Recipe.GT_Recipe_AssemblyLine.sAssemblylineRecipes){ if(GT_Utility.areStacksEqual(tRecipe.mResearchItem, aStack, true)){ - + System.out.println("3"); this.mOutputItems[0] = GT_Utility.copyAmount(1L, new Object[]{getSpecialSlot()}); getSpecialSlot().stackSize -= 1; GT_Utility.ItemNBT.setBookTitle(this.mOutputItems[0], GT_LanguageManager.getTranslation(tRecipe.mOutput.getDisplayName())+" Construction Data"); - + System.out.println("4"); NBTTagCompound tNBT = this.mOutputItems[0].getTagCompound(); if (tNBT == null) { tNBT = new NBTTagCompound(); - } + } System.out.println("41"); tNBT.setTag("output", tRecipe.mOutput.writeToNBT(new NBTTagCompound())); tNBT.setInteger("time", tRecipe.mDuration); tNBT.setInteger("eu", tRecipe.mEUt); + System.out.println("42"); for(int i = 0 ; i < tRecipe.mInputs.length ; i++){ tNBT.setTag(""+i, tRecipe.mInputs[i].writeToNBT(new NBTTagCompound())); - } + }System.out.println("43"); for(int i = 0 ; i < tRecipe.mFluidInputs.length ; i++){ tNBT.setTag("f"+i, tRecipe.mFluidInputs[i].writeToNBT(new NBTTagCompound())); } - + System.out.println("5"); tNBT.setString("author", "Assembly Line Recipe Generator"); NBTTagList tNBTList = new NBTTagList(); tNBTList.appendTag(new NBTTagString("Constructionplan for "+tRecipe.mOutput.stackSize+" "+GT_LanguageManager.getTranslation(tRecipe.mOutput.getDisplayName())+". Needed EU/t: "+tRecipe.mEUt+" Productiontime: "+(tRecipe.mDuration/20))); @@ -181,7 +185,7 @@ public class GT_MetaTileEntity_Scanner if(tRecipe.mInputs[i]!=null){ tNBTList.appendTag(new NBTTagString("Input Bus "+(i+1)+": "+tRecipe.mInputs[i].stackSize+" "+GT_LanguageManager.getTranslation(tRecipe.mInputs[i].getDisplayName()))); } - } + }System.out.println("6"); for(int i=0;i9pv#(j62I}Ch|Khz2Z+9=~ Uv)f;g3G^U?r>mdKI;Vst00g#(!~g&Q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Double_NaquadahcellDep.png b/src/main/resources/assets/gregtech/textures/items/gt.Double_NaquadahcellDep.png new file mode 100644 index 0000000000000000000000000000000000000000..e8b6f8ebb974f3eed0bea840cae47b4f4112e8b4 GIT binary patch literal 328 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggqW;q^C?pqQm9YCS0o-U3d7N^%v+St`9pv#(j62I}Ch|Khz2Z+9=~ Uv)f;g3G^U?r>mdKI;Vst00g#(!~g&Q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Naquadahcell.png b/src/main/resources/assets/gregtech/textures/items/gt.Naquadahcell.png new file mode 100644 index 0000000000000000000000000000000000000000..11cd5c53c78d8e7996cbf130b43feb6b4030564a GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G^tAk28_ZrvZCAbW|YuPggqW;q@Xv)S2_H-JKGJzX3_EKYBotjKpnLBu6}wh+^* zK54}rteoM_-z>hGib^ywUJBW;>TFl*-AN@npVj~KGT3Nl=We_Hq(<|N!CLh`N{yQ^6!n|~g=L$>LRITFZF|>HTAvb#S zi-oNpB(Jq9v@kFPc>NaeYZdqhGib^ywUJBW;>TFl*-AN@npVj~KGT3Nl=We_Hq(<|N!CLh`N{yQ^6!n|~g=L$>LRITFZF|>HTAvb#S zi-oNpB(Jq9v@kFPc>NaeYZdqA$8q(W|7lAu%aWofn9t|cPyY8kF-ejNV7J@h zx-Ml|qLgZNqk|+#Dy=n2DW=mYx7!V+6tmfkPyT#9F*-P%PW1bIEXzVl$>DGyO;g6> zaqY+Bv3B40%>r6$E|&`cX`1rC=XuWK@o4PJ*ui?eMoLK#1pMT_?<0gTcVOE#QcC0W zPaXsTj^kiiR&#{+q{U+K(O=Jbo;SY(&+`}z26Q?dvMeLZvW5d}w_6;?X^!xU>-EZN zwPLwkHhjO|f9^nQUC-L<_4v&jw@?%Xp6AskjYcDe!(pqtu4@+PcDqJpAp}B*R^Mzk zUq%7jwh6=>N31*00000 LNkvXXu0mjf!@JTR literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/gt.Quad_NaquadahcellDep.png b/src/main/resources/assets/gregtech/textures/items/gt.Quad_NaquadahcellDep.png new file mode 100644 index 0000000000000000000000000000000000000000..fa65528d478a46a31f1b9f15fd5dfb4fc661595b GIT binary patch literal 469 zcmV;`0V@89P)A$8q(W|7lAu%aWofn9t|cPyY8kF-ejNV7J@h zx-Ml|qLgZNqk|+#Dy=n2DW=mYx7!V+6tmfkPyT#9F*-P%PW1bIEXzVl$>DGyO;g6> zaqY+Bv3B40%>r6$E|&`cX`1rC=XuWK@o4PJ*ui?eMoLK#1pMT_?<0gTcVOE#QcC0W zPaXsTj^kiiR&#{+q{U+K(O=Jbo;SY(&+`}z26Q?dvMeLZvW5d}w_6;?X^!xU>-EZN zwPLwkHhjO|f9^nQUC-L<_4v&jw@?%Xp6AskjYcDe!(pqtu4@+PcDqJpAp}B*R^Mzk zUq%7jwh6=>N31*00000 LNkvXXu0mjf!@JTR literal 0 HcmV?d00001