Merge remote-tracking branch 'mraof/quest_systems' into quests/dialog…

…ue_gui_improvements

# Conflicts:
#	src/main/java/com/mraof/minestuck/entity/dialogue/Dialogue.java

.github/workflows/gradle_ci.yml

@@ -0,0 +1,54 @@
+name: Gradle CI
+
+on:
+  push:
+    branches: 
+      - '1.20.1'
+      - 'upcoming-content'
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  validate-and-build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK
+      uses: actions/setup-java@v4
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+    - name: Validate Gradle wrapper
+      uses: gradle/wrapper-validation-action@v2
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v3
+    - name: Gradle Build
+      timeout-minutes: 20
+      run: ./gradlew build
+
+  check-datagen:
+    needs: validate-and-build
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+        with:
+          cache-read-only: true
+        # Meant to be sped up by cached gradle stuff from the validate-and-build job,
+        # but the cache is only written to when that job is run on the default branch.
+        # If the next step is slow, rerun this action on the default branch to recreate the cache.
+      - name: Run Data Generation
+        timeout-minutes: 20
+        run: ./gradlew :runData
+      - name: Detect Changes
+        uses: NathanielHill/fail-if-changes@9e6ed6bb0543551728592d8114cfaa1dcd9155a6

CHANGELOG.md

@@ -10,20 +10,33 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
 - Spawn egg items for main Underling types, Consorts, and Carapacians
 - Stairs, slabs, walls, fences, fence gates, doors, trapdoors, buttons, and pressure plates to land-specific blocks
+- Carved Logs, Carved Wooden Leaf, and Treated and Lacquered variants of Carved blocks
 - Tree Stump feature in Forest Lands
 - Frog Ruins feature in Frog Lands
+- Various Unfinished and Carved features in Wood Lands
 - Transportalizer codes can now be manually set instead of having one randomly assigned (can only be done once per transportalizer)
 - New NBT tag on transportalizers that allows them to be locked, permanently preventing the viewing or editing of its id or destination
 - Transportalizer NBT data will now be saved when mined, even without silk touch, and can be viewed on the item's tooltip
-- Added Carved Bush.
 - New advancements for Echeladder milestones, using an Intellibeam Laserstation, getting a max tier weapon, and buying every item from a consort merchant
 - New computer Themes: Astral Charts, Lifdoff, LOWAS, Minestuck, SBURB 10, Scourging Heat, Skaianet Black, Skaianet Green, Skaianet White, Spirograph, ~ATH
-- Cruxite block set
+- Added Carved Bush
+- Added Uncarved Wood Cruxite, Uranium, Iron, Redstone, and Emerald ores
+- Added Silicone Caulk fluid, used in Wood lands
+- Added Cindered woodset and Trees in Heat lands
+- Added Igneous Stone, Pumice Stone, Singed Grass and Foliage, and Igneous Spike, that generate in Heat lands.
+- Added Sandy Grass, Dead Foliage, Tall Sandy Grass and Tall Dead Bush that generate in Sand lands.
+- Added Coffee Claws
+- Added TV Antenna
+- Added Molten Amber fluid, used in Heat lands
+- Added Cruxite block set
 - New dialogue system that uses a gui screen, replacing the chat-based system
 - Dialogue in this new system is data-driven, and can be defined or tweaked through datapacks
 
 ### Changed
 
+- Wooden Cactus is now only placeable on the Wood Terrain Blocks tag instead of Sand
+- Carved Planks are now the surface block of Wood Lands instead of Treated Planks
+- Carved Planks no longer need to be mined with a Stone Axe or better
 - Transportalizers now stack to one instead of 64
 - Prismarine armor remodel and retexture
 - Iron Lass Armor has now been remodeled, and retextured; with additional new animations.
@@ -32,20 +45,59 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - Computer Theme is now chosen from a list of available Themes in separate GUI
 - Changes to computer Theme texture Crocker
 - Computer programs now always use Theme specific texture for arrow buttons
+- Updated textures of Treated Planks, Chipboard, Wood Shavings, and Wooden Cactus by Vinnelli and Riotmode
+- Updated textures of Treated Bookshelf and Treated Ladder to fit updated Treated Planks
+- Oil Buckets no longer cost 8 Tar and 8 Shale, now cost 16 Shale
+- Renamed Oil to Shale Oil
+- Pumord is now alchemized with Pumice Stone instead of any regular Stone
 - Existing consort dialogue have been ported to the new dialogue system with some tweaks
 
 ### Fixed
 
 - Double slabs will now drop two slabs when broken
 - Sneaking now prevents trajectory blocks from moving the player
+- Blue dirt can now have the shovel used on it
+- Minestuck fences will now connect with vanilla fences appropriately
+- All walls will now connect with each other properly
+- Fixed name typos for some chess castle blocks
 - Improved grammar on some dialogues
 
+### Removed
+
+- Uncarved Wood no longer has a tooltip
+
 ### Contributors for this release
 
-- rose_bushes_, hadean, glubtier, ScarabOasis, Dweblenod, Boxfox, DORO, pavizi, sipher, kirderf1
+- rose_bushes_, hadean, glubtier, ScarabOasis, Dweblenod, Boxfox, DORO, Akisephila, Vinnelli, Riotmode, pavizi, sipher, kirderf1
 
 ## [Unreleased]
 
+### Changed
+
+- Minor changes to what is shown in the data checker
+- Duplicate titles are now allowed in the same session,
+  and consequently the session size limit has been removed
+- Pre-entry players no longer play a part in grist gutter capacity,
+  and they no longer receive grist from the gutter
+
+### Removed
+
+- Removed "skaianetCheck" config option
+
+### Fixed
+
+- Fixes some niche issues with connections
+- `/sburbpredefine` now gives an error when applied to a player that already has a land
+- Fixed missing data sync for land types after using `/debuglands`
+- Added command success message to `/debuglands`
+- Fixed player owner id not loading for mini alchemiter and grist widget
+
+### Contributors for this release
+
+- kirderf1
+
+## [1.20.1-1.11.2.1] - 2024-03-10
+
 ### Fixed
 
 - Metal Boats no longer crash the game when dispensed
@@ -56,6 +108,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 - Advanced color selection screen no longer tints buttons
 - Round the displayed max health value on the echeladder screen
 - Prevent one method of captchaloguing stacks with stack size larger than max stack size
+- Stopped editmode cursor from spinning
 
 ### Contributors for this release
 

build.gradle

@@ -60,15 +60,20 @@ minecraft {
     // Default run configurations.
     // These can be tweaked, removed, or duplicated as needed.
     runs {
-        client {
+        configureEach {
             workingDirectory project.file('run')
 
-            // Recommended logging data for a userdev environment
             property 'forge.logging.markers', 'REGISTRIES'
 
-            // Recommended logging level for the console
             property 'forge.logging.console.level', 'debug'
 
+            mods {
+                minestuck {
+                    source sourceSets.main
+                }
+            }
+        }
+        client {
             // Add an uuid arg if you have specified it in a relevant gradle.properties file. NOTE: Do not use the gradle.properties file in the project! (because that one is supposed to be shared among all devs) Create one in your "gradle user home" instead.
             if (project.hasProperty('mc_uuid')) {
                 args '--uuid', project.getProperty('mc_uuid')
@@ -78,44 +83,13 @@ minecraft {
             if (project.hasProperty('mc_username')) {
                 args '--username', project.getProperty('mc_username')
             }
-
-            mods {
-                minestuck {
-                    source sourceSets.main
-                }
-            }
         }
         server {
-            workingDirectory project.file('run')
-
-            // Recommended logging data for a userdev environment
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            // Recommended logging level for the console
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                minestuck {
-                    source sourceSets.main
-                }
-            }
+        }
+        gameTestServer {
         }
         data {
-            workingDirectory project.file('run')
-
-            // Recommended logging data for a userdev environment
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            // Recommended logging level for the console
-            property 'forge.logging.console.level', 'debug'
-
             args '--mod', 'minestuck', '--all', '--output', file('src/main/generated/resources/'), '--existing', sourceSets.main.resources.srcDirs[0]
-
-            mods {
-                minestuck {
-                    source sourceSets.main
-                }
-            }
         }
     }
 }

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.daemon=false
 
 mc_version=1.20.1
 
-mc_ms_version=1.20.1-1.11.2.0
+mc_ms_version=1.20.1-1.11.2.1
 
 mc_forge_version=1.20.1-47.1.3
 

src/main/generated/resources/assets/minestuck/blockstates/carved_knotted_wood.json

@@ -1,7 +1,19 @@
 {
   "variants": {
-    "": {
+    "facing=east": {
+      "model": "minestuck:block/carved_knotted_wood",
+      "y": 90
+    },
+    "facing=north": {
       "model": "minestuck:block/carved_knotted_wood"
+    },
+    "facing=south": {
+      "model": "minestuck:block/carved_knotted_wood",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "minestuck:block/carved_knotted_wood",
+      "y": 270
     }
   }
 }

src/main/generated/resources/assets/minestuck/blockstates/carved_log.json

@@ -0,0 +1,16 @@
+{
+  "variants": {
+    "axis=x": {
+      "model": "minestuck:block/carved_log",
+      "x": 90,
+      "y": 90
+    },
+    "axis=y": {
+      "model": "minestuck:block/carved_log"
+    },
+    "axis=z": {
+      "model": "minestuck:block/carved_log",
+      "x": 90
+    }
+  }
+}

src/main/generated/resources/assets/minestuck/blockstates/carved_wooden_leaf.json

@@ -0,0 +1,19 @@
+{
+  "variants": {
+    "facing=east": {
+      "model": "minestuck:block/carved_wooden_leaf",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "minestuck:block/carved_wooden_leaf"
+    },
+    "facing=south": {
+      "model": "minestuck:block/carved_wooden_leaf",
+      "y": 180
+    },
+    "facing=west": {
+      "model": "minestuck:block/carved_wooden_leaf",
+      "y": 270
+    }
+  }
+}

src/main/generated/resources/assets/minestuck/blockstates/caulk.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "minestuck:block/caulk"
+    }
+  }
+}