aboutsummaryrefslogtreecommitdiff
path: root/main/java/gregtech/common
diff options
context:
space:
mode:
Diffstat (limited to 'main/java/gregtech/common')
-rw-r--r--main/java/gregtech/common/GT_Proxy.java44
-rw-r--r--main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java2
-rw-r--r--main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java4
-rw-r--r--main/java/gregtech/common/items/GT_NeutronReflector_Item.java7
-rw-r--r--main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java5
-rw-r--r--main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java12
-rw-r--r--main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java2
-rw-r--r--main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java42
8 files changed, 77 insertions, 41 deletions
diff --git a/main/java/gregtech/common/GT_Proxy.java b/main/java/gregtech/common/GT_Proxy.java
index feddd5be46..8bae83ffa3 100644
--- a/main/java/gregtech/common/GT_Proxy.java
+++ b/main/java/gregtech/common/GT_Proxy.java
@@ -1006,7 +1006,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
}
try {
aEvent.Ore.stackSize = 1;
- if(this.mIgnoreTcon){
+ if(this.mIgnoreTcon||aEvent.Ore.getUnlocalizedName().startsWith("item.oreberry")){
if ((aOriginalMod.toLowerCase().contains("xycraft")) || (aOriginalMod.toLowerCase().contains("tconstruct"))
|| ((aOriginalMod.toLowerCase().contains("natura")) && (!aOriginalMod.toLowerCase().contains("natural")))) {
if (GT_Values.D1) {
@@ -1340,8 +1340,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
return;
}
}
- System.out.println("Material Name: "+aEvent.Name+ " !!!Unknown Material detected!!! Please report to GregTech Intergalactical for additional compatiblity. This is not an Error, an Issue nor a Lag Source, it is just an Information, which you should pass to me.");
- GT_Log.ore.println(tModToName + " uses an unknown Material. Report this to GregTech.");
+// System.out.println("Material Name: "+aEvent.Name+ " !!!Unknown Material detected!!! Please report to GregTech Intergalactical for additional compatiblity. This is not an Error, an Issue nor a Lag Source, it is just an Information, which you should pass to me.");
+// GT_Log.ore.println(tModToName + " uses an unknown Material. Report this to GregTech.");
return;
}
} else {
@@ -1795,7 +1795,34 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
for (OreDictEventContainer tOre : this.mEvents) {
if ((!(tOre.mEvent.Ore.getItem() instanceof GT_MetaGenerated_Item)) && (tOre.mPrefix != null) && (tOre.mPrefix.mIsUnificatable)
&& (tOre.mMaterial != null)) {
- if (GT_OreDictUnificator.isBlacklisted(tOre.mEvent.Ore)) {
+ if(tOre.mModID!=null&&tOre.mModID.toLowerCase().equals("enderio")&&tOre.mPrefix==OrePrefixes.ingot&&tOre.mMaterial==Materials.DarkSteel){
+ GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
+ GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null) && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true);
+ }else if(tOre.mModID!=null&&tOre.mModID.toLowerCase().equals("thermalfoundation")&&tOre.mPrefix==OrePrefixes.dust&&tOre.mMaterial==Materials.Blizz){
+ GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
+ GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null) && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true);
+ }else if(tOre.mModID!=null&&tOre.mModID.toLowerCase().equals("thermalfoundation")&&tOre.mPrefix==OrePrefixes.dust&&tOre.mMaterial==Materials.Pyrotheum){
+ GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
+ GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null) && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true);
+ }else if(tOre.mModID!=null&&tOre.mModID.toLowerCase().equals("arsmagica2")&&tOre.mPrefix==OrePrefixes.dust&&tOre.mMaterial==Materials.Vinteum){
+ GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
+ GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null) && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true);
+ }else if(tOre.mModID!=null&&tOre.mModID.toLowerCase().equals("arsmagica2")&&tOre.mPrefix==OrePrefixes.gem&&tOre.mMaterial==Materials.BlueTopaz){
+ GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
+ GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null) && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true);
+ }else if(tOre.mModID!=null&&tOre.mModID.toLowerCase().equals("arsmagica2")&&tOre.mPrefix==OrePrefixes.gem&&tOre.mMaterial==Materials.Chimerite){
+ GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
+ GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null) && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true);
+ }else if(tOre.mModID!=null&&tOre.mModID.toLowerCase().equals("arsmagica2")&&tOre.mPrefix==OrePrefixes.gem&&tOre.mMaterial==Materials.Moonstone){
+ GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
+ GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null) && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true);
+ }else if(tOre.mModID!=null&&tOre.mModID.toLowerCase().equals("arsmagica2")&&tOre.mPrefix==OrePrefixes.gem&&tOre.mMaterial==Materials.Sunstone){
+ GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
+ GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null) && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true);
+ }else if(tOre.mModID!=null&&tOre.mModID.toLowerCase().equals("rotarycraft")&&tOre.mPrefix==OrePrefixes.ingot&&tOre.mMaterial==Materials.HSLA){
+ GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
+ GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null) && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name, true)), true);
+ }else if(GT_OreDictUnificator.isBlacklisted(tOre.mEvent.Ore)) {
GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, true);
} else {
GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
@@ -1810,13 +1837,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, true);
} else {
GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
- GT_OreDictUnificator
- .set(tOre.mPrefix,
- tOre.mMaterial,
- tOre.mEvent.Ore,
- (tOre.mModID != null)
- && (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name,
- false)), true);
+ GT_OreDictUnificator.set(tOre.mPrefix,tOre.mMaterial,tOre.mEvent.Ore,(tOre.mModID != null)&&
+ (GregTech_API.sUnification.get(ConfigCategories.specialunificationtargets + "." + tOre.mModID, tOre.mEvent.Name,false)), true);
}
}
}
diff --git a/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java b/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java
index 83e25cfe42..3550fffd4b 100644
--- a/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java
+++ b/main/java/gregtech/common/gui/GT_GUIContainer_FusionReactor.java
@@ -25,7 +25,7 @@ public class GT_GUIContainer_FusionReactor extends GT_GUIContainerMetaTile_Machi
if (((GT_Container_MultiMachine)mContainer).mDisplayErrorCode == 0) {
if (((GT_Container_MultiMachine)mContainer).mActive == 0) {
- fontRendererObj.drawString("Hit with Rubber Hammer to (re-)start the Machine if it doesn't start.", -70, 170, 16448255);
+ fontRendererObj.drawString("Hit with Soft Hammer to (re-)start the Machine if it doesn't start.", -70, 170, 16448255);
} else {
fontRendererObj.drawString("Running perfectly.", 10, 170, 16448255);
}
diff --git a/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java b/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
index f6ed7f412c..7a593de334 100644
--- a/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
+++ b/main/java/gregtech/common/items/GT_MetaGenerated_Tool_01.java
@@ -169,13 +169,15 @@ import gregtech.common.tools.GT_Tool_Turbine_Small;
/* ?0:73 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(46, 1, Materials.Aluminium, Materials.Aluminium, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " S", " I ", "S f", Character.valueOf('I'), OrePrefixes.ingot.get(Materials.Aluminium), Character.valueOf('S'), OrePrefixes.stick.get(Materials.Aluminium) });
/* ?1:74 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(46, 1, Materials.StainlessSteel, Materials.StainlessSteel, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { " S", " I ", "S f", Character.valueOf('I'), OrePrefixes.ingot.get(Materials.StainlessSteel), Character.valueOf('S'), OrePrefixes.stick.get(Materials.StainlessSteel) });
/* ?2: */
+
+ if(!GregTech_API.sSpecialFile.get(ConfigCategories.general, "DisableFlintTools", false)){
/* ?3:76 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(0, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "F", "F", "S", Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood), Character.valueOf('F'), new ItemStack(Items.flint, 1) });
/* ?4:77 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(2, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "FFF", " S ", " S ", Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood), Character.valueOf('F'), new ItemStack(Items.flint, 1) });
/* ?5:78 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(4, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "F", "S", "S", Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood), Character.valueOf('F'), new ItemStack(Items.flint, 1) });
/* ?6:79 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(6, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "FF", "FS", " S", Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood), Character.valueOf('F'), new ItemStack(Items.flint, 1) });
/* ?7:80 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(8, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.MIRRORED | GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "FF", " S", " S", Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood), Character.valueOf('F'), new ItemStack(Items.flint, 1) });
/* ?8:81 */ GT_ModHandler.addCraftingRecipe(INSTANCE.getToolWithStats(34, 1, Materials.Flint, Materials.Wood, null), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { "F", "S", Character.valueOf('S'), OrePrefixes.stick.get(Materials.Wood), Character.valueOf('F'), new ItemStack(Items.flint, 1) });
-/* ?9:83 */ if (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, "Coal", true)) {
+/* ?9:83 */ }if (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, "Coal", true)) {
/* @0:83 */ GT_ModHandler.addShapelessCraftingRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 1L), GT_ModHandler.RecipeBits.NOT_REMOVABLE, new Object[] { ToolDictNames.craftingToolMortar, new ItemStack(Items.coal, 1) });
/* @1: */ }
/* @2:84 */ if (GregTech_API.sRecipeFile.get(ConfigCategories.Tools.mortar, "Clay", true)) {
diff --git a/main/java/gregtech/common/items/GT_NeutronReflector_Item.java b/main/java/gregtech/common/items/GT_NeutronReflector_Item.java
index 1430dcda8f..a9556cc486 100644
--- a/main/java/gregtech/common/items/GT_NeutronReflector_Item.java
+++ b/main/java/gregtech/common/items/GT_NeutronReflector_Item.java
@@ -1,6 +1,7 @@
package gregtech.common.items;
import gregtech.api.items.GT_Generic_Item;
+import gregtech.api.items.GT_RadioactiveCellIC_Item;
import ic2.api.reactor.IReactor;
import ic2.api.reactor.IReactorComponent;
import ic2.core.item.reactor.ItemReactorMOX;
@@ -28,7 +29,11 @@ public class GT_NeutronReflector_Item
}
else
{
- reactor.addOutput(1.0F);
+ float tEnergy=1.0f;
+ if(pulsingStack.getItem() instanceof GT_RadioactiveCellIC_Item){
+ tEnergy = (float) ((GT_RadioactiveCellIC_Item)pulsingStack.getItem()).sEnergy;
+ }
+ reactor.addOutput(tEnergy);
}
}
return true;
diff --git a/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java b/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
index ae576638a5..f3a87282be 100644
--- a/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
+++ b/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
@@ -83,9 +83,8 @@ import gregtech.api.enums.Textures;
/* 81: 62 */ i = 0;
/* 82: */ }
/* 83: */ }
-/* 84: 64 */ if ((OrePrefixes.values()[i].mPrefixedItems.isEmpty()) || (OrePrefixes.values()[i].mPrefixInto != OrePrefixes.values()[i])) {
-/* 85: */
-/* 86: */ }
+/* 84: 64 */ if(!OrePrefixes.values()[i].mPrefixedItems.isEmpty() && OrePrefixes.values()[i].mPrefixInto == OrePrefixes.values()[i])
+ mPrefix = OrePrefixes.values()[i];
/* 87: */ }
/* 88: */ }
/* 89: */ }
diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
index dc9c9a7615..674919761d 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine.java
@@ -71,20 +71,20 @@ public abstract class GT_MetaTileEntity_LargeTurbine extends GT_MetaTileEntity_M
for (byte k = 0; k < 4; k = (byte)(k + 1)) {
if (((i == 0) || (j == 0)) && ((k == 1) || (k == 2)))
{
- if (getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == getCasingBlock())
+ if (getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide > 4 ? -k : tSide == 3 ? k : i)) == getCasingBlock())
{
- if (getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == getCasingMeta()) {}
+ if (getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide > 4 ? -k : tSide == 3 ? k : i)) == getCasingMeta()) {}
}
- else if (!addToMachineList(getBaseMetaTileEntity().getIGregTechTileEntity(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)))) {
+ else if (!addToMachineList(getBaseMetaTileEntity().getIGregTechTileEntity(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide > 4 ? -k : tSide == 3 ? k : i)))) {
return false;
}
}
- else if (getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == getCasingBlock())
+ else if (getBaseMetaTileEntity().getBlock(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide > 4 ? -k : tSide == 3 ? k : i)) == getCasingBlock())
{
- if (getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide < 4 ? -k : tSide == 3 ? k : i)) == getCasingMeta()) {}
+ if (getBaseMetaTileEntity().getMetaID(tX + (tSide == 5 ? k : tSide < 4 ? i : -k), tY + j, tZ + (tSide > 4 ? -k : tSide == 3 ? k : i)) == getCasingMeta()) {}
}
else {
- return false;
+ return false;
}
}
}
diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
index 5ddd0e9069..0c4b88b621 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Plasma.java
@@ -49,7 +49,7 @@ public class GT_MetaTileEntity_LargeTurbine_Plasma extends GT_MetaTileEntity_Lar
counter = 0;
baseEff = (int) ((50.0F+(10.0F*((GT_MetaGenerated_Tool)aStack.getItem()).getToolCombatDamage(aStack)))*100);
optFlow = (int) Math.max(Float.MIN_NORMAL, ((GT_MetaGenerated_Tool)aStack.getItem()).getToolStats(aStack).getSpeedMultiplier() * ((GT_MetaGenerated_Tool)aStack.getItem()).getPrimaryMaterial(aStack).mToolSpeed*50);
- optFlow *=10;
+ optFlow *=40;
}
int tEU=0;
for(int i=0;i<steams.size();i++){
diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
index 8056f094d4..4726181726 100644
--- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
+++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java
@@ -60,37 +60,37 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
String tmp = mInventory[1].getUnlocalizedName().replaceAll("gt.blockmachines.basicmachine.", "");
if(tmp.startsWith("centrifuge")){
return GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes;
- }else if(tmp.equals("electrolyzer")){
+ }else if(tmp.startsWith("electrolyzer")){
return GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes;
- }else if(tmp.equals("alloysmelter")){
+ }else if(tmp.startsWith("alloysmelter")){
return GT_Recipe.GT_Recipe_Map.sAlloySmelterRecipes;
- }else if(tmp.equals("assembler")){
+ }else if(tmp.startsWith("assembler")){
return GT_Recipe.GT_Recipe_Map.sAssemblerRecipes;
- }else if(tmp.equals("compressor")){
+ }else if(tmp.startsWith("compressor")){
return GT_Recipe.GT_Recipe_Map.sCompressorRecipes;
- }else if(tmp.equals("extractor")){
+ }else if(tmp.startsWith("extractor")){
return GT_Recipe.GT_Recipe_Map.sExtractorRecipes;
- }else if(tmp.equals("macerator")){
+ }else if(tmp.startsWith("macerator")){
return GT_Recipe.GT_Recipe_Map.sMaceratorRecipes;
- }else if(tmp.equals("recycler")){
+ }else if(tmp.startsWith("recycler")){
return GT_Recipe.GT_Recipe_Map.sRecyclerRecipes;
- }else if(tmp.equals("thermalcentrifuge")){
+ }else if(tmp.startsWith("thermalcentrifuge")){
return GT_Recipe.GT_Recipe_Map.sThermalCentrifugeRecipes;
- }else if(tmp.equals("orewasher")){
+ }else if(tmp.startsWith("orewasher")){
return GT_Recipe.GT_Recipe_Map.sOreWasherRecipes;
- }else if(tmp.equals("chemicalreactor")){
+ }else if(tmp.startsWith("chemicalreactor")){
return GT_Recipe.GT_Recipe_Map.sChemicalRecipes;
- }else if(tmp.equals("chemicalbath")){
+ }else if(tmp.startsWith("chemicalbath")){
return GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes;
- }else if(tmp.equals("electromagneticseparator")){
+ }else if(tmp.startsWith("electromagneticseparator")){
return GT_Recipe.GT_Recipe_Map.sElectroMagneticSeparatorRecipes;
- }else if(tmp.equals("autoclave")){
+ }else if(tmp.startsWith("autoclave")){
return GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes;
- }else if(tmp.equals("mixer")){
+ }else if(tmp.startsWith("mixer")){
return GT_Recipe.GT_Recipe_Map.sMixerRecipes;
- }else if(tmp.equals("hammer")){
+ }else if(tmp.startsWith("hammer")){
return GT_Recipe.GT_Recipe_Map.sHammerRecipes;
- }else if(tmp.equals("sifter")){
+ }else if(tmp.startsWith("sifter")){
return GT_Recipe.GT_Recipe_Map.sSifterRecipes;
}
/* 57: 54 */ return null;
@@ -160,13 +160,20 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
this.mOutputItems = null;
this.mOutputFluids = null;
this.mMaxProgresstime = tRecipe.mDuration;
- int machines = Math.max(16,mInventory[1].stackSize);
+ int machines = Math.min(16,mInventory[1].stackSize);
this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
this.mEfficiencyIncrease = 10000;
int i = 0;
for(;i<machines;i++){
if(!tRecipe.isRecipeInputEqual(true, tFluids, tInputs))break;
}
+// System.out.println("recipe:"+i+" "+tRecipe.mDuration+" "+tRecipe.mEUt);
+// if(tRecipe.mOutputs.length>0){
+// System.out.println(tRecipe.mOutputs[0].getUnlocalizedName());
+// }
+// if(tRecipe.mFluidOutputs.length>0){
+// System.out.println(tRecipe.mFluidOutputs[0].getUnlocalizedName());
+// }
if (tRecipe.mEUt <= 16)
{
this.mEUt = (tRecipe.mEUt * (1 << tTier - 1) * (1 << tTier - 1));
@@ -206,6 +213,7 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl
this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
this.mOutputItems = tOut;
this.mOutputFluids = new FluidStack[]{tFOut};
+// System.out.println("ArrayOut"+mOutputItems.length+" "+mOutputFluids.length+" "+(mOutputItems.length>0?mOutputItems[0].getUnlocalizedName():"")+" "+(mOutputFluids.length>0?mOutputFluids[0].getUnlocalizedName():" "));
updateSlots();
/* 105: 93 */ return true;
/* 107: */ }
generated by cgit (git 2.46.0) at 2025-03-09 20:01:10 +0000