Renamge Generic parameter

12 files changed, 63 insertions, 64 deletions

diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureDefinition.java
index de7a98f9bc..ca9712df04 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureDefinition.java
@@ -7,15 +7,15 @@ import net.minecraft.world.World;
 import static com.github.technus.tectech.mechanics.structure.StructureIterationType.*;
 import static com.github.technus.tectech.mechanics.structure.StructureUtility.iterate;
 
-public interface IStructureDefinition<T> {
+public interface IStructureDefinition<MultiBlock> {
     /**
      * Used internally
      * @param name same name as for other methods here
      * @return the array of elements to process
      */
-    IStructureElement<T>[] getStructureFor(String name);
+    IStructureElement<MultiBlock>[] getStructureFor(String name);
 
-    default boolean check(T object,String piece, World world, ExtendedFacing extendedFacing,
+    default boolean check(MultiBlock object, String piece, World world, ExtendedFacing extendedFacing,
                           int basePositionX, int basePositionY, int basePositionZ,
                           int basePositionA, int basePositionB, int basePositionC,
                           boolean forceCheckAllBlocks){
@@ -23,21 +23,21 @@ public interface IStructureDefinition<T> {
                 basePositionA, basePositionB, basePositionC,forceCheckAllBlocks? CHECK_FULLY:CHECK);
     }
 
-    default boolean hints(T object, ItemStack trigger,String piece, World world, ExtendedFacing extendedFacing,
+    default boolean hints(MultiBlock object, ItemStack trigger, String piece, World world, ExtendedFacing extendedFacing,
                           int basePositionX, int basePositionY, int basePositionZ,
                           int basePositionA, int basePositionB, int basePositionC) {
         return iterate(object, trigger, getStructureFor(piece), world, extendedFacing, basePositionX, basePositionY, basePositionZ,
                 basePositionA, basePositionB, basePositionC,SPAWN_HINTS);
     }
 
-    default boolean build(T object, ItemStack trigger,String piece, World world, ExtendedFacing extendedFacing,
+    default boolean build(MultiBlock object, ItemStack trigger, String piece, World world, ExtendedFacing extendedFacing,
                           int basePositionX, int basePositionY, int basePositionZ,
                           int basePositionA, int basePositionB, int basePositionC) {
         return iterate(object, trigger, getStructureFor(piece), world, extendedFacing, basePositionX, basePositionY, basePositionZ,
                 basePositionA, basePositionB, basePositionC,BUILD_TEMPLATE);
     }
 
-    default boolean buildOrHints(T object, ItemStack trigger,String piece, World world, ExtendedFacing extendedFacing,
+    default boolean buildOrHints(MultiBlock object, ItemStack trigger, String piece, World world, ExtendedFacing extendedFacing,
                                  int basePositionX, int basePositionY, int basePositionZ,
                                  int basePositionA, int basePositionB, int basePositionC,
                                  boolean hints){
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElement.java b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElement.java
index f946e71f91..436c7ce203 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElement.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElement.java
@@ -6,12 +6,12 @@ import net.minecraft.world.World;
 /**
  * Use StructureUtility to instantiate
  */
-public interface IStructureElement<T> {
-    boolean check(T t,World world,int x,int y,int z);
+public interface IStructureElement<MultiBlock> {
+    boolean check(MultiBlock multiBlock, World world, int x, int y, int z);
 
-    boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger);
+    boolean spawnHint(MultiBlock multiBlock, World world, int x, int y, int z, ItemStack trigger);
 
-    boolean placeBlock(T t,World world,int x,int y,int z, ItemStack trigger);
+    boolean placeBlock(MultiBlock multiBlock, World world, int x, int y, int z, ItemStack trigger);
 
     default int getStepA(){
         return 1;
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementChain.java b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementChain.java
index f9593ee1c5..4c7059dd81 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementChain.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementChain.java
@@ -6,13 +6,13 @@ import net.minecraft.world.World;
 /**
  * Use StructureUtility to instantiate
  */
-public interface IStructureElementChain<T> extends IStructureElement<T> {
-    IStructureElement<T>[] fallbacks();
+public interface IStructureElementChain<MultiBlock> extends IStructureElement<MultiBlock> {
+    IStructureElement<MultiBlock>[] fallbacks();
 
     @Override
-    default boolean check(T t, World world, int x, int y, int z){
-        for (IStructureElement<T> fallback : fallbacks()) {
-            if (fallback.check(t, world, x, y, z)) {
+    default boolean check(MultiBlock multiBlock, World world, int x, int y, int z){
+        for (IStructureElement<MultiBlock> fallback : fallbacks()) {
+            if (fallback.check(multiBlock, world, x, y, z)) {
                 return true;
             }
         }
@@ -20,9 +20,9 @@ public interface IStructureElementChain<T> extends IStructureElement<T> {
     }
 
     @Override
-    default boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
-        for (IStructureElement<T> fallback : fallbacks()) {
-            if (fallback.spawnHint(t, world, x, y, z, trigger)) {
+    default boolean spawnHint(MultiBlock multiBlock, World world, int x, int y, int z, ItemStack trigger) {
+        for (IStructureElement<MultiBlock> fallback : fallbacks()) {
+            if (fallback.spawnHint(multiBlock, world, x, y, z, trigger)) {
                 return true;
             }
         }
@@ -30,9 +30,9 @@ public interface IStructureElementChain<T> extends IStructureElement<T> {
     }
 
     @Override
-    default boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
-        for (IStructureElement<T> fallback : fallbacks()) {
-            if (fallback.placeBlock(t, world, x, y, z, trigger)) {
+    default boolean placeBlock(MultiBlock multiBlock, World world, int x, int y, int z, ItemStack trigger) {
+        for (IStructureElement<MultiBlock> fallback : fallbacks()) {
+            if (fallback.placeBlock(multiBlock, world, x, y, z, trigger)) {
                 return true;
             }
         }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementCheckOnly.java b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementCheckOnly.java
index ec15aea53b..c6492a5ed6 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementCheckOnly.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementCheckOnly.java
@@ -3,14 +3,14 @@ package com.github.technus.tectech.mechanics.structure;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-public interface IStructureElementCheckOnly<T> extends IStructureElement<T> {
+public interface IStructureElementCheckOnly<MultiBlock> extends IStructureElement<MultiBlock> {
     @Override
-    default boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger){
+    default boolean placeBlock(MultiBlock multiBlock, World world, int x, int y, int z, ItemStack trigger){
         return false;
     }
 
     @Override
-    default boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger){
+    default boolean spawnHint(MultiBlock multiBlock, World world, int x, int y, int z, ItemStack trigger){
         return false;
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementDeferred.java b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementDeferred.java
index dbb74312a8..c0e39bb2ad 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementDeferred.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementDeferred.java
@@ -3,5 +3,5 @@ package com.github.technus.tectech.mechanics.structure;
 /**
  * Use StructureUtility to instantiate
  */
-public interface IStructureElementDeferred<T> extends IStructureElement<T> {
+public interface IStructureElementDeferred<MultiBlock> extends IStructureElement<MultiBlock> {
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementNoPlacement.java b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementNoPlacement.java
index 47e6060878..12cf2141ae 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementNoPlacement.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureElementNoPlacement.java
@@ -3,9 +3,9 @@ package com.github.technus.tectech.mechanics.structure;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 
-public interface IStructureElementNoPlacement<T> extends IStructureElement<T> {
+public interface IStructureElementNoPlacement<MultiBlock> extends IStructureElement<MultiBlock> {
     @Override
-    default boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger){
+    default boolean placeBlock(MultiBlock multiBlock, World world, int x, int y, int z, ItemStack trigger){
         return false;
     }
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureNavigate.java b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureNavigate.java
index d3f4134cea..8c7c837a94 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureNavigate.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/structure/IStructureNavigate.java
@@ -6,19 +6,19 @@ import net.minecraft.world.World;
 /**
  * Use StructureUtility to instantiate
  */
-interface IStructureNavigate<T> extends IStructureElement<T> {
+interface IStructureNavigate<MultiBlock> extends IStructureElement<MultiBlock> {
     @Override
-    default boolean check(T t, World world, int x, int y, int z){
+    default boolean check(MultiBlock multiBlock, World world, int x, int y, int z){
         return true;
     }
 
     @Override
-    default boolean spawnHint(T t, World world, int x, int y, int z, ItemStack trigger) {
+    default boolean spawnHint(MultiBlock multiBlock, World world, int x, int y, int z, ItemStack trigger) {
         return true;
     }
 
     @Override
-    default boolean placeBlock(T t, World world, int x, int y, int z, ItemStack trigger) {
+    default boolean placeBlock(MultiBlock multiBlock, World world, int x, int y, int z, ItemStack trigger) {
         return true;
     }
 
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/StructureDefinition.java b/src/main/java/com/github/technus/tectech/mechanics/structure/StructureDefinition.java
index 9a1e94d98a..f42cbd35d1 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/StructureDefinition.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/structure/StructureDefinition.java
@@ -7,31 +7,31 @@ import java.util.*;
 import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE;
 import static com.github.technus.tectech.mechanics.structure.StructureUtility.*;
 
-public class StructureDefinition<T> implements IStructureDefinition<T> {
-    private final Map<Character, IStructureElement<T>> elements;
+public class StructureDefinition<MultiBlock> implements IStructureDefinition<MultiBlock> {
+    private final Map<Character, IStructureElement<MultiBlock>> elements;
     private final Map<String, String> shapes;
-    private final Map<String, IStructureElement<T>[]> structures;
+    private final Map<String, IStructureElement<MultiBlock>[]> structures;
 
-    public static <B> Builder<B> builder() {
+    public static <MultiBlock> Builder<MultiBlock> builder() {
         return new Builder<>();
     }
 
     private StructureDefinition(
-            Map<Character, IStructureElement<T>> elements,
+            Map<Character, IStructureElement<MultiBlock>> elements,
             Map<String, String> shapes,
-            Map<String, IStructureElement<T>[]> structures) {
+            Map<String, IStructureElement<MultiBlock>[]> structures) {
         this.elements =elements;
         this.shapes=shapes;
         this.structures = structures;
     }
 
-    public static class Builder<T> {
+    public static class Builder<MultiBlock> {
         private static final char A='\uA000';
         private static final char B='\uB000';
         private static final char C='\uC000';
         private char d ='\uD000';
         private final Map<Vec3Impl,Character> navigates;
-        private final Map<Character, IStructureElement<T>> elements;
+        private final Map<Character, IStructureElement<MultiBlock>> elements;
         private final Map<String, String> shapes;
 
         private Builder() {
@@ -40,7 +40,7 @@ public class StructureDefinition<T> implements IStructureDefinition<T> {
             shapes = new HashMap<>();
         }
 
-        public Map<Character, IStructureElement<T>> getElements() {
+        public Map<Character, IStructureElement<MultiBlock>> getElements() {
             return elements;
         }
 
@@ -57,7 +57,7 @@ public class StructureDefinition<T> implements IStructureDefinition<T> {
          * @return
          */
         @Deprecated
-        public Builder<T> addShapeOldApi(String name, String[][] structurePiece) {
+        public Builder<MultiBlock> addShapeOldApi(String name, String[][] structurePiece) {
             StringBuilder builder = new StringBuilder();
             if (structurePiece.length > 0) {
                 for (String[] strings : structurePiece) {
@@ -142,7 +142,7 @@ public class StructureDefinition<T> implements IStructureDefinition<T> {
          * @param structurePiece generated or written struct - DO NOT STORE IT ANYWHERE, or at least set them to null afterwards
          * @return this builder
          */
-        public Builder<T> addShape(String name, String[][] structurePiece) {
+        public Builder<MultiBlock> addShape(String name, String[][] structurePiece) {
             StringBuilder builder = new StringBuilder();
             if (structurePiece.length > 0) {
                 for (String[] strings : structurePiece) {
@@ -199,13 +199,13 @@ public class StructureDefinition<T> implements IStructureDefinition<T> {
             return this;
         }
 
-        public Builder<T> addElement(Character name, IStructureElement<T> structurePiece) {
+        public Builder<MultiBlock> addElement(Character name, IStructureElement<MultiBlock> structurePiece) {
             elements.putIfAbsent(name, structurePiece);
             return this;
         }
 
-        public IStructureDefinition<T> build() {
-            Map<String, IStructureElement<T>[]> structures = compileStructureMap();
+        public IStructureDefinition<MultiBlock> build() {
+            Map<String, IStructureElement<MultiBlock>[]> structures = compileStructureMap();
             if(DEBUG_MODE){
                 return new StructureDefinition<>(new HashMap<>(elements), new HashMap<>(shapes), structures);
             }else {
@@ -214,22 +214,22 @@ public class StructureDefinition<T> implements IStructureDefinition<T> {
         }
 
         @SuppressWarnings("unchecked")
-        private Map<String, IStructureElement<T>[]> compileElementSetMap() {
+        private Map<String, IStructureElement<MultiBlock>[]> compileElementSetMap() {
             Set<Integer> missing = new HashSet<>();
             shapes.values().stream().map(CharSequence::chars).forEach(intStream -> intStream.forEach(c -> {
-                IStructureElement<T> iStructureElement = elements.get((char) c);
+                IStructureElement<MultiBlock> iStructureElement = elements.get((char) c);
                 if (iStructureElement == null) {
                     missing.add(c);
                 }
             }));
             if (missing.isEmpty()) {
-                Map<String, IStructureElement<T>[]> map = new HashMap<>();
+                Map<String, IStructureElement<MultiBlock>[]> map = new HashMap<>();
                 shapes.forEach((key, value) -> {
                     Set<Character> chars=new HashSet<>();
                     for (char c : value.toCharArray()) {
                         chars.add(c);
                     }
-                    IStructureElement<T>[] compiled = new IStructureElement[chars.size()];
+                    IStructureElement<MultiBlock>[] compiled = new IStructureElement[chars.size()];
                     int i=0;
                     for (Character aChar : chars) {
                         compiled[i++]=elements.get(aChar);
@@ -244,18 +244,18 @@ public class StructureDefinition<T> implements IStructureDefinition<T> {
         }
 
         @SuppressWarnings("unchecked")
-        private Map<String, IStructureElement<T>[]> compileStructureMap() {
+        private Map<String, IStructureElement<MultiBlock>[]> compileStructureMap() {
             Set<Integer> mising = new HashSet<>();
             shapes.values().stream().map(CharSequence::chars).forEach(intStream -> intStream.forEach(c -> {
-                IStructureElement<T> iStructureElement = elements.get((char) c);
+                IStructureElement<MultiBlock> iStructureElement = elements.get((char) c);
                 if (iStructureElement == null) {
                     mising.add(c);
                 }
             }));
             if (mising.isEmpty()) {
-                Map<String, IStructureElement<T>[]> map = new HashMap<>();
+                Map<String, IStructureElement<MultiBlock>[]> map = new HashMap<>();
                 shapes.forEach((key, value) -> {
-                    IStructureElement<T>[] compiled = new IStructureElement[value.length()];
+                    IStructureElement<MultiBlock>[] compiled = new IStructureElement[value.length()];
                     for (int i = 0; i < value.length(); i++) {
                         compiled[i] = elements.get(value.charAt(i));
                     }
@@ -269,7 +269,7 @@ public class StructureDefinition<T> implements IStructureDefinition<T> {
         }
     }
 
-    public Map<Character, IStructureElement<T>> getElements(){
+    public Map<Character, IStructureElement<MultiBlock>> getElements(){
         return elements;
     }
 
@@ -277,12 +277,12 @@ public class StructureDefinition<T> implements IStructureDefinition<T> {
         return shapes;
     }
 
-    public Map<String, IStructureElement<T>[]> getStructures() {
+    public Map<String, IStructureElement<MultiBlock>[]> getStructures() {
         return structures;
     }
 
     @Override
-    public IStructureElement<T>[] getStructureFor(String name) {
+    public IStructureElement<MultiBlock>[] getStructureFor(String name) {
         return structures.get(name);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/adders/IBlockAdder.java b/src/main/java/com/github/technus/tectech/mechanics/structure/adders/IBlockAdder.java
index 908c4c4aca..9d223ccd52 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/adders/IBlockAdder.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/structure/adders/IBlockAdder.java
@@ -3,12 +3,12 @@ package com.github.technus.tectech.mechanics.structure.adders;
 
 import net.minecraft.block.Block;
 
-public interface IBlockAdder<T> {
+public interface IBlockAdder<MultiBlock> {
     /**
      * Callback on block added, needs to check if block is valid (and add it)
      * @param block block attempted to add
      * @param meta meta of block attempted to add
      * @return is structure still valid
      */
-    boolean apply(T t,Block block, Integer meta);
+    boolean apply(MultiBlock multiBlock, Block block, Integer meta);
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/adders/IHatchAdder.java b/src/main/java/com/github/technus/tectech/mechanics/structure/adders/IHatchAdder.java
index a47befc2e8..e7bb5fc459 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/adders/IHatchAdder.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/structure/adders/IHatchAdder.java
@@ -3,12 +3,12 @@ package com.github.technus.tectech.mechanics.structure.adders;
 
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 
-public interface IHatchAdder<T> {
+public interface IHatchAdder<MultiBlock> {
     /**
      * Callback to add hatch, needs to check if hatch is valid (and add it)
      * @param iGregTechTileEntity hatch
-     * @param aShort requested texture index, or null if not...
+     * @param textureIndex requested texture index, or null if not...
      * @return managed to add hatch (structure still valid)
      */
-    boolean apply(T t,IGregTechTileEntity iGregTechTileEntity, Short aShort);
+    boolean apply(MultiBlock multiBlock, IGregTechTileEntity iGregTechTileEntity, Short textureIndex);
 }
diff --git a/src/main/java/com/github/technus/tectech/mechanics/structure/adders/ITileAdder.java b/src/main/java/com/github/technus/tectech/mechanics/structure/adders/ITileAdder.java
index cc3c7dbb7a..72d08751b5 100644
--- a/src/main/java/com/github/technus/tectech/mechanics/structure/adders/ITileAdder.java
+++ b/src/main/java/com/github/technus/tectech/mechanics/structure/adders/ITileAdder.java
@@ -2,11 +2,11 @@ package com.github.technus.tectech.mechanics.structure.adders;
 
 import net.minecraft.tileentity.TileEntity;
 
-public interface ITileAdder<T> {
+public interface ITileAdder<MultiBlock> {
     /**
      * Callback to add hatch, needs to check if tile is valid (and add it)
      * @param tileEntity tile
      * @return managed to add hatch (structure still valid)
      */
-    boolean apply(T t,TileEntity tileEntity);
+    boolean apply(MultiBlock multiBlock, TileEntity tileEntity);
 }
diff --git a/src/main/java/com/github/technus/tectech/util/Util.java b/src/main/java/com/github/technus/tectech/util/Util.java
index 1843770e3a..8c693620b6 100644
--- a/src/main/java/com/github/technus/tectech/util/Util.java
+++ b/src/main/java/com/github/technus/tectech/util/Util.java
@@ -40,7 +40,6 @@ public final class Util {
     private Util() {
     }
 
-    @SuppressWarnings("ComparatorMethodParameterNotUsed")
     public static <K, V extends Comparable<? super V>> SortedSet<Map.Entry<K, V>> entriesSortedByValues(Map<K, V> map) {
         SortedSet<Map.Entry<K, V>> sortedEntries = new TreeSet<>(
                 (e1, e2) -> {