diff options
Diffstat (limited to 'src/main/java')
31 files changed, 959 insertions, 1180 deletions
diff --git a/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_Layer_Space.java b/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_Layer_Space.java index 44fa0bf5a4..fa994b939d 100644 --- a/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_Layer_Space.java +++ b/src/main/java/bloodasp/galacticgreg/GT_Worldgen_GT_Ore_Layer_Space.java @@ -97,7 +97,7 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { /** * Check if *this* orelayer is enabled for pDimensionDef - * + * * @param pDimensionDef the ChunkProvider in question * @return */ @@ -110,7 +110,7 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { /** * Get the number of enabled OreMixes for given Dimension. This query is buffered and will only consume calculation * time on the first run for each dimension - * + * * @param pDimensionDef * @return */ @@ -133,7 +133,7 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { /** * Get a List of all Veins which are enabled for given Dim. Query is buffered - * + * * @param pDimensionDef * @return null if nothing is found or error */ @@ -171,7 +171,7 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { /** * Select a random ore-vein from the list - * + * * @param pDimensionDef * @param pRandom * @return @@ -189,10 +189,6 @@ public class GT_Worldgen_GT_Ore_Layer_Space extends GT_Worldgen { int tRnd = pRandom.nextInt(tEnabledVeins.size()); String tVeinName = tEnabledVeins.get(tRnd); - // No lambda in Java 1.6 and 1.7 :( - // GT_Worldgen_GT_Ore_Layer_Space tGen = GalacticGreg.oreVeinWorldgenList.stream().filter(p -> - // p.mWorldGenName == tVeinName).findFirst(); - GT_Worldgen tGen = null; for (GT_Worldgen tWorldGen : GalacticGreg.oreVeinWorldgenList) if (tWorldGen instanceof GT_Worldgen_GT_Ore_Layer_Space diff --git a/src/main/java/bloodasp/galacticgreg/GalacticGreg.java b/src/main/java/bloodasp/galacticgreg/GalacticGreg.java index 7afda35483..760564c741 100644 --- a/src/main/java/bloodasp/galacticgreg/GalacticGreg.java +++ b/src/main/java/bloodasp/galacticgreg/GalacticGreg.java @@ -68,11 +68,6 @@ public class GalacticGreg { Logger.trace("Leaving PRELOAD"); } - // @EventHandler - // public void onLoad(FMLInitializationEvent event){ - // GalacticGregRegistry.registerModContainer(ModRegisterer.Setup_GalactiCraftCore()); - // } - public static final ArrayList<Runnable> ADDITIONALVEINREGISTER = new ArrayList<>(); /** diff --git a/src/main/java/bloodasp/galacticgreg/api/ModDBMDef.java b/src/main/java/bloodasp/galacticgreg/api/ModDBMDef.java index bd0df8652b..674c1dd799 100644 --- a/src/main/java/bloodasp/galacticgreg/api/ModDBMDef.java +++ b/src/main/java/bloodasp/galacticgreg/api/ModDBMDef.java @@ -29,9 +29,9 @@ public class ModDBMDef { /** * Internal function - * + * * Check if the given Block is equal to the block in this instance - * + * * @param pBlock the Block in question * @return */ @@ -45,9 +45,9 @@ public class ModDBMDef { /** * Internal function - * + * * Check if the given Block is equal to the block in this instance and matches the metadata - * + * * @param pBlock the block in question * @param pMeta the metadata in question * @return @@ -73,7 +73,7 @@ public class ModDBMDef { /** * Create a new "Block that can be replaced by ores" definition. Meta defaults to 0 here - * + * * @param pTargetBlockName The unlocalizedName of the block */ public ModDBMDef(String pTargetBlockName) { @@ -82,7 +82,7 @@ public class ModDBMDef { /** * Create a new "Block that can be replaced by ores" definition - * + * * @param pTargetBlockName The unlocalizedName of the block * @param pMetaData The blocks metadata */ @@ -92,7 +92,7 @@ public class ModDBMDef { /** * Create a new "Block that can be replaced by ores" definition - * + * * @param pTargetBlock The instance of the block that can be replaced * @param pMetaData The blocks metadata */ @@ -102,7 +102,7 @@ public class ModDBMDef { /** * Create a new "Block that can be replaced by ores" definition. Meta defaults to 0 here - * + * * @param pTargetBlock The instance of the block that can be replaced */ public ModDBMDef(Block pTargetBlock) { @@ -111,7 +111,7 @@ public class ModDBMDef { /** * Create a new "Block that can be replaced by ores" definition - * + * * @param pTargetBlock * @param pCanAlwaysReplace set to true if this block can always be replaced, regardless of it's metavalue. Like: * [block]:* @@ -122,7 +122,7 @@ public class ModDBMDef { /** * Create a new "Block that can be replaced by ores" definition - * + * * @param pTargetBlockName The unlocalizedName of the block * @param pCanAlwaysReplace set to true if this block can always be replaced, regardless of it's metavalue. Like: * [block]:* @@ -133,7 +133,7 @@ public class ModDBMDef { /** * Create a new "Block that can be replaced by ores" definition - * + * * @param pTargetBlockName The unlocalizedName of the block * @param pMetaData The blocks metadata * @param pCanAlwaysReplace set to true if this block can always be replaced, regardless of it's metavalue. Like: @@ -148,18 +148,14 @@ public class ModDBMDef { /** * Internal function Never run this function. It is used to update the blocks name when GalacticGreg is initializing * its internal structures - * + * * @param pParentModName The modname to be attached to the block-name */ public void updateBlockName(String pParentModName) { // Do we already have a FQBN? then do nothing if (_targetBlockName.contains(":")) { - // GalacticGreg.Logger.trace("Not updating blockname, as it already contains a mods name: %s", - // _targetBlockName); return; } - // GalacticGreg.Logger.trace("Updating blockname: Old: %s new: %s:%s", _targetBlockName, pParentModName, - // _targetBlockName); _targetBlockName = String.format("%s:%s", pParentModName, _targetBlockName); } } diff --git a/src/main/java/bloodasp/galacticgreg/api/ModDimensionDef.java b/src/main/java/bloodasp/galacticgreg/api/ModDimensionDef.java index 4b634173f1..92b291f089 100644 --- a/src/main/java/bloodasp/galacticgreg/api/ModDimensionDef.java +++ b/src/main/java/bloodasp/galacticgreg/api/ModDimensionDef.java @@ -46,7 +46,7 @@ public class ModDimensionDef { /** * Internal function - * + * * @return A list of possible asteroid-mixes that shall be generated */ public List<AsteroidBlockComb> getValidAsteroidMaterials() { @@ -75,7 +75,7 @@ public class ModDimensionDef { /** * Register new generator for objects in space. You can register as many as you want. If you don't register * anything, no structures will generate and the default Asteroid-Generator will be used - * + * * @param pSpaceObjectGenerator An instance of your own object generator */ public void registerSpaceObjectGenerator(ISpaceObjectGenerator pSpaceObjectGenerator) { @@ -128,11 +128,11 @@ public class ModDimensionDef { * dimension, and you probably don't want to have asteroids stuck in the ground, both generators are separated from * each other. Basically, you can go with the default values. If you want to change them, make sure that pOregenMaxY * is lower than pAsteroidMinY - * + * * @param pOregenMaxY The maximum Y-height where ores will be allowed to spawn. Default: 64 * @param pAsteroidMinY The minimum Y-height that has to be reached before asteroids will spawn. Default: 128 * @throws IllegalArgumentException if the limits are invalid - * + * */ public void setAsteroidAndPlanetLimits(int pOregenMaxY, int pAsteroidMinY) { if (pOregenMaxY >= pAsteroidMinY) @@ -145,7 +145,7 @@ public class ModDimensionDef { /** * Internal function - * + * * @return A list of all special blocks that shall be used to generate the asteroids. */ public List<SpecialBlockComb> getSpecialBlocksForAsteroids() { @@ -158,7 +158,7 @@ public class ModDimensionDef { /** * Internal function - * + * * @return The type for this dimension */ public DimensionType getDimensionType() { @@ -168,7 +168,7 @@ public class ModDimensionDef { /** * Set whether this DimensionDefinition defines an void-dimension that shall spawn asteroids instead of ores in * stone - * + * * @param pType The dimensiontype to be used */ public void setDimensionType(DimensionType pType) { @@ -177,7 +177,7 @@ public class ModDimensionDef { /** * Internal function - * + * * @return The configuration for AirBlocks */ public AirReplaceRule getAirSetting() { @@ -189,10 +189,10 @@ public class ModDimensionDef { * NeverReplaceAir: No matter what, if there is an Air-Block found, it will not replace it. AllowReplaceAir: This * will generate Ores in Stones (defined by addBlockDefinition()) and air if found OnlyReplaceAir : This will not * generate Ores in solid blocks, but only in air - * + * * Note that "OnlyReplaceAir" is a special setting if you have a dimension that is not defined as "Asteroids" but * you still need/want to generate ores in midair. - * + * * @param pSetting */ public void setAirSetting(AirReplaceRule pSetting) { @@ -201,7 +201,7 @@ public class ModDimensionDef { /** * Internal function - * + * * @return The dimension identifier that is used internally to identify the dimension */ public String getDimIdentifier() { @@ -211,10 +211,10 @@ public class ModDimensionDef { /** * Set a manual override for ores that shall be generated. This setting is ignored if getIsAsteroidDimension() * returns true - * + * * For example, on GalactiCraft Mars, this value is set to GTOreTypes.RedGranite, because it matches the color * better. If you don't set anything here, it will generate regular stone-ores. - * + * * @param pStoneType */ public void setStoneType(GTOreTypes pStoneType) { @@ -223,7 +223,7 @@ public class ModDimensionDef { /** * Internal function - * + * * @return The stone override for gregtech ores */ public GTOreTypes getStoneType() { @@ -232,7 +232,7 @@ public class ModDimensionDef { /** * Internal function - * + * * @return The attached chunk-provider for this dimension */ public String getChunkProviderName() { @@ -242,14 +242,12 @@ public class ModDimensionDef { /** * Adds a new blockdefinition to this dimension. This block will then later be replaced by ores. You can add as many * blocks as you want. Just don't add Blocks.Air, as there is another setting for allowing Air-Replacement - * + * * @param pBlockDef * @return */ public boolean addBlockDefinition(ModDBMDef pBlockDef) { if (_mReplaceableBlocks.contains(pBlockDef)) { - // GalacticGreg.Logger.error("Cannot add Block %s:%d, as it is already existing!", pBlockDef.getBlockName(), - // pBlockDef.getMeta()); return false; } else { _mReplaceableBlocks.add(pBlockDef); @@ -259,7 +257,7 @@ public class ModDimensionDef { /** * Internal function - * + * * @return The DimensionName in a Human-readable format */ public String getDimensionName() { @@ -268,7 +266,7 @@ public class ModDimensionDef { /** * Internal function - * + * * @return A list of all defined Blocks that can be replaced while generating ores */ public ArrayList<ModDBMDef> getReplaceableBlocks() { @@ -277,7 +275,7 @@ public class ModDimensionDef { /** * Define a new dimension - * + * * @param pDimensionName The human-readable. Spaces will be removed * @param pChunkProvider The chunkprovider class that shall be observed for the oregen */ @@ -293,7 +291,7 @@ public class ModDimensionDef { /** * Define a new dimension - * + * * @param pDimensionName The human-readable. Spaces will be removed * @param pChunkProvider The chunkprovider class that shall be observed for the oregen * @param pBlockDefinitions The list of predefined blocks to be replaced by ores @@ -310,7 +308,7 @@ public class ModDimensionDef { /** * Define a new dimension - * + * * @param pDimensionName The human-readable DimensionName. Spaces will be removed * @param pChunkProviderName The human-readable, full-qualified classname for the chunkprovider */ @@ -320,7 +318,7 @@ public class ModDimensionDef { /** * Define a new dimension - * + * * @param pDimensionName The human-readable DimensionName. Spaces will be removed * @param pChunkProviderName The human-readable, full-qualified classname for the chunkprovider * @param pBlockDefinitions The list of predefined blocks to be replaced by ores @@ -343,15 +341,13 @@ public class ModDimensionDef { /** * Internal function - * + * * Do not call this function by yourself. Ever. It will cause explosions, water to blood, death of firstborn,... * Seriously, don't do it. */ protected void setParentModName(String pModName) { if (_mInternalDimIdentifier.equals(STR_NOTDEFINED)) { _mInternalDimIdentifier = String.format("%s_%s", pModName, _mDimensionName); - // GalacticGreg.Logger.debug("Set Internal Identifier for Dimension %s to %s", _mDimensionName, - // _mInternalDimIdentifier); } // Else Don't update, we're already set @@ -360,9 +356,9 @@ public class ModDimensionDef { /** * Internal function - * + * * Check if pBlock can be replaced by an ore - * + * * @param pBlock * @param pMeta * @return @@ -389,9 +385,9 @@ public class ModDimensionDef { /** * Internal function - * + * * Randomly select one material out of all defined materials - * + * * @return */ public AsteroidBlockComb getRandomAsteroidMaterial() { @@ -405,9 +401,9 @@ public class ModDimensionDef { /** * Internal function - * + * * Randomly select one special block to be placed in the asteroids - * + * * @return */ public SpecialBlockComb getRandomSpecialAsteroidBlock() { @@ -421,7 +417,7 @@ public class ModDimensionDef { /** * Define the material the asteroid shall be made of. Limited to GT-Based Ores and their stones - * + * * @param pMaterial */ public void addAsteroidMaterial(GTOreTypes pMaterial) { @@ -430,7 +426,7 @@ public class ModDimensionDef { /** * Define the material the asteroid shall be made of, more advanced option to specify your own blocks - * + * * @param pBlockComb */ public void addAsteroidMaterial(AsteroidBlockComb pBlockComb) { @@ -443,7 +439,7 @@ public class ModDimensionDef { * Adds a new material for asteroid generation. These will spawn randomly in asteroids if enabled. You can basically * add every block you can imagine. Be warned though, if you use Liquids (Water / Lava / ..), it can affect * performance if the liquid is flowing down to the void. So make sure you define "AsteroidCore" as position - * + * * @param pBlock Block-Meta Combination that shall be used */ public void addSpecialAsteroidBlock(SpecialBlockComb pBlock) { diff --git a/src/main/java/bloodasp/galacticgreg/bartworks/BW_Worldgen_Ore_Layer_Space.java b/src/main/java/bloodasp/galacticgreg/bartworks/BW_Worldgen_Ore_Layer_Space.java index ae5e6af7c5..822c9dfa59 100644 --- a/src/main/java/bloodasp/galacticgreg/bartworks/BW_Worldgen_Ore_Layer_Space.java +++ b/src/main/java/bloodasp/galacticgreg/bartworks/BW_Worldgen_Ore_Layer_Space.java @@ -36,7 +36,7 @@ public class BW_Worldgen_Ore_Layer_Space extends BW_OreLayer { /** * Code-only Constructor Will work with NEI - * + * * @param aName veinname, should start with mix. * @param pDefault enabled? * @param pMinY @@ -64,24 +64,6 @@ public class BW_Worldgen_Ore_Layer_Space extends BW_OreLayer { .get("worldgen.GaGregBartworks." + this.mWorldGenName, "Density", pDensity)); mSize = ((short) Math .max(1, GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, "Size", pSize))); - // short pPrimary = primaryBW instanceof Materials ? (short)((Materials)primaryBW).mMetaItemSubID : (primaryBW - // instanceof Werkstoff ? ((Werkstoff)primaryBW).getmID() : 0); - // short pSecondary = secondaryBW instanceof Materials ? (short)((Materials)secondaryBW).mMetaItemSubID : - // (secondaryBW instanceof Werkstoff ? ((Werkstoff)secondaryBW).getmID() : 0); - // short pBetween = betweenBW instanceof Materials ? (short)((Materials)betweenBW).mMetaItemSubID : (betweenBW - // instanceof Werkstoff ? ((Werkstoff)betweenBW).getmID() : 0); - // short pSporadic = sporadicBW instanceof Materials ? (short)((Materials)sporadicBW).mMetaItemSubID : - // (sporadicBW instanceof Werkstoff ? ((Werkstoff)sporadicBW).getmID() : 0); - // mPrimaryMeta = ((short) GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, - // "OrePrimaryLayer", pPrimary)); - // mSecondaryMeta = ((short) GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, - // "OreSecondaryLayer", pSecondary)); - // mBetweenMeta = ((short) GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, - // "OreSporadiclyInbetween", pBetween)); - // mSporadicMeta = ((short) GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, - // "OreSporaticlyAround", pSporadic)); - // bwOres = ((byte) GregTech_API.sWorldgenFile.get("worldgen.GaGregBartworks." + this.mWorldGenName, - // "BWGTlogic", bwOres)); if (mEnabled) { sWeight += this.mWeight; oreVeinWorldgenList.add(this); @@ -104,7 +86,7 @@ public class BW_Worldgen_Ore_Layer_Space extends BW_OreLayer { /** * Script Friendly Constructor, WONT WORK WITH NEI - * + * * @param aName * @param pDefault * @param pMinY @@ -178,7 +160,7 @@ public class BW_Worldgen_Ore_Layer_Space extends BW_OreLayer { /** * Script Friendly Constructor, WONT WORK WITH NEI - * + * * @param aName * @param enabled */ diff --git a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java index 8ffdc0b5a1..ddbaa84d6e 100644 --- a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java +++ b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java @@ -69,36 +69,13 @@ public class GTNHLanthanides { BeamlineRecipeLoader.load(); BotRecipes.addGTRecipe(); - // RecipeLoader.loadZylonRecipes(); proxy.postInit(e); - // GT_Log.out.print(FluidRegistry.getFluid("Sodium Tungstate").getName()); - // GT_Log.out.print(Arrays.toString(Werkstoff.werkstoffNameHashMap.keySet().toArray())); - // GT_Log.out.print(Arrays.toString(Werkstoff.werkstoffHashMap.keySet().toArray())); - - /* - * GT_Log.out.print("HMMM " + Arrays.toString(OreDictionary.getOreIDs( - * WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1)))); - */ } @EventHandler public static void onModLoadingComplete(FMLLoadCompleteEvent e) { - // GT_Log.out.print("AAAAAAAAAAAAAA " + new - // ItemStack(LanthItemList.maskMap.get(MaskList.CPU)).getUnlocalizedName()); - // - // GT_Log.out.print("We are done loading"); BotRecipes.removeRecipes(); RecipeLoader.removeCeriumSources(); - - /* - * for (GT_ItemStack stack : BeamlineRecipeAdder.instance.TargetChamberRecipes.mRecipeItemMap.keySet()) { - * GT_Log.out.print(" Recipes for: " + stack.mItem.getUnlocalizedName() + ": "); for (GT_Recipe recipe : - * BeamlineRecipeAdder.instance.TargetChamberRecipes.mRecipeItemMap.get(stack)) { - * GT_Log.out.print(Arrays.toString(recipe.mOutputs)); } } - */ - - // GT_Log.out.print("blah blah " + - // WerkstoffMaterialPool.PTMEGElastomer.hasGenerationFeature(OrePrefixes.ingot)); } } diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java index 4aed254be0..a6e806ca86 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java @@ -1502,24 +1502,6 @@ public class WerkstoffMaterialPool implements Runnable { offsetID4 + 30, TextureSet.SET_FLUID); - // enum Lanthanides { - // Lanthanum, - // Praseodymium, - // Cerium, - // Neodymium, - // Promethium, - // Samarium, - // Europium, - // Gadolinium, - // Terbium, - // Dysprosium, - // Holmium, - // Erbium, - // Thulium, - // Ytterbium, - // Lutetium - // } - // Lanthanides Chloride Concentrate // Lanthanum public static final Werkstoff LanthanumChlorideConcentrate = new Werkstoff( @@ -1739,17 +1721,6 @@ public class WerkstoffMaterialPool implements Runnable { offsetID4 + 50, TextureSet.SET_DULL); - // Samarium - // public static final Werkstoff SamariumOreConcentrate = new Werkstoff( - // new short[] { 255, 200, 230 }, - // "Samarium Ore Concentrate", - // subscriptNumbers("??Sm??"), - // new Werkstoff.Stats(), - // Werkstoff.Types.MIXTURE, - // new Werkstoff.GenerationFeatures().disable().onlyDust(), - // offsetID2 + 28, - // TextureSet.SET_DULL); - // Europium public static final Werkstoff EuropiumOreConcentrate = new Werkstoff( new short[] { 240, 200, 240 }, @@ -1882,30 +1853,6 @@ public class WerkstoffMaterialPool implements Runnable { offsetID5 + 39, TextureSet.SET_GEM_VERTICAL); - // public static final Werkstoff RawCeriumDopedLutetiumAluminiumGarnetPart = new Werkstoff( - // new short[] { 63, 255, 63 }, - // "Raw Cerium Doped Lutetium Aluminium Garnet Part", - // subscriptNumbers("(Ce)Lu3Al5O12"), - // new Werkstoff.Stats(), - // Werkstoff.Types.MATERIAL, - // new Werkstoff.GenerationFeatures().disable().addGems(), - // offsetID4 + 33, - // TextureSet.SET_GEM_VERTICAL); - - // public static final Werkstoff C272 = new Werkstoff( - // new short[] { 0x29, 0xc2, 0x2a }, - // "C-272", - // subscriptNumbers("(C8H17)2PO2H"), - // new Werkstoff.Stats().setElektrolysis(true), - // Werkstoff.Types.COMPOUND, - // new Werkstoff.GenerationFeatures().disable().addCells(), - // offsetID4 + 59, - // TextureSet.SET_FLUID, - // new Pair<>(Carbon, 16), - // new Pair<>(Phosphorus, 1), - // new Pair<>(Oxygen, 3), - // new Pair<>(Hydrogen, 35)); - public static final Werkstoff Permalloy = new Werkstoff( new short[] { 195, 230, 225 }, "Permalloy", diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java index 479569c7f6..239be6a3ea 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java +++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java @@ -73,9 +73,6 @@ public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase<Digester> .addElement('c', ofCoil(Digester::setCoilLevel, Digester::getCoilLevel)) .build(); - // private int mHeat; - // private int mNeededHeat; - public Digester(String name) { super(name); } diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java index f515024365..e6a714fd00 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java +++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java @@ -146,19 +146,12 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di FluidStack majorGenericFluid = tRecipe.mFluidInputs[0]; FluidStack minorGenericFluid = tRecipe.mFluidInputs[1]; - // FluidStack majorInput = null; - // FluidStack minorInput = null; - int majorAmount; int minorAmount; FluidStack fluidInputOne = tFluidInputs.get(0); FluidStack fluidInputTwo = tFluidInputs.get(1); - // majorInput = ((fluidInputOne.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName())) - // ? fluidInputOne - // : fluidInputTwo); - // GT_Log.out.print(majorInput.getLocalizedName()); if (fluidInputOne.getUnlocalizedName() .equals(majorGenericFluid.getUnlocalizedName())) { if (fluidInputTwo.getUnlocalizedName() @@ -183,12 +176,6 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di } else return false; - // GT_Log.out.print("out of switch weirdness"); - - // GT_Log.out.print("major " + majorInput.getLocalizedName()); - // GT_Log.out.print("minor " + minorInput.getLocalizedName()); - - // GT_Log.out.print("mjrinputamt " + majorInput.amount); return majorAmount / tRecipe.mSpecialValue == minorAmount; } diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/SourceChamber.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/SourceChamber.java index 6649d0a232..0626118a25 100644 --- a/ |