Merge pull request #7 from GTNewHorizons/buildscript

Update buildscript & apply spotless

Author: boubou19

.gitattributes

@@ -0,0 +1,44 @@
+* text eol=lf
+
+*.[jJ][aA][rR]          binary
+
+*.[pP][nN][gG]          binary
+*.[jJ][pP][gG]          binary
+*.[jJ][pP][eE][gG]      binary
+*.[gG][iI][fF]          binary
+*.[tT][iI][fF]          binary
+*.[tT][iI][fF][fF]      binary
+*.[iI][cC][oO]          binary
+*.[sS][vV][gG]          text
+*.[eE][pP][sS]          binary
+*.[xX][cC][fF]          binary
+
+*.[kK][aA][rR]          binary
+*.[mM]4[aA]             binary
+*.[mM][iI][dD]          binary
+*.[mM][iI][dD][iI]      binary
+*.[mM][pP]3             binary
+*.[oO][gG][gG]          binary
+*.[rR][aA]              binary
+
+*.7[zZ]                 binary
+*.[gG][zZ]              binary
+*.[tT][aA][rR]          binary
+*.[tT][gG][zZ]          binary
+*.[zZ][iI][pP]          binary
+
+*.[tT][cC][nN]          binary
+*.[sS][oO]              binary
+*.[dD][lL][lL]          binary
+*.[dD][yY][lL][iI][bB]  binary
+*.[pP][sS][dD]          binary
+*.[tT][tT][fF]          binary
+*.[oO][tT][fF]          binary
+
+*.[pP][aA][tT][cC][hH]  -text
+
+*.[bB][aA][tT]          text eol=crlf
+*.[cC][mM][dD]          text eol=crlf
+*.[pP][sS]1             text eol=crlf
+
+*[aA][uU][tT][oO][gG][eE][nN][eE][rR][aA][tT][eE][dD]* binary

build.gradle

@@ -0,0 +1,10 @@
+plugins {
+    id 'com.diffplug.blowdryerSetup' version '1.6.0'
+}
+
+apply plugin: 'com.diffplug.blowdryerSetup'
+
+blowdryerSetup {
+    github('GTNewHorizons/ExampleMod1.7.10', 'tag', '0.1.5')
+    //devLocal '.' // Use this when testing config updates locally
+}

settings.gradle

@@ -1,20 +1,18 @@
 package codechicken.lib.asm;
 
+import static org.objectweb.asm.tree.AbstractInsnNode.*;
+
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import com.google.common.collect.ImmutableMap;
+import java.util.*;
+import java.util.Map.Entry;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.InsnList;
 import org.objectweb.asm.tree.JumpInsnNode;
 import org.objectweb.asm.tree.LabelNode;
 
-import java.util.*;
-import java.util.Map.Entry;
-
-import static org.objectweb.asm.tree.AbstractInsnNode.*;
-
-public class ASMBlock
-{
+public class ASMBlock {
     public InsnListSection list;
     private BiMap<String, LabelNode> labels;
 
@@ -37,8 +35,7 @@ public ASMBlock() {
 
     public LabelNode getOrAdd(String s) {
         LabelNode l = get(s);
-        if (l == null)
-            labels.put(s, l = new LabelNode());
+        if (l == null) labels.put(s, l = new LabelNode());
         return l;
     }
 
@@ -51,8 +48,8 @@ public void replaceLabels(Map<LabelNode, LabelNode> labelMap, Set<LabelNode> use
             switch (insn.getType()) {
                 case LABEL:
                     AbstractInsnNode insn2 = insn.clone(labelMap);
-                    if (insn2 == insn)//identity mapping
-                        continue;
+                    if (insn2 == insn) // identity mapping
+                    continue;
                     if (usedLabels.contains(insn2))
                         throw new IllegalStateException("LabelNode cannot be a part of two InsnLists");
                     list.replace(insn, insn2);
@@ -64,10 +61,9 @@ public void replaceLabels(Map<LabelNode, LabelNode> labelMap, Set<LabelNode> use
                     list.replace(insn, insn.clone(labelMap));
             }
 
-        for(Entry<LabelNode, LabelNode> entry : labelMap.entrySet()) {
+        for (Entry<LabelNode, LabelNode> entry : labelMap.entrySet()) {
             String key = labels.inverse().get(entry.getKey());
-            if(key != null)
-                labels.put(key, entry.getValue());
+            if (key != null) labels.put(key, entry.getValue());
         }
     }
 
@@ -77,29 +73,25 @@ public void replaceLabels(Map<LabelNode, LabelNode> labelMap) {
 
     public void replaceLabel(String s, LabelNode l) {
         LabelNode old = get(s);
-        if (old != null)
-            replaceLabels(ImmutableMap.of(old, l));
+        if (old != null) replaceLabels(ImmutableMap.of(old, l));
     }
 
     /**
      * Pulls all common labels from other into this
      * @return this
      */
     public ASMBlock mergeLabels(ASMBlock other) {
-        if(labels.isEmpty() || other.labels.isEmpty())
-            return this;
+        if (labels.isEmpty() || other.labels.isEmpty()) return this;
 
-        //common labels, give them our nodes
+        // common labels, give them our nodes
         HashMap<LabelNode, LabelNode> labelMap = list.identityLabelMap();
-        for(Entry<String, LabelNode> entry : other.labels.entrySet()) {
+        for (Entry<String, LabelNode> entry : other.labels.entrySet()) {
             LabelNode old = labels.get(entry.getKey());
-            if(old != null)
-                labelMap.put(old, entry.getValue());
+            if (old != null) labelMap.put(old, entry.getValue());
         }
         HashSet<LabelNode> usedLabels = new HashSet<LabelNode>();
         for (AbstractInsnNode insn = other.list.list.getFirst(); insn != null; insn = insn.getNext())
-            if(insn.getType() == LABEL)
-                usedLabels.add((LabelNode) insn);
+            if (insn.getType() == LABEL) usedLabels.add((LabelNode) insn);
 
         replaceLabels(labelMap, usedLabels);
         return this;
@@ -118,50 +110,50 @@ public ASMBlock copy() {
         BiMap<String, LabelNode> labels = HashBiMap.create();
         Map<LabelNode, LabelNode> labelMap = list.cloneLabels();
 
-        for(Entry<String, LabelNode> entry : this.labels.entrySet())
+        for (Entry<String, LabelNode> entry : this.labels.entrySet())
             labels.put(entry.getKey(), labelMap.get(entry.getValue()));
 
         return new ASMBlock(list.copy(labelMap), labels);
     }
 
     public ASMBlock applyLabels(InsnListSection list2) {
-        if(labels.isEmpty())
-            return new ASMBlock(list2);
+        if (labels.isEmpty()) return new ASMBlock(list2);
 
         Set<LabelNode> cFlowLabels1 = labels.values();
         Set<LabelNode> cFlowLabels2 = InsnComparator.getControlFlowLabels(list2);
         ASMBlock block = new ASMBlock(list2);
 
         HashMap<LabelNode, LabelNode> labelMap = new HashMap<LabelNode, LabelNode>();
 
-        for(int i = 0, k = 0; i < list.size() && k < list2.size(); ) {
+        for (int i = 0, k = 0; i < list.size() && k < list2.size(); ) {
             AbstractInsnNode insn1 = list.get(i);
-            if(!InsnComparator.insnImportant(insn1, cFlowLabels1)) {
+            if (!InsnComparator.insnImportant(insn1, cFlowLabels1)) {
                 i++;
                 continue;
             }
 
             AbstractInsnNode insn2 = list2.get(k);
-            if(!InsnComparator.insnImportant(insn2, cFlowLabels2)) {
+            if (!InsnComparator.insnImportant(insn2, cFlowLabels2)) {
                 k++;
                 continue;
             }
 
-            if(insn1.getOpcode() != insn2.getOpcode())
-                throw new IllegalArgumentException("Lists do not match:\n"+list+"\n\n"+list2);
+            if (insn1.getOpcode() != insn2.getOpcode())
+                throw new IllegalArgumentException("Lists do not match:\n" + list + "\n\n" + list2);
 
-            switch(insn1.getType()) {
+            switch (insn1.getType()) {
                 case LABEL:
                     labelMap.put((LabelNode) insn1, (LabelNode) insn2);
                     break;
                 case JUMP_INSN:
                     labelMap.put(((JumpInsnNode) insn1).label, ((JumpInsnNode) insn2).label);
                     break;
             }
-            i++; k++;
+            i++;
+            k++;
         }
 
-        for(Entry<String, LabelNode> entry : labels.entrySet())
+        for (Entry<String, LabelNode> entry : labels.entrySet())
             block.labels.put(entry.getKey(), labelMap.get(entry.getValue()));
 
         return block;
@@ -170,4 +162,4 @@ public ASMBlock applyLabels(InsnListSection list2) {
     public InsnList rawListCopy() {
         return list.copy().list;
     }
-}
+}