worldgen tweaks

.github/workflows/gradle.yml

@@ -1,25 +1,48 @@
-name: Build
+name: Upload
 
 on:
-    push:
-        branches: [master]
-    pull_request:
-        branches: [master]
+  push:
+    branches: [master]
 
 jobs:
-    build:
-        runs-on: ubuntu-latest
+  build:
+    name: Upload
+    runs-on: ubuntu-latest
+    steps:
 
-        steps:
-            - uses: actions/checkout@v2
-            - name: Set up JDK 16
-              uses: actions/setup-java@v1
-              with:
-                  java-version: 16
-            - name: Create user.gradle file
-              run: touch user.gradle
-            - name: Build with Gradle
-              run: gradle shadowJar
-            - uses: actions/upload-artifact@v2
-              with:
-                path: build/libs/uhc-plugin-all.jar
+      # build the plugin jar
+      - uses: actions/checkout@v2
+      - name: Set up JDK 16
+        uses: actions/setup-java@v1
+        with:
+          java-version: 16
+      - name: Create user.gradle file
+        run: touch user.gradle
+      - name: Build with Gradle
+        run: gradle shadowJar
+
+      # create release
+      - name: Checkout code
+        uses: actions/checkout@v2
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          tag_name: ${{ github.head_ref }}
+          release_name: Automatic Release ${{ github.head_ref }}
+          draft: false
+          prerelease: true
+
+      # upload plugin jar to release
+      - name: Upload Release Asset
+        id: upload-release-asset
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ steps.create_release.outputs.upload_url }}
+          asset_path: build/libs/uhc-plugin-all.jar
+          asset_name: uhc-plugin-all.jar
+          asset_content_type: application/jar

src/main/kotlin/com/codeland/uhc/gui/gui/CreateGameGui.kt

@@ -79,7 +79,7 @@ class CreateGameGui(val gameConfig: GameConfig) : GuiPage(
 
 		/* row 2 */
 
-		addItem(object : GuiItemCounterF(coords(0, 1), gameConfig.scale, 0.5f, 2.0f, 0.1f) {
+		addItem(object : GuiItemCounterF(coords(0, 1), gameConfig.scale, 0.5f, 6.0f, 0.1f) {
 			override fun getStackProperty(value: Float): ItemStack {
 				return ItemCreator.fromType(Material.WARPED_TRAPDOOR)
 					.enchant(value != property.default)

src/main/kotlin/com/codeland/uhc/world/gen/CustomGenLayers.kt

@@ -27,33 +27,35 @@ object CustomGenLayers {
 	fun createAreaGame2(seed: Long, border: Int): Area {
 		val noise = { s: Long -> WorldGenContextArea(25, seed, s) }
 
-		var baseLayer = LayerUnique().a(noise(1000L))
-
-		baseLayer = GenLayerZoom.a.a(noise(1001L), baseLayer)
+		var baseLayer = LayerUnique().a(noise(0L))
 
 		baseLayer = GenLayerHole().a(noise(8080L), baseLayer)
 		baseLayer = GenLayerCohere().a(noise(8081L), baseLayer)
 		baseLayer = GenLayerSeparate().a(noise(8082L), baseLayer)
 		baseLayer = GenLayerRegion().a(noise(8083L), baseLayer)
+
 		baseLayer = GenLayerOcean(border - 16, 5).a(noise(8084L), baseLayer)
 
-		baseLayer = GenLayerZoom.a.a(noise(1002L), baseLayer)
-		baseLayer = GenLayerZoom.a.a(noise(1003L), baseLayer)
-		baseLayer = GenLayerZoom.a.a(noise(1004L), baseLayer)
+		baseLayer = GenLayerZoom.a.a(noise(1L), baseLayer)
+		baseLayer = GenLayerZoom.a.a(noise(2L), baseLayer)
+		baseLayer = GenLayerZoom.a.a(noise(3L), baseLayer)
 
 		baseLayer = GenLayerBorder().a(noise(7070L), baseLayer)
 		baseLayer = GenLayerSplit().a(noise(7071L), baseLayer)
 
-		baseLayer = GenLayerZoom.a.a(noise(1005L), baseLayer)
-		baseLayer = GenLayerZoom.a.a(noise(1006L), baseLayer)
+		baseLayer = GenLayerZoom.a.a(noise(4L), baseLayer)
+		baseLayer = GenLayerZoom.a.a(noise(5L), baseLayer)
+
+		/* ---------------------------------------------- */
+
+		var riverLayer = LayerNoise().a(noise(0L))
+
+		riverLayer = GenLayerZoom.a.a(noise(1L), riverLayer)
+		riverLayer = GenLayerZoom.a.a(noise(2L), riverLayer)
+		riverLayer = GenLayerZoom.a.a(noise(3L), riverLayer)
+		riverLayer = GenLayerZoom.a.a(noise(4L), riverLayer)
+		riverLayer = GenLayerZoom.a.a(noise(5L), riverLayer)
 
-		var riverLayer = LayerNoise().a(noise(1000L))
-		riverLayer = GenLayerZoom.a.a(noise(1001L), riverLayer)
-		riverLayer = GenLayerZoom.a.a(noise(1002L), riverLayer)
-		riverLayer = GenLayerZoom.a.a(noise(1003L), riverLayer)
-		riverLayer = GenLayerZoom.a.a(noise(1004L), riverLayer)
-		riverLayer = GenLayerZoom.a.a(noise(1005L), riverLayer)
-		riverLayer = GenLayerZoom.a.a(noise(1006L), riverLayer)
 		riverLayer = GenLayerEdge(BiomeNo.RIVER).a(noise(9090L), riverLayer)
 
 		baseLayer = GenLayerRiverApply().a(noise(9091L), baseLayer, riverLayer)

src/main/kotlin/com/codeland/uhc/world/gen/layer/game2/GenLayerHole.kt

@@ -7,9 +7,8 @@ import kotlin.random.Random
 class GenLayerHole : AreaTransformer7 {
 	override fun a(context: WorldGenContext, p1: Int, p2: Int, p3: Int, p4: Int, p5: Int): Int {
 		return if (p1 != p5 && p2 != p5 && p3 == p5 && p4 == p5) {
-			Random(p5).nextInt(0, 2)
-		} else if (p1 == p5 && p2 == p5 && p3 != p5 && p4 != p5) {
-			Random(p5).nextInt(3, 5)
+			val random = Random(p5)
+			if (random.nextBoolean()) random.nextInt(0, 2) else random.nextInt(3, 5)
 		} else {
 			2
 		}

src/main/kotlin/com/codeland/uhc/world/gen/layer/game2/LayerUnique.kt

@@ -5,7 +5,7 @@ import net.minecraft.world.level.newbiome.layer.traits.AreaTransformer1
 
 class LayerUnique : AreaTransformer1 {
 	override fun a(context: WorldGenContext, x: Int, z: Int): Int {
-		return x.shl(16).or(z.and(0xffff))
+		return (x / 3).shl(16).or((z / 3).and(0xffff))
 	}
 }