Terra++ v2.0

build.gradle

@@ -5,17 +5,23 @@ buildscript {
             name = "Minecraft Forge"
             url = "https://files.minecraftforge.net/maven"
         }
+        maven {
+            name = "SpongePowered"
+            url = "https://repo.spongepowered.org/maven"
+        }
     }
     dependencies {
         classpath "net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT"
+        classpath "org.spongepowered:mixingradle:0.6-SNAPSHOT"
         classpath "com.github.jengelman.gradle.plugins:shadow:4.0.0"
     }
 }
 apply plugin: "net.minecraftforge.gradle.forge"
+apply plugin: "org.spongepowered.mixin"
 apply plugin: "com.github.johnrengelman.shadow"
 apply plugin: "maven-publish"
 
-version = "1.1.0." + ('git rev-list --count HEAD'.execute().text.trim()) + "-1.12.2"
+version = "2.0.0." + ('git rev-list --count HEAD'.execute().text.trim()) + "-1.12.2"
 group = "net.buildtheearth"
 archivesBaseName = "terraplusplus"
 
@@ -29,6 +35,8 @@ minecraft {
 
     mappings = "stable_39"
     makeObfSourceJar = false
+
+    coreMod = "net.buildtheearth.terraplusplus.asm.TerraPlusPlusMixinLoader"
 }
 
 configurations {
@@ -37,40 +45,56 @@ configurations {
 }
 
 repositories {
-    maven { //used for leveldb
+    maven {
         name = "DaPorkchop_"
         url = "https://maven.daporkchop.net/"
     }
-    maven { //used for leveldb
-        name = "OpenCollab Snapshots"
-        url = "https://repo.opencollab.dev/snapshot/"
-    }
     maven {
         name = "JitPack"
         url = "https://jitpack.io/"
     }
 }
 
 dependencies {
-    deobfProvided ("com.github.OpenCubicChunks.CubicChunks:cubicchunks:f71aafb9854466ac5ffa0ccd2796921684f1d8b1") {
+    deobfProvided("com.github.OpenCubicChunks.CubicChunks:cubicchunks:9dcb135c2990f1de0d0fd9e418121d3476288c11") {
         transitive = false
     }
-    deobfProvided ("com.github.OpenCubicChunks:CubicWorldGen:27de56d2f792513873584b2f8fd9f3082fb259ec") {
+    deobfProvided("com.github.OpenCubicChunks:CubicWorldGen:27de56d2f792513873584b2f8fd9f3082fb259ec") {
         transitive = false
     }
 
-    shade "org.apache.commons:commons-imaging:1.0-alpha2"
+    /*compileOnly("net.daporkchop:fp2:0.0.1-1.12.2-SNAPSHOT") {
+        transitive = false
+    }*/
+
+    shade "com.github.DaMatrix:commons-imaging:4c6c5dfe6401a884cb4cf53fb838c99e1dfb104c"
 
     shade "com.fasterxml.jackson.core:jackson-databind:2.11.2"
 
-    shade("net.daporkchop.lib:binary:0.5.5-SNAPSHOT")  {
+    shade("net.daporkchop.lib:binary:0.5.8-SNAPSHOT") {
         exclude group: "io.netty"
     }
+    shade "net.daporkchop.lib:math:0.5.8-SNAPSHOT"
 
-    testCompile "junit:junit:4.12"
+    shade ("org.apache.sis.core:sis-referencing:1.3") {
+        exclude group: "jakarta.xml.bind"
+    }
+
+    if ("true".equalsIgnoreCase(System.getProperty("idea.sync.active"))) {
+        //intellij is present - we don't want it to register mixin as an annotation processor, so we just add it as a standard dependency.
+        //  if we don't do this, the intellij annotation processors will get totally screwed up
+        compile "org.spongepowered:mixin:0.8.1"
+    } else {
+        //register mixin as a standard annotation processor
+        annotationProcessor "org.spongepowered:mixin:0.8.1:processor"
+    }
 
     compileOnly "org.projectlombok:lombok:1.18.16"
     annotationProcessor "org.projectlombok:lombok:1.18.16"
+
+    testCompile "junit:junit:4.12"
+    testCompileOnly "org.projectlombok:lombok:1.18.16"
+    testAnnotationProcessor "org.projectlombok:lombok:1.18.16"
 }
 
 processResources {
@@ -92,11 +116,27 @@ processResources {
     }
 }
 
+mixin {
+    defaultObfuscationEnv searge
+    add sourceSets.main, "terraplusplus.refmap.json"
+}
+
 shadowJar {
     classifier = null
     configurations = [project.configurations.shade]
 
     exclude 'module-info.class'
+
+    manifest {
+        attributes(
+                "MixinConfigs": "terraplusplus.mixins.json",
+                "tweakClass": "org.spongepowered.asm.launch.MixinTweaker",
+                "TweakOrder": 0,
+                "FMLCorePluginContainsFMLMod": "true",
+                "FMLCorePlugin": "net.buildtheearth.terraplusplus.asm.TerraPlusPlusMixinLoader",
+                "ForceLoadAsMod": "true"
+        )
+    }
 }
 build.dependsOn shadowJar
 

src/main/java/net/buildtheearth/terraplusplus/EarthWorldType.java

@@ -9,6 +9,8 @@
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiCreateWorld;
 import net.minecraft.world.World;
+import net.minecraft.world.WorldProviderEnd;
+import net.minecraft.world.WorldProviderHell;
 import net.minecraft.world.WorldProviderSurface;
 import net.minecraft.world.WorldServer;
 import net.minecraft.world.WorldType;
@@ -33,7 +35,11 @@ public ICubeGenerator createCubeGenerator(World world) {
 
     @Override
     public BiomeProvider getBiomeProvider(World world) {
-        return EarthGeneratorSettings.parse(world.getWorldInfo().getGeneratorOptions()).biomeProvider();
+        if (world instanceof WorldServer) {
+            return EarthGeneratorSettings.forWorld((WorldServer) world).biomeProvider();
+        } else {
+            return EarthGeneratorSettings.parse(EarthGeneratorSettings.DEFAULT_SETTINGS).biomeProvider();
+        }
     }
 
     @Override
@@ -43,7 +49,9 @@ public IntRange calculateGenerationHeightRange(WorldServer world) {
 
     @Override
     public boolean hasCubicGeneratorForWorld(World w) {
-        return w.provider instanceof WorldProviderSurface; // an even more general way to check if it's overworld (need custom providers)
+        return w.provider instanceof WorldProviderSurface
+               || (TerraConfig.dimension.overrideNetherGeneration && w.provider instanceof WorldProviderHell)
+               || (TerraConfig.dimension.overrideEndGeneration && w.provider instanceof WorldProviderEnd);
     }
 
     @Override
@@ -61,6 +69,11 @@ public double voidFadeMagnitude() {
         return 0;
     }
 
+    @Override
+    public double getHorizon(World world) {
+        return Integer.MIN_VALUE;
+    }
+
     @Override
     @SideOnly(Side.CLIENT)
     public void onCustomizeButton(Minecraft mc, GuiCreateWorld guiCreateWorld) {

src/main/java/net/buildtheearth/terraplusplus/TerraConfig.java

@@ -1,5 +1,6 @@
 package net.buildtheearth.terraplusplus;
 
+import net.buildtheearth.terraplusplus.util.TerraConstants;
 import net.buildtheearth.terraplusplus.util.http.Http;
 import net.minecraftforge.common.config.Config;
 import net.minecraftforge.common.config.Config.Comment;
@@ -12,6 +13,11 @@
 @Mod.EventBusSubscriber(modid = TerraConstants.MODID)
 @Config(modid = TerraConstants.MODID)
 public class TerraConfig {
+    public static int[] lastVersion = { //this field might be used at some point
+            1, 12, 2, //mc version
+            2, 0, 0 //t++ version
+    };
+
     @Name("reduced_console_messages")
     @Comment({ "Removes all of TerraPlusPlus' messages which contain various links in the server console",
             "This is just if it seems to spam the console, it is purely for appearance" })
@@ -25,7 +31,17 @@ public class TerraConfig {
     public static boolean threeWater;
 
     @Comment({
-            "Configure how terraplusplus' will retrieve OpenStreetMap data."
+            "Configure how terraplusplus will retrieve surface elevation data."
+    })
+    public static ElevationOpts elevation = new ElevationOpts();
+
+    @Comment({
+            "Configure how terraplusplus will retrieve tree cover data."
+    })
+    public static TreeCoverOpts treeCover = new TreeCoverOpts();
+
+    @Comment({
+            "Configure how terraplusplus will retrieve OpenStreetMap data."
     })
     public static OSMOpts openstreetmap = new OSMOpts();
 
@@ -34,6 +50,8 @@ public class TerraConfig {
     })
     public static HttpOpts http = new HttpOpts();
 
+    public static DimensionOpts dimension = new DimensionOpts();
+
     @SubscribeEvent
     public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event) {
         if (TerraConstants.MODID.equals(event.getModID())) {
@@ -42,10 +60,27 @@ public static void onConfigChanged(ConfigChangedEvent.OnConfigChangedEvent event
         }
     }
 
+    public static class ElevationOpts {
+        public String[] servers = {
+                "https://cloud.daporkchop.net/gis/dem/earth/"
+        };
+    }
+
+    public static class TreeCoverOpts {
+        public String[] servers = {
+                "https://cloud.daporkchop.net/gis/treecover2000/"
+        };
+    }
+
     public static class OSMOpts {
+        @Deprecated
         public String[] servers = {
                 "https://cloud.daporkchop.net/gis/osm/0/"
         };
+
+        public String[] servers_v2 = { //different field name to avoid breaking old config files
+                "https://cloud.daporkchop.net/gis/osm/"
+        };
     }
 
     public static class HttpOpts {
@@ -62,9 +97,7 @@ public static class HttpOpts {
         public String[] maxConcurrentRequests = {
                 "8: https://cloud.daporkchop.net/",
                 "8: https://s3.amazonaws.com/",
-                "1: http://gis-treecover.wri.org/",
-                "1: https://overpass.kumi.systems/",
-                "1: https://lz4.overpass-api.de/"
+                "16: http://10.0.0.20/"
         };
 
         @Comment({
@@ -79,4 +112,16 @@ public static class HttpOpts {
         })
         public int cacheTTL = 1440;
     }
+
+    public static class DimensionOpts {
+        @Comment({
+                "Forces Terra++ generation in The End."
+        })
+        public boolean overrideEndGeneration = false;
+
+        @Comment({
+                "Forces Terra++ generation in the Nether."
+        })
+        public boolean overrideNetherGeneration = false;
+    }
 }

src/main/java/net/buildtheearth/terraplusplus/TerraMod.java

@@ -7,6 +7,8 @@
 import net.buildtheearth.terraplusplus.control.TerraTeleport;
 import net.buildtheearth.terraplusplus.provider.GenerationEventDenier;
 import net.buildtheearth.terraplusplus.provider.WaterDenier;
+import net.buildtheearth.terraplusplus.util.TerraConstants;
+import net.buildtheearth.terraplusplus.util.compat.fp2.TerraFP2CompatManager;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Mod;
@@ -40,6 +42,10 @@ public void construction(FMLConstructionEvent event) {
         }
 
         TerraConstants.CC_VERSION = Loader.instance().getIndexedModList().get(CubicChunks.MODID).getVersion();
+
+        if (Loader.instance().getIndexedModList().containsKey("fp2")) {
+            MinecraftForge.EVENT_BUS.register(TerraFP2CompatManager.class);
+        }
     }
 
     @EventHandler

src/main/java/net/buildtheearth/terraplusplus/asm/TerraPlusPlusMixinLoader.java

@@ -0,0 +1,48 @@
+package net.buildtheearth.terraplusplus.asm;
+
+import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
+import org.spongepowered.asm.launch.MixinBootstrap;
+import org.spongepowered.asm.mixin.Mixins;
+
+import javax.annotation.Nullable;
+import java.util.Map;
+
+/**
+ * @author DaPorkchop_
+ */
+public class TerraPlusPlusMixinLoader implements IFMLLoadingPlugin {
+    public TerraPlusPlusMixinLoader() {
+        try {
+            Class.forName("org.spongepowered.asm.launch.MixinBootstrap");
+            MixinBootstrap.init();
+            Mixins.addConfiguration("terraplusplus.mixins.json");
+        } catch (ClassNotFoundException ignored) {
+            //this means cubic chunks isn't there, let forge show missing dependency screen
+        }
+    }
+
+    @Override
+    public String[] getASMTransformerClass() {
+        return new String[0];
+    }
+
+    @Override
+    public String getModContainerClass() {
+        return null;
+    }
+
+    @Nullable
+    @Override
+    public String getSetupClass() {
+        return null;
+    }
+
+    @Override
+    public void injectData(Map<String, Object> data) {
+    }
+
+    @Override
+    public String getAccessTransformerClass() {
+        return null;
+    }
+}