Update to Spigot-1.12-pre5

Author: rutgerkok

build.gradle

@@ -19,9 +19,8 @@ subprojects
 
     task.plugins.withType(org.gradle.api.plugins.JavaBasePlugin)
     {
-        // We're still on Java 6
-        sourceCompatibility = '1.6'
-        targetCompatibility = '1.6'
+        sourceCompatibility = '1.8'
+        targetCompatibility = '1.8'
 
         // Generate Eclipse config files when using "gradle eclipse"
         task.apply plugin: 'eclipse'

common/src/main/java/com/khorn/terraincontrol/util/minecraftTypes/DefaultMaterial.java

@@ -250,6 +250,24 @@ public enum DefaultMaterial
     GREEN_SHULKER_BOX(232),
     RED_SHULKER_BOX(233),
     BLACK_SHULKER_BOX(234),
+    WHITE_GLAZED_TERRACOTTA(235),
+    ORANGE_GLAZED_TERRACOTTA(236),
+    MAGENTA_GLAZED_TERRACOTTA(237),
+    LIGHT_BLUE_GLAZED_TERRACOTTA(238),
+    YELLOW_GLAZED_TERRACOTTA(239),
+    LIME_GLAZED_TERRACOTTA(240),
+    PINK_GLAZED_TERRACOTTA(241),
+    GRAY_GLAZED_TERRACOTTA(242),
+    SILVER_GLAZED_TERRACOTTA(243),
+    CYAN_GLAZED_TERRACOTTA(244),
+    PURPLE_GLAZED_TERRACOTTA(245),
+    BLUE_GLAZED_TERRACOTTA(246),
+    BROWN_GLAZED_TERRACOTTA(247),
+    GREEN_GLAZED_TERRACOTTA(248),
+    RED_GLAZED_TERRACOTTA(249),
+    BLACK_GLAZED_TERRACOTTA(250),
+    CONCRETE(251),
+    CONCRETE_POWDER(252),
     STRUCTURE_BLOCK(255, false),
     UNKNOWN_BLOCK(254);
     /**

common/src/main/java/com/khorn/terraincontrol/util/minecraftTypes/MobNames.java

@@ -27,12 +27,14 @@ public enum MobNames
     GUARDIAN("guardian", "Guardian"),
     HORSE("horse", "EntityHorse", "Horse"),
     HUSK("husk", "Husk"),
+    ILLUSIONER("illusion_illager", "IllusionIllager", "illusionillager", "Illusioner", "illusioner"),
     IRON_GOLEM("villager_golem", "VillagerGolem", "villagergolem", "IronGolem", "irongolem", "iron_golem"),
     LLAMA("llama", "Llama", "LLama"),
     MAGMA_CUBE("magma_cube", "LavaSlime", "lavaslime", "lava_slime", "magmacube"),
     MULE("mule", "Mule"),
     MUSHROOM_COW("mooshroom", "MushroomCow", "mushroomcow", "shroom", "moshoom", "mcow", "shroomcow"),
     OCELOT("ocelot", "Ozelot", "ozelot", "Ocelot"),
+    PARROT("parrot", "Parrot"),
     PIG("pig", "Pig"),
     PIG_ZOMBIE("zombie_pigman", "ZombiePigman", "zombiepigman", "PigZombie", "pigzombie", "pig_zombie"),
     POLAR_BEAR("polar_bear", "PolarBear", "polarbear"),

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-3.1-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-3.5-all.zip

platforms/bukkit/build.gradle

@@ -5,7 +5,7 @@ apply plugin: 'java'
 // Project properties
 archivesBaseName = "terraincontrol-bukkit"
 description = "TerrainControl for Bukkit"
-ext.bukkitVersion = "1.11-R0.1-SNAPSHOT"
+ext.bukkitVersion = "1.12-pre5-SNAPSHOT"
 
 repositories
 {

platforms/bukkit/src/main/java/com/khorn/terraincontrol/bukkit/BukkitBiome.java

@@ -4,8 +4,8 @@
 import com.khorn.terraincontrol.LocalBiome;
 import com.khorn.terraincontrol.bukkit.util.WorldHelper;
 import com.khorn.terraincontrol.configuration.BiomeConfig;
-import net.minecraft.server.v1_11_R1.BiomeBase;
-import net.minecraft.server.v1_11_R1.BlockPosition;
+import net.minecraft.server.v1_12_R1.BiomeBase;
+import net.minecraft.server.v1_12_R1.BlockPosition;
 
 /**
  * The BukkitBiome is basically a wrapper for the BiomeBase. If you look at

platforms/bukkit/src/main/java/com/khorn/terraincontrol/bukkit/BukkitEngine.java

@@ -6,7 +6,7 @@
 import com.khorn.terraincontrol.configuration.standard.PluginStandardValues;
 import com.khorn.terraincontrol.exception.InvalidConfigException;
 import com.khorn.terraincontrol.util.minecraftTypes.DefaultMaterial;
-import net.minecraft.server.v1_11_R1.Block;
+import net.minecraft.server.v1_12_R1.Block;
 
 import java.io.File;
 

platforms/bukkit/src/main/java/com/khorn/terraincontrol/bukkit/BukkitMaterialData.java

@@ -4,9 +4,9 @@
 import com.khorn.terraincontrol.TerrainControl;
 import com.khorn.terraincontrol.util.helpers.BlockHelper;
 import com.khorn.terraincontrol.util.minecraftTypes.DefaultMaterial;
-import net.minecraft.server.v1_11_R1.Block;
-import net.minecraft.server.v1_11_R1.BlockFalling;
-import net.minecraft.server.v1_11_R1.IBlockData;
+import net.minecraft.server.v1_12_R1.Block;
+import net.minecraft.server.v1_12_R1.BlockFalling;
+import net.minecraft.server.v1_12_R1.IBlockData;
 
 /**
  * Implementation of LocalMaterial that wraps one of Minecraft's Blocks.

platforms/bukkit/src/main/java/com/khorn/terraincontrol/bukkit/BukkitMojangSettings.java

@@ -4,7 +4,7 @@
 import com.khorn.terraincontrol.bukkit.util.MobSpawnGroupHelper;
 import com.khorn.terraincontrol.configuration.WeightedMobSpawnGroup;
 import com.khorn.terraincontrol.configuration.standard.MojangSettings;
-import net.minecraft.server.v1_11_R1.BiomeBase;
+import net.minecraft.server.v1_12_R1.BiomeBase;
 
 import java.util.List;
 
@@ -74,13 +74,13 @@ public float getSurfaceVolatility()
     @Override
     public LocalMaterialData getSurfaceBlock()
     {
-        return BukkitMaterialData.ofMinecraftBlockData(biomeBase.r);
+        return BukkitMaterialData.ofMinecraftBlockData(biomeBase.q);
     }
 
     @Override
     public LocalMaterialData getGroundBlock()
     {
-        return BukkitMaterialData.ofMinecraftBlockData(biomeBase.s);
+        return BukkitMaterialData.ofMinecraftBlockData(biomeBase.r);
     }
 
     @Override

platforms/bukkit/src/main/java/com/khorn/terraincontrol/bukkit/BukkitWorld.java

@@ -1,7 +1,10 @@
 package com.khorn.terraincontrol.bukkit;
 
 import com.khorn.terraincontrol.*;
-import com.khorn.terraincontrol.bukkit.generator.*;
+import com.khorn.terraincontrol.bukkit.generator.BukkitVanillaBiomeGenerator;
+import com.khorn.terraincontrol.bukkit.generator.TXChunkGenerator;
+import com.khorn.terraincontrol.bukkit.generator.TXInternalChunkGenerator;
+import com.khorn.terraincontrol.bukkit.generator.TXWorldChunkManager;
 import com.khorn.terraincontrol.bukkit.generator.structures.*;
 import com.khorn.terraincontrol.bukkit.util.NBTHelper;
 import com.khorn.terraincontrol.configuration.*;
@@ -16,9 +19,9 @@
 import com.khorn.terraincontrol.util.helpers.ReflectionHelper;
 import com.khorn.terraincontrol.util.minecraftTypes.DefaultBiome;
 import com.khorn.terraincontrol.util.minecraftTypes.TreeType;
-import net.minecraft.server.v1_11_R1.*;
-import org.bukkit.craftbukkit.v1_11_R1.CraftWorld;
-import org.bukkit.craftbukkit.v1_11_R1.generator.CustomChunkGenerator;
+import net.minecraft.server.v1_12_R1.*;
+import org.bukkit.craftbukkit.v1_12_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_12_R1.generator.CustomChunkGenerator;
 
 import java.util.*;
 
@@ -702,14 +705,6 @@ public void enable(org.bukkit.World world)
         // for the first time or reloading
         this.world = mcWorld;
 
-        // Inject our own WorldProvider
-        if (mcWorld.worldProvider.getDimensionManager().equals(DimensionManager.OVERWORLD))
-        {
-            // Only replace the worldProvider if it's the overworld
-            // Replacing other dimensions causes a lot of glitches
-            mcWorld.worldProvider = new TXWorldProvider(this, this.world.worldProvider);
-        }
-
         // Inject our own BiomeManager (called WorldChunkManager)
         Class<? extends BiomeGenerator> biomeModeClass = this.settings.getWorldConfig().biomeMode;
         biomeGenerator = TerrainControl.getBiomeModeManager().createCached(biomeModeClass, this);
@@ -815,12 +810,6 @@ private void injectInternalChunkGenerator(CustomChunkGenerator chunkGenerator)
      */
     public void disable()
     {
-        // Restore old world provider if replaced
-        if (world.worldProvider instanceof TXWorldProvider)
-        {
-            world.worldProvider = ((TXWorldProvider) world.worldProvider).getOldWorldProvider();
-        }
-
         // Restore vanilla chunk generator
         this.injectInternalChunkGenerator(new CustomChunkGenerator(world, getSeed(), generator));
     }

platforms/bukkit/src/main/java/com/khorn/terraincontrol/bukkit/TXBiomeBase.java

@@ -11,8 +11,8 @@
 import com.khorn.terraincontrol.configuration.standard.WorldStandardValues;
 import com.khorn.terraincontrol.logging.LogMarker;
 import com.khorn.terraincontrol.util.helpers.StringHelper;
-import net.minecraft.server.v1_11_R1.BiomeBase;
-import net.minecraft.server.v1_11_R1.MinecraftKey;
+import net.minecraft.server.v1_12_R1.BiomeBase;
+import net.minecraft.server.v1_12_R1.MinecraftKey;
 import org.bukkit.block.Biome;
 
 import java.util.List;
@@ -167,14 +167,14 @@ private TXBiomeBase(BiomeConfig biomeConfig, BiomeIds biomeIds)
             throw new AssertionError("Biome temperature mismatch");
         }
 
-        this.r = ((BukkitMaterialData) biomeConfig.surfaceBlock).internalBlock();
-        this.s = ((BukkitMaterialData) biomeConfig.groundBlock).internalBlock();
+        this.q = ((BukkitMaterialData) biomeConfig.surfaceBlock).internalBlock();
+        this.r = ((BukkitMaterialData) biomeConfig.groundBlock).internalBlock();
 
         // Mob spawning
-        addMobs(this.u, biomeConfig.spawnMonsters);
-        addMobs(this.v, biomeConfig.spawnCreatures);
-        addMobs(this.w, biomeConfig.spawnWaterCreatures);
-        addMobs(this.x, biomeConfig.spawnAmbientCreatures);
+        addMobs(this.t, biomeConfig.spawnMonsters);
+        addMobs(this.u, biomeConfig.spawnCreatures);
+        addMobs(this.v, biomeConfig.spawnWaterCreatures);
+        addMobs(this.w, biomeConfig.spawnAmbientCreatures);
     }
 
     // Adds the mobs to the internal list.

platforms/bukkit/src/main/java/com/khorn/terraincontrol/bukkit/TXPlugin.java

@@ -13,7 +13,7 @@
 import com.khorn.terraincontrol.generator.biome.VanillaBiomeGenerator;
 import com.khorn.terraincontrol.logging.LogMarker;
 import com.khorn.terraincontrol.util.minecraftTypes.StructureNames;
-import net.minecraft.server.v1_11_R1.WorldGenFactory;
+import net.minecraft.server.v1_12_R1.WorldGenFactory;
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.command.Command;

platforms/bukkit/src/main/java/com/khorn/terraincontrol/bukkit/commands/MapCommand.java

@@ -6,7 +6,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
-import org.bukkit.craftbukkit.v1_11_R1.CraftWorld;
+import org.bukkit.craftbukkit.v1_12_R1.CraftWorld;
 import org.bukkit.entity.Player;
 
 import java.util.List;

platforms/bukkit/src/main/java/com/khorn/terraincontrol/bukkit/commands/runnable/MapWriter.java

@@ -7,8 +7,8 @@
 import com.khorn.terraincontrol.bukkit.util.WorldHelper;
 import com.khorn.terraincontrol.configuration.BiomeConfig;
 import com.khorn.terraincontrol.logging.LogMarker;
-import net.minecraft.server.v1_11_R1.BiomeBase;
-import net.minecraft.server.v1_11_R1.World;
+import net.minecraft.server.v1_12_R1.BiomeBase;
+import net.minecraft.server.v1_12_R1.World;
 import org.bukkit.command.CommandSender;
 
 import java.awt.Color;

platforms/bukkit/src/main/java/com/khorn/terraincontrol/bukkit/generator/BukkitVanillaBiomeGenerator.java

@@ -4,9 +4,9 @@
 import com.khorn.terraincontrol.bukkit.util.WorldHelper;
 import com.khorn.terraincontrol.generator.biome.OutputType;
 import com.khorn.terraincontrol.generator.biome.VanillaBiomeGenerator;
-import net.minecraft.server.v1_11_R1.BiomeBase;
-import net.minecraft.server.v1_11_R1.BlockPosition;
-import net.minecraft.server.v1_11_R1.WorldChunkManager;
+import net.minecraft.server.v1_12_R1.BiomeBase;
+import net.minecraft.server.v1_12_R1.BlockPosition;
+import net.minecraft.server.v1_12_R1.WorldChunkManager;
 
 /**
  * A biome generator that gets its information from Mojang's WorldChunkManager.

platforms/bukkit/src/main/java/com/khorn/terraincontrol/bukkit/generator/TXInternalChunkGenerator.java

@@ -4,8 +4,11 @@
 import com.khorn.terraincontrol.bukkit.BukkitWorld;
 import com.khorn.terraincontrol.configuration.WorldConfig;
 import com.khorn.terraincontrol.util.minecraftTypes.StructureNames;
-import net.minecraft.server.v1_11_R1.*;
-import org.bukkit.craftbukkit.v1_11_R1.generator.CustomChunkGenerator;
+import net.minecraft.server.v1_12_R1.BiomeBase;
+import net.minecraft.server.v1_12_R1.BlockPosition;
+import net.minecraft.server.v1_12_R1.EnumCreatureType;
+import net.minecraft.server.v1_12_R1.World;
+import org.bukkit.craftbukkit.v1_12_R1.generator.CustomChunkGenerator;
 import org.bukkit.generator.ChunkGenerator;
 
 import java.util.List;
@@ -23,6 +26,7 @@ public TXInternalChunkGenerator(BukkitWorld world, ChunkGenerator generator)
         this.localWorld = world;
     }
 
+    @Override
     public List<BiomeBase.BiomeMeta> getMobsFor(EnumCreatureType type, BlockPosition position)
     {
         WorldConfig worldConfig = localWorld.getConfigs().getWorldConfig();

platforms/bukkit/src/main/java/com/khorn/terraincontrol/bukkit/generator/TXWorldChunkManager.java

@@ -4,10 +4,10 @@
 import com.khorn.terraincontrol.generator.biome.BiomeGenerator;
 import com.khorn.terraincontrol.generator.biome.OutputType;
 import com.khorn.terraincontrol.util.minecraftTypes.DefaultBiome;
-import net.minecraft.server.v1_11_R1.BiomeBase;
-import net.minecraft.server.v1_11_R1.BlockPosition;
-import net.minecraft.server.v1_11_R1.WorldChunkManager;
-import net.minecraft.server.v1_11_R1.WorldGenVillage;
+import net.minecraft.server.v1_12_R1.BiomeBase;
+import net.minecraft.server.v1_12_R1.BlockPosition;
+import net.minecraft.server.v1_12_R1.WorldChunkManager;
+import net.minecraft.server.v1_12_R1.WorldGenVillage;
 
 import java.util.List;
 import java.util.Random;

platforms/bukkit/src/main/java/com/khorn/terraincontrol/bukkit/generator/TXWorldProvider.java

@@ -5,7 +5,7 @@
 import com.khorn.terraincontrol.bukkit.BukkitWorld;
 import com.khorn.terraincontrol.generator.SpawnableObject;
 import com.khorn.terraincontrol.util.Rotation;
-import net.minecraft.server.v1_11_R1.*;
+import net.minecraft.server.v1_12_R1.*;
 
 import java.util.Random;
 

platforms/bukkit/src/main/java/com/khorn/terraincontrol/bukkit/generator/structures/MojangStructurePart.java

@@ -4,7 +4,7 @@
 import com.khorn.terraincontrol.bukkit.BukkitBiome;
 import com.khorn.terraincontrol.configuration.ServerConfigProvider;
 import com.khorn.terraincontrol.util.minecraftTypes.StructureNames;
-import net.minecraft.server.v1_11_R1.*;
+import net.minecraft.server.v1_12_R1.*;
 
 import java.util.ArrayList;
 import java.util.List;

platforms/bukkit/src/main/java/com/khorn/terraincontrol/bukkit/generator/structures/TXMansionGen.java

@@ -7,7 +7,7 @@
 import com.khorn.terraincontrol.configuration.BiomeConfig.MineshaftType;
 import com.khorn.terraincontrol.util.ChunkCoordinate;
 import com.khorn.terraincontrol.util.minecraftTypes.StructureNames;
-import net.minecraft.server.v1_11_R1.*;
+import net.minecraft.server.v1_12_R1.*;
 
 import java.util.Random;
 

platforms/bukkit/src/main/java/com/khorn/terraincontrol/bukkit/generator/structures/TXMineshaftGen.java

@@ -4,9 +4,9 @@
 import com.khorn.terraincontrol.LocalWorld;
 import com.khorn.terraincontrol.bukkit.util.WorldHelper;
 import com.khorn.terraincontrol.util.minecraftTypes.StructureNames;
-import net.minecraft.server.v1_11_R1.*;
-import net.minecraft.server.v1_11_R1.BiomeBase.BiomeMeta;
-import net.minecraft.server.v1_11_R1.WorldGenNether.WorldGenNetherStart;
+import net.minecraft.server.v1_12_R1.*;
+import net.minecraft.server.v1_12_R1.BiomeBase.BiomeMeta;
+import net.minecraft.server.v1_12_R1.WorldGenNether.WorldGenNetherStart;
 
 import java.util.ArrayList;
 import java.util.List;

platforms/bukkit/src/main/java/com/khorn/terraincontrol/bukkit/generator/structures/TXNetherFortressGen.java

@@ -4,8 +4,8 @@
 import com.khorn.terraincontrol.bukkit.BukkitBiome;
 import com.khorn.terraincontrol.configuration.ConfigProvider;
 import com.khorn.terraincontrol.util.minecraftTypes.StructureNames;
-import net.minecraft.server.v1_11_R1.*;
-import net.minecraft.server.v1_11_R1.WorldGenMonument.WorldGenMonumentStart;
+import net.minecraft.server.v1_12_R1.*;
+import net.minecraft.server.v1_12_R1.WorldGenMonument.WorldGenMonumentStart;
 
 import java.util.ArrayList;
 import java.util.Arrays;