Building, trees and biomes

.gitignore

@@ -21,3 +21,4 @@ build
 eclipse
 run
 production
+.factorypath

README.md

@@ -1,5 +1,5 @@
 # Wasteland Mod
-The classic Minecraft Wasteland mod for 1.7.10
+The classic Minecraft Wasteland mod for 1.7.10, forked to integrate with HBM.
 
 ---
 
@@ -22,4 +22,11 @@ This mod is meant to make minecraft survival much harder. You wake up in an unde
 1. Special (slow) zombies spawn during daytime
 1. Disable sleeping through the night (don't worry, its all configurable)
 
-Starting out, you may find that this settings may be too difficult (good chest loot is rare, and ruins/villages are rare). Please change the rarity and other options in the config files, I tried to include as many options as possible. If you want configs for something in particular, let me know.
+Starting out, you may find that this settings may be too difficult (good chest loot is rare, and ruins/villages are rare). Please change the rarity and other options in the config files, I tried to include as many options as possible. If you want configs for something in particular, let me know.
+
+# Building
+
+* Linux: `./gradlew build`.
+* Windows: `./gradlew.bat build`. Untested.
+
+Java 21 must be installed. This mod uses some GregTech online resources which are regularly pruned for old versions - if the building doesn't work, try to update the plugin version in `settings.gradle` to the oldest available in repositories, then run `./gradlew updateBuildScript`, then build again.

dependencies.gradle

@@ -36,8 +36,8 @@
  */
 dependencies {
     shadowImplementation(rfg.deobf(project.files("libs/jnbt-1.1.jar")))
-    runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.5.4-GTNH:dev")
-    runtimeOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenLib:1.2.1:dev')
-    runtimeOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenCore:1.2.1:dev')
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:+:dev")
+    runtimeOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenLib:+:dev')
+    runtimeOnlyNonPublishable('com.github.GTNewHorizons:CodeChickenCore:+:dev')
     implementation(rfg.deobf("Hbm-s-Nuclear-Tech-GIT:Hbm-s-Nuclear-Tech-GIT:1.0.27_X5299"))
 }

gradle.properties

@@ -14,7 +14,7 @@ modId = wasteland
 modGroup = com.seventythousand.wasteland
 
 # Whether to use modGroup as the maven publishing group.
-# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
+# When false, com.github.GTNewHorizons is used.
 useModGroupForPublishing = false
 
 # Updates your build.gradle and settings.gradle automatically whenever an update is available.
@@ -55,8 +55,6 @@ generateGradleTokenClass = com.seventythousand.wasteland.Info
 # Name of the token containing the project's current version to generate/replace.
 gradleTokenVersion = VERSION
 
-# do this if you want to set the version, goober
-# VERSION=0.420.69 ./gradlew build
 # [DEPRECATED]
 # Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
 # public static final String VERSION = "GRADLETOKEN_VERSION";
@@ -78,13 +76,20 @@ accessTransformersFile =
 # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
 usesMixins = false
 
+# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main.
+# This can speed up compile times thanks to not running the mixin annotation processor on all input sources.
+# Mixin classes will have access to "main" classes, but not the other way around.
+separateMixinSourceSet =
+
 # Adds some debug arguments like verbose output and class export.
 usesMixinDebug = false
 
 # Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
 mixinPlugin =
 
-# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
+# Specify the package that contains all of your Mixins. The package must exist or
+# the build will fail. If you have a package property defined in your mixins.<modid>.json,
+# it must match with this or the build will fail.
 mixinsPackage =
 
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
@@ -110,9 +115,15 @@ minimizeShadowedDependencies = true
 # If disabled, won't rename the shadowed classes.
 relocateShadowedDependencies = true
 
-# Adds the GTNH maven, CurseMaven, IC2/Player maven, and some more well-known 1.7.10 repositories.
+# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories.
 includeWellKnownRepositories = true
 
+# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated
+# list of strings, with the acceptable keys being(case does not matter):
+# cursemaven
+# modrinth
+excludeWellKnownRepositories =
+
 # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven.
 # Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables.
 # If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle.
@@ -133,7 +144,7 @@ modrinthProjectId =
 #       type can be one of [project, version],
 #       and the name is the Modrinth project or version slug/id of the other mod.
 # Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
-# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
+# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
 modrinthRelations =
 
 # Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
@@ -154,6 +165,12 @@ curseForgeRelations =
 # projects. New projects should not use this parameter.
 # customArchiveBaseName =
 
+# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
+# runClientWorkingDirectory = run/client
+
+# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
+# runServerWorkingDirectory = run/server
+
 # Optional parameter to have the build automatically fail if an illegal version is used.
 # This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
 # The check is ONLY performed if the version is a git tag.
@@ -166,10 +183,10 @@ curseForgeRelations =
 # Uncomment this to disable Spotless checks.
 # This should only be uncommented to keep it easier to sync with upstream/other forks.
 # That is, if there is no other active fork/upstream, NEVER change this.
-  disableSpotless = true
+disableSpotless = true
 
 # Uncomment this to disable Checkstyle checks (currently wildcard import check).
-  disableCheckstyle = true
+disableCheckstyle = true
 
 # Override the IDEA build type. Valid values are: "" (leave blank, do not override), "idea" (force use native IDEA build), "gradle"
 # (force use delegated build).

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -17,5 +17,5 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.15'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.50'
 }

src/main/java/com/seventythousand/wasteland/config/ModConfig.java

@@ -9,6 +9,8 @@
 import net.minecraftforge.common.config.Configuration;
 
 public class ModConfig {
+  public static int wastelandBiomeSize;
+
   public static int wastelandTreeSpawnRate;
 
   public static int lakeSpawnRate;
@@ -21,6 +23,8 @@ public class ModConfig {
 
   public static String surfaceBlockString;
 
+  public static String leavesOnTreesString;
+
   public static String lakeLiquidString;
 
   public static String[] woodBlockStringList;
@@ -94,6 +98,7 @@ public static void loadConfig(Configuration config) {
     wastelandRiverBiomeID = ConfigHelper.createConfigInt(config,"IDs", "Wasteland River Biome ID", 55);
 
     config.setCategoryComment("Worldgen", "General world generation config");
+    wastelandBiomeSize = ConfigHelper.createConfigInt(config, "Worldgen", "Biome size", "Sets the size of biomes. Vanilla (spanning 200~ of blocks) is 4, Large Biomes (spanning 1000~ of blocks) is 6.", 4);
     wastelandTreeSpawnRate = ConfigHelper.createConfigInt(config,"Worldgen", "Dead Tree Rarity", 10);
     minVillageDistance = ConfigHelper.createConfigInt(config,"Worldgen", "Min chunks between abandoned towns", 32);
     wastelandRuinRarirty = ConfigHelper.createConfigInt(config,"Worldgen", "Wasteland ruins rarity", 20);
@@ -104,7 +109,8 @@ public static void loadConfig(Configuration config) {
     woodBlockStringList = config.getStringList("Forest tree type rarity", "Worldgen", new String[] { "minecraft:log:0,70", "minecraft:log:1,20", "minecraft:log2:1,9", "minecraft:log2:0,1" }, "Wood blocks that are allowed to be generated in the Wasteland Forest biome\nmod_name:block_name:meta_id,weighted_spawn_chance");
     spawnBunker = ConfigHelper.createConfigBool(config,"Worldgen", "Spawn in underground bunker", true);
     surfaceBlockString = ConfigHelper.createConfigString(config,"Worldgen", "The top block layer of the wasteland biome", "minecraft:dirt");
-    lakeLiquidString = ConfigHelper.createConfigString(config,"Worldgen", "Generated lake pockets liquid", "WLM:tile.toxicWasteBlock");
+    lakeLiquidString = ConfigHelper.createConfigString(config,"Worldgen", "Generated lake pockets liquid", "hbm:tile.toxic_block");
+    leavesOnTreesString = ConfigHelper.createConfigString(config, "Worldgen", "Type of leaves on trees. Set to minecraft:air to remove wastes leaves from trees for a bit deadlier look. Set back to hbm:tile.waste_leaves to restore them.", "hbm:tile.waste_leaves");
     config.setCategoryComment("Misc", "Other config options");
     disableSleep = ConfigHelper.createConfigBool(config,"Misc", "Disable sleeping in bed", true);
     config.setCategoryComment("CityGen", "World generation of cities and their spawners");
@@ -138,6 +144,10 @@ public static Block getSurfaceBlock() {
     return getBlockFromString(surfaceBlockString);
   }
 
+  public static Block getLeavesBlock() {
+    return getBlockFromString(leavesOnTreesString);
+  }
+
   public static Block getlakeLiquid() {
     return getBlockFromString(lakeLiquidString);
   }

src/main/java/com/seventythousand/wasteland/world/WastelandGenLayerBiome.java

@@ -71,7 +71,7 @@ public static GenLayer[] initializeAllBiomeGenerators(long p_75901_0_, WorldType
     GenLayerAddMushroomIsland genlayeraddmushroomisland = new GenLayerAddMushroomIsland(5L, genlayeraddisland);
     GenLayerDeepOcean genlayerdeepocean = new GenLayerDeepOcean(4L, genlayeraddmushroomisland);
     GenLayer genlayer2 = GenLayerZoom.magnify(1000L, genlayerdeepocean, 0);
-    byte b0 = 4;
+    byte b0 = (byte)(ModConfig.wastelandBiomeSize);
 
     b0 = getModdedBiomeSize(p_75901_2_, b0);
 

src/main/java/com/seventythousand/wasteland/world/biome/BiomeGenWastelandMesa.java

@@ -35,7 +35,7 @@ public BiomeGenWastelandMesa(int par1ID, String par2Name, Height par3BiomeHeight
         this.fillerBlock = Blocks.stained_hardened_clay;
         this.treeSpawnRate /= 4;
         this.treesPerChunk *= 3;
-        this.theBiomeDecorator.deadBushPerChunk = 20;
+        this.theBiomeDecorator.deadBushPerChunk = 5;
         this.theBiomeDecorator.reedsPerChunk = 3;
         this.theBiomeDecorator.cactiPerChunk = 5;
         bryce = alive;

src/main/java/com/seventythousand/wasteland/world/biome/BiomeGenWastelandTaiga.java

@@ -18,7 +18,6 @@ public BiomeGenWastelandTaiga(int par1ID, String par2Name, BiomeGenBase.Height p
         treesPerChunk = 2;
         treeSpawnRate /= 2;
         temples = true;
-        this.theBiomeDecorator.grassPerChunk = 2;
         this.theBiomeDecorator.deadBushPerChunk = 6;
         this.theBiomeDecorator.mushroomsPerChunk = 6;
         setCreatureSpawns(EntitySpawnConfig.wastelandCreatures.get(0), this.spawnableMonsterList, EntitySpawnConfig.enableHostileSpawn);

src/main/java/com/seventythousand/wasteland/world/gen/WorldGenWastelandBigTree.java

@@ -47,7 +47,7 @@ public WorldGenWastelandBigTree(boolean par1) {
     super(par1);
     this.block = Blocks.log;
     this.meta = 0;
-    this.leaf = ModBlocks.waste_leaves;
+    this.leaf = ModConfig.getLeavesBlock();
   }
 
     public WorldGenWastelandBigTree(boolean par1, boolean wide) {
@@ -190,12 +190,12 @@ void generateLeafNode(int par1, int par2, int par3) {
     for (int var5 = par2 + this.leafDistanceLimit; l < var5; l++) {
       var6 = leafSize(l - par2);
       if(rand.nextInt(50) == 0) {
-          leaf = Blocks.leaves;
+          leaf = ModConfig.getLeavesBlock();
           leafMeta = (byte) meta;
       }
       else {
           leafMeta = 0;
-          leaf = ModBlocks.waste_leaves;
+          leaf = ModConfig.getLeavesBlock();
       }
 
       genTreeLayer(par1, l, par3, var6, (byte)1, leaf, leafMeta);
@@ -404,7 +404,7 @@ public boolean generate(World par1World, Random par2Random, int par3, int par4,
   public void setTreeType(Block block, int meta) {
     this.block = block;
     this.meta = meta;
-    this.leaf = ModBlocks.waste_leaves;
+    this.leaf = ModConfig.getLeavesBlock();
   }
 
   public void setTreeType(int[] blockData) {

src/main/java/com/seventythousand/wasteland/world/gen/WorldGenWastelandTrees.java

@@ -100,7 +100,7 @@ public boolean generate(World world, Random rand, int x, int y, int z) {
                                         Block block1 = world.getBlock(i2, k1, k2);
 
                                         if (block1.isAir(world, i2, k1, k2) || block1.isLeaves(world, i2, k1, k2)) {
-                                            this.setBlockAndNotifyAdequately(world, i2, k1, k2, ModBlocks.waste_leaves, 0);
+                                            this.setBlockAndNotifyAdequately(world, i2, k1, k2, ModConfig.getLeavesBlock(), 0);
                                         }
                                     }
                                 }

src/main/resources/mcmod.info

@@ -3,7 +3,7 @@
   "modid": "wastelands",
   "name": "Wasteland",
   "description": "Wasteland biome mod, effectively a HBM's NTM addon",
-  "version": "1.8.8",
+  "version": "1.8.9",
   "mcversion": "1.7.10",
   "url": "https://github.com/chiqors",
   "updateUrl": "",