Tidy up

diff --git a/build.gradle b/build.gradle
index 8b9db04564061a63fa673fdbbaac0920ec1f7180..c84131daffade1a0ccd88e2a40e21ea3c5aa48ea 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         maven { url 'https://files.minecraftforge.net/maven' }
     }
     dependencies {
-        classpath 'com.github.Irtimaled:ForgeGradle:' + project.mcVersion+ '-SNAPSHOT'
+        classpath 'com.github.Irtimaled:ForgeGradle:' + project.mcVersion + '-SNAPSHOT'
         classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT'
     }
 }
@@ -65,10 +65,10 @@ sourceSets {
 processResources {
     filesMatching('profile.json') {
         expand([
-            'version': project.version,
-            'mcVersion': project.mcVersion,
-            'tweakClass': project.minecraft.tweakClass,
-            'formattedTime': new Date().format("yyyy-MM-dd'T'HH:mm:ss'-08:00'")
+                'version'      : project.version,
+                'mcVersion'    : project.mcVersion,
+                'tweakClass'   : project.minecraft.tweakClass,
+                'formattedTime': new Date().format("yyyy-MM-dd'T'HH:mm:ss'-08:00'")
         ])
     }
 
@@ -81,7 +81,7 @@ jar {
     manifest.attributes(
             'Main-Class': 'com.irtimaled.bbor.Main'
     )
- 
+
     classifier = 'vanilla'
 }
 

diff --git a/gradle.properties b/gradle.properties
index 5c0dd85fddf773c4615c540c9d3666b9d398922a..91964517832191da1b96aeb7299c8072712cfc21 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-name = bbor
-buildVersion = 1.0.13
-
-mcVersion = 1.13
+name=bbor
+buildVersion=1.0.13
+# leave a space to reduce merge conflicts on version change
+mcVersion=1.13

diff --git a/src/main/java/com/irtimaled/bbor/client/gui/BoundingBoxTypeButton.java b/src/main/java/com/irtimaled/bbor/client/gui/BoundingBoxTypeButton.java
index 28af129c0e1b83530098860fc4be7a819b47cb85..d44f0586852793442903bf077e70ac5f8dddb07e 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/gui/BoundingBoxTypeButton.java
+++ b/src/main/java/com/irtimaled/bbor/client/gui/BoundingBoxTypeButton.java
@@ -19,7 +19,7 @@ public class BoundingBoxTypeButton extends BoolSettingButton {
 
     @Override
     protected void renderBackground() {
-        if(!enabled) return;
+        if (!enabled) return;
 
         int left = x + 1;
         int top = y + 1;

diff --git a/src/main/java/com/irtimaled/bbor/client/interop/ClientInterop.java b/src/main/java/com/irtimaled/bbor/client/interop/ClientInterop.java
index e5bd46879d00bcf7067e89a77a8d62fa27e6350a..59c569a23f64bc3bbd212c84caea98136d07d053 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/interop/ClientInterop.java
+++ b/src/main/java/com/irtimaled/bbor/client/interop/ClientInterop.java
@@ -6,7 +6,6 @@ import com.irtimaled.bbor.client.events.Render;
 import com.irtimaled.bbor.client.events.SeedCommandTyped;
 import com.irtimaled.bbor.common.EventBus;
 import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.network.NetworkManager;
 
 public class ClientInterop {
     public static void disconnectedFromRemoteServer() {

diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/Renderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/Renderer.java
index 4e4790241ac7ec9258263cd30ef10a9d9364e809..7f46a538597468b81d0fd8b8cbb09b2ed6fdd33e 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/renderers/Renderer.java
+++ b/src/main/java/com/irtimaled/bbor/client/renderers/Renderer.java
@@ -51,7 +51,7 @@ public class Renderer {
         return this;
     }
 
-    public Renderer setAlpha(int alpha){
+    public Renderer setAlpha(int alpha) {
         this.alpha = alpha;
         return this;
     }
@@ -85,7 +85,7 @@ public class Renderer {
     }
 
     private void tex(double u, double v) {
-        bufferBuilder.tex(u,v);
+        bufferBuilder.tex(u, v);
     }
 
     private void color() {

diff --git a/src/main/java/com/irtimaled/bbor/common/BoundingBoxCache.java b/src/main/java/com/irtimaled/bbor/common/BoundingBoxCache.java
index 638265031c3da82348df5c61674f24b3805218bf..39ede83990d5a018aff719fb996bd743fbbf7eec 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/common/BoundingBoxCache.java
+++ b/src/main/java/com/irtimaled/bbor/common/BoundingBoxCache.java
@@ -27,7 +27,7 @@ public class BoundingBoxCache {
     }
 
     public void addBoundingBox(AbstractBoundingBox key) {
-        if(isCached(key)) return;
+        if (isCached(key)) return;
 
         Set<AbstractBoundingBox> boundingBoxes = new HashSet<>();
         boundingBoxes.add(key);

diff --git a/src/main/java/com/irtimaled/bbor/common/CommonProxy.java b/src/main/java/com/irtimaled/bbor/common/CommonProxy.java
index f637bf55110ffd7629afca19852cd86f2604c907..1543710f477b61f8c0cac5985472e8ce1b1d4e40 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/common/CommonProxy.java
+++ b/src/main/java/com/irtimaled/bbor/common/CommonProxy.java
@@ -14,7 +14,10 @@ import com.irtimaled.bbor.common.models.AbstractBoundingBox;
 import com.irtimaled.bbor.common.models.BoundingBoxMobSpawner;
 import com.irtimaled.bbor.common.models.ServerPlayer;
 
-import java.util.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class CommonProxy {

diff --git a/src/main/java/com/irtimaled/bbor/common/TypeHelper.java b/src/main/java/com/irtimaled/bbor/common/TypeHelper.java
index 5fe0a01d42a829c10b441ee4d15ceb90a1f3117b..9b8ddd55d9b94001ca914bc2e95524308d462da5 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/common/TypeHelper.java
+++ b/src/main/java/com/irtimaled/bbor/common/TypeHelper.java
@@ -14,7 +14,7 @@ public class TypeHelper {
 
     public static <T> void doIfType(Object value, Class<T> clazz, Consumer<T> consumer) {
         T typedValue = as(value, clazz);
-        if(typedValue == null) return;
+        if (typedValue == null) return;
         consumer.accept(typedValue);
     }
 }

diff --git a/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java b/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java
index e61a6e27381212e7bf8df12631f403714f397104..f079b9a636bbf57bb710f6f408cce952acd2f447 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java
+++ b/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java
@@ -59,7 +59,7 @@ public class CommonInterop {
     }
 
     public static void tryHarvestBlock(Block block, BlockPos pos, World world) {
-        if(block instanceof BlockMobSpawner) {
+        if (block instanceof BlockMobSpawner) {
             EventBus.publish(new MobSpawnerBroken(world.dimension.getType().getId(), new Coords(pos)));
         }
     }

diff --git a/src/main/java/com/irtimaled/bbor/mixin/client/entity/MixinEntityPlayerSP.java b/src/main/java/com/irtimaled/bbor/mixin/client/entity/MixinEntityPlayerSP.java
index 1e9ad4992aa8481559bcb9ee7c021b87d282ecc4..5a6237bdab301ff1220f3bab48953bfc2d23f5e5 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/mixin/client/entity/MixinEntityPlayerSP.java
+++ b/src/main/java/com/irtimaled/bbor/mixin/client/entity/MixinEntityPlayerSP.java
@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public abstract class MixinEntityPlayerSP {
     @Inject(method = "sendChatMessage", at = @At("HEAD"), cancellable = true)
     private void sendChatMessage(String message, CallbackInfo ci) {
-        if(ClientInterop.interceptChatMessage(message))
+        if (ClientInterop.interceptChatMessage(message))
             ci.cancel();
     }
 }

diff --git a/src/main/resources/mixins.bbor.json b/src/main/resources/mixins.bbor.json
index c8d3129a78083b601aba83f0199f86f1efbcae47..4632988fc5b8b536162397afec38754d1f781a53 100644 (file)
--- a/src/main/resources/mixins.bbor.json
+++ b/src/main/resources/mixins.bbor.json
@@ -6,25 +6,25 @@
   "package": "com.irtimaled.bbor.mixin",
   "refmap": "mixins.bbor.refmap.json",
   "mixins": [
-    "world.chunk.MixinChunk",
-    "world.MixinWorldServer",
     "network.play.client.MixinCPacketCustomPayload",
-    "server.management.MixinPlayerList",
+    "server.MixinMinecraftServer",
     "server.management.MixinPlayerInteractionManager",
-    "server.MixinMinecraftServer"
+    "server.management.MixinPlayerList",
+    "world.MixinWorldServer",
+    "world.chunk.MixinChunk"
   ],
   "client": [
     "client.MixinMinecraft",
     "client.entity.MixinEntityPlayerSP",
     "client.gui.MixinGuiOptions",
-    "client.renderer.MixinEntityRenderer",
-    "network.play.server.MixinSPacketCustomPayload",
-    "network.play.server.MixinSPacketSpawnPosition",
     "client.multiplayer.MixinWorldClient",
     "client.network.MixinNetHandlerLoginClient",
     "client.network.MixinNetHandlerPlayClient",
+    "client.renderer.MixinEntityRenderer",
+    "client.settings.MixinGameSettings",
     "client.settings.MixinKeyBinding",
-    "client.settings.MixinGameSettings"
+    "network.play.server.MixinSPacketCustomPayload",
+    "network.play.server.MixinSPacketSpawnPosition"
   ],
   "server": [
     "server.dedicated.MixinDedicatedServer"

diff --git a/src/main/resources/profile.json b/src/main/resources/profile.json
index 2f41427156abd4bf3046f36470092764bed69887..aa4252d47db1376ecc5d54d21e901488808cfddb 100644 (file)
--- a/src/main/resources/profile.json
+++ b/src/main/resources/profile.json
@@ -1,35 +1,35 @@
 {
-    "inheritsFrom": "${mcVersion}",
-    "id": "BBOR-${version}",
-    "jar": "${mcVersion}",
-    "time": "${formattedTime}",
-    "type": "release",
-    "arguments": {
-        "game": [
-            "--tweakClass",
-            "${tweakClass}"
-        ]
-    },
-    "mainClass": "net.minecraft.launchwrapper.Launch",
-    "libraries": [
-        {
-            "name": "com.irtimaled:bbor:${version}",
-            "url": "https://github.com/irtimaled/maven/releases/download/"
-        },
-        {
-            "name": "org.spongepowered:mixin:0.7.11-SNAPSHOT",
-            "url": "https://github.com/irtimaled/maven/releases/download/"
-        },
-        {
-            "name": "org.ow2.asm:asm:6.2",
-            "url": "http://repo1.maven.org/maven2/"
-        },
-        {
-            "name": "org.ow2.asm:asm-commons:6.2",
-            "url": "http://repo1.maven.org/maven2/"
-        },
-        {
-            "name": "net.minecraft:launchwrapper:1.12"
-        }
+  "inheritsFrom": "${mcVersion}",
+  "id": "BBOR-${version}",
+  "jar": "${mcVersion}",
+  "time": "${formattedTime}",
+  "type": "release",
+  "arguments": {
+    "game": [
+      "--tweakClass",
+      "${tweakClass}"
     ]
+  },
+  "mainClass": "net.minecraft.launchwrapper.Launch",
+  "libraries": [
+    {
+      "name": "com.irtimaled:bbor:${version}",
+      "url": "https://github.com/irtimaled/maven/releases/download/"
+    },
+    {
+      "name": "org.spongepowered:mixin:0.7.11-SNAPSHOT",
+      "url": "https://github.com/irtimaled/maven/releases/download/"
+    },
+    {
+      "name": "org.ow2.asm:asm:6.2",
+      "url": "http://repo1.maven.org/maven2/"
+    },
+    {
+      "name": "org.ow2.asm:asm-commons:6.2",
+      "url": "http://repo1.maven.org/maven2/"
+    },
+    {
+      "name": "net.minecraft:launchwrapper:1.12"
+    }
+  ]
 }
\ No newline at end of file