Update tweaker for 1.13.1 & 1.13.2

diff --git a/build.gradle b/build.gradle
index b77cd97b1198dacb73fcf2cf53971d89371fea8e..5ac3a582da84d23715f728169ea0b3693bc95d4f 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,17 @@
 buildscript {
     repositories {
         jcenter()
-        maven { url 'https://www.dimdev.org/maven/' }
         maven { url 'https://repo.spongepowered.org/maven' }
         maven { url 'https://plugins.gradle.org/m2/' }
+        maven { url 'https://jitpack.io' }
+        maven { url 'https://files.minecraftforge.net/maven' }
     }
     dependencies {
-        classpath 'org.dimdev:ForgeGradle:2.3-SNAPSHOT'
+        if(gradle.startParameter.projectProperties.mc == null) {
+            classpath 'com.github.Irtimaled:ForgeGradle:1.13.2-SNAPSHOT'
+        } else {
+            classpath "com.github.Irtimaled:ForgeGradle:${mc}-SNAPSHOT"
+        }
         classpath 'org.spongepowered:mixingradle:0.6-SNAPSHOT'
     }
 }
@@ -16,7 +21,7 @@ apply plugin: 'java'
 apply plugin: 'org.spongepowered.mixin'
 apply plugin: 'maven-publish'
 
-def mcVersion = '1.13'
+def mcVersion = project.hasProperty('mc') ? project.mc : '1.13.2'
 group 'com.irtimaled'
 version "1.0.4-$mcVersion"
 archivesBaseName = 'BBOutlineReloaded'
@@ -27,8 +32,8 @@ targetCompatibility = 1.8
 repositories {
     mavenCentral()
     maven { url 'https://libraries.minecraft.net/' }
-    maven { url 'https://www.dimdev.org/maven/' }
     maven { url 'https://repo.spongepowered.org/maven/' }
+    maven { url 'https://jitpack.io' }
 }
 
 dependencies {
@@ -40,7 +45,7 @@ dependencies {
 
 minecraft {
     version = mcVersion
-    mappings = 'snapshot_20180908'
+    mappings = 'snapshot_20181106'
     runDir = 'run'
     tweakClass = 'com.irtimaled.bbor.launch.ClientTweaker'
     makeObfSourceJar = false

diff --git a/src/main/java/com/irtimaled/bbor/client/ClientProxy.java b/src/main/java/com/irtimaled/bbor/client/ClientProxy.java
index 6b26bc68d06e9150c1427a9725bc4005af566ee1..fd84cd66c986664f120ef1b2939208c84ac0e809 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/ClientProxy.java
+++ b/src/main/java/com/irtimaled/bbor/client/ClientProxy.java
@@ -7,7 +7,6 @@ import com.irtimaled.bbor.config.ConfigManager;
 import net.minecraft.client.Minecraft;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.network.NetworkManager;
-import net.minecraft.world.dimension.DimensionType;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;
@@ -40,7 +39,7 @@ public class ClientProxy extends CommonProxy {
         PlayerData.setPlayerPosition(partialTicks, entityPlayer);
 
         if (this.active) {
-            renderer.render(DimensionType.getById(entityPlayer.dimension), outerBoxOnly);
+            renderer.render(entityPlayer.dimension, outerBoxOnly);
         }
     }
 

diff --git a/src/main/java/com/irtimaled/bbor/client/NBTFileParser.java b/src/main/java/com/irtimaled/bbor/client/NBTFileParser.java
index 719fb18940ed66601f82f526f43c0cfc9aeb5915..056d3c2da6823721b7a75ec6494457916ad8e8b4 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/client/NBTFileParser.java
+++ b/src/main/java/com/irtimaled/bbor/client/NBTFileParser.java
@@ -51,10 +51,10 @@ class NBTFileParser {
         if (nbt == null)
             return;
 
-        NBTTagCompound data = nbt.getCompoundTag("Data");
+        NBTTagCompound data = nbt.getCompound("Data");
         long seed = data.getLong("RandomSeed");
-        int spawnX = data.getInteger("SpawnX");
-        int spawnZ = data.getInteger("SpawnZ");
+        int spawnX = data.getInt("SpawnX");
+        int spawnZ = data.getInt("SpawnZ");
         Logger.info("Loaded level.dat (seed: %d, spawn: %d,%d)", seed, spawnX, spawnZ);
         dimensionCache.setWorldData(seed, spawnX, spawnZ);
     }
@@ -121,11 +121,11 @@ class NBTFileParser {
         if (nbt == null)
             return;
 
-        NBTTagCompound features = nbt.getCompoundTag("data")
-                .getCompoundTag("Features");
+        NBTTagCompound features = nbt.getCompound("data")
+                .getCompound("Features");
         int loadedStructureCount = 0;
-        for (Object key : features.getKeySet()) {
-            NBTTagCompound feature = features.getCompoundTag((String) key);
+        for (Object key : features.keySet()) {
+            NBTTagCompound feature = features.getCompound((String) key);
             BoundingBox structure = BoundingBoxStructure.from(feature.getIntArray("BB"), color);
             Set<BoundingBox> boundingBoxes = new HashSet<>();
             NBTTagCompound[] children = getChildCompoundTags(feature, "Children");
@@ -147,11 +147,11 @@ class NBTFileParser {
         if (nbt == null)
             return;
 
-        NBTTagCompound[] villages = getChildCompoundTags(nbt.getCompoundTag("data"), "Villages");
+        NBTTagCompound[] villages = getChildCompoundTags(nbt.getCompound("data"), "Villages");
         for (NBTTagCompound village : villages) {
-            BlockPos center = new BlockPos(village.getInteger("CX"), village.getInteger("CY"), village.getInteger("CZ"));
-            int radius = village.getInteger("Radius");
-            int population = village.getInteger("PopSize");
+            BlockPos center = new BlockPos(village.getInt("CX"), village.getInt("CY"), village.getInt("CZ"));
+            int radius = village.getInt("Radius");
+            int population = village.getInt("PopSize");
             Set<BlockPos> doors = getDoors(village);
             BoundingBox boundingBox = BoundingBoxVillage.from(center, radius, village.hashCode(), population, doors);
             cache.addBoundingBox(boundingBox);
@@ -163,7 +163,7 @@ class NBTFileParser {
     private static Set<BlockPos> getDoors(NBTTagCompound village) {
         Set<BlockPos> doors = new HashSet<>();
         for (NBTTagCompound door : getChildCompoundTags(village, "Doors")) {
-            doors.add(new BlockPos(door.getInteger("X"), door.getInteger("Y"), door.getInteger("Z")));
+            doors.add(new BlockPos(door.getInt("X"), door.getInt("Y"), door.getInt("Z")));
         }
         return doors;
     }
@@ -179,10 +179,10 @@ class NBTFileParser {
     }
 
     private static NBTTagCompound[] getChildCompoundTags(NBTTagCompound parent, String key) {
-        NBTTagList tagList = parent.getTagList(key, 10);
+        NBTTagList tagList = parent.getList(key, 10);
         NBTTagCompound[] result = new NBTTagCompound[tagList.size()];
         for (int index = 0; index < tagList.size(); index++) {
-            result[index] = tagList.getCompoundTagAt(index);
+            result[index] = tagList.getCompound(index);
         }
         return result;
     }

diff --git a/src/main/java/com/irtimaled/bbor/mixin/client/renderer/MixinEntityRenderer.java b/src/main/java/com/irtimaled/bbor/mixin/client/renderer/MixinEntityRenderer.java
deleted file mode 100644 (file)
index 44e5222..0000000
--- a/src/main/java/com/irtimaled/bbor/mixin/client/renderer/MixinEntityRenderer.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.irtimaled.bbor.mixin.client.renderer;
-
-import com.irtimaled.bbor.client.BoundingBoxOutlineReloaded;
-import net.minecraft.client.renderer.EntityRenderer;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(EntityRenderer.class)
-public class MixinEntityRenderer {
-    @Inject(method = "updateCameraAndRender(FJ)V", at = @At(value = "INVOKE_STRING", target = "Lnet/minecraft/profiler/Profiler;endStartSection(Ljava/lang/String;)V", args = "ldc=hand", shift = At.Shift.BEFORE))
-    private void render(float partialTicks, long ignored, CallbackInfo ci) {
-        BoundingBoxOutlineReloaded.render(partialTicks);
-    }
-}

diff --git a/src/main/java/com/irtimaled/bbor/mixin/client/renderer/MixinGameRenderer.java b/src/main/java/com/irtimaled/bbor/mixin/client/renderer/MixinGameRenderer.java
new file mode 100644 (file)
index 0000000..6282ccb
--- /dev/null
+++ b/src/main/java/com/irtimaled/bbor/mixin/client/renderer/MixinGameRenderer.java
@@ -0,0 +1,16 @@
+package com.irtimaled.bbor.mixin.client.renderer;
+
+import com.irtimaled.bbor.client.BoundingBoxOutlineReloaded;
+import net.minecraft.client.renderer.GameRenderer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(GameRenderer.class)
+public class MixinGameRenderer {
+    @Inject(method = "updateCameraAndRender(FJ)V", at = @At(value = "INVOKE_STRING", target = "Lnet/minecraft/profiler/Profiler;endStartSection(Ljava/lang/String;)V", args = "ldc=hand", shift = At.Shift.BEFORE))
+    private void render(float partialTicks, long ignored, CallbackInfo ci) {
+        BoundingBoxOutlineReloaded.render(partialTicks);
+    }
+}

diff --git a/src/main/java/com/irtimaled/bbor/mixin/server/MixinMinecraftServer.java b/src/main/java/com/irtimaled/bbor/mixin/server/MixinMinecraftServer.java
index 936a5fcc4209745fe1ef0db2b8366264307e7dfe..2141017750eb3737bab5d2e6ec9d11cfdbdc763e 100644 (file)
--- a/src/main/java/com/irtimaled/bbor/mixin/server/MixinMinecraftServer.java
+++ b/src/main/java/com/irtimaled/bbor/mixin/server/MixinMinecraftServer.java
@@ -4,20 +4,24 @@ import com.irtimaled.bbor.client.BoundingBoxOutlineReloaded;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
+import net.minecraft.world.dimension.DimensionType;
+import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+import java.util.Map;
+
 @Mixin(MinecraftServer.class)
 public class MixinMinecraftServer {
-    @Shadow public WorldServer[] worlds;
+    @Shadow @Final private Map<DimensionType, WorldServer> worlds;
 
     @Inject(method = "initialWorldChunkLoad", at = @At("HEAD"))
     private void initialWorldChunkLoad(CallbackInfo ci)
     {
-        for(World world : worlds) {
+        for(World world : worlds.values()) {
             BoundingBoxOutlineReloaded.worldLoaded(world);
         }
     }

diff --git a/src/main/resources/mixins.bbor.json b/src/main/resources/mixins.bbor.json
index 65c188b4b67667cd7009c2b6c93df66b19d54f4f..8dd8d85b8cd43c1b001a4de8e933082c977f9c4a 100644 (file)
--- a/src/main/resources/mixins.bbor.json
+++ b/src/main/resources/mixins.bbor.json
@@ -12,7 +12,7 @@
   ],
   "client": [
     "client.MixinMinecraft",
-    "client.renderer.MixinEntityRenderer",
+    "client.renderer.MixinGameRenderer",
     "client.multiplayer.MixinWorldClient",
     "client.settings.MixinKeyBinding",
     "client.settings.MixinGameSettings"