diff --git a/build.gradle b/build.gradle index fa96b2fbd..11bda0980 100644 --- a/build.gradle +++ b/build.gradle @@ -90,6 +90,22 @@ dependencies { prefer "${project.terrablender_version}" } } + implementation "net.zepalesque.unity:aether_unity:${project.mc_version}-${project.unity_version}-neoforge" + jarJar("net.zepalesque.unity:aether_unity:${project.mc_version}-${project.unity_version}-neoforge") { + version { + strictly "[${project.mc_version}-${project.unity_version},)" + prefer "${project.mc_version}-${project.unity_version}" + } + } + + // Unity Dependency + implementation "net.zepalesque.zenith:zenith:${project.mc_version}-${zenith_version}-neoforge" + jarJar("net.zepalesque.zenith:zenith:${project.mc_version}-${project.zenith_version}-neoforge") { + version { + strictly "[${project.mc_version}-${project.zenith_version},)" + prefer "${project.mc_version}-${project.zenith_version}" + } + } //Optional Dependencies compileOnly("mezz.jei:jei-${project.mc_version}-common-api:${project.jei_version}") @@ -101,6 +117,8 @@ repositories { maven githubPackage.invoke("The-Aether-Team/Nitrogen") maven githubPackage.invoke("The-Aether-Team/Cumulus") maven githubPackage.invoke("The-Aether-Team/Protect-Your-Moa") + maven githubPackage.invoke("Zepalesque/The-Aether-Unity") + maven githubPackage.invoke("Zepalesque/Zenith") maven { url = "https://maven.theillusivec4.top/" } maven { url = 'https://maven.minecraftforge.net/' } maven { url = "https://maven.wispforest.io" } diff --git a/gradle.properties b/gradle.properties index 41e0f959c..079f736cc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,15 +27,19 @@ mod_authors=RazorDevs mod_description=Deep Aether is an unofficial addon for the Aether Mod which aims to add extra content to the Aether Dimension in a similar fashion to the 1.16 Nether Expansion update.\nExtra content includes new blocks, items, plants, biomes, trees, mobs, and more!\nCreated by RazorDevs! # Dependencies -aether_version=1.21.1-1.5.1-beta.3-neoforge +aether_version=1.21.1-1.5.1-neoforge nitrogen_version=1.21.1-1.1.19-neoforge -cumulus_version=1.21.1-1.1.0-neoforge +cumulus_version=1.21.1-2.0.0-neoforge accessories_version=1.1.0-beta.16 cloth_config_version=15.0.140 # Included Dependencies aeroblender_version=1.21.1-1.0.0-neoforge terrablender_version=1.21.1-4.1.0.3 +unity_version=0.0.7 + +# Unity Dependency +zenith_version=1.2.02 # Optional Dependencies jei_version=19.21.0.246 \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/blockstates/aether_coarse_dirt.json b/src/generated/resources/assets/deep_aether/blockstates/aether_coarse_dirt.json deleted file mode 100644 index c24ca49fc..000000000 --- a/src/generated/resources/assets/deep_aether/blockstates/aether_coarse_dirt.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "deep_aether:block/aether_coarse_dirt" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/blockstates/aether_moss_block.json b/src/generated/resources/assets/deep_aether/blockstates/aether_moss_block.json deleted file mode 100644 index e92443405..000000000 --- a/src/generated/resources/assets/deep_aether/blockstates/aether_moss_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "deep_aether:block/aether_moss_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/blockstates/aether_mud.json b/src/generated/resources/assets/deep_aether/blockstates/aether_mud.json deleted file mode 100644 index 6ed924504..000000000 --- a/src/generated/resources/assets/deep_aether/blockstates/aether_mud.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "deep_aether:block/aether_mud" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/blockstates/aether_mud_bricks.json b/src/generated/resources/assets/deep_aether/blockstates/aether_mud_bricks.json deleted file mode 100644 index 181a0fda1..000000000 --- a/src/generated/resources/assets/deep_aether/blockstates/aether_mud_bricks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "deep_aether:block/aether_mud_bricks" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/blockstates/aether_mud_bricks_slab.json b/src/generated/resources/assets/deep_aether/blockstates/aether_mud_bricks_slab.json deleted file mode 100644 index 86e3fdbb6..000000000 --- a/src/generated/resources/assets/deep_aether/blockstates/aether_mud_bricks_slab.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "variants": { - "type=bottom": { - "model": "deep_aether:block/aether_mud_bricks_slab" - }, - "type=double": { - "model": "deep_aether:block/aether_mud_bricks" - }, - "type=top": { - "model": "deep_aether:block/aether_mud_bricks_slab_top" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/blockstates/aether_mud_bricks_stairs.json b/src/generated/resources/assets/deep_aether/blockstates/aether_mud_bricks_stairs.json deleted file mode 100644 index 75c4a62c0..000000000 --- a/src/generated/resources/assets/deep_aether/blockstates/aether_mud_bricks_stairs.json +++ /dev/null @@ -1,209 +0,0 @@ -{ - "variants": { - "facing=east,half=bottom,shape=inner_left": { - "model": "deep_aether:block/aether_mud_bricks_stairs_inner", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=inner_right": { - "model": "deep_aether:block/aether_mud_bricks_stairs_inner" - }, - "facing=east,half=bottom,shape=outer_left": { - "model": "deep_aether:block/aether_mud_bricks_stairs_outer", - "uvlock": true, - "y": 270 - }, - "facing=east,half=bottom,shape=outer_right": { - "model": "deep_aether:block/aether_mud_bricks_stairs_outer" - }, - "facing=east,half=bottom,shape=straight": { - "model": "deep_aether:block/aether_mud_bricks_stairs" - }, - "facing=east,half=top,shape=inner_left": { - "model": "deep_aether:block/aether_mud_bricks_stairs_inner", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=inner_right": { - "model": "deep_aether:block/aether_mud_bricks_stairs_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=outer_left": { - "model": "deep_aether:block/aether_mud_bricks_stairs_outer", - "uvlock": true, - "x": 180 - }, - "facing=east,half=top,shape=outer_right": { - "model": "deep_aether:block/aether_mud_bricks_stairs_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=east,half=top,shape=straight": { - "model": "deep_aether:block/aether_mud_bricks_stairs", - "uvlock": true, - "x": 180 - }, - "facing=north,half=bottom,shape=inner_left": { - "model": "deep_aether:block/aether_mud_bricks_stairs_inner", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=inner_right": { - "model": "deep_aether:block/aether_mud_bricks_stairs_inner", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=outer_left": { - "model": "deep_aether:block/aether_mud_bricks_stairs_outer", - "uvlock": true, - "y": 180 - }, - "facing=north,half=bottom,shape=outer_right": { - "model": "deep_aether:block/aether_mud_bricks_stairs_outer", - "uvlock": true, - "y": 270 - }, - "facing=north,half=bottom,shape=straight": { - "model": "deep_aether:block/aether_mud_bricks_stairs", - "uvlock": true, - "y": 270 - }, - "facing=north,half=top,shape=inner_left": { - "model": "deep_aether:block/aether_mud_bricks_stairs_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=inner_right": { - "model": "deep_aether:block/aether_mud_bricks_stairs_inner", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=outer_left": { - "model": "deep_aether:block/aether_mud_bricks_stairs_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=north,half=top,shape=outer_right": { - "model": "deep_aether:block/aether_mud_bricks_stairs_outer", - "uvlock": true, - "x": 180 - }, - "facing=north,half=top,shape=straight": { - "model": "deep_aether:block/aether_mud_bricks_stairs", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=south,half=bottom,shape=inner_left": { - "model": "deep_aether:block/aether_mud_bricks_stairs_inner" - }, - "facing=south,half=bottom,shape=inner_right": { - "model": "deep_aether:block/aether_mud_bricks_stairs_inner", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=outer_left": { - "model": "deep_aether:block/aether_mud_bricks_stairs_outer" - }, - "facing=south,half=bottom,shape=outer_right": { - "model": "deep_aether:block/aether_mud_bricks_stairs_outer", - "uvlock": true, - "y": 90 - }, - "facing=south,half=bottom,shape=straight": { - "model": "deep_aether:block/aether_mud_bricks_stairs", - "uvlock": true, - "y": 90 - }, - "facing=south,half=top,shape=inner_left": { - "model": "deep_aether:block/aether_mud_bricks_stairs_inner", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=inner_right": { - "model": "deep_aether:block/aether_mud_bricks_stairs_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=outer_left": { - "model": "deep_aether:block/aether_mud_bricks_stairs_outer", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=south,half=top,shape=outer_right": { - "model": "deep_aether:block/aether_mud_bricks_stairs_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=south,half=top,shape=straight": { - "model": "deep_aether:block/aether_mud_bricks_stairs", - "uvlock": true, - "x": 180, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_left": { - "model": "deep_aether:block/aether_mud_bricks_stairs_inner", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=inner_right": { - "model": "deep_aether:block/aether_mud_bricks_stairs_inner", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=outer_left": { - "model": "deep_aether:block/aether_mud_bricks_stairs_outer", - "uvlock": true, - "y": 90 - }, - "facing=west,half=bottom,shape=outer_right": { - "model": "deep_aether:block/aether_mud_bricks_stairs_outer", - "uvlock": true, - "y": 180 - }, - "facing=west,half=bottom,shape=straight": { - "model": "deep_aether:block/aether_mud_bricks_stairs", - "uvlock": true, - "y": 180 - }, - "facing=west,half=top,shape=inner_left": { - "model": "deep_aether:block/aether_mud_bricks_stairs_inner", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=inner_right": { - "model": "deep_aether:block/aether_mud_bricks_stairs_inner", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=outer_left": { - "model": "deep_aether:block/aether_mud_bricks_stairs_outer", - "uvlock": true, - "x": 180, - "y": 180 - }, - "facing=west,half=top,shape=outer_right": { - "model": "deep_aether:block/aether_mud_bricks_stairs_outer", - "uvlock": true, - "x": 180, - "y": 270 - }, - "facing=west,half=top,shape=straight": { - "model": "deep_aether:block/aether_mud_bricks_stairs", - "uvlock": true, - "x": 180, - "y": 180 - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/blockstates/aether_mud_bricks_wall.json b/src/generated/resources/assets/deep_aether/blockstates/aether_mud_bricks_wall.json deleted file mode 100644 index b488fe7b4..000000000 --- a/src/generated/resources/assets/deep_aether/blockstates/aether_mud_bricks_wall.json +++ /dev/null @@ -1,90 +0,0 @@ -{ - "multipart": [ - { - "apply": { - "model": "deep_aether:block/aether_mud_bricks_wall_post" - }, - "when": { - "up": "true" - } - }, - { - "apply": { - "model": "deep_aether:block/aether_mud_bricks_wall_side", - "uvlock": true, - "y": 90 - }, - "when": { - "east": "low" - } - }, - { - "apply": { - "model": "deep_aether:block/aether_mud_bricks_wall_side_tall", - "uvlock": true, - "y": 90 - }, - "when": { - "east": "tall" - } - }, - { - "apply": { - "model": "deep_aether:block/aether_mud_bricks_wall_side", - "uvlock": true - }, - "when": { - "north": "low" - } - }, - { - "apply": { - "model": "deep_aether:block/aether_mud_bricks_wall_side_tall", - "uvlock": true - }, - "when": { - "north": "tall" - } - }, - { - "apply": { - "model": "deep_aether:block/aether_mud_bricks_wall_side", - "uvlock": true, - "y": 180 - }, - "when": { - "south": "low" - } - }, - { - "apply": { - "model": "deep_aether:block/aether_mud_bricks_wall_side_tall", - "uvlock": true, - "y": 180 - }, - "when": { - "south": "tall" - } - }, - { - "apply": { - "model": "deep_aether:block/aether_mud_bricks_wall_side", - "uvlock": true, - "y": 270 - }, - "when": { - "west": "low" - } - }, - { - "apply": { - "model": "deep_aether:block/aether_mud_bricks_wall_side_tall", - "uvlock": true, - "y": 270 - }, - "when": { - "west": "tall" - } - } - ] -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/blockstates/packed_aether_mud.json b/src/generated/resources/assets/deep_aether/blockstates/packed_aether_mud.json deleted file mode 100644 index 2c1db5763..000000000 --- a/src/generated/resources/assets/deep_aether/blockstates/packed_aether_mud.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "deep_aether:block/packed_aether_mud" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/models/block/aether_coarse_dirt.json b/src/generated/resources/assets/deep_aether/models/block/aether_coarse_dirt.json deleted file mode 100644 index 1a36e786f..000000000 --- a/src/generated/resources/assets/deep_aether/models/block/aether_coarse_dirt.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "deep_aether:block/aether_coarse_dirt" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/models/block/aether_moss_block.json b/src/generated/resources/assets/deep_aether/models/block/aether_moss_block.json deleted file mode 100644 index 7d81404a0..000000000 --- a/src/generated/resources/assets/deep_aether/models/block/aether_moss_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "deep_aether:block/aether_moss_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/models/block/aether_mud.json b/src/generated/resources/assets/deep_aether/models/block/aether_mud.json deleted file mode 100644 index 2fb3d8a40..000000000 --- a/src/generated/resources/assets/deep_aether/models/block/aether_mud.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "deep_aether:block/aether_mud" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks.json b/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks.json deleted file mode 100644 index c8371763e..000000000 --- a/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "deep_aether:block/aether_mud_bricks" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_slab.json b/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_slab.json deleted file mode 100644 index 6d3efb652..000000000 --- a/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_slab.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab", - "textures": { - "bottom": "deep_aether:block/aether_mud_bricks", - "side": "deep_aether:block/aether_mud_bricks", - "top": "deep_aether:block/aether_mud_bricks" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_slab_top.json b/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_slab_top.json deleted file mode 100644 index 5bdc9a168..000000000 --- a/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_slab_top.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/slab_top", - "textures": { - "bottom": "deep_aether:block/aether_mud_bricks", - "side": "deep_aether:block/aether_mud_bricks", - "top": "deep_aether:block/aether_mud_bricks" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_stairs.json b/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_stairs.json deleted file mode 100644 index 165923122..000000000 --- a/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_stairs.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/stairs", - "textures": { - "bottom": "deep_aether:block/aether_mud_bricks", - "side": "deep_aether:block/aether_mud_bricks", - "top": "deep_aether:block/aether_mud_bricks" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_stairs_inner.json b/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_stairs_inner.json deleted file mode 100644 index 95970e774..000000000 --- a/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_stairs_inner.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/inner_stairs", - "textures": { - "bottom": "deep_aether:block/aether_mud_bricks", - "side": "deep_aether:block/aether_mud_bricks", - "top": "deep_aether:block/aether_mud_bricks" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_stairs_outer.json b/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_stairs_outer.json deleted file mode 100644 index 4dd525f15..000000000 --- a/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_stairs_outer.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/outer_stairs", - "textures": { - "bottom": "deep_aether:block/aether_mud_bricks", - "side": "deep_aether:block/aether_mud_bricks", - "top": "deep_aether:block/aether_mud_bricks" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_wall_post.json b/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_wall_post.json deleted file mode 100644 index 827d0e317..000000000 --- a/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_wall_post.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_post", - "textures": { - "wall": "deep_aether:block/aether_mud_bricks" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_wall_side.json b/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_wall_side.json deleted file mode 100644 index 3f9417fb9..000000000 --- a/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_wall_side.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_side", - "textures": { - "wall": "deep_aether:block/aether_mud_bricks" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_wall_side_tall.json b/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_wall_side_tall.json deleted file mode 100644 index fa4f9e8c2..000000000 --- a/src/generated/resources/assets/deep_aether/models/block/aether_mud_bricks_wall_side_tall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_wall_side_tall", - "textures": { - "wall": "deep_aether:block/aether_mud_bricks" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/models/block/packed_aether_mud.json b/src/generated/resources/assets/deep_aether/models/block/packed_aether_mud.json deleted file mode 100644 index 987f442f9..000000000 --- a/src/generated/resources/assets/deep_aether/models/block/packed_aether_mud.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "deep_aether:block/packed_aether_mud" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/models/item/aether_coarse_dirt.json b/src/generated/resources/assets/deep_aether/models/item/aether_coarse_dirt.json deleted file mode 100644 index f947c146d..000000000 --- a/src/generated/resources/assets/deep_aether/models/item/aether_coarse_dirt.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "deep_aether:block/aether_coarse_dirt" -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/models/item/aether_moss_block.json b/src/generated/resources/assets/deep_aether/models/item/aether_moss_block.json deleted file mode 100644 index 1a7f78e4a..000000000 --- a/src/generated/resources/assets/deep_aether/models/item/aether_moss_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "deep_aether:block/aether_moss_block" -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/models/item/aether_moss_carpet.json b/src/generated/resources/assets/deep_aether/models/item/aether_moss_carpet.json deleted file mode 100644 index fe783855a..000000000 --- a/src/generated/resources/assets/deep_aether/models/item/aether_moss_carpet.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "deep_aether:block/aether_moss_carpet" -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/models/item/aether_mud.json b/src/generated/resources/assets/deep_aether/models/item/aether_mud.json deleted file mode 100644 index d8409c41a..000000000 --- a/src/generated/resources/assets/deep_aether/models/item/aether_mud.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "deep_aether:block/aether_mud" -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/models/item/aether_mud_bricks.json b/src/generated/resources/assets/deep_aether/models/item/aether_mud_bricks.json deleted file mode 100644 index bae7aac22..000000000 --- a/src/generated/resources/assets/deep_aether/models/item/aether_mud_bricks.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "deep_aether:block/aether_mud_bricks" -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/models/item/aether_mud_bricks_slab.json b/src/generated/resources/assets/deep_aether/models/item/aether_mud_bricks_slab.json deleted file mode 100644 index d00111f7e..000000000 --- a/src/generated/resources/assets/deep_aether/models/item/aether_mud_bricks_slab.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "deep_aether:block/aether_mud_bricks_slab" -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/models/item/aether_mud_bricks_stairs.json b/src/generated/resources/assets/deep_aether/models/item/aether_mud_bricks_stairs.json deleted file mode 100644 index 10e4df959..000000000 --- a/src/generated/resources/assets/deep_aether/models/item/aether_mud_bricks_stairs.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "deep_aether:block/aether_mud_bricks_stairs" -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/models/item/aether_mud_bricks_wall.json b/src/generated/resources/assets/deep_aether/models/item/aether_mud_bricks_wall.json deleted file mode 100644 index 83d08345d..000000000 --- a/src/generated/resources/assets/deep_aether/models/item/aether_mud_bricks_wall.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/wall_inventory", - "textures": { - "wall": "deep_aether:block/aether_mud_bricks" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/deep_aether/models/item/packed_aether_mud.json b/src/generated/resources/assets/deep_aether/models/item/packed_aether_mud.json deleted file mode 100644 index 95190976d..000000000 --- a/src/generated/resources/assets/deep_aether/models/item/packed_aether_mud.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "deep_aether:block/packed_aether_mud" -} \ No newline at end of file diff --git a/src/generated/resources/data/aether/tags/block/aether_dirt.json b/src/generated/resources/data/aether/tags/block/aether_dirt.json new file mode 100644 index 000000000..c457ceaef --- /dev/null +++ b/src/generated/resources/data/aether/tags/block/aether_dirt.json @@ -0,0 +1,6 @@ +{ + "values": [ + "deep_aether:golden_heights_grass_block", + "deep_aether:aercloud_grass_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/aether_unity/tags/item/packed_aether_mud_crafting.json b/src/generated/resources/data/aether_unity/tags/item/packed_aether_mud_crafting.json new file mode 100644 index 000000000..f62db6a9b --- /dev/null +++ b/src/generated/resources/data/aether_unity/tags/item/packed_aether_mud_crafting.json @@ -0,0 +1,5 @@ +{ + "values": [ + "deep_aether:aerglow_blossom" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/advancement/recipes/building_blocks/aether_coarse_dirt.json b/src/generated/resources/data/deep_aether/advancement/recipes/building_blocks/aether_coarse_dirt.json deleted file mode 100644 index ef0164e04..000000000 --- a/src/generated/resources/data/deep_aether/advancement/recipes/building_blocks/aether_coarse_dirt.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_aether_dirt": { - "conditions": { - "items": [ - { - "items": "aether:aether_dirt" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "deep_aether:aether_coarse_dirt" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_aether_dirt" - ] - ], - "rewards": { - "recipes": [ - "deep_aether:aether_coarse_dirt" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/advancement/recipes/building_blocks/aether_mud_bricks_slab.json b/src/generated/resources/data/deep_aether/advancement/recipes/building_blocks/aether_mud_bricks_slab.json deleted file mode 100644 index 55eef2975..000000000 --- a/src/generated/resources/data/deep_aether/advancement/recipes/building_blocks/aether_mud_bricks_slab.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_aether_mud_bricks": { - "conditions": { - "items": [ - { - "items": "deep_aether:aether_mud_bricks" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "deep_aether:aether_mud_bricks_slab" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_aether_mud_bricks" - ] - ], - "rewards": { - "recipes": [ - "deep_aether:aether_mud_bricks_slab" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/advancement/recipes/building_blocks/aether_mud_bricks_stairs.json b/src/generated/resources/data/deep_aether/advancement/recipes/building_blocks/aether_mud_bricks_stairs.json deleted file mode 100644 index 3b6bbac0b..000000000 --- a/src/generated/resources/data/deep_aether/advancement/recipes/building_blocks/aether_mud_bricks_stairs.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_aether_mud_bricks": { - "conditions": { - "items": [ - { - "items": "deep_aether:aether_mud_bricks" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "deep_aether:aether_mud_bricks_stairs" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_aether_mud_bricks" - ] - ], - "rewards": { - "recipes": [ - "deep_aether:aether_mud_bricks_stairs" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/advancement/recipes/decorations/aerglow_blossom_block.json b/src/generated/resources/data/deep_aether/advancement/recipes/decorations/aerglow_blossom_block.json deleted file mode 100644 index 6ec5a1ab7..000000000 --- a/src/generated/resources/data/deep_aether/advancement/recipes/decorations/aerglow_blossom_block.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_aerglow_blossom": { - "conditions": { - "items": [ - { - "items": "deep_aether:aerglow_blossom" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "deep_aether:aerglow_blossom_block" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_aerglow_blossom" - ] - ], - "rewards": { - "recipes": [ - "deep_aether:aerglow_blossom_block" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/advancement/recipes/decorations/aether_moss_carpet.json b/src/generated/resources/data/deep_aether/advancement/recipes/decorations/aether_moss_carpet.json deleted file mode 100644 index 59006159f..000000000 --- a/src/generated/resources/data/deep_aether/advancement/recipes/decorations/aether_moss_carpet.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_aether_moss_block": { - "conditions": { - "items": [ - { - "items": "deep_aether:aether_moss_block" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "deep_aether:aether_moss_carpet" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_aether_moss_block" - ] - ], - "rewards": { - "recipes": [ - "deep_aether:aether_moss_carpet" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/advancement/recipes/decorations/aether_mud_bricks.json b/src/generated/resources/data/deep_aether/advancement/recipes/decorations/aether_mud_bricks.json deleted file mode 100644 index 4f6523993..000000000 --- a/src/generated/resources/data/deep_aether/advancement/recipes/decorations/aether_mud_bricks.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_packed_aether_mud": { - "conditions": { - "items": [ - { - "items": "deep_aether:packed_aether_mud" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "deep_aether:aether_mud_bricks" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_packed_aether_mud" - ] - ], - "rewards": { - "recipes": [ - "deep_aether:aether_mud_bricks" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/advancement/recipes/decorations/aether_mud_bricks_wall.json b/src/generated/resources/data/deep_aether/advancement/recipes/decorations/aether_mud_bricks_wall.json deleted file mode 100644 index e0c27ac6e..000000000 --- a/src/generated/resources/data/deep_aether/advancement/recipes/decorations/aether_mud_bricks_wall.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_aether_mud_bricks": { - "conditions": { - "items": [ - { - "items": "deep_aether:aether_mud_bricks" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "deep_aether:aether_mud_bricks_wall" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_aether_mud_bricks" - ] - ], - "rewards": { - "recipes": [ - "deep_aether:aether_mud_bricks_wall" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/advancement/recipes/decorations/mossy_holystone_bricks_from_aether_moss.json b/src/generated/resources/data/deep_aether/advancement/recipes/decorations/mossy_holystone_bricks_from_flutemoss.json similarity index 79% rename from src/generated/resources/data/deep_aether/advancement/recipes/decorations/mossy_holystone_bricks_from_aether_moss.json rename to src/generated/resources/data/deep_aether/advancement/recipes/decorations/mossy_holystone_bricks_from_flutemoss.json index e848ed20c..1169f0a67 100644 --- a/src/generated/resources/data/deep_aether/advancement/recipes/decorations/mossy_holystone_bricks_from_aether_moss.json +++ b/src/generated/resources/data/deep_aether/advancement/recipes/decorations/mossy_holystone_bricks_from_flutemoss.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "deep_aether:mossy_holystone_bricks_from_aether_moss" + "recipe": "deep_aether:mossy_holystone_bricks_from_flutemoss" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "deep_aether:mossy_holystone_bricks_from_aether_moss" + "deep_aether:mossy_holystone_bricks_from_flutemoss" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/advancement/recipes/decorations/mossy_holystone_from_aether_moss.json b/src/generated/resources/data/deep_aether/advancement/recipes/decorations/mossy_holystone_from_aether_moss.json deleted file mode 100644 index 37fe05119..000000000 --- a/src/generated/resources/data/deep_aether/advancement/recipes/decorations/mossy_holystone_from_aether_moss.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_holystone": { - "conditions": { - "items": [ - { - "items": "aether:holystone" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "deep_aether:mossy_holystone_from_aether_moss" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_holystone" - ] - ], - "rewards": { - "recipes": [ - "deep_aether:mossy_holystone_from_aether_moss" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/advancement/recipes/decorations/mossy_holystone_tiles_from_aether_moss.json b/src/generated/resources/data/deep_aether/advancement/recipes/decorations/mossy_holystone_tiles_from_flutemoss.json similarity index 79% rename from src/generated/resources/data/deep_aether/advancement/recipes/decorations/mossy_holystone_tiles_from_aether_moss.json rename to src/generated/resources/data/deep_aether/advancement/recipes/decorations/mossy_holystone_tiles_from_flutemoss.json index 90fcf9044..44899fae1 100644 --- a/src/generated/resources/data/deep_aether/advancement/recipes/decorations/mossy_holystone_tiles_from_aether_moss.json +++ b/src/generated/resources/data/deep_aether/advancement/recipes/decorations/mossy_holystone_tiles_from_flutemoss.json @@ -13,7 +13,7 @@ }, "has_the_recipe": { "conditions": { - "recipe": "deep_aether:mossy_holystone_tiles_from_aether_moss" + "recipe": "deep_aether:mossy_holystone_tiles_from_flutemoss" }, "trigger": "minecraft:recipe_unlocked" } @@ -26,7 +26,7 @@ ], "rewards": { "recipes": [ - "deep_aether:mossy_holystone_tiles_from_aether_moss" + "deep_aether:mossy_holystone_tiles_from_flutemoss" ] } } \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/advancement/recipes/decorations/muddy_yagroot_roots.json b/src/generated/resources/data/deep_aether/advancement/recipes/decorations/muddy_yagroot_roots.json deleted file mode 100644 index 198993858..000000000 --- a/src/generated/resources/data/deep_aether/advancement/recipes/decorations/muddy_yagroot_roots.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_aether_mud": { - "conditions": { - "items": [ - { - "items": "deep_aether:aether_mud" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "deep_aether:muddy_yagroot_roots" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_aether_mud" - ] - ], - "rewards": { - "recipes": [ - "deep_aether:muddy_yagroot_roots" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/advancement/recipes/decorations/packed_aether_mud.json b/src/generated/resources/data/deep_aether/advancement/recipes/decorations/packed_aether_mud.json deleted file mode 100644 index 51f21377a..000000000 --- a/src/generated/resources/data/deep_aether/advancement/recipes/decorations/packed_aether_mud.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "parent": "minecraft:recipes/root", - "criteria": { - "has_aether_mud": { - "conditions": { - "items": [ - { - "items": "deep_aether:aether_mud" - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_the_recipe": { - "conditions": { - "recipe": "deep_aether:packed_aether_mud" - }, - "trigger": "minecraft:recipe_unlocked" - } - }, - "requirements": [ - [ - "has_the_recipe", - "has_aether_mud" - ] - ], - "rewards": { - "recipes": [ - "deep_aether:packed_aether_mud" - ] - } -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/loot_table/blocks/aether_coarse_dirt.json b/src/generated/resources/data/deep_aether/loot_table/blocks/aether_coarse_dirt.json deleted file mode 100644 index 1ab4e1d36..000000000 --- a/src/generated/resources/data/deep_aether/loot_table/blocks/aether_coarse_dirt.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "aether:double_drops" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "deep_aether:aether_coarse_dirt" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "deep_aether:blocks/aether_coarse_dirt" -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/loot_table/blocks/aether_moss_block.json b/src/generated/resources/data/deep_aether/loot_table/blocks/aether_moss_block.json deleted file mode 100644 index b55a3bf2c..000000000 --- a/src/generated/resources/data/deep_aether/loot_table/blocks/aether_moss_block.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "deep_aether:aether_moss_block" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "deep_aether:blocks/aether_moss_block" -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/loot_table/blocks/aether_moss_carpet.json b/src/generated/resources/data/deep_aether/loot_table/blocks/aether_moss_carpet.json deleted file mode 100644 index 64cee5608..000000000 --- a/src/generated/resources/data/deep_aether/loot_table/blocks/aether_moss_carpet.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "deep_aether:aether_moss_carpet" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "deep_aether:blocks/aether_moss_carpet" -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/loot_table/blocks/aether_mud.json b/src/generated/resources/data/deep_aether/loot_table/blocks/aether_mud.json deleted file mode 100644 index 656d112b6..000000000 --- a/src/generated/resources/data/deep_aether/loot_table/blocks/aether_mud.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "type": "minecraft:block", - "functions": [ - { - "function": "aether:double_drops" - } - ], - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "deep_aether:aether_mud" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "deep_aether:blocks/aether_mud" -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/loot_table/blocks/aether_mud_bricks.json b/src/generated/resources/data/deep_aether/loot_table/blocks/aether_mud_bricks.json deleted file mode 100644 index afd816347..000000000 --- a/src/generated/resources/data/deep_aether/loot_table/blocks/aether_mud_bricks.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "deep_aether:aether_mud_bricks" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "deep_aether:blocks/aether_mud_bricks" -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/loot_table/blocks/aether_mud_bricks_slab.json b/src/generated/resources/data/deep_aether/loot_table/blocks/aether_mud_bricks_slab.json deleted file mode 100644 index dde8b84d5..000000000 --- a/src/generated/resources/data/deep_aether/loot_table/blocks/aether_mud_bricks_slab.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:item", - "functions": [ - { - "add": false, - "conditions": [ - { - "block": "deep_aether:aether_mud_bricks_slab", - "condition": "minecraft:block_state_property", - "properties": { - "type": "double" - } - } - ], - "count": 2.0, - "function": "minecraft:set_count" - }, - { - "function": "minecraft:explosion_decay" - } - ], - "name": "deep_aether:aether_mud_bricks_slab" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "deep_aether:blocks/aether_mud_bricks_slab" -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/loot_table/blocks/aether_mud_bricks_stairs.json b/src/generated/resources/data/deep_aether/loot_table/blocks/aether_mud_bricks_stairs.json deleted file mode 100644 index f85faf859..000000000 --- a/src/generated/resources/data/deep_aether/loot_table/blocks/aether_mud_bricks_stairs.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "deep_aether:aether_mud_bricks_stairs" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "deep_aether:blocks/aether_mud_bricks_stairs" -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/loot_table/blocks/aether_mud_bricks_wall.json b/src/generated/resources/data/deep_aether/loot_table/blocks/aether_mud_bricks_wall.json deleted file mode 100644 index 0ab2b1e72..000000000 --- a/src/generated/resources/data/deep_aether/loot_table/blocks/aether_mud_bricks_wall.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "deep_aether:aether_mud_bricks_wall" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "deep_aether:blocks/aether_mud_bricks_wall" -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/loot_table/blocks/packed_aether_mud.json b/src/generated/resources/data/deep_aether/loot_table/blocks/packed_aether_mud.json deleted file mode 100644 index 25a8b166a..000000000 --- a/src/generated/resources/data/deep_aether/loot_table/blocks/packed_aether_mud.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ], - "entries": [ - { - "type": "minecraft:item", - "name": "deep_aether:packed_aether_mud" - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "deep_aether:blocks/packed_aether_mud" -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/recipe/aerglow_blossom_block.json b/src/generated/resources/data/deep_aether/recipe/aerglow_blossom_block.json deleted file mode 100644 index 0e618a57a..000000000 --- a/src/generated/resources/data/deep_aether/recipe/aerglow_blossom_block.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "A": { - "item": "deep_aether:aerglow_blossom" - } - }, - "pattern": [ - "AA", - "AA" - ], - "result": { - "count": 1, - "id": "deep_aether:aerglow_blossom_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/recipe/aether_coarse_dirt.json b/src/generated/resources/data/deep_aether/recipe/aether_coarse_dirt.json deleted file mode 100644 index b6f486923..000000000 --- a/src/generated/resources/data/deep_aether/recipe/aether_coarse_dirt.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "D": { - "item": "aether:aether_dirt" - }, - "G": { - "item": "minecraft:gravel" - } - }, - "pattern": [ - "DG", - "GD" - ], - "result": { - "count": 4, - "id": "deep_aether:aether_coarse_dirt" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/recipe/aether_moss_carpet.json b/src/generated/resources/data/deep_aether/recipe/aether_moss_carpet.json deleted file mode 100644 index 312eb23e2..000000000 --- a/src/generated/resources/data/deep_aether/recipe/aether_moss_carpet.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "A": { - "item": "deep_aether:aether_moss_block" - } - }, - "pattern": [ - "AA" - ], - "result": { - "count": 3, - "id": "deep_aether:aether_moss_carpet" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/recipe/aether_mud_bricks.json b/src/generated/resources/data/deep_aether/recipe/aether_mud_bricks.json deleted file mode 100644 index 87a4ad316..000000000 --- a/src/generated/resources/data/deep_aether/recipe/aether_mud_bricks.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "A": { - "item": "deep_aether:packed_aether_mud" - } - }, - "pattern": [ - "AA", - "AA" - ], - "result": { - "count": 4, - "id": "deep_aether:aether_mud_bricks" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/recipe/aether_mud_bricks_slab.json b/src/generated/resources/data/deep_aether/recipe/aether_mud_bricks_slab.json deleted file mode 100644 index 72ed82ee8..000000000 --- a/src/generated/resources/data/deep_aether/recipe/aether_mud_bricks_slab.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "#": { - "item": "deep_aether:aether_mud_bricks" - } - }, - "pattern": [ - "###" - ], - "result": { - "count": 6, - "id": "deep_aether:aether_mud_bricks_slab" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/recipe/aether_mud_bricks_stairs.json b/src/generated/resources/data/deep_aether/recipe/aether_mud_bricks_stairs.json deleted file mode 100644 index 58a9f6d93..000000000 --- a/src/generated/resources/data/deep_aether/recipe/aether_mud_bricks_stairs.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "building", - "key": { - "#": { - "item": "deep_aether:aether_mud_bricks" - } - }, - "pattern": [ - "# ", - "## ", - "###" - ], - "result": { - "count": 4, - "id": "deep_aether:aether_mud_bricks_stairs" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/recipe/aether_mud_bricks_wall.json b/src/generated/resources/data/deep_aether/recipe/aether_mud_bricks_wall.json deleted file mode 100644 index 79cb189ab..000000000 --- a/src/generated/resources/data/deep_aether/recipe/aether_mud_bricks_wall.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "misc", - "key": { - "#": { - "item": "deep_aether:aether_mud_bricks" - } - }, - "pattern": [ - "###", - "###" - ], - "result": { - "count": 6, - "id": "deep_aether:aether_mud_bricks_wall" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/recipe/mossy_holystone_bricks_from_aether_moss.json b/src/generated/resources/data/deep_aether/recipe/mossy_holystone_bricks_from_flutemoss.json similarity index 85% rename from src/generated/resources/data/deep_aether/recipe/mossy_holystone_bricks_from_aether_moss.json rename to src/generated/resources/data/deep_aether/recipe/mossy_holystone_bricks_from_flutemoss.json index df668ce71..e082c7954 100644 --- a/src/generated/resources/data/deep_aether/recipe/mossy_holystone_bricks_from_aether_moss.json +++ b/src/generated/resources/data/deep_aether/recipe/mossy_holystone_bricks_from_flutemoss.json @@ -7,7 +7,7 @@ "item": "aether:holystone_bricks" }, { - "item": "deep_aether:aether_moss_block" + "item": "aether_unity:flutemoss_block" } ], "result": { diff --git a/src/generated/resources/data/deep_aether/recipe/mossy_holystone_from_aether_moss.json b/src/generated/resources/data/deep_aether/recipe/mossy_holystone_from_aether_moss.json deleted file mode 100644 index ad29ea08b..000000000 --- a/src/generated/resources/data/deep_aether/recipe/mossy_holystone_from_aether_moss.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "type": "minecraft:crafting_shaped", - "category": "misc", - "group": "mossy_holystone", - "key": { - "A": { - "item": "aether:holystone" - }, - "B": { - "item": "deep_aether:aether_moss_block" - } - }, - "pattern": [ - "AB" - ], - "result": { - "count": 1, - "id": "aether:mossy_holystone" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/recipe/mossy_holystone_tiles_from_aether_moss.json b/src/generated/resources/data/deep_aether/recipe/mossy_holystone_tiles_from_flutemoss.json similarity index 85% rename from src/generated/resources/data/deep_aether/recipe/mossy_holystone_tiles_from_aether_moss.json rename to src/generated/resources/data/deep_aether/recipe/mossy_holystone_tiles_from_flutemoss.json index 51e33c705..f23975731 100644 --- a/src/generated/resources/data/deep_aether/recipe/mossy_holystone_tiles_from_aether_moss.json +++ b/src/generated/resources/data/deep_aether/recipe/mossy_holystone_tiles_from_flutemoss.json @@ -7,7 +7,7 @@ "item": "deep_aether:holystone_tiles" }, { - "item": "deep_aether:aether_moss_block" + "item": "aether_unity:flutemoss_block" } ], "result": { diff --git a/src/generated/resources/data/deep_aether/recipe/muddy_yagroot_roots.json b/src/generated/resources/data/deep_aether/recipe/muddy_yagroot_roots.json deleted file mode 100644 index 6097b07bf..000000000 --- a/src/generated/resources/data/deep_aether/recipe/muddy_yagroot_roots.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "item": "deep_aether:aether_mud" - }, - { - "item": "deep_aether:yagroot_roots" - } - ], - "result": { - "count": 1, - "id": "deep_aether:muddy_yagroot_roots" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/recipe/packed_aether_mud.json b/src/generated/resources/data/deep_aether/recipe/packed_aether_mud.json deleted file mode 100644 index 81eaff28b..000000000 --- a/src/generated/resources/data/deep_aether/recipe/packed_aether_mud.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "type": "minecraft:crafting_shapeless", - "category": "misc", - "ingredients": [ - { - "item": "deep_aether:aether_mud" - }, - { - "item": "deep_aether:aerglow_blossom" - } - ], - "result": { - "count": 1, - "id": "deep_aether:packed_aether_mud" - } -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/worldgen/configured_feature/aerlavender_patch.json b/src/generated/resources/data/deep_aether/worldgen/configured_feature/aerlavender_patch.json index f7b0feae5..9202d721c 100644 --- a/src/generated/resources/data/deep_aether/worldgen/configured_feature/aerlavender_patch.json +++ b/src/generated/resources/data/deep_aether/worldgen/configured_feature/aerlavender_patch.json @@ -20,15 +20,6 @@ }, "weight": 32 }, - { - "data": { - "Name": "minecraft:tall_grass", - "Properties": { - "half": "lower" - } - }, - "weight": 16 - }, { "data": { "Name": "aether:berry_bush", @@ -40,9 +31,13 @@ }, { "data": { - "Name": "minecraft:short_grass" + "Name": "aether_unity:short_aether_grass", + "Properties": { + "enchanted": "false", + "grass_size": "medium" + } }, - "weight": 32 + "weight": 48 } ] } diff --git a/src/generated/resources/data/deep_aether/worldgen/configured_feature/aether_cattails_patch.json b/src/generated/resources/data/deep_aether/worldgen/configured_feature/aether_cattails_patch.json index 848f59824..29a446d86 100644 --- a/src/generated/resources/data/deep_aether/worldgen/configured_feature/aether_cattails_patch.json +++ b/src/generated/resources/data/deep_aether/worldgen/configured_feature/aether_cattails_patch.json @@ -16,7 +16,11 @@ }, { "data": { - "Name": "minecraft:short_grass" + "Name": "aether_unity:short_aether_grass", + "Properties": { + "enchanted": "false", + "grass_size": "medium" + } }, "weight": 5 }, diff --git a/src/generated/resources/data/deep_aether/worldgen/configured_feature/aether_moss_patch_bonemeal.json b/src/generated/resources/data/deep_aether/worldgen/configured_feature/aether_moss_patch_bonemeal.json index 865b7b56f..df981e4f1 100644 --- a/src/generated/resources/data/deep_aether/worldgen/configured_feature/aether_moss_patch_bonemeal.json +++ b/src/generated/resources/data/deep_aether/worldgen/configured_feature/aether_moss_patch_bonemeal.json @@ -7,7 +7,7 @@ "ground_state": { "type": "minecraft:simple_state_provider", "state": { - "Name": "deep_aether:aether_moss_block", + "Name": "aether_unity:flutemoss_block", "Properties": { "double_drops": "false" } @@ -17,7 +17,7 @@ "surface": "floor", "vegetation_chance": 0.6, "vegetation_feature": { - "feature": "deep_aether:aether_moss_vegetation", + "feature": "aether_unity:flutemoss_vegetation", "placement": [] }, "vertical_range": 5, diff --git a/src/generated/resources/data/deep_aether/worldgen/configured_feature/aether_moss_vegetation.json b/src/generated/resources/data/deep_aether/worldgen/configured_feature/aether_moss_vegetation.json deleted file mode 100644 index 8b3fe6d1d..000000000 --- a/src/generated/resources/data/deep_aether/worldgen/configured_feature/aether_moss_vegetation.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "type": "minecraft:simple_block", - "config": { - "to_place": { - "type": "minecraft:weighted_state_provider", - "entries": [ - { - "data": { - "Name": "deep_aether:aether_moss_carpet" - }, - "weight": 25 - }, - { - "data": { - "Name": "minecraft:short_grass" - }, - "weight": 50 - }, - { - "data": { - "Name": "minecraft:short_grass" - }, - "weight": 10 - } - ] - } - } -} \ No newline at end of file diff --git a/src/generated/resources/data/deep_aether/worldgen/configured_feature/luminescent_skyroot_forest_grass.json b/src/generated/resources/data/deep_aether/worldgen/configured_feature/luminescent_skyroot_forest_grass.json index 7deb525a4..f8d3974dd 100644 --- a/src/generated/resources/data/deep_aether/worldgen/configured_feature/luminescent_skyroot_forest_grass.json +++ b/src/generated/resources/data/deep_aether/worldgen/configured_feature/luminescent_skyroot_forest_grass.json @@ -10,7 +10,11 @@ "entries": [ { "data": { - "Name": "minecraft:short_grass" + "Name": "aether_unity:short_aether_grass", + "Properties": { + "enchanted": "false", + "grass_size": "medium" + } }, "weight": 40 }, diff --git a/src/generated/resources/data/deep_aether/worldgen/configured_feature/roseroot_forest_grass.json b/src/generated/resources/data/deep_aether/worldgen/configured_feature/roseroot_forest_grass.json index 50cf6cde0..110c1ffce 100644 --- a/src/generated/resources/data/deep_aether/worldgen/configured_feature/roseroot_forest_grass.json +++ b/src/generated/resources/data/deep_aether/worldgen/configured_feature/roseroot_forest_grass.json @@ -25,18 +25,13 @@ }, { "data": { - "Name": "minecraft:short_grass" - }, - "weight": 6 - }, - { - "data": { - "Name": "minecraft:tall_grass", + "Name": "aether_unity:short_aether_grass", "Properties": { - "half": "lower" + "enchanted": "false", + "grass_size": "medium" } }, - "weight": 2 + "weight": 8 }, { "data": { diff --git a/src/generated/resources/data/minecraft/tags/block/dirt.json b/src/generated/resources/data/minecraft/tags/block/dirt.json deleted file mode 100644 index 4fb0507ae..000000000 --- a/src/generated/resources/data/minecraft/tags/block/dirt.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "values": [ - "deep_aether:aether_mud", - "deep_aether:aether_moss_block", - "deep_aether:golden_heights_grass_block", - "deep_aether:aercloud_grass_block", - "deep_aether:aether_coarse_dirt" - ] -} \ No newline at end of file diff --git a/src/main/java/io/github/razordevs/deep_aether/DeepAether.java b/src/main/java/io/github/razordevs/deep_aether/DeepAether.java index 6b6c18d54..d46551e15 100644 --- a/src/main/java/io/github/razordevs/deep_aether/DeepAether.java +++ b/src/main/java/io/github/razordevs/deep_aether/DeepAether.java @@ -246,7 +246,6 @@ private void getFlawlessBossDrop(EntityType type, String string, Item fallBac } private void registerDispenserBehaviors() { - DispenserBlock.registerBehavior(Items.POTION, DADispenseBehaviors.WATER_BOTTLE_TO_AETHER_MUD_DISPENSE_BEHAVIOR); DispenserBlock.registerBehavior(DAItems.PLACEABLE_POISON_BUCKET.get(), DADispenseBehaviors.DEEP_AETHER_BUCKET_PICKUP_DISPENSE_BEHAVIOR); DispenserBlock.registerBehavior(DAItems.VIRULENT_QUICKSAND_BUCKET.get(), DADispenseBehaviors.DEEP_AETHER_BUCKET_PICKUP_DISPENSE_BEHAVIOR); DispenserBlock.registerBehavior(DAItems.SKYROOT_VIRULENT_QUICKSAND_BUCKET.get(), AetherDispenseBehaviors.SKYROOT_BUCKET_DISPENSE_BEHAVIOR); diff --git a/src/main/java/io/github/razordevs/deep_aether/block/behavior/DABlockInteractionBehavior.java b/src/main/java/io/github/razordevs/deep_aether/block/behavior/DABlockInteractionBehavior.java index 1e030e57f..ab89eea91 100644 --- a/src/main/java/io/github/razordevs/deep_aether/block/behavior/DABlockInteractionBehavior.java +++ b/src/main/java/io/github/razordevs/deep_aether/block/behavior/DABlockInteractionBehavior.java @@ -69,9 +69,6 @@ public static void onRightClick(PlayerInteractEvent.RightClickBlock event) { if(itemstack.is(Tags.Items.TOOLS_SHEAR)) { handleShears(event, itemstack, pos, level, state, player); } - else if ((event.getFace() != Direction.DOWN && itemstack.getOrDefault(DataComponents.POTION_CONTENTS, PotionContents.EMPTY).is(Potions.WATER))) { - handleWatterBottle(event, itemstack, pos, level, state, player); - } else if (itemstack.getItem() == AetherItems.SKYROOT_POISON_BUCKET.get()) { handleSkyrootPoisonBucket(event, itemstack, level, player); } @@ -109,40 +106,6 @@ else if(state.getBlock().equals(DABlocks.TALL_GLOWING_GRASS.get())) { } } - /** - * Handles interactions between Water Bottle and Aether Dirt. Converts Aether Dirt into Aether Mud. - */ - private static void handleWatterBottle(PlayerInteractEvent.RightClickBlock event, ItemStack itemstack, BlockPos pos, Level level, BlockState state, Player player) { - if (state.getBlock() == AetherBlocks.AETHER_DIRT.get()) { - - //Changes the Aether Dirt block into an Aether Mud Block. - BlockState newState = DABlocks.AETHER_MUD.get().defaultBlockState(); - level.setBlockAndUpdate(pos, newState); - - player.awardStat(Stats.ITEM_USED.get(itemstack.getItem())); - - //Shrinks stack - if (!player.getAbilities().instabuild) { - itemstack.shrink(1); - ItemStack bottleStack = new ItemStack(Items.GLASS_BOTTLE); - if (!player.addItem(bottleStack)) { - Containers.dropItemStack(player.level(), player.getX(), player.getY(), player.getZ(), bottleStack); - } - } - //Spawns splash particles - if (!level.isClientSide) { - ServerLevel serverlevel = (ServerLevel) level; - for (int i = 0; i < 5; ++i) { - serverlevel.sendParticles(ParticleTypes.SPLASH, (double) pos.getX() + level.random.nextDouble(), pos.getY() + 1, (double) pos.getZ() + level.random.nextDouble(), 1, 0.0D, 0.0D, 0.0D, 1.0D); - } - } - - level.playSound(player, pos, SoundEvents.BOTTLE_EMPTY, SoundSource.PLAYERS, 0.5F, 1F); - event.setCancellationResult(InteractionResult.SUCCESS); - event.setCanceled(true); - } - } - /** * Handles the placing of poison from a skyroot poison bucket */ diff --git a/src/main/java/io/github/razordevs/deep_aether/block/behavior/DADispenseBehaviors.java b/src/main/java/io/github/razordevs/deep_aether/block/behavior/DADispenseBehaviors.java index 3e8d19cc1..b3162aa13 100644 --- a/src/main/java/io/github/razordevs/deep_aether/block/behavior/DADispenseBehaviors.java +++ b/src/main/java/io/github/razordevs/deep_aether/block/behavior/DADispenseBehaviors.java @@ -26,51 +26,6 @@ public class DADispenseBehaviors { - public static final DispenseItemBehavior WATER_BOTTLE_TO_AETHER_MUD_DISPENSE_BEHAVIOR = new DefaultDispenseItemBehavior() { - - @Override - public ItemStack execute(BlockSource source, ItemStack stack) { - if (!stack.getOrDefault(DataComponents.POTION_CONTENTS, PotionContents.EMPTY).is(Potions.WATER)) { - return super.execute(source, stack); - } - - else { - ServerLevel serverlevel = source.level(); - BlockPos blockpos = source.pos(); - BlockPos blockpos1 = source.pos().relative(source.state().getValue(DispenserBlock.FACING)); - - if (serverlevel.getBlockState(blockpos1).is(AetherBlocks.AETHER_DIRT.get())) { - if (!serverlevel.isClientSide) { - for (int i = 0; i < 5; ++i) { - serverlevel.sendParticles(ParticleTypes.SPLASH, (double) blockpos.getX() + serverlevel.random.nextDouble(), blockpos.getY() + 1, (double) blockpos.getZ() + serverlevel.random.nextDouble(), 1, 0.0D, 0.0D, 0.0D, 1.0D); - } - } - - serverlevel.playSound(null, blockpos, SoundEvents.BOTTLE_EMPTY, SoundSource.BLOCKS, 1.0F, 1.0F); - serverlevel.gameEvent(null, GameEvent.FLUID_PLACE, blockpos); - serverlevel.setBlockAndUpdate(blockpos1, DABlocks.AETHER_MUD.get().defaultBlockState()); - return new ItemStack(Items.GLASS_BOTTLE); - } - - else if (serverlevel.getBlockState(blockpos1).getBlockHolder().is(BlockTags.CONVERTABLE_TO_MUD)) { - if (!serverlevel.isClientSide) { - for (int i = 0; i < 5; ++i) { - serverlevel.sendParticles(ParticleTypes.SPLASH, (double) blockpos.getX() + serverlevel.random.nextDouble(), blockpos.getY() + 1, (double) blockpos.getZ() + serverlevel.random.nextDouble(), 1, 0.0D, 0.0D, 0.0D, 1.0D); - } - } - - serverlevel.playSound(null, blockpos, SoundEvents.BOTTLE_EMPTY, SoundSource.BLOCKS, 1.0F, 1.0F); - serverlevel.gameEvent(null, GameEvent.FLUID_PLACE, blockpos); - serverlevel.setBlockAndUpdate(blockpos1, Blocks.MUD.defaultBlockState()); - return new ItemStack(Items.GLASS_BOTTLE); - } - - else { - return super.execute(source, stack); - } - } - } - }; /** * [CODE COPY] - {@link DispenseItemBehavior#bootStrap()}.

diff --git a/src/main/java/io/github/razordevs/deep_aether/block/natural/DAMossBlock.java b/src/main/java/io/github/razordevs/deep_aether/block/natural/DAMossBlock.java deleted file mode 100644 index 26782645e..000000000 --- a/src/main/java/io/github/razordevs/deep_aether/block/natural/DAMossBlock.java +++ /dev/null @@ -1,38 +0,0 @@ -package io.github.razordevs.deep_aether.block.natural; - -import com.aetherteam.aether.block.AetherBlockStateProperties; -import com.aetherteam.aether.block.natural.AetherDoubleDropBlock; -import io.github.razordevs.deep_aether.datagen.registry.DAConfiguredFeatures; -import net.minecraft.core.BlockPos; -import net.minecraft.core.registries.Registries; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.util.RandomSource; -import net.minecraft.world.level.Level; -import net.minecraft.world.level.LevelReader; -import net.minecraft.world.level.block.BonemealableBlock; -import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.block.state.BlockState; - -public class DAMossBlock extends AetherDoubleDropBlock implements BonemealableBlock { - public DAMossBlock(BlockBehaviour.Properties properties) { - super(properties); - this.registerDefaultState(this.defaultBlockState().setValue(AetherBlockStateProperties.DOUBLE_DROPS, false)); - } - - @Override - public boolean isValidBonemealTarget(LevelReader level, BlockPos pos, BlockState p_50899_) { - return level.getBlockState(pos.above()).isAir(); - } - - @Override - public boolean isBonemealSuccess(Level pLevel, RandomSource pRandom, BlockPos pPos, BlockState pState) { - return true; - } - - @Override - public void performBonemeal(ServerLevel level, RandomSource random, BlockPos pPos, BlockState pState) { - level.registryAccess().registry(Registries.CONFIGURED_FEATURE).flatMap((features) - -> features.getHolder(DAConfiguredFeatures.AETHER_MOSS_PATCH_BONEMEAL)).ifPresent((feature) - -> feature.value().place(level, level.getChunkSource().getGenerator(), random, pPos.above())); - } -} \ No newline at end of file diff --git a/src/main/java/io/github/razordevs/deep_aether/datagen/DABlockstateData.java b/src/main/java/io/github/razordevs/deep_aether/datagen/DABlockstateData.java index 7d0897b50..d8a8a3f47 100644 --- a/src/main/java/io/github/razordevs/deep_aether/datagen/DABlockstateData.java +++ b/src/main/java/io/github/razordevs/deep_aether/datagen/DABlockstateData.java @@ -141,15 +141,6 @@ public void registerStatesAndModels() { this.signBlock((StandingSignBlock) DABlocks.SUNROOT_SIGN.get(), (WallSignBlock) DABlocks.SUNROOT_WALL_SIGN.get(), this.texture(this.name(DABlocks.SUNROOT_PLANKS.get()))); this.hangingSignBlock(DABlocks.SUNROOT_HANGING_SIGN.get(), (WallHangingSignBlock) DABlocks.SUNROOT_WALL_HANGING_SIGN.get(), this.texture(this.name(DABlocks.STRIPPED_SUNROOT_LOG.get()))); - //Mud blockset - this.blockDoubleDrops(DABlocks.AETHER_MUD.get()); - this.blockDoubleDrops(DABlocks.AETHER_COARSE_DIRT.get()); - this.block(DABlocks.PACKED_AETHER_MUD.get()); - this.block(DABlocks.AETHER_MUD_BRICKS.get()); - this.slab((SlabBlock) DABlocks.AETHER_MUD_BRICKS_SLAB.get(), DABlocks.AETHER_MUD_BRICKS.get()); - this.stairs((StairBlock) DABlocks.AETHER_MUD_BRICKS_STAIRS.get(), DABlocks.AETHER_MUD_BRICKS.get()); - this.wallBlock((WallBlock) DABlocks.AETHER_MUD_BRICKS_WALL.get(), DABlocks.AETHER_MUD_BRICKS.get()); - //Ores this.block(DABlocks.SKYJADE_ORE.get()); this.block(DABlocks.SKYJADE_BLOCK.get()); @@ -290,9 +281,6 @@ public void registerStatesAndModels() { this.translucentBlock(DABlocks.STERLING_AERCLOUD.get()); this.combiner(DABlocks.COMBINER.get()); - //Moss - this.block(DABlocks.AETHER_MOSS_BLOCK.get()); - //GENESIS COMPATIBILITY this.makeLogWalls(); } diff --git a/src/main/java/io/github/razordevs/deep_aether/datagen/DADataMapData.java b/src/main/java/io/github/razordevs/deep_aether/datagen/DADataMapData.java index 4efec7d94..a42050b98 100644 --- a/src/main/java/io/github/razordevs/deep_aether/datagen/DADataMapData.java +++ b/src/main/java/io/github/razordevs/deep_aether/datagen/DADataMapData.java @@ -26,8 +26,6 @@ protected void gather() { this.addCompost(compostables, DABlocks.FLOWERING_BLUE_ROSEROOT_LEAVES.get().asItem(), 0.3F); this.addCompost(compostables, DABlocks.YAGROOT_LEAVES.get().asItem(), 0.3F); this.addCompost(compostables, DABlocks.CRUDEROOT_LEAVES.get().asItem(), 0.3F); - this.addCompost(compostables, DABlocks.AETHER_MOSS_BLOCK.get().asItem(), 0.65F); - this.addCompost(compostables, DABlocks.AETHER_MOSS_CARPET.get().asItem(), 0.3F); this.addCompost(compostables, DABlocks.CLOUDBLOOM_CARPET.get().asItem(), 0.3F); this.addCompost(compostables, DABlocks.ROSEROOT_SAPLING.get().asItem(), 0.3F); this.addCompost(compostables, DABlocks.BLUE_ROSEROOT_SAPLING.get().asItem(), 0.3F); diff --git a/src/main/java/io/github/razordevs/deep_aether/datagen/DAItemModelData.java b/src/main/java/io/github/razordevs/deep_aether/datagen/DAItemModelData.java index dd5d2961f..1010a834d 100644 --- a/src/main/java/io/github/razordevs/deep_aether/datagen/DAItemModelData.java +++ b/src/main/java/io/github/razordevs/deep_aether/datagen/DAItemModelData.java @@ -151,15 +151,6 @@ protected void registerModels() { this.item(DAItems.SUNROOT_BOAT.get()); this.item(DAItems.SUNROOT_CHEST_BOAT.get()); - //Mud blockset - this.itemBlock(DABlocks.AETHER_COARSE_DIRT.get()); - this.itemBlock(DABlocks.AETHER_MUD.get()); - this.itemBlock(DABlocks.PACKED_AETHER_MUD.get()); - this.itemBlock(DABlocks.AETHER_MUD_BRICKS.get()); - this.itemBlock(DABlocks.AETHER_MUD_BRICKS_SLAB.get()); - this.itemBlock(DABlocks.AETHER_MUD_BRICKS_STAIRS.get()); - this.itemWallBlock(DABlocks.AETHER_MUD_BRICKS_WALL.get(), DABlocks.AETHER_MUD_BRICKS.get()); - //Ores this.itemBlock(DABlocks.SKYJADE_BLOCK.get()); this.itemBlock(DABlocks.SKYJADE_ORE.get()); @@ -282,9 +273,7 @@ protected void registerModels() { this.itemBlock(DABlocks.GREEN_SQUASH.get()); this.itemBlock(DABlocks.PURPLE_SQUASH.get()); - this.itemBlock(DABlocks.AETHER_MOSS_CARPET.get()); this.itemBlock(DABlocks.CLOUDBLOOM_CARPET.get()); - this.itemBlock(DABlocks.AETHER_MOSS_BLOCK.get()); this.item(DAItems.VIRULENT_QUICKSAND_BUCKET.get()); this.item(DAItems.SKYROOT_VIRULENT_QUICKSAND_BUCKET.get()); diff --git a/src/main/java/io/github/razordevs/deep_aether/datagen/DARecipeData.java b/src/main/java/io/github/razordevs/deep_aether/datagen/DARecipeData.java index 7a5cfc646..0386ce97d 100644 --- a/src/main/java/io/github/razordevs/deep_aether/datagen/DARecipeData.java +++ b/src/main/java/io/github/razordevs/deep_aether/datagen/DARecipeData.java @@ -33,6 +33,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; import net.neoforged.neoforge.common.Tags; +import net.zepalesque.unity.block.UnityBlocks; import java.util.concurrent.CompletableFuture; import java.util.function.Supplier; @@ -46,14 +47,6 @@ public DARecipeData(PackOutput output, CompletableFuture @Override protected void buildRecipes(RecipeOutput consumer) { - ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, DABlocks.AETHER_COARSE_DIRT.get(), 4) - .define('D', AetherBlocks.AETHER_DIRT.get().asItem()) - .define('G', Blocks.GRAVEL) - .pattern("DG") - .pattern("GD") - .unlockedBy(getHasName(AetherBlocks.AETHER_DIRT.get()), has(AetherBlocks.AETHER_DIRT.get())) - .save(consumer, name("aether_coarse_dirt")); - //Wood Types woodFromLogs(consumer, DABlocks.ROSEROOT_WOOD.get(), DABlocks.ROSEROOT_LOG.get()); woodFromLogs(consumer, DABlocks.STRIPPED_ROSEROOT_WOOD.get(), DABlocks.STRIPPED_ROSEROOT_LOG.get()); @@ -142,14 +135,7 @@ protected void buildRecipes(RecipeOutput consumer) { .define('A', DAItems.AERGLOW_BLOSSOM.get()) .pattern("AA") .pattern("AA") - .unlockedBy(getHasName(DAItems.AERGLOW_BLOSSOM.get()), has(DAItems.AERGLOW_BLOSSOM.get())) - .save(consumer); - - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, DABlocks.AETHER_MOSS_CARPET.get(), 3) - .define('A', DABlocks.AETHER_MOSS_BLOCK.get().asItem()) - .pattern("AA") - .unlockedBy(getHasName(DABlocks.AETHER_MOSS_BLOCK.get()), has(DABlocks.AETHER_MOSS_BLOCK.get())) - .save(consumer); + .unlockedBy(getHasName(DAItems.AERGLOW_BLOSSOM.get()), has(DAItems.AERGLOW_BLOSSOM.get())); ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, DABlocks.CLOUDBLOOM_CARPET.get(), 1) .define('A', DAItems.CLOUDBLOOM_BOUQUET.get()) @@ -157,33 +143,10 @@ protected void buildRecipes(RecipeOutput consumer) { .unlockedBy(getHasName(DAItems.CLOUDBLOOM_BOUQUET.get()), has(DAItems.CLOUDBLOOM_BOUQUET.get())) .save(consumer); - //Mud - ShapelessRecipeBuilder.shapeless(RecipeCategory.DECORATIONS, DABlocks.PACKED_AETHER_MUD.get()) - .requires(DABlocks.AETHER_MUD.get()) - .requires(DAItems.AERGLOW_BLOSSOM.get()) - .unlockedBy(getHasName(DABlocks.AETHER_MUD.get()), has(DABlocks.AETHER_MUD.get())) - .save(consumer); - ShapelessRecipeBuilder.shapeless(RecipeCategory.DECORATIONS, DABlocks.MUDDY_YAGROOT_ROOTS.get()) - .requires(DABlocks.AETHER_MUD.get()) - .requires(DABlocks.YAGROOT_ROOTS.get()) - .unlockedBy(getHasName(DABlocks.AETHER_MUD.get()), has(DABlocks.AETHER_MUD.get())) - .save(consumer); - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, DABlocks.AETHER_MUD_BRICKS.get(), 4) - .define('A', DABlocks.PACKED_AETHER_MUD.get().asItem()) - .pattern("AA") - .pattern("AA") - .unlockedBy(getHasName(DABlocks.PACKED_AETHER_MUD.get()), has(DABlocks.PACKED_AETHER_MUD.get())) - .save(consumer); - stairs(DABlocks.AETHER_MUD_BRICKS_STAIRS, DABlocks.AETHER_MUD_BRICKS).save(consumer); - slabBuilder(RecipeCategory.BUILDING_BLOCKS, DABlocks.AETHER_MUD_BRICKS_SLAB.get(), Ingredient.of(DABlocks.AETHER_MUD_BRICKS.get())) - .unlockedBy(getHasName(DABlocks.AETHER_MUD_BRICKS.get()), has(DABlocks.AETHER_MUD_BRICKS.get())) - .save(consumer); - wall(consumer, RecipeCategory.DECORATIONS, DABlocks.AETHER_MUD_BRICKS_WALL.get(), DABlocks.AETHER_MUD_BRICKS.get()); - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, Blocks.BREWING_STAND, 1) .group("minecraft:brewing_stand") .define('I', DAItems.BIO_CRYSTAL.get()) - .define('D', AetherBlocks.HOLYSTONE.get().asItem()) + .define('D', AetherBlocks.HOLYSTONE) .pattern(" I ") .pattern("DDD") .unlockedBy(getHasName(DAItems.BIO_CRYSTAL.get()), has(DAItems.BIO_CRYSTAL.get())) @@ -269,7 +232,7 @@ protected void buildRecipes(RecipeOutput consumer) { enchantingRecipe(RecipeCategory.MISC, DABlocks.CLORITE.get(), DABlocks.RAW_CLORITE.get(), 0.15F, 50).save(consumer, this.name("raw_clorite_enchanting")); ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, DABlocks.RAW_CLORITE.get(), 4) - .define('A', DABlocks.ASETERITE.get().asItem()) + .define('A', DABlocks.ASETERITE) .define('B', AetherBlocks.HOLYSTONE.get()) .pattern("AB") .pattern("BA") @@ -283,7 +246,7 @@ protected void buildRecipes(RecipeOutput consumer) { wall(consumer, RecipeCategory.DECORATIONS, DABlocks.RAW_CLORITE_WALL.get(), DABlocks.RAW_CLORITE.get()); brick(consumer, DABlocks.POLISHED_CLORITE.get(), DABlocks.CLORITE.get()); ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, DABlocks.CLORITE_PILLAR.get(), 1) - .define('A', DABlocks.CLORITE_SLAB.get().asItem()) + .define('A', DABlocks.CLORITE_SLAB) .pattern("A") .pattern("A") .unlockedBy(getHasName(DABlocks.CLORITE.get()), has(DABlocks.CLORITE.get())) @@ -312,28 +275,28 @@ protected void buildRecipes(RecipeOutput consumer) { wall(consumer, RecipeCategory.DECORATIONS, DABlocks.BIG_HOLYSTONE_BRICKS_WALL.get(), DABlocks.BIG_HOLYSTONE_BRICKS.get()); ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, DABlocks.HOLYSTONE_PILLAR.get(), 2) - .define('A', AetherBlocks.HOLYSTONE.get().asItem()) + .define('A', AetherBlocks.HOLYSTONE) .pattern("A") .pattern("A") .unlockedBy(getHasName(DABlocks.HOLYSTONE_PILLAR.get()), has(DABlocks.HOLYSTONE_PILLAR.get())) .save(consumer); ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, DABlocks.HOLYSTONE_PILLAR_UP.get(), 2) - .define('A', DABlocks.HOLYSTONE_PILLAR.get().asItem()) + .define('A', DABlocks.HOLYSTONE_PILLAR) .pattern("A") .pattern("A") .unlockedBy(getHasName(DABlocks.HOLYSTONE_PILLAR_UP.get()), has(DABlocks.HOLYSTONE_PILLAR_UP.get())) .save(consumer); ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, DABlocks.HOLYSTONE_PILLAR_DOWN.get(), 2) - .define('A', DABlocks.HOLYSTONE_PILLAR_UP.get().asItem()) + .define('A', DABlocks.HOLYSTONE_PILLAR_UP) .pattern("A") .pattern("A") .unlockedBy(getHasName(DABlocks.HOLYSTONE_PILLAR_DOWN.get()), has(DABlocks.HOLYSTONE_PILLAR_DOWN.get())) .save(consumer); ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, DABlocks.CHISELED_HOLYSTONE.get(), 1) - .define('A', AetherBlocks.HOLYSTONE_SLAB.get().asItem()) + .define('A', AetherBlocks.HOLYSTONE_SLAB) .pattern("A") .pattern("A") .unlockedBy(getHasName(DABlocks.CHISELED_HOLYSTONE.get()), has(DABlocks.CHISELED_HOLYSTONE.get())) @@ -374,27 +337,27 @@ protected void buildRecipes(RecipeOutput consumer) { ShapelessRecipeBuilder.shapeless(RecipeCategory.DECORATIONS, DABlocks.MOSSY_HOLYSTONE_BRICKS.get(), 1) .group("mossy_holystone_bricks") - .requires(AetherBlocks.HOLYSTONE_BRICKS.get().asItem()) + .requires(AetherBlocks.HOLYSTONE_BRICKS) .requires(Blocks.MOSS_BLOCK.asItem()) .unlockedBy(getHasName(AetherBlocks.HOLYSTONE_BRICKS.get()), has(AetherBlocks.HOLYSTONE_BRICKS.get())) .save(consumer, name("mossy_holystone_bricks_from_moss")); ShapelessRecipeBuilder.shapeless(RecipeCategory.DECORATIONS, DABlocks.MOSSY_HOLYSTONE_BRICKS.get(), 1) .group("mossy_holystone_bricks") - .requires(AetherBlocks.HOLYSTONE_BRICKS.get().asItem()) - .requires(DABlocks.AETHER_MOSS_BLOCK.get().asItem()) + .requires(AetherBlocks.HOLYSTONE_BRICKS) + .requires(UnityBlocks.FLUTEMOSS_BLOCK) .unlockedBy(getHasName(AetherBlocks.HOLYSTONE_BRICKS.get()), has(AetherBlocks.HOLYSTONE_BRICKS.get())) - .save(consumer, name("mossy_holystone_bricks_from_aether_moss")); + .save(consumer, name("mossy_holystone_bricks_from_flutemoss")); ShapelessRecipeBuilder.shapeless(RecipeCategory.DECORATIONS, DABlocks.MOSSY_HOLYSTONE_BRICKS.get(), 1) .group("mossy_holystone_bricks") - .requires(AetherBlocks.HOLYSTONE_BRICKS.get().asItem()) + .requires(AetherBlocks.HOLYSTONE_BRICKS) .requires(Blocks.VINE.asItem()) .unlockedBy(getHasName(AetherBlocks.HOLYSTONE_BRICKS.get()), has(AetherBlocks.HOLYSTONE_BRICKS.get())) .save(consumer, name("mossy_holystone_bricks_from_vines")); ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, DABlocks.MOSSY_HOLYSTONE_BRICKS.get(), 4) - .define('A', AetherBlocks.MOSSY_HOLYSTONE.get().asItem()) + .define('A', AetherBlocks.MOSSY_HOLYSTONE) .pattern("AA") .pattern("AA") .unlockedBy(getHasName(AetherBlocks.HOLYSTONE_BRICKS.get()), has(AetherBlocks.HOLYSTONE_BRICKS.get())) @@ -421,40 +384,32 @@ protected void buildRecipes(RecipeOutput consumer) { ShapelessRecipeBuilder.shapeless(RecipeCategory.DECORATIONS, DABlocks.MOSSY_HOLYSTONE_TILES.get(), 1) .group("mossy_holystone_tiles") - .requires(DABlocks.HOLYSTONE_TILES.get().asItem()) + .requires(DABlocks.HOLYSTONE_TILES) .requires(Blocks.MOSS_BLOCK.asItem()) .unlockedBy(getHasName(DABlocks.HOLYSTONE_TILES.get()), has(DABlocks.HOLYSTONE_TILES.get())) .save(consumer, name("mossy_holystone_tiles_from_moss")); ShapelessRecipeBuilder.shapeless(RecipeCategory.DECORATIONS, DABlocks.MOSSY_HOLYSTONE_TILES.get(), 1) .group("mossy_holystone_tiles") - .requires(DABlocks.HOLYSTONE_TILES.get().asItem()) - .requires(DABlocks.AETHER_MOSS_BLOCK.get().asItem()) + .requires(DABlocks.HOLYSTONE_TILES) + .requires(UnityBlocks.FLUTEMOSS_BLOCK) .unlockedBy(getHasName(DABlocks.HOLYSTONE_TILES.get()), has(DABlocks.HOLYSTONE_TILES.get())) - .save(consumer, name("mossy_holystone_tiles_from_aether_moss")); + .save(consumer, name("mossy_holystone_tiles_from_flutemoss")); ShapelessRecipeBuilder.shapeless(RecipeCategory.DECORATIONS, DABlocks.MOSSY_HOLYSTONE_TILES.get(), 1) .group("mossy_holystone_tiles") - .requires(DABlocks.HOLYSTONE_TILES.get().asItem()) + .requires(DABlocks.HOLYSTONE_TILES) .requires(Blocks.VINE.asItem()) .unlockedBy(getHasName(DABlocks.HOLYSTONE_TILES.get()), has(DABlocks.HOLYSTONE_TILES.get())) .save(consumer, name("mossy_holystone_tiles_from_vines")); ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, DABlocks.MOSSY_HOLYSTONE_TILES.get(), 4) - .define('A', DABlocks.MOSSY_HOLYSTONE_BRICKS.get().asItem()) + .define('A', DABlocks.MOSSY_HOLYSTONE_BRICKS) .pattern("AA") .pattern("AA") .unlockedBy(getHasName(DABlocks.HOLYSTONE_TILES.get()), has(DABlocks.HOLYSTONE_TILES.get())) .save(consumer); - ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, AetherBlocks.MOSSY_HOLYSTONE.get(), 1) - .group("mossy_holystone") - .define('A', AetherBlocks.HOLYSTONE.get().asItem()) - .define('B', DABlocks.AETHER_MOSS_BLOCK.get().asItem()) - .pattern("AB") - .unlockedBy(getHasName(AetherBlocks.HOLYSTONE.get()), has(AetherBlocks.HOLYSTONE.get().asItem())) - .save(consumer, name("mossy_holystone_from_aether_moss")); - //Skyjade ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, DABlocks.SKYJADE_BLOCK.get()) .define('A', DAItems.SKYJADE.get()) @@ -484,7 +439,7 @@ protected void buildRecipes(RecipeOutput consumer) { ShapedRecipeBuilder.shaped(RecipeCategory.DECORATIONS, DABlocks.SKYJADE_LANTERN.get()) .define('A', DAItems.SKYJADE_NUGGET.get()) - .define('B', AetherBlocks.AMBROSIUM_TORCH.get().asItem()) + .define('B', AetherBlocks.AMBROSIUM_TORCH) .pattern("AAA") .pattern("ABA") .pattern("AAA") @@ -780,8 +735,8 @@ protected void buildRecipes(RecipeOutput consumer) { 0.1f, 100) .requires(AetherItems.GOLDEN_AMBER.get()) .requires(DAItems.FROZEN_GOLDEN_BERRIES.get()) - .requires(AetherBlocks.ICESTONE.get().asItem()) - .unlockedBy(getHasName(AetherBlocks.ICESTONE.get().asItem()), has(AetherBlocks.ICESTONE.get().asItem())) + .requires(AetherBlocks.ICESTONE) + .unlockedBy(getHasName(AetherBlocks.ICESTONE), has(AetherBlocks.ICESTONE)) .save(consumer); fodder.set(DADataComponentTypes.MOA_FODDER, new MoaFodder(new MobEffectInstance(MobEffects.JUMP, 14400, 1))); diff --git a/src/main/java/io/github/razordevs/deep_aether/datagen/loot/DABlockLoot.java b/src/main/java/io/github/razordevs/deep_aether/datagen/loot/DABlockLoot.java index 87c3a2620..b931f6266 100644 --- a/src/main/java/io/github/razordevs/deep_aether/datagen/loot/DABlockLoot.java +++ b/src/main/java/io/github/razordevs/deep_aether/datagen/loot/DABlockLoot.java @@ -197,14 +197,6 @@ public void generate() { this.dropSelf(DABlocks.ZEPHYR_TOTEM.get()); this.dropSelf(DABlocks.AERWHALE_TOTEM.get()); - //Aether Mud set - this.dropSelfDouble(DABlocks.AETHER_MUD.get()); - this.dropSelf(DABlocks.PACKED_AETHER_MUD.get()); - this.dropSelf(DABlocks.AETHER_MUD_BRICKS.get()); - this.add(DABlocks.AETHER_MUD_BRICKS_SLAB.get(), this::createSlabItemTable); - this.dropSelf(DABlocks.AETHER_MUD_BRICKS_STAIRS.get()); - this.dropSelf(DABlocks.AETHER_MUD_BRICKS_WALL.get()); - //Ores this.add(DABlocks.SKYJADE_ORE.get(), (block) -> this.createOreDrop(block, DAItems.SKYJADE.get())); this.dropSelf(DABlocks.SKYJADE_BLOCK.get()); @@ -271,8 +263,6 @@ public void generate() { this.dropSelf(DABlocks.CHISELED_HOLYSTONE.get()); //Plants - this.dropSelf(DABlocks.AETHER_MOSS_BLOCK.get()); - this.dropSelf(DABlocks.AETHER_MOSS_CARPET.get()); this.dropSelf(DABlocks.CLOUDBLOOM_CARPET.get()); this.dropSelf(DABlocks.BLUE_SQUASH.get()); @@ -367,7 +357,6 @@ public void generate() { this.dropDoubleWithSilk(DABlocks.AERCLOUD_GRASS_BLOCK.get(), AetherBlocks.COLD_AERCLOUD.get()); this.dropSelf(DABlocks.BLUE_AERCLOUD_MUSHROOMS.get()); this.dropSelf(DABlocks.PINK_AERCLOUD_MUSHROOMS.get()); - this.dropSelfDouble(DABlocks.AETHER_COARSE_DIRT.get()); this.dropSelf(DABlocks.COMBINER.get()); diff --git a/src/main/java/io/github/razordevs/deep_aether/datagen/registry/DAConfiguredFeatures.java b/src/main/java/io/github/razordevs/deep_aether/datagen/registry/DAConfiguredFeatures.java index 9174444f3..643bbf470 100644 --- a/src/main/java/io/github/razordevs/deep_aether/datagen/registry/DAConfiguredFeatures.java +++ b/src/main/java/io/github/razordevs/deep_aether/datagen/registry/DAConfiguredFeatures.java @@ -65,6 +65,8 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; import net.minecraft.world.level.levelgen.structure.templatesystem.TagMatchTest; import net.neoforged.neoforge.registries.DeferredBlock; +import net.zepalesque.unity.block.UnityBlocks; +import net.zepalesque.unity.data.resource.registries.UnityFeatureConfig; import java.util.List; import java.util.Optional; @@ -82,7 +84,7 @@ public class DAConfiguredFeatures { public static final ResourceKey> CRUDEROOT_TREE_CONFIGURATION = createKey("cruderoot_tree"); public static final ResourceKey> ROSEROOT_AND_BLUE_ROSEROOT_TREES_PLACEMENT = createKey("roseroot_and_blue_roseroot_trees_placement"); public static final ResourceKey> YAGROOT_AND_CRUDEROOT_TREES_PLACEMENT = createKey("yagroot_and_cruderoot_trees_placement"); - public static final ResourceKey> AETHER_MOSS_VEGETATION = createKey("aether_moss_vegetation"); + public static final ResourceKey> AETHER_MOSS_VEGETATION = UnityFeatureConfig.FLUTEMOSS_VEGETATION; public static final ResourceKey> AETHER_MOSS_PATCH_BONEMEAL = createKey("aether_moss_patch_bonemeal"); public static final ResourceKey> ORE_SKYJADE_CONFIGURATION = createKey("skyjade_ore"); public static final ResourceKey> ORE_MORE_SKYJADE_CONFIGURATION = createKey("more_skyjade_ore"); @@ -149,9 +151,9 @@ public static void bootstrap(BootstrapContext> context) HolderGetter> configuredFeatures = context.lookup(Registries.CONFIGURED_FEATURE); register(context, POISON_LAKE_CONFIGURATION, DAFeatures.POISON_LAKE.get(), AetherConfiguredFeatureBuilders.lake(BlockStateProvider.simple(DABlocks.POISON_BLOCK.get()), - BlockStateProvider.simple(DABlocks.AETHER_MUD.get()))); + BlockStateProvider.simple(UnityBlocks.AETHER_MUD.get()))); register(context, POISON_SPRING_CONFIGURATION, Feature.SPRING, - AetherConfiguredFeatureBuilders.spring(DABlocks.POISON_BLOCK.get().fluid.defaultFluidState(), true, 4, 1, HolderSet.direct(Block::builtInRegistryHolder, AetherBlocks.HOLYSTONE.get(), DABlocks.AETHER_MUD.get()))); + AetherConfiguredFeatureBuilders.spring(DABlocks.POISON_BLOCK.get().fluid.defaultFluidState(), true, 4, 1, HolderSet.direct(Block::builtInRegistryHolder, AetherBlocks.HOLYSTONE.get(), UnityBlocks.AETHER_MUD.get()))); register(context, AERCLOUD_LAKE_CONFIGURATION, AetherFeatures.LAKE.get(), AetherConfiguredFeatureBuilders.lake(BlockStateProvider.simple(Blocks.WATER), BlockStateProvider.simple(DABlocks.RAIN_AERCLOUD.get()))); @@ -192,7 +194,7 @@ public static void bootstrap(BootstrapContext> context) register(context, LUMINESCENT_SKYROOT_FOREST_GRASS, Feature.RANDOM_PATCH, NitrogenConfiguredFeatureBuilders.grassPatch(new WeightedStateProvider(SimpleWeightedRandomList.builder() - .add(Blocks.SHORT_GRASS.defaultBlockState(),40) + .add(UnityBlocks.SHORT_AETHER_GRASS.get().defaultBlockState(),40) .add(DABlocks.TALL_GLOWING_GRASS.get().defaultBlockState(),20) .add(DAFeatureStates.RADIANT_ORCHID, 4)), 140)); @@ -257,7 +259,7 @@ public static void bootstrap(BootstrapContext> context) BlockStateProvider.simple(DAFeatureStates.VIRULENT_QUICKSAND), ConstantFloat.of(Mth.sqrt(12)), UniformInt.of(0, 48), - HolderSet.direct(Block::builtInRegistryHolder, DABlocks.AETHER_MUD.get()))); + HolderSet.direct(Block::builtInRegistryHolder, UnityBlocks.AETHER_MUD.get()))); register(context, BLUE_ROSEROOT_TREE_LARGE, Feature.TREE, @@ -284,7 +286,7 @@ public static void bootstrap(BootstrapContext> context) new YagrootFoliagePlacer(ConstantInt.of(1), ConstantInt.of(1), ConstantInt.of(1)), Optional.of( new YagrootRootPlacer(UniformInt.of(0, 1), BlockStateProvider.simple(DAFeatureStates.YAGROOT_ROOTS), Optional.of( new AboveRootPlacement(BlockStateProvider.simple(DAFeatureStates.AETHER_MOSS_CARPET), 0.5F)), - new MangroveRootPlacement(holdergetter.getOrThrow(BlockTags.MANGROVE_ROOTS_CAN_GROW_THROUGH), HolderSet.direct(Block::builtInRegistryHolder, DABlocks.AETHER_MUD.get(), DABlocks.MUDDY_YAGROOT_ROOTS.get()), BlockStateProvider.simple(DAFeatureStates.YAGROOT_ROOTS), 8, 15, 0.0F))), + new MangroveRootPlacement(holdergetter.getOrThrow(BlockTags.MANGROVE_ROOTS_CAN_GROW_THROUGH), HolderSet.direct(Block::builtInRegistryHolder, UnityBlocks.AETHER_MUD.get(), DABlocks.MUDDY_YAGROOT_ROOTS.get()), BlockStateProvider.simple(DAFeatureStates.YAGROOT_ROOTS), 8, 15, 0.0F))), new TwoLayersFeatureSize(2, 0, 2))).decorators(List.of(new YagrootVineDecorator(0.2f))).ignoreVines().build()); @@ -356,15 +358,14 @@ public static void bootstrap(BootstrapContext> context) NitrogenConfiguredFeatureBuilders.grassPatch(new WeightedStateProvider(SimpleWeightedRandomList.builder() .add(DAFeatureStates.AERLAVENDER, 64) .add(DAFeatureStates.TALL_AERLAVENDER, 32) - .add(Blocks.TALL_GRASS.defaultBlockState(), 16) .add(AetherFeatureStates.BERRY_BUSH, 1) - .add(Blocks.SHORT_GRASS.defaultBlockState(), 32)), 418)); + .add(UnityBlocks.SHORT_AETHER_GRASS.get().defaultBlockState(), 48)), 418)); register(context, AETHER_CATTAILS_PATCH, Feature.FLOWER, NitrogenConfiguredFeatureBuilders.grassPatch(new WeightedStateProvider(SimpleWeightedRandomList.builder() .add(DAFeatureStates.AETHER_CATTAILS, 5) - .add(Blocks.SHORT_GRASS.defaultBlockState(), 5) + .add(UnityBlocks.SHORT_AETHER_GRASS.get().defaultBlockState(), 5) .add(DAFeatureStates.TALL_AETHER_CATTAILS, 3)), 15)); register(context, ROSEROOT_FOREST_FLOWERS, Feature.FLOWER, @@ -401,8 +402,7 @@ public static void bootstrap(BootstrapContext> context) NitrogenConfiguredFeatureBuilders.grassPatch(new WeightedStateProvider(SimpleWeightedRandomList.builder() .add(DAFeatureStates.FEATHER_GRASS,12) .add(DAFeatureStates.TALL_FEATHER_GRASS,3) - .add(Blocks.SHORT_GRASS.defaultBlockState(),6) - .add(Blocks.TALL_GRASS.defaultBlockState(),2) + .add(UnityBlocks.SHORT_AETHER_GRASS.get().defaultBlockState(), 8) .add(AetherFeatureStates.BERRY_BUSH, 1)), 90)); register(context, ROSEROOT_TREES_PLACEMENT, Feature.RANDOM_SELECTOR, new RandomFeatureConfiguration(List.of( @@ -427,12 +427,12 @@ public static void bootstrap(BootstrapContext> context) PlacementUtils.inlinePlaced(configuredFeatures.getOrThrow(SUNROOT_TREE), PlacementUtils.filteredByBlockSurvival(DABlocks.SUNROOT_SAPLING.get())), 0.5F)), PlacementUtils.inlinePlaced(configuredFeatures.getOrThrow(CONBERRY_TREE), PlacementUtils.filteredByBlockSurvival(DABlocks.CONBERRY_SAPLING.get())))); - register(context, AETHER_MOSS_VEGETATION, Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(DABlocks.AETHER_MOSS_CARPET.get().defaultBlockState(), 25).add(Blocks.SHORT_GRASS.defaultBlockState(), 50).add(Blocks.SHORT_GRASS.defaultBlockState(), 10)))); - register(context, AETHER_MOSS_PATCH_BONEMEAL, Feature.VEGETATION_PATCH, new VegetationPatchConfiguration(BlockTags.MOSS_REPLACEABLE, BlockStateProvider.simple(DABlocks.AETHER_MOSS_BLOCK.get()), + register(context, AETHER_MOSS_VEGETATION, Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(UnityBlocks.FLUTEMOSS_CARPET.get().defaultBlockState(), 25).add(UnityBlocks.SHORT_AETHER_GRASS.get().defaultBlockState(), 50).add(UnityBlocks.SHORT_AETHER_GRASS.get().defaultBlockState(), 10)))); + register(context, AETHER_MOSS_PATCH_BONEMEAL, Feature.VEGETATION_PATCH, new VegetationPatchConfiguration(BlockTags.MOSS_REPLACEABLE, BlockStateProvider.simple(UnityBlocks.FLUTEMOSS_BLOCK.get()), PlacementUtils.inlinePlaced(configuredFeatures.getOrThrow(AETHER_MOSS_VEGETATION)), CaveSurface.FLOOR, ConstantInt.of(1), 0.0F, 5, 0.6F, UniformInt.of(1, 2), 0.75F)); register(context, AETHER_COARSE_DIRT, Feature.SIMPLE_BLOCK, new SimpleBlockConfiguration(new WeightedStateProvider(SimpleWeightedRandomList.builder().add(DABlocks.LIGHTCAP_MUSHROOMS.get().defaultBlockState(), 1).add(Blocks.AIR.defaultBlockState(), 10)))); - register(context, AETHER_COARSE_DIRT_PATCH, Feature.VEGETATION_PATCH, new VegetationPatchConfiguration(BlockTags.MOSS_REPLACEABLE, BlockStateProvider.simple(DABlocks.AETHER_COARSE_DIRT.get()), + register(context, AETHER_COARSE_DIRT_PATCH, Feature.VEGETATION_PATCH, new VegetationPatchConfiguration(BlockTags.MOSS_REPLACEABLE, BlockStateProvider.simple(UnityBlocks.COARSE_AETHER_DIRT.get()), PlacementUtils.inlinePlaced(configuredFeatures.getOrThrow(AETHER_COARSE_DIRT)), CaveSurface.FLOOR, ConstantInt.of(1), 0.0F, 5, 0.6F, UniformInt.of(1, 2), 0.75F)); register(context, ORE_SKYJADE_CONFIGURATION, Feature.ORE, new OreConfiguration(AetherFeatureRules.HOLYSTONE, DAFeatureStates.SKYJADE_ORE, 6, 0.65F)); diff --git a/src/main/java/io/github/razordevs/deep_aether/datagen/tags/DABlockTagData.java b/src/main/java/io/github/razordevs/deep_aether/datagen/tags/DABlockTagData.java index 5ced392fb..a8c00a073 100644 --- a/src/main/java/io/github/razordevs/deep_aether/datagen/tags/DABlockTagData.java +++ b/src/main/java/io/github/razordevs/deep_aether/datagen/tags/DABlockTagData.java @@ -12,6 +12,7 @@ import net.neoforged.neoforge.common.data.BlockTagsProvider; import net.neoforged.neoforge.common.data.ExistingFileHelper; import net.neoforged.neoforge.registries.DeferredHolder; +import net.zepalesque.unity.block.UnityBlocks; import org.jetbrains.annotations.NotNull; import javax.annotation.Nonnull; @@ -231,7 +232,6 @@ protected void addTags(HolderLookup.@NotNull Provider provider) { DABlocks.COBBLED_ASETERITE_WALL.get(), DABlocks.ASETERITE_BRICKS_WALL.get(), DABlocks.BIG_HOLYSTONE_BRICKS_WALL.get(), - DABlocks.AETHER_MUD_BRICKS_WALL.get(), DABlocks.HOLYSTONE_TILE_WALL.get(), DABlocks.MOSSY_HOLYSTONE_BRICK_WALL.get(), DABlocks.MOSSY_HOLYSTONE_TILE_WALL.get(), @@ -304,19 +304,15 @@ protected void addTags(HolderLookup.@NotNull Provider provider) { DABlocks.SUNROOT_HANGER.get() ); - tag(BlockTags.DIRT).add( - DABlocks.AETHER_MUD.get(), - DABlocks.AETHER_MOSS_BLOCK.get(), + tag(AetherTags.Blocks.AETHER_DIRT).add( DABlocks.GOLDEN_GRASS_BLOCK.get(), - DABlocks.AERCLOUD_GRASS_BLOCK.get(), - DABlocks.AETHER_COARSE_DIRT.get() + DABlocks.AERCLOUD_GRASS_BLOCK.get() ); tag(BlockTags.MANGROVE_LOGS_CAN_GROW_THROUGH).add( - DABlocks.AETHER_MOSS_BLOCK.get(), - DABlocks.AETHER_MOSS_CARPET.get(), + UnityBlocks.FLUTEMOSS_BLOCK.get(), + UnityBlocks.FLUTEMOSS_CARPET.get(), DABlocks.CLOUDBLOOM_CARPET.get(), DABlocks.YAGROOT_LOG.get(), - DABlocks.AETHER_MUD.get(), DABlocks.MUDDY_YAGROOT_ROOTS.get(), DABlocks.YAGROOT_ROOTS.get(), DABlocks.TALL_AETHER_CATTAILS.get(), @@ -324,8 +320,8 @@ protected void addTags(HolderLookup.@NotNull Provider provider) { DABlocks.AETHER_CATTAILS.get() ); tag(BlockTags.MANGROVE_ROOTS_CAN_GROW_THROUGH).add( - DABlocks.AETHER_MOSS_BLOCK.get(), - DABlocks.AETHER_MOSS_CARPET.get(), + UnityBlocks.FLUTEMOSS_BLOCK.get(), + UnityBlocks.FLUTEMOSS_CARPET.get(), DABlocks.CLOUDBLOOM_CARPET.get(), DABlocks.YAGROOT_ROOTS.get() ); @@ -342,11 +338,9 @@ protected void addTags(HolderLookup.@NotNull Provider provider) { ); tag(BlockTags.MINEABLE_WITH_SHOVEL).add( - DABlocks.AETHER_MUD.get(), DABlocks.MUDDY_YAGROOT_ROOTS.get(), DABlocks.GOLDEN_GRASS_BLOCK.get(), - DABlocks.GOLDEN_DIRT_PATH.get(), - DABlocks.AETHER_COARSE_DIRT.get() + DABlocks.GOLDEN_DIRT_PATH.get() ); tag(BlockTags.MINEABLE_WITH_HOE).add( DABlocks.YAGROOT_LEAVES.get(), @@ -355,8 +349,6 @@ protected void addTags(HolderLookup.@NotNull Provider provider) { DABlocks.FLOWERING_BLUE_ROSEROOT_LEAVES.get(), DABlocks.BLUE_ROSEROOT_LEAVES.get(), DABlocks.CRUDEROOT_LEAVES.get(), - DABlocks.AETHER_MOSS_BLOCK.get(), - DABlocks.AETHER_MOSS_CARPET.get(), DABlocks.CLOUDBLOOM_CARPET.get(), DABlocks.AERGLOW_BLOSSOM_BLOCK.get(), DABlocks.CONBERRY_LEAVES.get(), @@ -541,12 +533,6 @@ protected void addTags(HolderLookup.@NotNull Provider provider) { DABlocks.MOSSY_HOLYSTONE_TILE_STAIRS.get(), DABlocks.MOSSY_HOLYSTONE_TILE_WALL.get(), - DABlocks.PACKED_AETHER_MUD.get(), - DABlocks.AETHER_MUD_BRICKS.get(), - DABlocks.AETHER_MUD_BRICKS_SLAB.get(), - DABlocks.AETHER_MUD_BRICKS_STAIRS.get(), - DABlocks.AETHER_MUD_BRICKS_WALL.get(), - DABlocks.GILDED_HOLYSTONE_BRICKS.get(), DABlocks.GILDED_HOLYSTONE_BRICK_SLAB.get(), DABlocks.GILDED_HOLYSTONE_BRICK_STAIRS.get(), diff --git a/src/main/java/io/github/razordevs/deep_aether/datagen/tags/DAItemTagData.java b/src/main/java/io/github/razordevs/deep_aether/datagen/tags/DAItemTagData.java index 457afd524..d5f99771b 100644 --- a/src/main/java/io/github/razordevs/deep_aether/datagen/tags/DAItemTagData.java +++ b/src/main/java/io/github/razordevs/deep_aether/datagen/tags/DAItemTagData.java @@ -16,6 +16,7 @@ import net.neoforged.neoforge.common.Tags; import net.neoforged.neoforge.common.data.ExistingFileHelper; import net.neoforged.neoforge.registries.DeferredHolder; +import net.zepalesque.unity.data.UnityTags; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -88,6 +89,10 @@ protected void addTags(HolderLookup.Provider provider) { DABlocks.STRIPPED_SUNROOT_WOOD.get().asItem() ); + tag(UnityTags.Items.PACKED_AETHER_MUD_CRAFTING).add( + DAItems.AERGLOW_BLOSSOM.get() + ); + tag(AetherTags.Items.SKYROOT_STICK_CRAFTING).add( DABlocks.ROSEROOT_PLANKS.get().asItem(), DABlocks.YAGROOT_PLANKS.get().asItem(), @@ -188,7 +193,6 @@ protected void addTags(HolderLookup.Provider provider) { DABlocks.COBBLED_ASETERITE_STAIRS.get().asItem(), DABlocks.ASETERITE_BRICKS_STAIRS.get().asItem(), DABlocks.BIG_HOLYSTONE_BRICKS_STAIRS.get().asItem(), - DABlocks.AETHER_MUD_BRICKS_STAIRS.get().asItem(), DABlocks.HOLYSTONE_TILE_STAIRS.get().asItem(), DABlocks.MOSSY_HOLYSTONE_BRICK_STAIRS.get().asItem(), DABlocks.MOSSY_HOLYSTONE_TILE_STAIRS.get().asItem(), @@ -210,7 +214,6 @@ protected void addTags(HolderLookup.Provider provider) { DABlocks.COBBLED_ASETERITE_SLAB.get().asItem(), DABlocks.ASETERITE_BRICKS_SLAB.get().asItem(), DABlocks.BIG_HOLYSTONE_BRICKS_SLAB.get().asItem(), - DABlocks.AETHER_MUD_BRICKS_SLAB.get().asItem(), DABlocks.HOLYSTONE_TILE_SLAB.get().asItem(), DABlocks.MOSSY_HOLYSTONE_BRICK_SLAB.get().asItem(), DABlocks.MOSSY_HOLYSTONE_TILE_SLAB.get().asItem(), @@ -237,7 +240,6 @@ protected void addTags(HolderLookup.Provider provider) { DABlocks.COBBLED_ASETERITE_WALL.get().asItem(), DABlocks.ASETERITE_BRICKS_WALL.get().asItem(), DABlocks.BIG_HOLYSTONE_BRICKS_WALL.get().asItem(), - DABlocks.AETHER_MUD_BRICKS_WALL.get().asItem(), DABlocks.HOLYSTONE_TILE_WALL.get().asItem(), DABlocks.MOSSY_HOLYSTONE_BRICK_WALL.get().asItem(), DABlocks.MOSSY_HOLYSTONE_TILE_WALL.get().asItem(), diff --git a/src/main/java/io/github/razordevs/deep_aether/init/DABlocks.java b/src/main/java/io/github/razordevs/deep_aether/init/DABlocks.java index e51a95664..fb5cc5997 100644 --- a/src/main/java/io/github/razordevs/deep_aether/init/DABlocks.java +++ b/src/main/java/io/github/razordevs/deep_aether/init/DABlocks.java @@ -56,7 +56,6 @@ public class DABlocks { //GRASS public static final DeferredBlock GOLDEN_GRASS_BLOCK = registerBlock("golden_heights_grass_block", () -> new GoldenGrassBlock(Block.Properties.of().mapColor(MapColor.GOLD).randomTicks().strength(0.2F).sound(SoundType.GRASS))); public static final DeferredBlock GOLDEN_DIRT_PATH = registerBlock("golden_heights_dirt_path", () -> new AetherDirtPathBlock(Block.Properties.of().mapColor(MapColor.GOLD).strength(0.2F).sound(SoundType.GRASS))); - public static final DeferredBlock AETHER_COARSE_DIRT = registerBlock("aether_coarse_dirt", () -> new AetherCoarseDirtBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.COARSE_DIRT))); public static final DeferredBlock MINI_GOLDEN_GRASS = registerBlock("mini_golden_grass", ()-> new GoldenGrassPlant(BlockBehaviour.Properties.ofFullCopy(Blocks.SHORT_GRASS))); public static final DeferredBlock SHORT_GOLDEN_GRASS = registerBlock("short_golden_grass", ()-> new GoldenGrassPlant(BlockBehaviour.Properties.ofFullCopy(Blocks.SHORT_GRASS))); @@ -357,21 +356,14 @@ public class DABlocks { //MISC public static final DeferredBlock AERGLOW_BLOSSOM_BLOCK = registerBlock("aerglow_blossom_block", () -> new Block(BlockBehaviour.Properties.of().sound(SoundType.MOSS).strength(1f, 10f).lightLevel(s -> 9))); - public static final DeferredBlock AETHER_MOSS_CARPET = registerBlock("aether_moss_carpet", () -> new CarpetBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.MOSS_CARPET))); public static final DeferredBlock CLOUDBLOOM_CARPET = registerBlock("cloudbloom_carpet", () -> new CarpetBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.MOSS_CARPET))); - public static final DeferredBlock AETHER_MOSS_BLOCK = registerBlock("aether_moss_block", () -> new DAMossBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.MOSS_BLOCK))); public static final DeferredBlock VIRULENT_QUICKSAND = BLOCKS.register("virulent_quicksand", () -> new VirulentQuicksandBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.SAND))); public static final DeferredBlock SKYJADE_CHAIN = registerBlock("skyjade_chain", () -> new ChainBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.CHAIN))); public static final DeferredBlock SKYJADE_LANTERN = registerBlock("skyjade_lantern", () -> new LanternBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.LANTERN))); - //MUD - public static final DeferredBlock AETHER_MUD = registerBlock("aether_mud", () -> new DoubleDropMudBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.MUD).noOcclusion())); - public static final DeferredBlock PACKED_AETHER_MUD = registerBlock("packed_aether_mud", () -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.PACKED_MUD))); - public static final DeferredBlock AETHER_MUD_BRICKS = registerBlock("aether_mud_bricks", () -> new Block(BlockBehaviour.Properties.ofFullCopy(Blocks.MUD_BRICKS))); - public static final DeferredBlock AETHER_MUD_BRICKS_SLAB = registerBlock("aether_mud_bricks_slab", () -> new SlabBlock(BlockBehaviour.Properties.ofFullCopy(Blocks.MUD_BRICK_SLAB))); - public static final DeferredBlock AETHER_MUD_BRICKS_STAIRS = registerBlock("aether_mud_bricks_stairs", () -> new StairBlock(DABlocks.AETHER_MUD_BRICKS.get().defaultBlockState(), BlockBehaviour.Properties.of().sound(SoundType.MUD_BRICKS).strength(2.0F, 6.0F).requiresCorrectToolForDrops())); - public static final DeferredBlock AETHER_MUD_BRICKS_WALL = registerBlock("aether_mud_bricks_wall", () -> new WallBlock(BlockBehaviour.Properties.of().sound(SoundType.MUD_BRICKS).strength(2.0F, 6.0F).requiresCorrectToolForDrops())); + // POISON + public static final DeferredBlock POISON_BLOCK = BLOCKS.register("poison", () -> new PoisonBlock(DAFluids.POISON_FLUID.get(), BlockBehaviour.Properties.of() .noCollission() .replaceable() diff --git a/src/main/java/io/github/razordevs/deep_aether/init/DAMenus.java b/src/main/java/io/github/razordevs/deep_aether/init/DAMenus.java index 1f94103ac..f408b4650 100644 --- a/src/main/java/io/github/razordevs/deep_aether/init/DAMenus.java +++ b/src/main/java/io/github/razordevs/deep_aether/init/DAMenus.java @@ -5,9 +5,10 @@ import io.github.razordevs.deep_aether.DeepAether; import net.neoforged.neoforge.registries.DeferredRegister; -public class DAMenus { - public static final DeferredRegister MENUS = DeferredRegister.create(Cumulus.MENU_REGISTRY_KEY, DeepAether.MODID); +public class DAMenus { +// public static final DeferredRegister MENUS = DeferredRegister.create(Cumulus.MENU_REGISTRY_KEY, DeepAether.MODID); +// // // Icons // private static final ResourceLocation DEEP_AETHER_ICON = ResourceLocation.fromNamespaceAndPath(DeepAether.MODID, "textures/gui/menu_api/menu_icon_deep_aether.png"); // diff --git a/src/main/java/io/github/razordevs/deep_aether/init/DATabs.java b/src/main/java/io/github/razordevs/deep_aether/init/DATabs.java index 9ee178b59..23169ee7a 100644 --- a/src/main/java/io/github/razordevs/deep_aether/init/DATabs.java +++ b/src/main/java/io/github/razordevs/deep_aether/init/DATabs.java @@ -192,14 +192,6 @@ public static void buildCreativeModeTabs(BuildCreativeModeTabContentsEvent event }, event); } - addToTab(AetherBlocks.HOLYSTONE_BRICK_WALL.get().asItem(), new Block[]{ - DABlocks.PACKED_AETHER_MUD.get(), - DABlocks.AETHER_MUD_BRICKS.get(), - DABlocks.AETHER_MUD_BRICKS_STAIRS.get(), - DABlocks.AETHER_MUD_BRICKS_SLAB.get(), - DABlocks.AETHER_MUD_BRICKS_WALL.get(), - }, event); - addToTab(AetherBlocks.ZANITE_BLOCK.get().asItem(), DABlocks.SKYJADE_BLOCK.get().asItem(), event); addToTab(AetherBlocks.ENCHANTED_GRAVITITE.get().asItem(), DABlocks.STRATUS_BLOCK.get().asItem(), event); @@ -208,12 +200,8 @@ public static void buildCreativeModeTabs(BuildCreativeModeTabContentsEvent event if (tab == AetherCreativeTabs.AETHER_NATURAL_BLOCKS.getKey()) { addToTab(AetherBlocks.ENCHANTED_AETHER_GRASS_BLOCK.get().asItem(), DABlocks.GOLDEN_GRASS_BLOCK.get().asItem(), event); addToTab(AetherBlocks.AETHER_DIRT_PATH.get().asItem(), DABlocks.GOLDEN_DIRT_PATH.get().asItem(), event); - addToTab(AetherBlocks.AETHER_DIRT.get().asItem(), DABlocks.AETHER_COARSE_DIRT.get().asItem(), event); addToTab(AetherBlocks.AETHER_FARMLAND.get().asItem(), new Block[]{ - DABlocks.AETHER_MOSS_BLOCK.get(), - DABlocks.AETHER_MOSS_CARPET.get(), DABlocks.CLOUDBLOOM_CARPET.get(), - DABlocks.AETHER_MUD.get(), DABlocks.MUDDY_YAGROOT_ROOTS.get(), DABlocks.YAGROOT_ROOTS.get() }, event); diff --git a/src/main/java/io/github/razordevs/deep_aether/item/misc/SunClock.java b/src/main/java/io/github/razordevs/deep_aether/item/misc/SunClock.java index a5318a0a8..05a7046be 100644 --- a/src/main/java/io/github/razordevs/deep_aether/item/misc/SunClock.java +++ b/src/main/java/io/github/razordevs/deep_aether/item/misc/SunClock.java @@ -3,6 +3,7 @@ import com.aetherteam.aether.Aether; import com.aetherteam.aether.AetherConfig; import com.aetherteam.aether.attachment.AetherDataAttachments; +import com.aetherteam.aether.attachment.AetherTimeAttachment; import com.aetherteam.aether.command.SunAltarWhitelist; import com.aetherteam.aether.data.resources.registries.AetherDimensions; import com.aetherteam.aether.network.packet.clientbound.OpenSunAltarPacket; @@ -34,7 +35,7 @@ public InteractionResultHolder use(Level level, Player player, Intera if (level.dimension().location().toString().equals("aether:the_aether")) { if (level.hasData(AetherDataAttachments.AETHER_TIME)) { // Checks if the level has the capability used for Aether time, which determines if the Sun Altar has control over the time of a dimension. if (!level.getData(AetherDataAttachments.AETHER_TIME).isEternalDay()) { // Checks if the time is locked into eternal day or not. - this.openScreen(level, player, AetherDimensions.AETHER_TICKS_PER_DAY); + this.openScreen(level, player, AetherTimeAttachment.getTicksPerDay()); } else { player.displayClientMessage(Component.translatable(Aether.MODID + ".sun_altar.in_control"), true); // Sun Spirit is still in control of the realm. } diff --git a/src/main/java/io/github/razordevs/deep_aether/screen/DATitleScreen.java b/src/main/java/io/github/razordevs/deep_aether/screen/DATitleScreen.java index ac0decbe8..133dac901 100644 --- a/src/main/java/io/github/razordevs/deep_aether/screen/DATitleScreen.java +++ b/src/main/java/io/github/razordevs/deep_aether/screen/DATitleScreen.java @@ -2,10 +2,10 @@ import com.aetherteam.aether.client.AetherSoundEvents; import com.aetherteam.aether.client.gui.component.menu.AetherMenuButton; -import com.aetherteam.aether.client.gui.component.menu.DynamicMenuButton; import com.aetherteam.aether.client.gui.screen.menu.AetherTitleScreen; import com.aetherteam.aether.client.gui.screen.menu.TitleScreenBehavior; import com.aetherteam.aether.mixin.mixins.client.accessor.TitleScreenAccessor; +import com.aetherteam.cumulus.client.gui.screen.DynamicMenuButton; import com.aetherteam.cumulus.mixin.mixins.client.accessor.SplashRendererAccessor; import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; diff --git a/src/main/java/io/github/razordevs/deep_aether/world/biomes/DASurfaceData.java b/src/main/java/io/github/razordevs/deep_aether/world/biomes/DASurfaceData.java index afd827418..15679c0c0 100644 --- a/src/main/java/io/github/razordevs/deep_aether/world/biomes/DASurfaceData.java +++ b/src/main/java/io/github/razordevs/deep_aether/world/biomes/DASurfaceData.java @@ -6,6 +6,7 @@ import net.minecraft.world.level.levelgen.Noises; import net.minecraft.world.level.levelgen.SurfaceRules; import net.minecraft.world.level.levelgen.placement.CaveSurface; +import net.zepalesque.unity.block.UnityBlocks; public class DASurfaceData { @@ -29,10 +30,10 @@ public static SurfaceRules.RuleSource makeRules() SurfaceRules.state(DABlocks.VIRULENT_QUICKSAND.get().defaultBlockState())))), SurfaceRules.ifTrue(SurfaceRules.isBiome(DABiomes.YAGROOT_SWAMP), - SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR, SurfaceRules.state(DABlocks.AETHER_MUD.get().defaultBlockState().setValue(AetherBlockStateProperties.DOUBLE_DROPS, true)))), + SurfaceRules.ifTrue(SurfaceRules.ON_FLOOR, SurfaceRules.state(UnityBlocks.AETHER_MUD.get().defaultBlockState().setValue(AetherBlockStateProperties.DOUBLE_DROPS, true)))), SurfaceRules.ifTrue(SurfaceRules.isBiome(DABiomes.YAGROOT_SWAMP), - SurfaceRules.ifTrue(SurfaceRules.stoneDepthCheck(0, true, 0, CaveSurface.FLOOR), SurfaceRules.state(DABlocks.AETHER_MUD.get().defaultBlockState().setValue(AetherBlockStateProperties.DOUBLE_DROPS, true)))) + SurfaceRules.ifTrue(SurfaceRules.stoneDepthCheck(0, true, 0, CaveSurface.FLOOR), SurfaceRules.state(UnityBlocks.AETHER_MUD.get().defaultBlockState().setValue(AetherBlockStateProperties.DOUBLE_DROPS, true)))) ); } } diff --git a/src/main/java/io/github/razordevs/deep_aether/world/feature/DAFeatureStates.java b/src/main/java/io/github/razordevs/deep_aether/world/feature/DAFeatureStates.java index 3077c8a82..cef913efc 100644 --- a/src/main/java/io/github/razordevs/deep_aether/world/feature/DAFeatureStates.java +++ b/src/main/java/io/github/razordevs/deep_aether/world/feature/DAFeatureStates.java @@ -3,6 +3,7 @@ import com.aetherteam.aether.block.AetherBlockStateProperties; import io.github.razordevs.deep_aether.init.DABlocks; import net.minecraft.world.level.block.state.BlockState; +import net.zepalesque.unity.block.UnityBlocks; public class DAFeatureStates { public static final BlockState ROSEROOT_LOG = DABlocks.ROSEROOT_LOG.get().defaultBlockState().setValue(AetherBlockStateProperties.DOUBLE_DROPS, true); @@ -17,7 +18,7 @@ public class DAFeatureStates { public static final BlockState FLOWERING_ROSEROOT_LEAVES = DABlocks.FLOWERING_ROSEROOT_LEAVES.get().defaultBlockState().setValue(AetherBlockStateProperties.DOUBLE_DROPS, true); public static final BlockState FLOWERING_BLUE_ROSEROOT_LEAVES = DABlocks.FLOWERING_BLUE_ROSEROOT_LEAVES.get().defaultBlockState().setValue(AetherBlockStateProperties.DOUBLE_DROPS, true); public static final BlockState YAGROOT_ROOTS = DABlocks.YAGROOT_ROOTS.get().defaultBlockState().setValue(AetherBlockStateProperties.DOUBLE_DROPS, true); - public static final BlockState AETHER_MOSS_CARPET = DABlocks.AETHER_MOSS_CARPET.get().defaultBlockState(); + public static final BlockState AETHER_MOSS_CARPET = UnityBlocks.FLUTEMOSS_CARPET.get().defaultBlockState(); public static final BlockState SKYJADE_ORE = DABlocks.SKYJADE_ORE.get().defaultBlockState(); public static final BlockState ASETERITE = DABlocks.ASETERITE.get().defaultBlockState().setValue(AetherBlockStateProperties.DOUBLE_DROPS, true); public static final BlockState RAW_CLORITE = DABlocks.RAW_CLORITE.get().defaultBlockState().setValue(AetherBlockStateProperties.DOUBLE_DROPS, true); @@ -37,6 +38,6 @@ public class DAFeatureStates { public static final BlockState SUNROOT_LOG = DABlocks.SUNROOT_LOG.get().defaultBlockState().setValue(AetherBlockStateProperties.DOUBLE_DROPS, true); public static final BlockState SUNROOT_LEAVES = DABlocks.SUNROOT_LEAVES.get().defaultBlockState().setValue(AetherBlockStateProperties.DOUBLE_DROPS, true); public static final BlockState VIRULENT_QUICKSAND = DABlocks.VIRULENT_QUICKSAND.get().defaultBlockState(); - public static final BlockState AETHER_MUD = DABlocks.AETHER_MUD.get().defaultBlockState().setValue(AetherBlockStateProperties.DOUBLE_DROPS, true); + public static final BlockState AETHER_MUD = UnityBlocks.AETHER_MUD.get().defaultBlockState().setValue(AetherBlockStateProperties.DOUBLE_DROPS, true); } diff --git a/src/main/resources/data/deep_aether/structure/brass_dungeon/brass_dungeon_room_0.nbt b/src/main/resources/data/deep_aether/structure/brass_dungeon/brass_dungeon_room_0.nbt index 2642cc5ed..da4a65d9a 100644 Binary files a/src/main/resources/data/deep_aether/structure/brass_dungeon/brass_dungeon_room_0.nbt and b/src/main/resources/data/deep_aether/structure/brass_dungeon/brass_dungeon_room_0.nbt differ diff --git a/src/main/resources/data/deep_aether/structure/brass_dungeon/brass_dungeon_room_0_boss.nbt b/src/main/resources/data/deep_aether/structure/brass_dungeon/brass_dungeon_room_0_boss.nbt index d3c6b33c7..7b7219474 100644 Binary files a/src/main/resources/data/deep_aether/structure/brass_dungeon/brass_dungeon_room_0_boss.nbt and b/src/main/resources/data/deep_aether/structure/brass_dungeon/brass_dungeon_room_0_boss.nbt differ diff --git a/src/main/resources/data/deep_aether/structure/brass_dungeon/brass_dungeon_room_1.nbt b/src/main/resources/data/deep_aether/structure/brass_dungeon/brass_dungeon_room_1.nbt index d5f52db68..3378c80c6 100644 Binary files a/src/main/resources/data/deep_aether/structure/brass_dungeon/brass_dungeon_room_1.nbt and b/src/main/resources/data/deep_aether/structure/brass_dungeon/brass_dungeon_room_1.nbt differ diff --git a/src/main/resources/data/deep_aether/structure/brass_dungeon/brass_dungeon_room_2_boss.nbt b/src/main/resources/data/deep_aether/structure/brass_dungeon/brass_dungeon_room_2_boss.nbt index f8e253338..ddf9a7af8 100644 Binary files a/src/main/resources/data/deep_aether/structure/brass_dungeon/brass_dungeon_room_2_boss.nbt and b/src/main/resources/data/deep_aether/structure/brass_dungeon/brass_dungeon_room_2_boss.nbt differ diff --git a/src/main/resources/data/deep_aether/structure/sacred_lands/altar_camp.nbt b/src/main/resources/data/deep_aether/structure/sacred_lands/altar_camp.nbt index 3c2c2356c..51e114586 100644 Binary files a/src/main/resources/data/deep_aether/structure/sacred_lands/altar_camp.nbt and b/src/main/resources/data/deep_aether/structure/sacred_lands/altar_camp.nbt differ