Motschen/ThisRocks
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/ThisRocks.git synced 2025-12-13 01:35:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

port: Spring to Life (MC 1.21.5)

Browse Source
This commit is contained in:
Martin Prokoph
2025-03-26 14:03:15 +01:00
parent 95488b91af
commit 5a37100032
32 changed files with 124 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.9-SNAPSHOT'
id 'fabric-loom' version '1.10-SNAPSHOT'
id 'maven-publish'
id "me.shedaniel.unified-publishing" version "0.1.+"
}

16
gradle.properties
View File

@@ -3,12 +3,12 @@ org.gradle.jvmargs=-Xmx2G
# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.21.4
yarn_mappings=1.21.4+build.4
loader_version=0.16.9
minecraft_version=1.21.5
yarn_mappings=1.21.5+build.1
loader_version=0.16.10
# Mod Properties
mod_version = 1.9.3
mod_version = 1.9.3+1.21.5
maven_group = eu.midnightdust.motschen
archives_base_name = rocks
release_type=release
@@ -17,7 +17,7 @@ org.gradle.jvmargs=-Xmx2G
# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
fabric_version=0.113.0+1.21.4
midnightlib_version=1.6.6-fabric
polymer_version=0.11.3+1.21.4
factorytools_version=0.5.0+1.21.4
fabric_version=0.119.5+1.21.5
midnightlib_version=1.6.10+1.21.4-fabric
polymer_version=0.12.1+1.21.5-rc2
factorytools_version=0.6.0+1.21.5

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

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

9
src/main/generated/assets/rocks/blockstates/acacia_stick.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/acacia_stick_large",
"y": 0
"model": "rocks:block/acacia_stick_large"
},
{
"model": "rocks:block/acacia_stick_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/acacia_stick_medium",
"y": 0
"model": "rocks:block/acacia_stick_medium"
},
{
"model": "rocks:block/acacia_stick_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/acacia_stick_small",
"y": 0
"model": "rocks:block/acacia_stick_small"
},
{
"model": "rocks:block/acacia_stick_small",

12
src/main/generated/assets/rocks/blockstates/andesite_rock.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/andesite_rock_large",
"y": 0
"model": "rocks:block/andesite_rock_large"
},
{
"model": "rocks:block/andesite_rock_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/andesite_rock_medium",
"y": 0
"model": "rocks:block/andesite_rock_medium"
},
{
"model": "rocks:block/andesite_rock_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/andesite_rock_small",
"y": 0
"model": "rocks:block/andesite_rock_small"
},
{
"model": "rocks:block/andesite_rock_small",
@@ -56,8 +53,7 @@
],
"variation=tiny": [
{
"model": "rocks:block/andesite_rock_tiny",
"y": 0
"model": "rocks:block/andesite_rock_tiny"
},
{
"model": "rocks:block/andesite_rock_tiny",

9
src/main/generated/assets/rocks/blockstates/bamboo_stick.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/bamboo_stick_large",
"y": 0
"model": "rocks:block/bamboo_stick_large"
},
{
"model": "rocks:block/bamboo_stick_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/bamboo_stick_medium",
"y": 0
"model": "rocks:block/bamboo_stick_medium"
},
{
"model": "rocks:block/bamboo_stick_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/bamboo_stick_small",
"y": 0
"model": "rocks:block/bamboo_stick_small"
},
{
"model": "rocks:block/bamboo_stick_small",

9
src/main/generated/assets/rocks/blockstates/birch_stick.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/birch_stick_large",
"y": 0
"model": "rocks:block/birch_stick_large"
},
{
"model": "rocks:block/birch_stick_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/birch_stick_medium",
"y": 0
"model": "rocks:block/birch_stick_medium"
},
{
"model": "rocks:block/birch_stick_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/birch_stick_small",
"y": 0
"model": "rocks:block/birch_stick_small"
},
{
"model": "rocks:block/birch_stick_small",

9
src/main/generated/assets/rocks/blockstates/cherry_stick.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/cherry_stick_large",
"y": 0
"model": "rocks:block/cherry_stick_large"
},
{
"model": "rocks:block/cherry_stick_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/cherry_stick_medium",
"y": 0
"model": "rocks:block/cherry_stick_medium"
},
{
"model": "rocks:block/cherry_stick_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/cherry_stick_small",
"y": 0
"model": "rocks:block/cherry_stick_small"
},
{
"model": "rocks:block/cherry_stick_small",

9
src/main/generated/assets/rocks/blockstates/crimson_stick.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/crimson_stick_large",
"y": 0
"model": "rocks:block/crimson_stick_large"
},
{
"model": "rocks:block/crimson_stick_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/crimson_stick_medium",
"y": 0
"model": "rocks:block/crimson_stick_medium"
},
{
"model": "rocks:block/crimson_stick_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/crimson_stick_small",
"y": 0
"model": "rocks:block/crimson_stick_small"
},
{
"model": "rocks:block/crimson_stick_small",

9
src/main/generated/assets/rocks/blockstates/dark_oak_stick.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/dark_oak_stick_large",
"y": 0
"model": "rocks:block/dark_oak_stick_large"
},
{
"model": "rocks:block/dark_oak_stick_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/dark_oak_stick_medium",
"y": 0
"model": "rocks:block/dark_oak_stick_medium"
},
{
"model": "rocks:block/dark_oak_stick_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/dark_oak_stick_small",
"y": 0
"model": "rocks:block/dark_oak_stick_small"
},
{
"model": "rocks:block/dark_oak_stick_small",

12
src/main/generated/assets/rocks/blockstates/diorite_rock.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/diorite_rock_large",
"y": 0
"model": "rocks:block/diorite_rock_large"
},
{
"model": "rocks:block/diorite_rock_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/diorite_rock_medium",
"y": 0
"model": "rocks:block/diorite_rock_medium"
},
{
"model": "rocks:block/diorite_rock_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/diorite_rock_small",
"y": 0
"model": "rocks:block/diorite_rock_small"
},
{
"model": "rocks:block/diorite_rock_small",
@@ -56,8 +53,7 @@
],
"variation=tiny": [
{
"model": "rocks:block/diorite_rock_tiny",
"y": 0
"model": "rocks:block/diorite_rock_tiny"
},
{
"model": "rocks:block/diorite_rock_tiny",

12
src/main/generated/assets/rocks/blockstates/end_stone_rock.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/end_stone_rock_large",
"y": 0
"model": "rocks:block/end_stone_rock_large"
},
{
"model": "rocks:block/end_stone_rock_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/end_stone_rock_medium",
"y": 0
"model": "rocks:block/end_stone_rock_medium"
},
{
"model": "rocks:block/end_stone_rock_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/end_stone_rock_small",
"y": 0
"model": "rocks:block/end_stone_rock_small"
},
{
"model": "rocks:block/end_stone_rock_small",
@@ -56,8 +53,7 @@
],
"variation=tiny": [
{
"model": "rocks:block/end_stone_rock_tiny",
"y": 0
"model": "rocks:block/end_stone_rock_tiny"
},
{
"model": "rocks:block/end_stone_rock_tiny",

12
src/main/generated/assets/rocks/blockstates/granite_rock.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/granite_rock_large",
"y": 0
"model": "rocks:block/granite_rock_large"
},
{
"model": "rocks:block/granite_rock_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/granite_rock_medium",
"y": 0
"model": "rocks:block/granite_rock_medium"
},
{
"model": "rocks:block/granite_rock_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/granite_rock_small",
"y": 0
"model": "rocks:block/granite_rock_small"
},
{
"model": "rocks:block/granite_rock_small",
@@ -56,8 +53,7 @@
],
"variation=tiny": [
{
"model": "rocks:block/granite_rock_tiny",
"y": 0
"model": "rocks:block/granite_rock_tiny"
},
{
"model": "rocks:block/granite_rock_tiny",

12
src/main/generated/assets/rocks/blockstates/gravel_rock.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/gravel_rock_large",
"y": 0
"model": "rocks:block/gravel_rock_large"
},
{
"model": "rocks:block/gravel_rock_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/gravel_rock_medium",
"y": 0
"model": "rocks:block/gravel_rock_medium"
},
{
"model": "rocks:block/gravel_rock_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/gravel_rock_small",
"y": 0
"model": "rocks:block/gravel_rock_small"
},
{
"model": "rocks:block/gravel_rock_small",
@@ -56,8 +53,7 @@
],
"variation=tiny": [
{
"model": "rocks:block/gravel_rock_tiny",
"y": 0
"model": "rocks:block/gravel_rock_tiny"
},
{
"model": "rocks:block/gravel_rock_tiny",

12
src/main/generated/assets/rocks/blockstates/ice_rock.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/ice_rock_large",
"y": 0
"model": "rocks:block/ice_rock_large"
},
{
"model": "rocks:block/ice_rock_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/ice_rock_medium",
"y": 0
"model": "rocks:block/ice_rock_medium"
},
{
"model": "rocks:block/ice_rock_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/ice_rock_small",
"y": 0
"model": "rocks:block/ice_rock_small"
},
{
"model": "rocks:block/ice_rock_small",
@@ -56,8 +53,7 @@
],
"variation=tiny": [
{
"model": "rocks:block/ice_rock_tiny",
"y": 0
"model": "rocks:block/ice_rock_tiny"
},
{
"model": "rocks:block/ice_rock_tiny",

9
src/main/generated/assets/rocks/blockstates/jungle_stick.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/jungle_stick_large",
"y": 0
"model": "rocks:block/jungle_stick_large"
},
{
"model": "rocks:block/jungle_stick_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/jungle_stick_medium",
"y": 0
"model": "rocks:block/jungle_stick_medium"
},
{
"model": "rocks:block/jungle_stick_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/jungle_stick_small",
"y": 0
"model": "rocks:block/jungle_stick_small"
},
{
"model": "rocks:block/jungle_stick_small",

9
src/main/generated/assets/rocks/blockstates/mangrove_stick.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/mangrove_stick_large",
"y": 0
"model": "rocks:block/mangrove_stick_large"
},
{
"model": "rocks:block/mangrove_stick_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/mangrove_stick_medium",
"y": 0
"model": "rocks:block/mangrove_stick_medium"
},
{
"model": "rocks:block/mangrove_stick_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/mangrove_stick_small",
"y": 0
"model": "rocks:block/mangrove_stick_small"
},
{
"model": "rocks:block/mangrove_stick_small",

12
src/main/generated/assets/rocks/blockstates/netherrack_rock.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/netherrack_rock_large",
"y": 0
"model": "rocks:block/netherrack_rock_large"
},
{
"model": "rocks:block/netherrack_rock_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/netherrack_rock_medium",
"y": 0
"model": "rocks:block/netherrack_rock_medium"
},
{
"model": "rocks:block/netherrack_rock_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/netherrack_rock_small",
"y": 0
"model": "rocks:block/netherrack_rock_small"
},
{
"model": "rocks:block/netherrack_rock_small",
@@ -56,8 +53,7 @@
],
"variation=tiny": [
{
"model": "rocks:block/netherrack_rock_tiny",
"y": 0
"model": "rocks:block/netherrack_rock_tiny"
},
{
"model": "rocks:block/netherrack_rock_tiny",

9
src/main/generated/assets/rocks/blockstates/oak_stick.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/oak_stick_large",
"y": 0
"model": "rocks:block/oak_stick_large"
},
{
"model": "rocks:block/oak_stick_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/oak_stick_medium",
"y": 0
"model": "rocks:block/oak_stick_medium"
},
{
"model": "rocks:block/oak_stick_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/oak_stick_small",
"y": 0
"model": "rocks:block/oak_stick_small"
},
{
"model": "rocks:block/oak_stick_small",

9
src/main/generated/assets/rocks/blockstates/pale_oak_stick.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/pale_oak_stick_large",
"y": 0
"model": "rocks:block/pale_oak_stick_large"
},
{
"model": "rocks:block/pale_oak_stick_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/pale_oak_stick_medium",
"y": 0
"model": "rocks:block/pale_oak_stick_medium"
},
{
"model": "rocks:block/pale_oak_stick_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/pale_oak_stick_small",
"y": 0
"model": "rocks:block/pale_oak_stick_small"
},
{
"model": "rocks:block/pale_oak_stick_small",

12
src/main/generated/assets/rocks/blockstates/red_sand_rock.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/red_sand_rock_large",
"y": 0
"model": "rocks:block/red_sand_rock_large"
},
{
"model": "rocks:block/red_sand_rock_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/red_sand_rock_medium",
"y": 0
"model": "rocks:block/red_sand_rock_medium"
},
{
"model": "rocks:block/red_sand_rock_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/red_sand_rock_small",
"y": 0
"model": "rocks:block/red_sand_rock_small"
},
{
"model": "rocks:block/red_sand_rock_small",
@@ -56,8 +53,7 @@
],
"variation=tiny": [
{
"model": "rocks:block/red_sand_rock_tiny",
"y": 0
"model": "rocks:block/red_sand_rock_tiny"
},
{
"model": "rocks:block/red_sand_rock_tiny",

12
src/main/generated/assets/rocks/blockstates/rock.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/rock_large",
"y": 0
"model": "rocks:block/rock_large"
},
{
"model": "rocks:block/rock_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/rock_medium",
"y": 0
"model": "rocks:block/rock_medium"
},
{
"model": "rocks:block/rock_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/rock_small",
"y": 0
"model": "rocks:block/rock_small"
},
{
"model": "rocks:block/rock_small",
@@ -56,8 +53,7 @@
],
"variation=tiny": [
{
"model": "rocks:block/rock_tiny",
"y": 0
"model": "rocks:block/rock_tiny"
},
{
"model": "rocks:block/rock_tiny",

12
src/main/generated/assets/rocks/blockstates/sand_rock.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/sand_rock_large",
"y": 0
"model": "rocks:block/sand_rock_large"
},
{
"model": "rocks:block/sand_rock_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/sand_rock_medium",
"y": 0
"model": "rocks:block/sand_rock_medium"
},
{
"model": "rocks:block/sand_rock_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/sand_rock_small",
"y": 0
"model": "rocks:block/sand_rock_small"
},
{
"model": "rocks:block/sand_rock_small",
@@ -56,8 +53,7 @@
],
"variation=tiny": [
{
"model": "rocks:block/sand_rock_tiny",
"y": 0
"model": "rocks:block/sand_rock_tiny"
},
{
"model": "rocks:block/sand_rock_tiny",

12
src/main/generated/assets/rocks/blockstates/soul_soil_rock.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/soul_soil_rock_large",
"y": 0
"model": "rocks:block/soul_soil_rock_large"
},
{
"model": "rocks:block/soul_soil_rock_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/soul_soil_rock_medium",
"y": 0
"model": "rocks:block/soul_soil_rock_medium"
},
{
"model": "rocks:block/soul_soil_rock_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/soul_soil_rock_small",
"y": 0
"model": "rocks:block/soul_soil_rock_small"
},
{
"model": "rocks:block/soul_soil_rock_small",
@@ -56,8 +53,7 @@
],
"variation=tiny": [
{
"model": "rocks:block/soul_soil_rock_tiny",
"y": 0
"model": "rocks:block/soul_soil_rock_tiny"
},
{
"model": "rocks:block/soul_soil_rock_tiny",

9
src/main/generated/assets/rocks/blockstates/spruce_stick.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/spruce_stick_large",
"y": 0
"model": "rocks:block/spruce_stick_large"
},
{
"model": "rocks:block/spruce_stick_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/spruce_stick_medium",
"y": 0
"model": "rocks:block/spruce_stick_medium"
},
{
"model": "rocks:block/spruce_stick_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/spruce_stick_small",
"y": 0
"model": "rocks:block/spruce_stick_small"
},
{
"model": "rocks:block/spruce_stick_small",

9
src/main/generated/assets/rocks/blockstates/warped_stick.json
View File

@@ -2,8 +2,7 @@
"variants": {
"variation=large": [
{
"model": "rocks:block/warped_stick_large",
"y": 0
"model": "rocks:block/warped_stick_large"
},
{
"model": "rocks:block/warped_stick_large",
@@ -20,8 +19,7 @@
],
"variation=medium": [
{
"model": "rocks:block/warped_stick_medium",
"y": 0
"model": "rocks:block/warped_stick_medium"
},
{
"model": "rocks:block/warped_stick_medium",
@@ -38,8 +36,7 @@
],
"variation=small": [
{
"model": "rocks:block/warped_stick_small",
"y": 0
"model": "rocks:block/warped_stick_small"
},
{
"model": "rocks:block/warped_stick_small",

32
src/main/java/eu/midnightdust/motschen/rocks/datagen/Models.java
View File

@@ -9,9 +9,13 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
import net.minecraft.block.Block;
import net.minecraft.client.data.*;
import net.minecraft.client.render.item.model.ItemModel;
import net.minecraft.client.render.model.json.ModelVariant;
import net.minecraft.client.render.model.json.WeightedVariant;
import net.minecraft.item.Item;
import net.minecraft.registry.Registries;
import net.minecraft.util.Identifier;
import net.minecraft.util.collection.Pool;
import net.minecraft.util.math.AxisRotation;
import java.util.*;
@@ -77,13 +81,13 @@ public class Models extends FabricModelProvider {
modelGenerator.output.accept(starfish.asItem(), ItemModels.select(RocksMain.STARFISH_VARIATION, ItemModels.basic(ModelIds.getItemModelId(starfish.asItem())), variantMap));
}
public static <T> List<BlockStateVariant> getRandomRotationVariants(VariantSetting<T> baseSettings, T value) {
List<BlockStateVariant> list = new ArrayList<>();
for (VariantSettings.Rotation rotation : VariantSettings.Rotation.values()) {
BlockStateVariant rotatedVariant = BlockStateVariant.create().put(baseSettings, value);
list.add(rotatedVariant.put(VariantSettings.Y, rotation));
public static WeightedVariant getRandomRotationWeightedVariant(Identifier modelId) {
Pool.Builder<ModelVariant> list = Pool.builder();
for (AxisRotation rotation : AxisRotation.values()) {
ModelVariant rotatedVariant = new ModelVariant(modelId, ModelVariant.ModelState.DEFAULT.setRotationY(rotation));
list.add(rotatedVariant);
}
return list;
return new WeightedVariant(list.build());
}
private static class RockModel {
@@ -97,10 +101,10 @@ public class Models extends FabricModelProvider {
modelGenerator.blockStateCollector.accept(createBlockState(rockBlock, new Identifier[]{largeRock, mediumRock, smallRock, tinyRock}));
}
private static BlockStateSupplier createBlockState(Block rockBlock, Identifier[] modelIds) {
return VariantsBlockStateSupplier.create(rockBlock)
.coordinate(BlockStateVariantMap.create(RocksMain.ROCK_VARIATION)
.registerVariants(variation -> getRandomRotationVariants(VariantSettings.MODEL, modelIds[3 - variation.ordinal()]))
private static BlockModelDefinitionCreator createBlockState(Block rockBlock, Identifier[] modelIds) {
return VariantsBlockModelDefinitionCreator.of(rockBlock)
.with(BlockStateVariantMap.models(RocksMain.ROCK_VARIATION)
.generate(variation -> getRandomRotationWeightedVariant(modelIds[3 - variation.ordinal()]))
);
}
}
@@ -114,10 +118,10 @@ public class Models extends FabricModelProvider {
modelGenerator.blockStateCollector.accept(createBlockState(stickBlock, new Identifier[]{largeRock, mediumRock, smallRock}));
}
private static BlockStateSupplier createBlockState(Block stickBlock, Identifier[] modelIds) {
return VariantsBlockStateSupplier.create(stickBlock)
.coordinate(BlockStateVariantMap.create(RocksMain.STICK_VARIATION)
.registerVariants(variation -> getRandomRotationVariants(VariantSettings.MODEL, modelIds[2 - variation.ordinal()]))
private static BlockModelDefinitionCreator createBlockState(Block stickBlock, Identifier[] modelIds) {
return VariantsBlockModelDefinitionCreator.of(stickBlock)
.with(BlockStateVariantMap.models(RocksMain.STICK_VARIATION)
.generate(variation -> getRandomRotationWeightedVariant(modelIds[2 - variation.ordinal()]))
);
}
}

8
src/main/java/eu/midnightdust/motschen/rocks/world/FeatureRegistry.java
View File

@@ -9,7 +9,7 @@ import net.minecraft.block.BlockState;
import net.minecraft.registry.Registries;
import net.minecraft.registry.Registry;
import net.minecraft.state.property.Properties;
import net.minecraft.util.collection.DataPool;
import net.minecraft.util.collection.Pool;
import net.minecraft.world.gen.ProbabilityConfig;
import net.minecraft.world.gen.feature.Feature;
import net.minecraft.world.gen.feature.FeatureConfig;
@@ -27,17 +27,17 @@ public class FeatureRegistry {
return Registry.register(Registries.FEATURE, name, feature);
}
private static final WeightedBlockStateProvider StarfishStates = new WeightedBlockStateProvider(DataPool.<BlockState>builder()
private static final WeightedBlockStateProvider StarfishStates = new WeightedBlockStateProvider(Pool.<BlockState>builder()
.add(RocksMain.Starfish.getDefaultState().with(RocksMain.STARFISH_VARIATION, StarfishVariation.RED).with(Properties.WATERLOGGED, true), 6)
.add(RocksMain.Starfish.getDefaultState().with(RocksMain.STARFISH_VARIATION,StarfishVariation.PINK).with(Properties.WATERLOGGED, true), 7)
.add(RocksMain.Starfish.getDefaultState().with(RocksMain.STARFISH_VARIATION,StarfishVariation.ORANGE).with(Properties.WATERLOGGED, true), 2).build());
private static final WeightedBlockStateProvider SeashellStates = new WeightedBlockStateProvider(DataPool.<BlockState>builder()
private static final WeightedBlockStateProvider SeashellStates = new WeightedBlockStateProvider(Pool.<BlockState>builder()
.add(RocksMain.Seashell.getDefaultState().with(RocksMain.SEASHELL_VARIATION, SeashellVariation.YELLOW).with(Properties.WATERLOGGED, true), 7)
.add(RocksMain.Seashell.getDefaultState().with(RocksMain.SEASHELL_VARIATION,SeashellVariation.PINK).with(Properties.WATERLOGGED, true), 2)
.add(RocksMain.Seashell.getDefaultState().with(RocksMain.SEASHELL_VARIATION,SeashellVariation.WHITE).with(Properties.WATERLOGGED, true), 6).build());
private static final WeightedBlockStateProvider GeyserStates = new WeightedBlockStateProvider(DataPool.<BlockState>builder()
private static final WeightedBlockStateProvider GeyserStates = new WeightedBlockStateProvider(Pool.<BlockState>builder()
.add(RocksMain.Geyser.getDefaultState().with(Properties.SNOWY, true), 1).build());
static {

8
src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/MiscFeatures.java
View File

@@ -9,7 +9,7 @@ import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.registry.Registerable;
import net.minecraft.registry.entry.RegistryEntry;
import net.minecraft.util.collection.DataPool;
import net.minecraft.util.collection.Pool;
import net.minecraft.util.math.Vec3i;
import net.minecraft.world.gen.ProbabilityConfig;
import net.minecraft.world.gen.blockpredicate.BlockPredicate;
@@ -23,19 +23,19 @@ import static eu.midnightdust.motschen.rocks.util.RegistryUtil.register;
public class MiscFeatures {
private static final ConfiguredFeature<?, ?> SEASHELL_FEATURE = new ConfiguredFeature<>(Feature.SIMPLE_BLOCK, new SimpleBlockFeatureConfig(
new WeightedBlockStateProvider(DataPool.<BlockState>builder()
new WeightedBlockStateProvider(Pool.<BlockState>builder()
.add(RocksMain.Seashell.getDefaultState().with(RocksMain.SEASHELL_VARIATION,SeashellVariation.YELLOW), 7)
.add(RocksMain.Seashell.getDefaultState().with(RocksMain.SEASHELL_VARIATION,SeashellVariation.PINK), 2)
.add(RocksMain.Seashell.getDefaultState().with(RocksMain.SEASHELL_VARIATION,SeashellVariation.WHITE), 6).build()
)));
public static ConfiguredFeature<?, ?> STARFISH_FEATURE = new ConfiguredFeature<>(Feature.SIMPLE_BLOCK, new SimpleBlockFeatureConfig(
new WeightedBlockStateProvider(DataPool.<BlockState>builder()
new WeightedBlockStateProvider(Pool.<BlockState>builder()
.add(RocksMain.Starfish.getDefaultState().with(RocksMain.STARFISH_VARIATION,StarfishVariation.RED), 2)
.add(RocksMain.Starfish.getDefaultState().with(RocksMain.STARFISH_VARIATION,StarfishVariation.PINK), 6)
.add(RocksMain.Starfish.getDefaultState().with(RocksMain.STARFISH_VARIATION,StarfishVariation.ORANGE), 7).build()))
);
public static ConfiguredFeature<?, ?> PINECONE_FEATURE = new ConfiguredFeature<>(Feature.SIMPLE_BLOCK, new SimpleBlockFeatureConfig(
new WeightedBlockStateProvider(DataPool.<BlockState>builder()
new WeightedBlockStateProvider(Pool.<BlockState>builder()
.add(RocksMain.Pinecone.getDefaultState(), 1).build()))
);

4
src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/NetherFeatures.java
View File

@@ -6,7 +6,7 @@ import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.registry.Registerable;
import net.minecraft.registry.entry.RegistryEntry;
import net.minecraft.util.collection.DataPool;
import net.minecraft.util.collection.Pool;
import net.minecraft.util.math.Vec3i;
import net.minecraft.world.gen.blockpredicate.BlockPredicate;
import net.minecraft.world.gen.feature.*;
@@ -19,7 +19,7 @@ import static eu.midnightdust.motschen.rocks.util.RegistryUtil.register;
public class NetherFeatures {
public static ConfiguredFeature<?, ?> NETHER_GEYSER_FEATURE = new ConfiguredFeature<>(Feature.SIMPLE_BLOCK, new SimpleBlockFeatureConfig(
new WeightedBlockStateProvider(DataPool.<BlockState>builder().add(RocksMain.NetherGeyser.getDefaultState(), 1)))
new WeightedBlockStateProvider(Pool.<BlockState>builder().add(RocksMain.NetherGeyser.getDefaultState(), 1)))
);
public static PlacedFeature NETHER_GEYSER_PLACED_FEATURE = new PlacedFeature(RegistryEntry.of(NETHER_GEYSER_FEATURE),

8
src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/RockFeatures.java
View File

@@ -8,7 +8,7 @@ import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.registry.*;
import net.minecraft.registry.entry.RegistryEntry;
import net.minecraft.util.collection.DataPool;
import net.minecraft.util.collection.Pool;
import net.minecraft.util.math.Vec3i;
import net.minecraft.world.gen.blockpredicate.BlockPredicate;
import net.minecraft.world.gen.feature.*;
@@ -46,7 +46,7 @@ public class RockFeatures {
BlockFilterPlacementModifier.of(BlockPredicate.bothOf(BlockPredicate.IS_AIR, BlockPredicate.matchingBlocks(new Vec3i(0, -1, 0), groundBlocks))));
}
public static ConfiguredFeature<?, ?> ROCK_MIX_FEATURE = new ConfiguredFeature<>(Feature.SIMPLE_BLOCK, new SimpleBlockFeatureConfig(
new WeightedBlockStateProvider(DataPool.<BlockState>builder()
new WeightedBlockStateProvider(Pool.<BlockState>builder()
.add(rocksByType.get(RockType.GRANITE).getDefaultState().with(ROCK_VARIATION,RockVariation.TINY), 10).add(rocksByType.get(RockType.GRANITE).getDefaultState().with(ROCK_VARIATION,RockVariation.SMALL), 7)
.add(rocksByType.get(RockType.GRANITE).getDefaultState().with(ROCK_VARIATION,RockVariation.MEDIUM), 5).add(rocksByType.get(RockType.GRANITE).getDefaultState().with(ROCK_VARIATION,RockVariation.LARGE), 1)
.add(rocksByType.get(RockType.DIORITE).getDefaultState().with(ROCK_VARIATION,RockVariation.TINY), 10).add(rocksByType.get(RockType.DIORITE).getDefaultState().with(ROCK_VARIATION,RockVariation.SMALL), 7)
@@ -56,7 +56,7 @@ public class RockFeatures {
.build()))
);
public static ConfiguredFeature<?, ?> NETHER_GRAVEL_ROCK_FEATURE = new ConfiguredFeature<>(Feature.SIMPLE_BLOCK, new SimpleBlockFeatureConfig(
new WeightedBlockStateProvider(DataPool.<BlockState>builder()
new WeightedBlockStateProvider(Pool.<BlockState>builder()
.add(rocksByType.get(RockType.GRAVEL).getDefaultState().with(RocksMain.ROCK_VARIATION, RockVariation.TINY), 10)
.add(rocksByType.get(RockType.GRAVEL).getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.SMALL), 7)
.add(rocksByType.get(RockType.GRAVEL).getDefaultState().with(RocksMain.ROCK_VARIATION,RockVariation.MEDIUM), 5)
@@ -69,7 +69,7 @@ public class RockFeatures {
public static void init() {
for (RockType type : RockType.values()) {
ConfiguredFeature<?, ?> ROCK_FEATURE = new ConfiguredFeature<>(Feature.SIMPLE_BLOCK, new SimpleBlockFeatureConfig(
new WeightedBlockStateProvider(DataPool.<BlockState>builder()
new WeightedBlockStateProvider(Pool.<BlockState>builder()
.add(rocksByType.get(type).getDefaultState().with(ROCK_VARIATION, RockVariation.TINY), 10)
.add(rocksByType.get(type).getDefaultState().with(ROCK_VARIATION, RockVariation.SMALL), 7)
.add(rocksByType.get(type).getDefaultState().with(ROCK_VARIATION, RockVariation.MEDIUM), 5)

4
src/main/java/eu/midnightdust/motschen/rocks/world/configured_feature/StickFeatures.java
View File

@@ -7,7 +7,7 @@ import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.registry.Registerable;
import net.minecraft.registry.entry.RegistryEntry;
import net.minecraft.util.collection.DataPool;
import net.minecraft.util.collection.Pool;
import net.minecraft.util.math.Vec3i;
import net.minecraft.world.gen.blockpredicate.BlockPredicate;
import net.minecraft.world.gen.feature.*;
@@ -41,7 +41,7 @@ public class StickFeatures {
public static void init() {
for (StickType type : StickType.values()) {
ConfiguredFeature<?, ?> STICK_FEATURE = new ConfiguredFeature<>(Feature.SIMPLE_BLOCK, new SimpleBlockFeatureConfig(
new WeightedBlockStateProvider(DataPool.<BlockState>builder()
new WeightedBlockStateProvider(Pool.<BlockState>builder()
.add(sticksByType.get(type).getDefaultState().with(STICK_VARIATION, StickVariation.SMALL), 7)
.add(sticksByType.get(type).getDefaultState().with(STICK_VARIATION, StickVariation.MEDIUM), 5)
.add(sticksByType.get(type).getDefaultState().with(STICK_VARIATION, StickVariation.LARGE), 1).build()))