Merge pull request #28 from TrainerSnow/master

Fix Digester and Tank structure

2 files changed, 11 insertions, 15 deletions

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 2433458a02..6f2cc4535f 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java
@@ -41,12 +41,12 @@ public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase<Digester>
 
     private HeatingCoilLevel heatLevel;
 
-    private IStructureDefinition<Digester> multiDefinition = StructureDefinition.<Digester>builder()
+    private final IStructureDefinition<Digester> multiDefinition = StructureDefinition.<Digester>builder()
             .addShape(mName, transpose(new String[][] {
-                {"-------", "-ttttt-", "-t---t-", "-t---t-", "-t---t-", "-ttttt-", "-------"},
-                {"--ttt--", "-t---t-", "t-----t", "t-----t", "t-----t", "-t---t-", "--ttt--"},
-                {"-tccct-", "tc---ct", "c-----c", "c-----c", "c-----c", "tc---ct", "-tccct-"},
-                {"-tt~tt-", "thhhhht", "thsssht", "thsssht", "thsssht", "thhhhht", "-ttttt-"},
+                {"       ", " ttttt ", " t---t ", " t---t ", " t---t ", " ttttt ", "       "},
+                {"  ttt  ", " t---t ", "t-----t", "t-----t", "t-----t", " t---t ", "  ttt  "},
+                {" tccct ", "tc---ct", "c-----c", "c-----c", "c-----c", "tc---ct", " tccct "},
+                {" tt~tt ", "thhhhht", "thsssht", "thsssht", "thsssht", "thhhhht", " ttttt "},
             }))
             .addElement(
                     't',
@@ -93,14 +93,14 @@ public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase<Digester>
 
     @Override
     public boolean checkRecipe(ItemStack itemStack) {
-        GT_Log.out.print("in checkRecipe\n");
+        GT_Log.out.print("Digester: in checkRecipe\n");
 
         ArrayList<FluidStack> tFluidInputs = this.getStoredFluids();
         FluidStack[] tFluidInputArray = tFluidInputs.toArray(new FluidStack[0]);
         ItemStack[] tItems = this.getStoredInputs().toArray(new ItemStack[0]);
         long tVoltage = this.getMaxInputVoltage();
 
-        GT_Log.out.print(Arrays.toString(mInventory));
+        GT_Log.out.print("Digester: " + Arrays.toString(mInventory));
 
         // Collection<GT_Recipe> tRecipes = RecipeAdder.instance.DigesterRecipes.mRecipeList;
         GT_Recipe tRecipe = RecipeAdder.instance.DigesterRecipes.findRecipe(
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 b10e56b6e9..08af3b5549 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java
@@ -37,13 +37,13 @@ import net.minecraftforge.fluids.FluidStack;
 public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<DissolutionTank>
         implements IConstructable, ISecondaryDescribable {
 
-    private IStructureDefinition<DissolutionTank> multiDefinition = StructureDefinition.<DissolutionTank>builder()
+    private final IStructureDefinition<DissolutionTank> multiDefinition = StructureDefinition.<DissolutionTank>builder()
             .addShape(mName, transpose(new String[][] {
-                {"-sss-", "sssss", "sssss", "sssss", "-sss-"},
+                {" sss ", "sssss", "sssss", "sssss", " sss "},
                 {"sgggs", "g---g", "g---g", "g---g", "sgggs"},
                 {"sgggs", "g---g", "g---g", "g---g", "sgggs"},
                 {"ss~ss", "shhhs", "shhhs", "shhhs", "sssss"},
-                {"s---s", "-----", "-----", "-----", "s---s"}
+                {"s   s", "     ", "     ", "     ", "s   s"}
             }))
             .addElement(
                     's',
@@ -82,11 +82,7 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di
     }
 
     private boolean addGlass(Block block, int meta) {
-        if (block != ItemRegistry.bw_glasses[0]) {
-            return false;
-        } else {
-            return true;
-        }
+        return block == ItemRegistry.bw_glasses[0];
     }
 
     @Override