aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2018-07-06 05:53:11 +1000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2018-07-06 05:53:11 +1000
commit555492921a5bd9c0f62195a633e0f5a1da627a11 (patch)
tree66dc7e09621b483ad2124177e3dee6e3d65e611f /src/Java/gtPlusPlus/xmod/gregtech
parent1b3cc3bcba3cd2ce2b4c461c115b739e6e454a2c (diff)
downloadGT5-Unofficial-555492921a5bd9c0f62195a633e0f5a1da627a11.tar.gz
GT5-Unofficial-555492921a5bd9c0f62195a633e0f5a1da627a11.tar.bz2
GT5-Unofficial-555492921a5bd9c0f62195a633e0f5a1da627a11.zip
% Rebalanced Pollution for some Multiblocks and added some to others. (This may break existing Multiblocks which may now require a muffler hatch.) Closes #328.
% Moved intermod postInit to before recipe generator runs. (Fixes issues where recipes got queued after the generator ran.) $ Fixed some recipes not working in the Large Centrifuge and Large Electrolyzer. Closes #324, Closes #321. $ Fixed some Forestry Frame Recipes not working as intended. $ Further improvement to recipe system.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java235
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java17
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java5
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java14
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java8
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java7
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialExtruder.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMacerator.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMixer.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialMultiMachine.java18
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialPlatePress.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSifter.java6
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialSinter.java1
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialThermalCentrifuge.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialVacuumFreezer.java7
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWashPlant.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialWireMill.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java428
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Fusion_MK4.java143
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_Implosion.java216
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_AutoCrafter.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GT4Entity_ThermalBoiler.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_FastNeutronReactor.java1
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMTE_NuclearReactor.java1
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityGeneratorArray.java5
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntityTreeFarm.java1
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_AlloyBlastSmelter.java1
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Cyclotron.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_IndustrialFishingPond.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_MassFabricator.java3
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/GregtechMetaTileEntity_Refinery.java1
32 files changed, 625 insertions, 529 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
index 372db7da10..0401d7e15a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/base/GregtechMeta_MultiBlockBase.java
@@ -242,6 +242,32 @@ GT_MetaTileEntity_MultiBlockBase {
return true;
}
+ /**
+ * A Static {@link Method} object which holds the current status of logging.
+ */
+ Method aLogger = null;
+
+ public void log(String s) {
+ boolean isDebugLogging = false;
+ boolean reset = false;
+ if (aLogger == null || reset) {
+ if (isDebugLogging) {
+ try {
+ aLogger = Logger.class.getMethod("INFO", String.class);
+ } catch (NoSuchMethodException | SecurityException e) {}
+ }
+ else {
+ try {
+ aLogger = Logger.class.getMethod("MACHINE_INFO", String.class);
+ } catch (NoSuchMethodException | SecurityException e) {}
+ }
+ }
+ try {
+ aLogger.invoke(null, s);
+ } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {}
+
+ }
+
public boolean checkRecipeGeneric() {
return checkRecipeGeneric(1, 100, 0);
}
@@ -264,6 +290,9 @@ GT_MetaTileEntity_MultiBlockBase {
int aSpeedBonusPercent, int aOutputChanceRoll) {
// Based on the Processing Array. A bit overkill, but very flexible.
+
+
+
// Reset outputs and progress stats
this.mEUt = 0;
this.mMaxProgresstime = 0;
@@ -272,24 +301,24 @@ GT_MetaTileEntity_MultiBlockBase {
long tVoltage = getMaxInputVoltage();
byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage));
- Logger.MACHINE_INFO("Running checkRecipeGeneric(0)");
+ log("Running checkRecipeGeneric(0)");
GT_Recipe tRecipe = findRecipe(
getBaseMetaTileEntity(), mLastRecipe, false,
gregtech.api.enums.GT_Values.V[tTier], aFluidInputs, aItemInputs);
- Logger.MACHINE_INFO("Running checkRecipeGeneric(1)");
+ log("Running checkRecipeGeneric(1)");
// Remember last recipe - an optimization for findRecipe()
this.mLastRecipe = tRecipe;
if (tRecipe == null) {
- Logger.MACHINE_INFO("BAD RETURN - 1");
+ log("BAD RETURN - 1");
return false;
}
if (!this.canBufferOutputs(tRecipe, aMaxParallelRecipes)) {
- Logger.MACHINE_INFO("BAD RETURN - 2");
+ log("BAD RETURN - 2");
return false;
}
@@ -299,23 +328,23 @@ GT_MetaTileEntity_MultiBlockBase {
int parallelRecipes = 0;
- Logger.MACHINE_INFO("parallelRecipes: "+parallelRecipes);
- Logger.MACHINE_INFO("aMaxParallelRecipes: "+aMaxParallelRecipes);
- Logger.MACHINE_INFO("tTotalEUt: "+tTotalEUt);
- Logger.MACHINE_INFO("tVoltage: "+tVoltage);
- Logger.MACHINE_INFO("tRecipeEUt: "+tRecipeEUt);
+ log("parallelRecipes: "+parallelRecipes);
+ log("aMaxParallelRecipes: "+aMaxParallelRecipes);
+ log("tTotalEUt: "+tTotalEUt);
+ log("tVoltage: "+tVoltage);
+ log("tRecipeEUt: "+tRecipeEUt);
// Count recipes to do in parallel, consuming input items and fluids and considering input voltage limits
for (; parallelRecipes < aMaxParallelRecipes && tTotalEUt < (tVoltage - tRecipeEUt); parallelRecipes++) {
if (!tRecipe.isRecipeInputEqual(true, aFluidInputs, aItemInputs)) {
- Logger.MACHINE_INFO("Broke at "+parallelRecipes+".");
+ log("Broke at "+parallelRecipes+".");
break;
}
- Logger.MACHINE_INFO("Bumped EU from "+tTotalEUt+" to "+(tTotalEUt+tRecipeEUt)+".");
+ log("Bumped EU from "+tTotalEUt+" to "+(tTotalEUt+tRecipeEUt)+".");
tTotalEUt += tRecipeEUt;
}
if (parallelRecipes == 0) {
- Logger.MACHINE_INFO("BAD RETURN - 3");
+ log("BAD RETURN - 3");
return false;
}
@@ -412,7 +441,7 @@ GT_MetaTileEntity_MultiBlockBase {
// Play sounds (GT++ addition - GT multiblocks play no sounds)
startProcess();
- Logger.MACHINE_INFO("GOOD RETURN - 1");
+ log("GOOD RETURN - 1");
return true;
}
@@ -438,16 +467,16 @@ GT_MetaTileEntity_MultiBlockBase {
(100 - percentage));
cloneRecipe.mDuration = tempTime;
if (cloneRecipe.mDuration < originalTime) {
- Logger.MACHINE_INFO("Generated recipe with a smaller time. | "
+ log("Generated recipe with a smaller time. | "
+ originalTime + " | " + cloneRecipe.mDuration + " |");
return cloneRecipe;
} else {
- Logger.MACHINE_INFO("Did not generate recipe with a smaller time. | "
+ log("Did not generate recipe with a smaller time. | "
+ originalTime + " | " + cloneRecipe.mDuration + " |");
return tRecipe;
}
}
- Logger.MACHINE_INFO("Error generating recipe, returning null.");
+ log("Error generating recipe, returning null.");
return null;
}
@@ -807,6 +836,10 @@ GT_MetaTileEntity_MultiBlockBase {
public int getPollutionPerTick(ItemStack arg0) {
return 0;
}
+
+ public String getPollutionTooltip() {
+ return "Causes " + 20 * this.getPollutionPerTick(null) + " Pollution per second";
+ }
@Override
public void saveNBTData(NBTTagCompound aNBT) {
@@ -873,116 +906,118 @@ GT_MetaTileEntity_MultiBlockBase {
final boolean aNotUnificated, final boolean aDontCheckStackSizes, final long aVoltage,
final FluidStack[] aFluids, final ItemStack aSpecialSlot, ItemStack... aInputs) {
if (this.getRecipeMap().mRecipeList.isEmpty()) {
- Logger.MACHINE_INFO("No Recipes in Map to search through.");
+ Logger.INFO("No Recipes in Map to search through.");
return null;
}
GT_Recipe mRecipeResult = null;
try {
- if (GregTech_API.sPostloadFinished) {
- if (this.getRecipeMap().mMinimalInputFluids > 0) {
- if (aFluids == null) {
- Logger.MACHINE_INFO("aFluids == null && minFluids > 0");
- return null;
- }
- int tAmount = 0;
- for (final FluidStack aFluid : aFluids) {
- if (aFluid != null) {
- ++tAmount;
+ if (GregTech_API.sPostloadFinished) {
+ if (this.getRecipeMap().mMinimalInputFluids > 0) {
+ if (aFluids == null) {
+ Logger.INFO("aFluids == null && minFluids > 0");
+ return null;
}
- }
- if (tAmount < this.getRecipeMap().mMinimalInputFluids) {
- Logger.MACHINE_INFO("Not enough fluids?");
- return null;
- }
- }
- if (this.getRecipeMap().mMinimalInputItems > 0) {
- if (aInputs == null) {
- Logger.MACHINE_INFO("No inputs and minItems > 0");
- return null;
- }
- int tAmount = 0;
- for (final ItemStack aInput : aInputs) {
- if (aInput != null) {
- ++tAmount;
+ int tAmount = 0;
+ for (final FluidStack aFluid : aFluids) {
+ if (aFluid != null) {
+ ++tAmount;
+ }
+ }
+ if (tAmount < this.getRecipeMap().mMinimalInputFluids) {
+ Logger.INFO("Not enough fluids?");
+ return null;
}
}
- if (tAmount < this.getRecipeMap().mMinimalInputItems) {
- Logger.MACHINE_INFO("Not enough items?");
- return null;
+ if (this.getRecipeMap().mMinimalInputItems > 0) {
+ if (aInputs == null) {
+ Logger.INFO("No inputs and minItems > 0");
+ return null;
+ }
+ int tAmount = 0;
+ for (final ItemStack aInput : aInputs) {
+ if (aInput != null) {
+ ++tAmount;
+ }
+ }
+ if (tAmount < this.getRecipeMap().mMinimalInputItems) {
+ Logger.INFO("Not enough items?");
+ return null;
+ }
}
}
- }
- else {
- Logger.MACHINE_INFO("Game Not Loaded properly for recipe lookup.");
- }
- if (aNotUnificated) {
- aInputs = GT_OreDictUnificator.getStackArray(true, (Object[]) aInputs);
- }
- if (aRecipe != null && !aRecipe.mFakeRecipe && aRecipe.mCanBeBuffered
- && aRecipe.isRecipeInputEqual(false, aDontCheckStackSizes, aFluids, aInputs)) {
- mRecipeResult = (aRecipe.mEnabled/* && aVoltage * this.getRecipeMap().mAmperage >= aRecipe.mEUt*/) ? aRecipe : null;
- Logger.MACHINE_INFO("x) Found Recipe? "+(mRecipeResult != null ? "true" : "false"));
- if (mRecipeResult != null) {
- return mRecipeResult;
+ else {
+ Logger.INFO("Game Not Loaded properly for recipe lookup.");
}
- }
- if (mRecipeResult == null && this.getRecipeMap().mUsualInputCount >= 0 && aInputs != null && aInputs.length > 0) {
- for (final ItemStack tStack : aInputs) {
- if (tStack != null) {
- Collection<GT_Recipe> tRecipes = this.getRecipeMap().mRecipeItemMap.get(new GT_ItemStack(tStack));
- if (tRecipes != null) {
- for (final GT_Recipe tRecipe : tRecipes) {
- if (!tRecipe.mFakeRecipe && tRecipe.isRecipeInputEqual(false, aDontCheckStackSizes, aFluids, aInputs)) {
- mRecipeResult = (tRecipe.mEnabled/* && aVoltage * this.getRecipeMap().mAmperage >= tRecipe.mEUt*/)
- ? tRecipe
- : null;
- Logger.MACHINE_INFO("1) Found Recipe? "+(mRecipeResult != null ? "true" : "false"));
- //return mRecipeResult;
+ if (aNotUnificated) {
+ aInputs = GT_OreDictUnificator.getStackArray(true, (Object[]) aInputs);
+ }
+ if (aRecipe != null && !aRecipe.mFakeRecipe && aRecipe.mCanBeBuffered
+ && aRecipe.isRecipeInputEqual(false, aDontCheckStackSizes, aFluids, aInputs)) {
+ mRecipeResult = (aRecipe.mEnabled/* && aVoltage * this.getRecipeMap().mAmperage >= aRecipe.mEUt*/) ? aRecipe : null;
+ Logger.INFO("x) Found Recipe? "+(mRecipeResult != null ? "true" : "false"));
+ if (mRecipeResult != null) {
+ return mRecipeResult;
+ }
+ }
+ if (mRecipeResult == null && this.getRecipeMap().mUsualInputCount >= 0 && aInputs != null && aInputs.length > 0) {
+ for (final ItemStack tStack : aInputs) {
+ if (tStack != null) {
+ Collection<GT_Recipe> tRecipes = this.getRecipeMap().mRecipeItemMap.get(new GT_ItemStack(tStack));
+ if (tRecipes != null) {
+ for (final GT_Recipe tRecipe : tRecipes) {
+ if (!tRecipe.mFakeRecipe && tRecipe.isRecipeInputEqual(false, aDontCheckStackSizes, aFluids, aInputs)) {
+ mRecipeResult = (tRecipe.mEnabled/* && aVoltage * this.getRecipeMap().mAmperage >= tRecipe.mEUt*/)
+ ? tRecipe
+ : null;
+ Logger.INFO("1) Found Recipe? "+(mRecipeResult != null ? "true" : "false"));
+ //return mRecipeResult;
+ }
}
}
- }
- tRecipes = this.getRecipeMap().mRecipeItemMap
- .get(new GT_ItemStack(GT_Utility.copyMetaData(32767L, new Object[]{tStack})));
- if (tRecipes != null) {
- for (final GT_Recipe tRecipe : tRecipes) {
- if (!tRecipe.mFakeRecipe
- && tRecipe.isRecipeInputEqual(false, aDontCheckStackSizes, aFluids, aInputs)) {
- mRecipeResult = (tRecipe.mEnabled && aVoltage * this.getRecipeMap().mAmperage >= tRecipe.mEUt)
- ? tRecipe
- : null;
- Logger.MACHINE_INFO("2) Found Recipe? "+(mRecipeResult != null ? "true" : "false"));
- //return mRecipeResult;
+
+ //TODO - Investigate if this requires to be in it's own block
+ tRecipes = this.getRecipeMap().mRecipeItemMap
+ .get(new GT_ItemStack(GT_Utility.copyMetaData(32767L, new Object[]{tStack})));
+ if (tRecipes != null) {
+ for (final GT_Recipe tRecipe : tRecipes) {
+ if (!tRecipe.mFakeRecipe
+ && tRecipe.isRecipeInputEqual(false, aDontCheckStackSizes, aFluids, aInputs)) {
+ mRecipeResult = (tRecipe.mEnabled /*&& aVoltage * this.getRecipeMap().mAmperage >= tRecipe.mEUt*/)
+ ? tRecipe
+ : null;
+ Logger.INFO("2) Found Recipe? "+(mRecipeResult != null ? "true" : "false"));
+ //return mRecipeResult;
+ }
}
}
}
}
}
- }
- if (mRecipeResult == null && this.getRecipeMap().mMinimalInputItems == 0 && aFluids != null && aFluids.length > 0) {
- for (final FluidStack aFluid2 : aFluids) {
- if (aFluid2 != null) {
- final Collection<GT_Recipe> tRecipes = this.getRecipeMap().mRecipeFluidMap.get(aFluid2.getFluid());
- if (tRecipes != null) {
- for (final GT_Recipe tRecipe : tRecipes) {
- if (!tRecipe.mFakeRecipe
- && tRecipe.isRecipeInputEqual(false, aDontCheckStackSizes, aFluids, aInputs)) {
- mRecipeResult = (tRecipe.mEnabled/* && aVoltage * this.getRecipeMap().mAmperage >= tRecipe.mEUt*/)
- ? tRecipe
- : null;
- Logger.MACHINE_INFO("3) Found Recipe? "+(mRecipeResult != null ? "true" : "false"));
- //return mRecipeResult;
+ if (mRecipeResult == null && this.getRecipeMap().mMinimalInputItems == 0 && aFluids != null && aFluids.length > 0) {
+ for (final FluidStack aFluid2 : aFluids) {
+ if (aFluid2 != null) {
+ final Collection<GT_Recipe> tRecipes = this.getRecipeMap().mRecipeFluidMap.get(aFluid2.getFluid());
+ if (tRecipes != null) {
+ for (final GT_Recipe tRecipe : tRecipes) {
+ if (!tRecipe.mFakeRecipe
+ && tRecipe.isRecipeInputEqual(false, aDontCheckStackSizes, aFluids, aInputs)) {
+ mRecipeResult = (tRecipe.mEnabled/* && aVoltage * this.getRecipeMap().mAmperage >= tRecipe.mEUt*/)
+ ? tRecipe
+ : null;
+ Logger.INFO("3) Found Recipe? "+(mRecipeResult != null ? "true" : "false"));
+ //return mRecipeResult;
+ }
}
}
}
}
}
}
- }
catch (Throwable t) {
- Logger.MACHINE_INFO("Invalid recipe lookup.");
+ Logger.INFO("Invalid recipe lookup.");
}
if (mRecipeResult == null) {
- return this.getRecipeMap().findRecipe(aTileEntity, aRecipe, aNotUnificated, aDontCheckStackSizes, aVoltage, aFluids, aSpecialSlot, aInputs);
+ return this.getRecipeMap().findRecipe(aTileEntity, aRecipe, aNotUnificated, aDontCheckStackSizes, aVoltage, aFluids, aSpecialSlot, aInputs);
}
else {
return mRecipeResult;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java
index 146d1b9fcc..42ef0340d3 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java
@@ -38,12 +38,10 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase {
public GMTE_AmazonPackager(int aID, String aName, String aNameRegional) {
super(aID, aName, aNameRegional);
- initFields();
}
public GMTE_AmazonPackager(String aName) {
super(aName);
- initFields();
}
@Override
@@ -70,6 +68,7 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase {
"1x Maintenance Hatch (anywhere)",
"1x Muffler (anywhere)",
"Supply Depot. Casings for the rest (10 at least!)",
+ "Produces "+this.getPollutionPerTick(null)+" pollution per tick",
CORE.GT_Tooltip
};
}
@@ -102,11 +101,14 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase {
@Override
- public boolean checkRecipe(ItemStack aStack) {
+ public boolean checkRecipe(ItemStack aStack) {
+
+ //Just the best place to check this~
+ initFields();
+
ArrayList<ItemStack> tItems = getStoredInputs();
if (this.getGUIItemStack() != null) {
- tItems.add(this.getGUIItemStack());
-
+ tItems.add(this.getGUIItemStack());
}
ArrayList<FluidStack> tFluids = getStoredFluids();
ItemStack[] tItemInputs = tItems.toArray(new ItemStack[tItems.size()]);
@@ -258,4 +260,9 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase {
return 10000;
}
+ @Override
+ public int getPollutionPerTick(ItemStack arg0) {
+ return 2;
+ }
+
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java
index 037c7d6ee6..e905324ee5 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GregtechMTE_TeslaTower.java
@@ -28,6 +28,7 @@ import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.api.objects.data.Pair;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.entity.EntityTeslaTowerLightning;
+import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.minecraft.MaterialUtils;
import gtPlusPlus.core.util.minecraft.PlayerUtils;
@@ -87,7 +88,9 @@ public class GregtechMTE_TeslaTower extends GregtechMeta_MultiBlockBase {
"1x3x1 " + casings + " pillar (Center of base)",
"1x3x1 " + MaterialUtils.getMaterialName(getFrameMaterial()) + " Frame Boxes (Each pillar side and on top)",
"1x Maintenance Hatch (One of base casings)",
- "1x " + VN[getMinTier()] + "+ Energy Hatch (Any bottom layer casing)"};
+ "1x " + VN[getMinTier()] + "+ Energy Hatch (Any bottom layer casing)",
+ "Produces "+this.getPollutionPerTick(null)+" pollution per tick",
+ CORE.GT_Tooltip};
}
private final void initFields() {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java
index e6e9709800..2512a37eb4 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCentrifuge.java
@@ -57,9 +57,11 @@ extends GregtechMeta_MultiBlockBase {
"1x Input Hatch",
"1x Output Hatch",
"1x Input Bus",
- "1x [HV] Output Bus",
- "1x [EV] Energy Hatch (Can be higher Tier) [Blue]",
- "Centrifuge Casings for the rest (16 at least)",
+ "1x Output Bus",
+ "1x Muffler Hatch",
+ "1x Energy Hatch [Blue]",
+ "Centrifuge Casings for the rest (10 at least)",
+ getPollutionTooltip(),
CORE.GT_Tooltip};
}
@@ -128,7 +130,7 @@ extends GregtechMeta_MultiBlockBase {
final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j);
//Utils.LOG_WARNING("X:"+tTileEntity.getXCoord()+" Y:"+tTileEntity.getYCoord()+" Z:"+tTileEntity.getZCoord());
- if ((!this.addMaintenanceToMachineList(tTileEntity, getCasingTextureIndex())) && (!this.addInputToMachineList(tTileEntity, getCasingTextureIndex())) && (!this.addOutputToMachineList(tTileEntity, getCasingTextureIndex())) && (!this.addEnergyInputToMachineList(tTileEntity, getCasingTextureIndex()))) {
+ if ((!this.addToMachineList(tTileEntity, getCasingTextureIndex())) && (!this.addInputToMachineList(tTileEntity, getCasingTextureIndex())) && (!this.addOutputToMachineList(tTileEntity, getCasingTextureIndex())) && (!this.addEnergyInputToMachineList(tTileEntity, getCasingTextureIndex()))) {
//Maintenance Hatch
if ((tTileEntity != null) && (tTileEntity.getMetaTileEntity() != null)) {
@@ -159,7 +161,7 @@ extends GregtechMeta_MultiBlockBase {
}
}
}
- return tAmount >= 16;
+ return tAmount >= 10;
}
@Override
@@ -169,7 +171,7 @@ extends GregtechMeta_MultiBlockBase {
@Override
public int getPollutionPerTick(final ItemStack aStack) {
- return 0;
+ return 15;
}
@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java
index e5e8e075d8..a8ac814c8e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCokeOven.java
@@ -56,6 +56,7 @@ extends GregtechMeta_MultiBlockBase {
"1x Maintenance Hatch (one of bottom)",
"1x Muffler Hatch (top middle)",
"Structural Coke Oven Casings for the rest",
+ "Produces "+this.getPollutionPerTick(null)+" pollution per tick",
CORE.GT_Tooltip};
}
@@ -167,7 +168,7 @@ extends GregtechMeta_MultiBlockBase {
@Override
public int getPollutionPerTick(final ItemStack aStack) {
- return 0;
+ return 4;
}
/* @Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java
index 229251142d..3bd659f03e 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialCuttingMachine.java
@@ -48,8 +48,10 @@ extends GregtechMeta_MultiBlockBase {
"2x Output Bus (side centered)",
"1x Energy Hatch (top or bottom centered)",
"1x Input Hatch (top or bottom centered)",
+ "1x Muffler Hatch (top)",
"1x Maintenance Hatch (back centered)",
"Cutting Factory Frames for the rest (32 at least!)",
+ "Produces "+this.getPollutionPerTick(null)+" pollution per tick",
CORE.GT_Tooltip
};
}
@@ -158,8 +160,8 @@ extends GregtechMeta_MultiBlockBase {
return false;
}
}
- if ((this.mMaintenanceHatches.size() != 1) || (this.mEnergyHatches.size() != 1)) {
- Logger.INFO("Incorrect amount of Maintenance or Energy hatches.");
+ if ((this.mMaintenanceHatches.size() != 1) || (this.mMufflerHatches.size() != 1) || (this.mEnergyHatches.size() < 1)) {
+ Logger.INFO("Incorrect amount of Maintenance or Energy or Muffler hatches.");
return false;
}
} else {
@@ -177,7 +179,7 @@ extends GregtechMeta_MultiBlockBase {
@Override
public int getPollutionPerTick(final ItemStack aStack) {
- return 0;
+ return 8;
}
@Override
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java
index 036b185749..b247a09e00 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialElectrolyzer.java
@@ -47,7 +47,8 @@ extends GregtechMeta_MultiBlockBase {
"1x Energy Hatch (anywhere)",
"1x Maintenance Hatch (anywhere)",
"1x Muffler (anywhere)",
- "Electrolyzer Casings for the rest