aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/elisis/gtnhlanth/common
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/elisis/gtnhlanth/common')
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java53
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java3
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java13
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/tileentity/SourceChamber.java2
4 files changed, 0 insertions, 71 deletions
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/src/main/java/com/elisis/gtnhlanth/common/tileentity/SourceChamber.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/SourceChamber.java
@@ -203,8 +203,6 @@ public class SourceChamber extends GT_MetaTileEntity_EnhancedMultiBlockBase<Sour
// when produced by this
// multiblock
float maxMaterialEnergy = tRecipe.maxEnergy; // The maximum energy for the recipe processed
- // outputEnergy = (float) ((-maxEnergy) * Math.pow(1.001, -(tRecipe.energyRatio)*(tVoltage-tRecipe.mEUt))) +
- // maxEnergy;
outputEnergy = (float) Math.min(
(-maxMaterialEnergy) * Math.pow(1.001, -(tRecipe.energyRatio) * (tVoltageMaxTier - tRecipe.mEUt))
+ maxMaterialEnergy,