From 2bf1dfef061494782bfe6f76a714aa232effc753 Mon Sep 17 00:00:00 2001 From: maple! Date: Wed, 14 Aug 2024 20:54:33 +0200 Subject: [PATCH] 1.1.0 backport, part 1 --- .../rounded/blockstates/bladderwrack.json | 7 + .../blockstates/bladderwrack_block.json | 7 + .../blockstates/bladderwrack_wall.json | 19 +++ .../chiseled_prismarine_bricks.json | 7 + .../blockstates/dead_bladderwrack.json | 7 + .../blockstates/dead_bladderwrack_block.json | 7 + .../blockstates/dead_bladderwrack_wall.json | 19 +++ .../blockstates/moisture_detector.json | 10 ++ .../blockstates/prismarine_lantern.json | 10 ++ .../blockstates/smooth_prismarine.json | 7 + .../blockstates/smooth_prismarine_slab.json | 13 ++ .../resources/assets/rounded/lang/en_pt.json | 42 +++++ .../resources/assets/rounded/lang/en_us.json | 20 ++- .../resources/assets/rounded/lang/lol_us.json | 15 +- .../resources/assets/rounded/lang/pl_pl.json | 13 ++ .../rounded/models/block/bladderwrack.json | 6 + .../models/block/bladderwrack_block.json | 6 + .../models/block/bladderwrack_wall.json | 6 + .../block/chiseled_prismarine_bricks.json | 7 + .../models/block/dead_bladderwrack.json | 6 + .../models/block/dead_bladderwrack_block.json | 6 + .../models/block/dead_bladderwrack_wall.json | 6 + .../models/block/moisture_detector.json | 8 + .../models/block/moisture_detector_level.json | 8 + .../models/block/prismarine_lantern.json | 6 + .../block/prismarine_lantern_hanging.json | 6 + .../models/block/smooth_prismarine.json | 6 + .../models/block/smooth_prismarine_slab.json | 8 + .../block/smooth_prismarine_slab_double.json | 7 + .../block/smooth_prismarine_slab_top.json | 8 + .../rounded/models/item/bladderwrack.json | 6 + .../models/item/bladderwrack_block.json | 3 + .../item/chiseled_prismarine_bricks.json | 3 + .../models/item/dead_bladderwrack.json | 6 + .../models/item/dead_bladderwrack_block.json | 3 + .../models/item/moisture_detector.json | 3 + .../models/item/prismarine_lantern.json | 6 + .../models/item/smooth_prismarine.json | 3 + .../models/item/smooth_prismarine_slab.json | 3 + .../rounded/textures/block/bladderwrack.png | Bin 0 -> 200 bytes .../textures/block/bladderwrack_block.png | Bin 0 -> 221 bytes .../block/chiseled_prismarine_bricks.png | Bin 0 -> 211 bytes .../betterend/treated_dragon_tree_planks.png | Bin 278 -> 270 bytes .../betterend/treated_helix_tree_planks.png | Bin 220 -> 210 bytes .../betterend/treated_jellyshroom_planks.png | Bin 220 -> 210 bytes .../betterend/treated_lacugrove_planks.png | Bin 220 -> 210 bytes .../betterend/treated_lucernia_planks.png | Bin 220 -> 210 bytes .../treated_mossy_glowshroom_planks.png | Bin 220 -> 210 bytes .../betterend/treated_pythadendron_planks.png | Bin 300 -> 292 bytes .../betterend/treated_tenanea_planks.png | Bin 220 -> 210 bytes .../treated_umbrella_tree_planks.png | Bin 220 -> 210 bytes .../treated_mushroom_fir_planks.png | Bin 220 -> 210 bytes .../treated_nether_mushroom_planks.png | Bin 474 -> 461 bytes .../betternether/treated_rubeus_planks.png | Bin 248 -> 247 bytes .../betternether/treated_wart_planks.png | Bin 422 -> 415 bytes .../betternether/treated_willow_planks.png | Bin 222 -> 219 bytes .../biomesoplenty/treated_dead_planks.png | Bin 220 -> 207 bytes .../biomesoplenty/treated_empyreal_planks.png | Bin 220 -> 207 bytes .../biomesoplenty/treated_fir_planks.png | Bin 220 -> 207 bytes .../biomesoplenty/treated_hellbark_planks.png | Bin 220 -> 207 bytes .../treated_jacaranda_planks.png | Bin 220 -> 207 bytes .../biomesoplenty/treated_magic_planks.png | Bin 223 -> 210 bytes .../biomesoplenty/treated_mahogany_planks.png | Bin 220 -> 207 bytes .../biomesoplenty/treated_maple_planks.png | Bin 220 -> 207 bytes .../biomesoplenty/treated_palm_planks.png | Bin 220 -> 207 bytes .../biomesoplenty/treated_pine_planks.png | Bin 220 -> 207 bytes .../biomesoplenty/treated_redwood_planks.png | Bin 220 -> 207 bytes .../biomesoplenty/treated_umbran_planks.png | Bin 220 -> 207 bytes .../biomesoplenty/treated_willow_planks.png | Bin 220 -> 207 bytes .../cinderscapes/treated_scorched_planks.png | Bin 574 -> 207 bytes .../cinderscapes/treated_umbral_planks.png | Bin 574 -> 207 bytes .../terrestria/treated_hemlock_planks.png | Bin 394 -> 378 bytes .../treated_hevea_brasiliensis_planks.png | Bin 200 -> 194 bytes .../wilderwild/treated_baobab_planks.png | Bin 220 -> 207 bytes .../wilderwild/treated_cypress_planks.png | Bin 220 -> 207 bytes .../compat/wilderwild/treated_palm_planks.png | Bin 219 -> 206 bytes .../textures/block/dead_bladderwrack.png | Bin 0 -> 200 bytes .../block/dead_bladderwrack_block.png | Bin 0 -> 221 bytes .../rounded/textures/block/lustershroom.png | Bin 160 -> 147 bytes .../textures/block/lustershroom_block.png | Bin 195 -> 176 bytes .../textures/block/moisture_detector_side.png | Bin 0 -> 210 bytes .../textures/block/moisture_detector_top.png | Bin 0 -> 229 bytes .../block/moisture_detector_top_level.png | Bin 0 -> 229 bytes .../textures/block/prismarine_lantern.png | Bin 0 -> 302 bytes .../block/prismarine_lantern.png.mcmeta | 5 + .../textures/block/smooth_prismarine.png | Bin 0 -> 191 bytes .../block/smooth_prismarine_slab_side.png | Bin 0 -> 192 bytes .../textures/block/treated_acacia_planks.png | Bin 219 -> 208 bytes .../textures/block/treated_bamboo_planks.png | Bin 230 -> 223 bytes .../textures/block/treated_birch_planks.png | Bin 220 -> 210 bytes .../textures/block/treated_cherry_planks.png | Bin 220 -> 210 bytes .../textures/block/treated_crimson_planks.png | Bin 220 -> 210 bytes .../textures/block/treated_jungle_planks.png | Bin 220 -> 210 bytes .../block/treated_mangrove_planks.png | Bin 220 -> 210 bytes .../textures/block/treated_oak_planks.png | Bin 220 -> 210 bytes .../textures/block/treated_spruce_planks.png | Bin 220 -> 210 bytes .../textures/block/treated_warped_planks.png | Bin 220 -> 210 bytes .../rounded/textures/block/trough_feed.png | Bin 179 -> 166 bytes .../rounded/textures/block/trough_inside.png | Bin 158 -> 145 bytes .../rounded/textures/block/trough_side.png | Bin 238 -> 225 bytes .../textures/item/prismarine_lantern.png | Bin 0 -> 207 bytes .../com/lumiscosity/rounded/RegisterMisc.java | 21 +++ .../java/com/lumiscosity/rounded/Rounded.java | 3 + .../rounded/blocks/MoistureDetectorBlock.java | 133 ++++++++++++++++ .../rounded/blocks/RegisterBlocks.java | 146 ++++++++++++++---- .../rounded/mixin/ExtraConduitPowerMixin.java | 19 +++ .../rounded/worldgen/RegisterFeatures.java | 46 ++++++ src/main/resources/rounded.mixins.json | 3 +- 108 files changed, 683 insertions(+), 32 deletions(-) create mode 100644 src/client/resources/assets/rounded/blockstates/bladderwrack.json create mode 100644 src/client/resources/assets/rounded/blockstates/bladderwrack_block.json create mode 100644 src/client/resources/assets/rounded/blockstates/bladderwrack_wall.json create mode 100644 src/client/resources/assets/rounded/blockstates/chiseled_prismarine_bricks.json create mode 100644 src/client/resources/assets/rounded/blockstates/dead_bladderwrack.json create mode 100644 src/client/resources/assets/rounded/blockstates/dead_bladderwrack_block.json create mode 100644 src/client/resources/assets/rounded/blockstates/dead_bladderwrack_wall.json create mode 100644 src/client/resources/assets/rounded/blockstates/moisture_detector.json create mode 100644 src/client/resources/assets/rounded/blockstates/prismarine_lantern.json create mode 100644 src/client/resources/assets/rounded/blockstates/smooth_prismarine.json create mode 100644 src/client/resources/assets/rounded/blockstates/smooth_prismarine_slab.json create mode 100644 src/client/resources/assets/rounded/lang/en_pt.json create mode 100644 src/client/resources/assets/rounded/models/block/bladderwrack.json create mode 100644 src/client/resources/assets/rounded/models/block/bladderwrack_block.json create mode 100644 src/client/resources/assets/rounded/models/block/bladderwrack_wall.json create mode 100644 src/client/resources/assets/rounded/models/block/chiseled_prismarine_bricks.json create mode 100644 src/client/resources/assets/rounded/models/block/dead_bladderwrack.json create mode 100644 src/client/resources/assets/rounded/models/block/dead_bladderwrack_block.json create mode 100644 src/client/resources/assets/rounded/models/block/dead_bladderwrack_wall.json create mode 100644 src/client/resources/assets/rounded/models/block/moisture_detector.json create mode 100644 src/client/resources/assets/rounded/models/block/moisture_detector_level.json create mode 100644 src/client/resources/assets/rounded/models/block/prismarine_lantern.json create mode 100644 src/client/resources/assets/rounded/models/block/prismarine_lantern_hanging.json create mode 100644 src/client/resources/assets/rounded/models/block/smooth_prismarine.json create mode 100644 src/client/resources/assets/rounded/models/block/smooth_prismarine_slab.json create mode 100644 src/client/resources/assets/rounded/models/block/smooth_prismarine_slab_double.json create mode 100644 src/client/resources/assets/rounded/models/block/smooth_prismarine_slab_top.json create mode 100644 src/client/resources/assets/rounded/models/item/bladderwrack.json create mode 100644 src/client/resources/assets/rounded/models/item/bladderwrack_block.json create mode 100644 src/client/resources/assets/rounded/models/item/chiseled_prismarine_bricks.json create mode 100644 src/client/resources/assets/rounded/models/item/dead_bladderwrack.json create mode 100644 src/client/resources/assets/rounded/models/item/dead_bladderwrack_block.json create mode 100644 src/client/resources/assets/rounded/models/item/moisture_detector.json create mode 100644 src/client/resources/assets/rounded/models/item/prismarine_lantern.json create mode 100644 src/client/resources/assets/rounded/models/item/smooth_prismarine.json create mode 100644 src/client/resources/assets/rounded/models/item/smooth_prismarine_slab.json create mode 100644 src/client/resources/assets/rounded/textures/block/bladderwrack.png create mode 100644 src/client/resources/assets/rounded/textures/block/bladderwrack_block.png create mode 100644 src/client/resources/assets/rounded/textures/block/chiseled_prismarine_bricks.png create mode 100644 src/client/resources/assets/rounded/textures/block/dead_bladderwrack.png create mode 100644 src/client/resources/assets/rounded/textures/block/dead_bladderwrack_block.png create mode 100644 src/client/resources/assets/rounded/textures/block/moisture_detector_side.png create mode 100644 src/client/resources/assets/rounded/textures/block/moisture_detector_top.png create mode 100644 src/client/resources/assets/rounded/textures/block/moisture_detector_top_level.png create mode 100644 src/client/resources/assets/rounded/textures/block/prismarine_lantern.png create mode 100644 src/client/resources/assets/rounded/textures/block/prismarine_lantern.png.mcmeta create mode 100644 src/client/resources/assets/rounded/textures/block/smooth_prismarine.png create mode 100644 src/client/resources/assets/rounded/textures/block/smooth_prismarine_slab_side.png create mode 100644 src/client/resources/assets/rounded/textures/item/prismarine_lantern.png create mode 100644 src/main/java/com/lumiscosity/rounded/RegisterMisc.java create mode 100644 src/main/java/com/lumiscosity/rounded/blocks/MoistureDetectorBlock.java create mode 100644 src/main/java/com/lumiscosity/rounded/mixin/ExtraConduitPowerMixin.java create mode 100644 src/main/java/com/lumiscosity/rounded/worldgen/RegisterFeatures.java diff --git a/src/client/resources/assets/rounded/blockstates/bladderwrack.json b/src/client/resources/assets/rounded/blockstates/bladderwrack.json new file mode 100644 index 0000000..f9a708a --- /dev/null +++ b/src/client/resources/assets/rounded/blockstates/bladderwrack.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "rounded:block/bladderwrack" + } + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/blockstates/bladderwrack_block.json b/src/client/resources/assets/rounded/blockstates/bladderwrack_block.json new file mode 100644 index 0000000..8807452 --- /dev/null +++ b/src/client/resources/assets/rounded/blockstates/bladderwrack_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "rounded:block/bladderwrack_block" + } + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/blockstates/bladderwrack_wall.json b/src/client/resources/assets/rounded/blockstates/bladderwrack_wall.json new file mode 100644 index 0000000..6b49177 --- /dev/null +++ b/src/client/resources/assets/rounded/blockstates/bladderwrack_wall.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "rounded:block/bladderwrack_wall", + "y": 90 + }, + "facing=north": { + "model": "rounded:block/bladderwrack_wall" + }, + "facing=south": { + "model": "rounded:block/bladderwrack_wall", + "y": 180 + }, + "facing=west": { + "model": "rounded:block/bladderwrack_wall", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/blockstates/chiseled_prismarine_bricks.json b/src/client/resources/assets/rounded/blockstates/chiseled_prismarine_bricks.json new file mode 100644 index 0000000..e8c661d --- /dev/null +++ b/src/client/resources/assets/rounded/blockstates/chiseled_prismarine_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "rounded:block/chiseled_prismarine_bricks" + } + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/blockstates/dead_bladderwrack.json b/src/client/resources/assets/rounded/blockstates/dead_bladderwrack.json new file mode 100644 index 0000000..9a5b47d --- /dev/null +++ b/src/client/resources/assets/rounded/blockstates/dead_bladderwrack.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "rounded:block/dead_bladderwrack" + } + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/blockstates/dead_bladderwrack_block.json b/src/client/resources/assets/rounded/blockstates/dead_bladderwrack_block.json new file mode 100644 index 0000000..93f4de3 --- /dev/null +++ b/src/client/resources/assets/rounded/blockstates/dead_bladderwrack_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "rounded:block/dead_bladderwrack_block" + } + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/blockstates/dead_bladderwrack_wall.json b/src/client/resources/assets/rounded/blockstates/dead_bladderwrack_wall.json new file mode 100644 index 0000000..1c5d5be --- /dev/null +++ b/src/client/resources/assets/rounded/blockstates/dead_bladderwrack_wall.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "rounded:block/dead_bladderwrack_wall", + "y": 90 + }, + "facing=north": { + "model": "rounded:block/dead_bladderwrack_wall" + }, + "facing=south": { + "model": "rounded:block/dead_bladderwrack_wall", + "y": 180 + }, + "facing=west": { + "model": "rounded:block/dead_bladderwrack_wall", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/blockstates/moisture_detector.json b/src/client/resources/assets/rounded/blockstates/moisture_detector.json new file mode 100644 index 0000000..f2a29b1 --- /dev/null +++ b/src/client/resources/assets/rounded/blockstates/moisture_detector.json @@ -0,0 +1,10 @@ +{ + "variants": { + "check_level=false": { + "model": "rounded:block/moisture_detector" + }, + "check_level=true": { + "model": "rounded:block/moisture_detector_level" + } + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/blockstates/prismarine_lantern.json b/src/client/resources/assets/rounded/blockstates/prismarine_lantern.json new file mode 100644 index 0000000..44b2dbb --- /dev/null +++ b/src/client/resources/assets/rounded/blockstates/prismarine_lantern.json @@ -0,0 +1,10 @@ +{ + "variants": { + "hanging=false": { + "model": "rounded:block/prismarine_lantern" + }, + "hanging=true": { + "model": "rounded:block/prismarine_lantern_hanging" + } + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/blockstates/smooth_prismarine.json b/src/client/resources/assets/rounded/blockstates/smooth_prismarine.json new file mode 100644 index 0000000..f62acb0 --- /dev/null +++ b/src/client/resources/assets/rounded/blockstates/smooth_prismarine.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "rounded:block/smooth_prismarine" + } + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/blockstates/smooth_prismarine_slab.json b/src/client/resources/assets/rounded/blockstates/smooth_prismarine_slab.json new file mode 100644 index 0000000..9a02e7d --- /dev/null +++ b/src/client/resources/assets/rounded/blockstates/smooth_prismarine_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "rounded:block/smooth_prismarine_slab" + }, + "type=double": { + "model": "rounded:block/smooth_prismarine_slab_double" + }, + "type=top": { + "model": "rounded:block/smooth_prismarine_slab_top" + } + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/lang/en_pt.json b/src/client/resources/assets/rounded/lang/en_pt.json new file mode 100644 index 0000000..3fb2c23 --- /dev/null +++ b/src/client/resources/assets/rounded/lang/en_pt.json @@ -0,0 +1,42 @@ +{ + "block.rounded.treated_oak_planks": "Glazed planks o' oak", + "block.rounded.treated_spruce_planks": "Glazed planks o' spruce", + "block.rounded.treated_birch_planks": "Glazed planks o' birch", + "block.rounded.treated_jungle_planks": "Glazed planks o' jungle", + "block.rounded.treated_acacia_planks": "Glazed planks o' acacia", + "block.rounded.treated_cherry_planks": "Glazed planks o' cherry", + "block.rounded.treated_dark_oak_planks": "Glazed planks o' dusky oak", + "block.rounded.treated_mangrove_planks": "Glazed planks o' mangrove", + "block.rounded.treated_bamboo_planks": "Glazed planks o' bambarrr", + "block.rounded.treated_crimson_planks": "Glazed planks o' ichor", + "block.rounded.treated_warped_planks": "Glazed twisted planks o' hyphae", + "block.rounded.lustershroom": "Shroom o' glistenin'", + "block.rounded.lustershroom_block": "Chunk o' shrooms o' glistenin'", + "block.rounded.luster_cluster": "Clump o' glistenin'", + "block.rounded.trough": "Box o' slop", + "block.rounded.smooth_prismarine": "Smooth prismarine", + "block.rounded.smooth_prismarine_slab": "Slab o' smooth prismarine", + "block.rounded.chiseled_prismarine_bricks": "Carv'd bricks o' prismarine", + "block.rounded.prismarine_lantern": "Prismarine lantarrrn", + "block.rounded.dead_bladderwrack": "Dead bladdarrrwrack", + "block.rounded.bladderwrack": "Bladdarrrwrack", + "block.rounded.dead_bladderwrack_block": "Chunk o' dead bladdarrrwrack", + "block.rounded.bladderwrack_block": "Chunk o' bladarrrwrack", + "block.rounded.moisture_detector": "Wetness finder", + + "subtitles.rounded.block.trough_fill": "Box o' slop filled", + "subtitles.rounded.block.trough_consume": "Slop scarfed down", + "subtitles.rounded.block.trough_rustle": "Slop shivers", + + "tag.worldgen.biome.rounded.has_lustershrooms": "Has shrooms o' glistenin'", + "tag.worldgen.biome.rounded.has_more_lustershrooms": "Has a trove of shrooms o' glistenin'", + "tag.worldgen.biome.rounded.has_smooth_basalt_sea_rocks": "Has smooth basalt sea boulders", + "tag.worldgen.biome.rounded.has_andesite_sea_rocks": "Has gray pebble sea boulders", + "tag.worldgen.biome.rounded.has_diorite_sea_rocks": "Has brown pebble sea boulders", + "tag.worldgen.biome.rounded.has_bladderwrack": "Has bladdarrrwrack", + "tag.item.rounded.trough_feed": "Slop", + "tag.item.rounded.treated_planks": "Glazed planks", + "tag.item.c.grain": "Grain", + "tag.item.c.mushrooms": "Shrooms", + "tag.item.c.mushroom_caps": "Caps o' shrooms" +} diff --git a/src/client/resources/assets/rounded/lang/en_us.json b/src/client/resources/assets/rounded/lang/en_us.json index d6589a7..e8cbb70 100644 --- a/src/client/resources/assets/rounded/lang/en_us.json +++ b/src/client/resources/assets/rounded/lang/en_us.json @@ -14,16 +14,32 @@ "block.rounded.lustershroom_block": "Lustershroom Block", "block.rounded.luster_cluster": "Luster Cluster", "block.rounded.trough": "Trough", + "block.rounded.smooth_prismarine": "Smooth Prismarine", + "block.rounded.smooth_prismarine_slab": "Smooth Prismarine Slab", + "block.rounded.chiseled_prismarine_bricks": "Chiseled Prismarine Bricks", + "block.rounded.prismarine_lantern": "Prismarine Lantern", + "block.rounded.dead_bladderwrack": "Dead Bladderwrack", + "block.rounded.bladderwrack": "Bladderwrack", + "block.rounded.dead_bladderwrack_block": "Dead Bladderwrack Block", + "block.rounded.bladderwrack_block": "Bladderwrack Block", + "block.rounded.moisture_detector": "Moisture Detector", + "subtitles.rounded.block.trough_fill": "Trough filled", "subtitles.rounded.block.trough_consume": "Trough consumed", "subtitles.rounded.block.trough_rustle": "Feed rustles", - "tag.worldgen.biome.rounded.has_lustershrooms": "Has Lustershrooms", - "tag.worldgen.biome.rounded.has_more_lustershrooms": "Has more Lustershrooms", + + "tag.worldgen.biome.rounded.has_lustershrooms": "Has lustershrooms", + "tag.worldgen.biome.rounded.has_more_lustershrooms": "Has more lustershrooms", + "tag.worldgen.biome.rounded.has_smooth_basalt_sea_rocks": "Has smooth basalt sea rocks", + "tag.worldgen.biome.rounded.has_andesite_sea_rocks": "Has andesite sea rocks", + "tag.worldgen.biome.rounded.has_diorite_sea_rocks": "Has diorite sea rocks", + "tag.worldgen.biome.rounded.has_bladderwrack": "Has bladderwrack", "tag.item.rounded.trough_feed": "Trough Feed", "tag.item.rounded.treated_planks": "Treated Planks", "tag.item.c.grain": "Grain", "tag.item.c.mushrooms": "Mushrooms", "tag.item.c.mushroom_caps": "Mushroom Caps", + "block.rounded.compat.treated_hevea_brasiliensis_planks": "Treated Hevea Brasiliensis Planks", "block.rounded.compat.betterend.treated_dragon_tree_planks": "Treated Dragon Tree Planks", "block.rounded.compat.betterend.treated_end_lotus_planks": "Treated End Lotus Planks", diff --git a/src/client/resources/assets/rounded/lang/lol_us.json b/src/client/resources/assets/rounded/lang/lol_us.json index ccf3841..4b4740d 100644 --- a/src/client/resources/assets/rounded/lang/lol_us.json +++ b/src/client/resources/assets/rounded/lang/lol_us.json @@ -14,6 +14,15 @@ "block.rounded.lustershroom_block": "Glowy shroom Blok", "block.rounded.luster_cluster": "Blue Shroom thingy", "block.rounded.trough": "Troff", + "block.rounded.smooth_prismarine": "Smooth Prizmarine", + "block.rounded.smooth_prismarine_slab": "Smooth Prizmarine Sleb", + "block.rounded.chiseled_prismarine_bricks": "Chizald Prizmarine Briks", + "block.rounded.prismarine_lantern": "Prizmarine Lanturn", + "block.rounded.dead_bladderwrack": "Ded Slimy kelp", + "block.rounded.bladderwrack": "Slimy kelp", + "block.rounded.dead_bladderwrack_block": "Ded Slimy kelp blok", + "block.rounded.bladderwrack_block": "Slimy kelp Blok", + "block.rounded.moisture_detector": "wet eater", "subtitles.rounded.block.trough_fill": "Troff fill", "subtitles.rounded.block.trough_consume": "Troff eated", @@ -21,9 +30,13 @@ "tag.worldgen.biome.rounded.has_lustershrooms": "Haves glowyshooms", "tag.worldgen.biome.rounded.has_more_lustershrooms": "Haves MOAR gloweyshroom", + "tag.worldgen.biome.rounded.has_smooth_basalt_sea_rocks": "Haves smooz bazalt seerok", + "tag.worldgen.biome.rounded.has_andesite_sea_rocks": "Haves grey rok seerock", + "tag.worldgen.biome.rounded.has_diorite_sea_rocks": "Haves litter stuff seerok", + "tag.worldgen.biome.rounded.has_bladderwrack": "Haves slimey kelp", "tag.item.rounded.trough_feed": "Yumy", "tag.item.rounded.treated_planks": "SHINEH wud bloc", "tag.item.c.grain": "Wheaty stuffs", "tag.item.c.mushrooms": "Shrum", "tag.item.c.mushroom_caps": "Shrum Hat" -} +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/lang/pl_pl.json b/src/client/resources/assets/rounded/lang/pl_pl.json index ea24507..259afe3 100644 --- a/src/client/resources/assets/rounded/lang/pl_pl.json +++ b/src/client/resources/assets/rounded/lang/pl_pl.json @@ -14,6 +14,15 @@ "block.rounded.lustershroom_block": "Blok lśniącogrzybu", "block.rounded.luster_cluster": "Skupiony lśniącogrzyb", "block.rounded.trough": "Koryto", + "block.rounded.smooth_prismarine": "Gładki pryzmaryn", + "block.rounded.smooth_prismarine_slab": "Gładka pryzmarynowa płyta", + "block.rounded.chiseled_prismarine_bricks": "Rzeźbione pryzmarynowe cegły", + "block.rounded.prismarine_lantern": "Pryzmarynowa latarenka", + "block.rounded.dead_bladderwrack": "Martwy morszczyn", + "block.rounded.bladderwrack": "Morszczyn", + "block.rounded.dead_bladderwrack_block": "Blok martwego morszczynu", + "block.rounded.bladderwrack_block": "Blok morszczynu", + "block.rounded.moisture_detector": "Detektor wilgoci", "subtitles.rounded.block.trough_fill": "Napełniono koryto", "subtitles.rounded.block.trough_consume": "Opróżniono koryto", @@ -21,6 +30,10 @@ "tag.worldgen.biome.rounded.has_lustershrooms": "Ma lśniącogrzyby", "tag.worldgen.biome.rounded.has_more_lustershrooms": "Ma więcej lśniącogrzybów", + "tag.worldgen.biome.rounded.has_smooth_basalt_sea_rocks": "Ma gładko-bazaltowe głazy morskie", + "tag.worldgen.biome.rounded.has_andesite_sea_rocks": "Ma andezytowe głazy morskie", + "tag.worldgen.biome.rounded.has_diorite_sea_rocks": "Ma diorytowe głazy morskie", + "tag.worldgen.biome.rounded.has_bladderwrack": "Ma morszczyn", "tag.item.rounded.trough_feed": "Pasza", "tag.item.rounded.treated_planks": "Impregnowane deski", "tag.item.c.grain": "Zboże", diff --git a/src/client/resources/assets/rounded/models/block/bladderwrack.json b/src/client/resources/assets/rounded/models/block/bladderwrack.json new file mode 100644 index 0000000..029c304 --- /dev/null +++ b/src/client/resources/assets/rounded/models/block/bladderwrack.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/coral_fan", + "textures": { + "fan": "rounded:block/bladderwrack" + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/models/block/bladderwrack_block.json b/src/client/resources/assets/rounded/models/block/bladderwrack_block.json new file mode 100644 index 0000000..d607121 --- /dev/null +++ b/src/client/resources/assets/rounded/models/block/bladderwrack_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "rounded:block/bladderwrack_block" + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/models/block/bladderwrack_wall.json b/src/client/resources/assets/rounded/models/block/bladderwrack_wall.json new file mode 100644 index 0000000..182b29d --- /dev/null +++ b/src/client/resources/assets/rounded/models/block/bladderwrack_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/coral_wall_fan", + "textures": { + "fan": "rounded:block/bladderwrack" + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/models/block/chiseled_prismarine_bricks.json b/src/client/resources/assets/rounded/models/block/chiseled_prismarine_bricks.json new file mode 100644 index 0000000..fcdf31c --- /dev/null +++ b/src/client/resources/assets/rounded/models/block/chiseled_prismarine_bricks.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "minecraft:block/prismarine_bricks", + "side": "rounded:block/chiseled_prismarine_bricks" + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/models/block/dead_bladderwrack.json b/src/client/resources/assets/rounded/models/block/dead_bladderwrack.json new file mode 100644 index 0000000..b0fd4ad --- /dev/null +++ b/src/client/resources/assets/rounded/models/block/dead_bladderwrack.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/coral_fan", + "textures": { + "fan": "rounded:block/dead_bladderwrack" + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/models/block/dead_bladderwrack_block.json b/src/client/resources/assets/rounded/models/block/dead_bladderwrack_block.json new file mode 100644 index 0000000..8ed629b --- /dev/null +++ b/src/client/resources/assets/rounded/models/block/dead_bladderwrack_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "rounded:block/dead_bladderwrack_block" + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/models/block/dead_bladderwrack_wall.json b/src/client/resources/assets/rounded/models/block/dead_bladderwrack_wall.json new file mode 100644 index 0000000..752ede3 --- /dev/null +++ b/src/client/resources/assets/rounded/models/block/dead_bladderwrack_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/coral_wall_fan", + "textures": { + "fan": "rounded:block/dead_bladderwrack" + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/models/block/moisture_detector.json b/src/client/resources/assets/rounded/models/block/moisture_detector.json new file mode 100644 index 0000000..5f99c2d --- /dev/null +++ b/src/client/resources/assets/rounded/models/block/moisture_detector.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "top": "rounded:block/moisture_detector_top", + "side": "rounded:block/moisture_detector_side", + "bottom": "rounded:block/smooth_prismarine" + } +} diff --git a/src/client/resources/assets/rounded/models/block/moisture_detector_level.json b/src/client/resources/assets/rounded/models/block/moisture_detector_level.json new file mode 100644 index 0000000..5f31c37 --- /dev/null +++ b/src/client/resources/assets/rounded/models/block/moisture_detector_level.json @@ -0,0 +1,8 @@ +{ + "parent": "block/cube_bottom_top", + "textures": { + "top": "rounded:block/moisture_detector_top_level", + "side": "rounded:block/moisture_detector_side", + "bottom": "rounded:block/smooth_prismarine" + } +} diff --git a/src/client/resources/assets/rounded/models/block/prismarine_lantern.json b/src/client/resources/assets/rounded/models/block/prismarine_lantern.json new file mode 100644 index 0000000..5ca349d --- /dev/null +++ b/src/client/resources/assets/rounded/models/block/prismarine_lantern.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_lantern", + "textures": { + "lantern": "rounded:block/prismarine_lantern" + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/models/block/prismarine_lantern_hanging.json b/src/client/resources/assets/rounded/models/block/prismarine_lantern_hanging.json new file mode 100644 index 0000000..f67c827 --- /dev/null +++ b/src/client/resources/assets/rounded/models/block/prismarine_lantern_hanging.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_hanging_lantern", + "textures": { + "lantern": "rounded:block/prismarine_lantern" + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/models/block/smooth_prismarine.json b/src/client/resources/assets/rounded/models/block/smooth_prismarine.json new file mode 100644 index 0000000..5f5ca9d --- /dev/null +++ b/src/client/resources/assets/rounded/models/block/smooth_prismarine.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "rounded:block/smooth_prismarine" + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/models/block/smooth_prismarine_slab.json b/src/client/resources/assets/rounded/models/block/smooth_prismarine_slab.json new file mode 100644 index 0000000..6264b33 --- /dev/null +++ b/src/client/resources/assets/rounded/models/block/smooth_prismarine_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "rounded:block/smooth_prismarine", + "side": "rounded:block/smooth_prismarine_slab_side", + "top": "rounded:block/smooth_prismarine" + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/models/block/smooth_prismarine_slab_double.json b/src/client/resources/assets/rounded/models/block/smooth_prismarine_slab_double.json new file mode 100644 index 0000000..14a6e7c --- /dev/null +++ b/src/client/resources/assets/rounded/models/block/smooth_prismarine_slab_double.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "rounded:block/smooth_prismarine", + "side": "rounded:block/smooth_prismarine_slab_side" + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/models/block/smooth_prismarine_slab_top.json b/src/client/resources/assets/rounded/models/block/smooth_prismarine_slab_top.json new file mode 100644 index 0000000..ce454a6 --- /dev/null +++ b/src/client/resources/assets/rounded/models/block/smooth_prismarine_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "rounded:block/smooth_prismarine", + "side": "rounded:block/smooth_prismarine_slab_side", + "top": "rounded:block/smooth_prismarine" + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/models/item/bladderwrack.json b/src/client/resources/assets/rounded/models/item/bladderwrack.json new file mode 100644 index 0000000..d281122 --- /dev/null +++ b/src/client/resources/assets/rounded/models/item/bladderwrack.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "rounded:block/bladderwrack" + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/models/item/bladderwrack_block.json b/src/client/resources/assets/rounded/models/item/bladderwrack_block.json new file mode 100644 index 0000000..c44afe3 --- /dev/null +++ b/src/client/resources/assets/rounded/models/item/bladderwrack_block.json @@ -0,0 +1,3 @@ +{ + "parent": "rounded:block/bladderwrack_block" +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/models/item/chiseled_prismarine_bricks.json b/src/client/resources/assets/rounded/models/item/chiseled_prismarine_bricks.json new file mode 100644 index 0000000..05bbfa8 --- /dev/null +++ b/src/client/resources/assets/rounded/models/item/chiseled_prismarine_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "rounded:block/chiseled_prismarine_bricks" +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/models/item/dead_bladderwrack.json b/src/client/resources/assets/rounded/models/item/dead_bladderwrack.json new file mode 100644 index 0000000..5467d35 --- /dev/null +++ b/src/client/resources/assets/rounded/models/item/dead_bladderwrack.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "rounded:block/dead_bladderwrack" + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/models/item/dead_bladderwrack_block.json b/src/client/resources/assets/rounded/models/item/dead_bladderwrack_block.json new file mode 100644 index 0000000..d8cc2a4 --- /dev/null +++ b/src/client/resources/assets/rounded/models/item/dead_bladderwrack_block.json @@ -0,0 +1,3 @@ +{ + "parent": "rounded:block/dead_bladderwrack_block" +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/models/item/moisture_detector.json b/src/client/resources/assets/rounded/models/item/moisture_detector.json new file mode 100644 index 0000000..3aa521c --- /dev/null +++ b/src/client/resources/assets/rounded/models/item/moisture_detector.json @@ -0,0 +1,3 @@ +{ + "parent": "rounded:block/moisture_detector" +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/models/item/prismarine_lantern.json b/src/client/resources/assets/rounded/models/item/prismarine_lantern.json new file mode 100644 index 0000000..52b64f1 --- /dev/null +++ b/src/client/resources/assets/rounded/models/item/prismarine_lantern.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "rounded:item/prismarine_lantern" + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/models/item/smooth_prismarine.json b/src/client/resources/assets/rounded/models/item/smooth_prismarine.json new file mode 100644 index 0000000..d031b23 --- /dev/null +++ b/src/client/resources/assets/rounded/models/item/smooth_prismarine.json @@ -0,0 +1,3 @@ +{ + "parent": "rounded:block/smooth_prismarine" +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/models/item/smooth_prismarine_slab.json b/src/client/resources/assets/rounded/models/item/smooth_prismarine_slab.json new file mode 100644 index 0000000..6ea0b84 --- /dev/null +++ b/src/client/resources/assets/rounded/models/item/smooth_prismarine_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "rounded:block/smooth_prismarine_slab" +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/textures/block/bladderwrack.png b/src/client/resources/assets/rounded/textures/block/bladderwrack.png new file mode 100644 index 0000000000000000000000000000000000000000..6a76a731293fe3ac00af5027cba8974bd97d17ce GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Vt`MGE0ER}XEfJj@-<`54PvQD zW}n%>*^$dD&dC_%!aAu!KS@9S3s4bbNswPKgTu2MX+Tb>r;B4q#jT_T#t)pHF<4FE zVs1#3XbJsqUr`dMb6`fp#b58cj2?YX+Uvo(yxa1D#LH94IcwHsa$l0&|JYUa)|6-= t1#9m+(RrUaCq*>AU;I^L?aELDm2O literal 0 HcmV?d00001 diff --git a/src/client/resources/assets/rounded/textures/block/bladderwrack_block.png b/src/client/resources/assets/rounded/textures/block/bladderwrack_block.png new file mode 100644 index 0000000000000000000000000000000000000000..567347c64361b02a6d0ea57571d5886351ceae2a GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!T!2rAtGOnVuNiZc3u|r=OHDHS zqze6+4V)dhyyBdU+Tx74f#G66l~tZDjv*DdSPwQbGCOh{HgGPg-Shv@REx5`TjE9g ztq<&B^LKImEcKpcTA1SFxjf$WiHwSpZ7Jn9TTK{tbDr6d>5#UWA;+k|h?{qI>=Qo) z-k0m#->aOoFfKm6+THj>uxHc^&aEEnDvzfjK1eEYumfuq##*WbAo*Z)|^yz<4W St}>u27(8A5T-G@yGywoDFiQ{s literal 0 HcmV?d00001 diff --git a/src/client/resources/assets/rounded/textures/block/chiseled_prismarine_bricks.png b/src/client/resources/assets/rounded/textures/block/chiseled_prismarine_bricks.png new file mode 100644 index 0000000000000000000000000000000000000000..f4f4fb8ba3649d28dbd10a8219ee97527392285d GIT binary patch literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!M1W6-t7BtU)cPfPJJ(G;f4u4F zo}ih{iA!g>b(VxSv{?bwlzF;1hE&{QJ=n;2z<}qF!Q+w-|Bp}p@b2BY^78L8;#Ui# z&hE(gVx6m$vw<;rLtw?Stx_C{1~(Yg)q)x(M8!C5Uz;7?6e+o*ZNkl&TO8Hjval&< zYy9vL7S_18clYPJKj%H3^nR=Fr@buiv^{^cDnoN;lDf~t*4#g*QM=kQdO;g~EHDZ?Y#8A%L?Vd1e z`B@R13d3P4T#@J-hauA=m==GpL$hMorOlyv2O4Iy$31vhY)vcgBe)@L!z@Ktl%|M# bt@V=!n}r3Ve-yVA00000NkvXXu0mjf((g}d delta 179 zcmV;k08Iam0+s@hBnkm@Qb$4nuFf3kks(Weh)G02RCwA=h*d%aKnz1)GJ@Ov?}<(u zV86DF3qh{vm*Mdy=WQs@lHH_Bp~Do4SLgzFbiScYObHzcG;s+pU=U^se<}=A8?h9o zxeVmCg__wvJ{7@-&jI_ECO`;+wgo?g0tUh@&4EDi3E1RV0gwq6@<99u2sqF*-k`!B hp1uLy!TR&v@C!)FLzUy_lkxxn002ovPDHLkV1hqrO&tIL diff --git a/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_helix_tree_planks.png b/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_helix_tree_planks.png index 8db8ba45f243c4b7864865121d6cb63d22a2a493..7167b2ed0bd7089378ceadc7bd3adc933d9249d4 100644 GIT binary patch delta 159 zcmV;Q0AT;z0n!1G7zqdi0000eEe}(XE+>C=Nklo;{B0lyJ@mr|?lxIcT-JrqCF;@`V4)SX6|ZL{tFU XU@ejN<=i9y00008NkvXXu0mjf&3;IQ diff --git a/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_jellyshroom_planks.png b/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_jellyshroom_planks.png index 8bb9d8e5794023e3767b82eca5c850af9ab88dc2..976c6d6765895b57551285762d11bace88910195 100644 GIT binary patch delta 159 zcmV;Q0AT;z0n!1G7zqdi0000eEe}(XE+>C=Nklo;{B0lyJ@mr|?lxIcT-JrqCF;@`V4)SX6|ZL{tFU XU@ejN<=i9y00008NkvXXu0mjf&3;IQ diff --git a/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_lacugrove_planks.png b/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_lacugrove_planks.png index 83a88f8167e65c1aab2684cd4550be40e8ef1c92..206c12306b5d6ac188a5ba13588bf327920485e7 100644 GIT binary patch delta 159 zcmV;Q0AT;z0n!1G7zqdi0000eEe}(XE+>C=Nklo;{B0lyJ@mr|?lxIcT-JrqCF;@`V4)SX6|ZL{tFU XU@ejN<=i9y00008NkvXXu0mjf&3;IQ diff --git a/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_lucernia_planks.png b/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_lucernia_planks.png index 400ffc30e8ac0c56e59d04c972e3ae79a2b428c4..acb9316b0b170019a07489044cf1aa71275d8278 100644 GIT binary patch delta 159 zcmV;Q0AT;z0n!1G7zqdi0000eEe}(XE+>C=Nklo;{B0lyJ@mr|?lxIcT-JrqCF;@`V4)SX6|ZL{tFU XU@ejN<=i9y00008NkvXXu0mjf&3;IQ diff --git a/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_mossy_glowshroom_planks.png b/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_mossy_glowshroom_planks.png index f9fca4ca1554b0ed38892d81498a80927e210745..ceae3348e26dfeca76c61257ef699aa2ad3af07a 100644 GIT binary patch delta 159 zcmV;Q0AT;z0n!1G7zqdi0000eEe}(XE+>C=Nklo;{B0lyJ@mr|?lxIcT-JrqCF;@`V4)SX6|ZL{tFU XU@ejN<=i9y00008NkvXXu0mjf&3;IQ diff --git a/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_pythadendron_planks.png b/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_pythadendron_planks.png index b97856490e129e9c31e8f50ab56278a5fff6c2b4..f41120a18bc0b8166985d5bf481a496f23775b40 100644 GIT binary patch delta 180 zcmV;l089U@0;B?vB#|*!f0Ri?K~#9!RgOCn!Y~vA6-hua;7{Th?tfDJLPfESW=FHY zvMhfz%bh|uQAwegtRkA|MiKAHOJt#tCKxpCrjm@L8_;AHQ&~cxfz{$}VaO8!X}w-Q zHu^JNhB*xyyNphwnnVj^Y!q4;hls~{C=3f{X^~MBfkGt57=tzuDxq=s7q^pPC~8?v i7n&G3=b%rHobwmv8U|Zf7hW9z0000AJVtC``>a~ zVvF(PNWdoqxvSqNPhWDrCgn}Ci&RtSVHS$_P#s)R`-gI3n$RVIW_$^+z)V=u@vp*+ z`i|HXX3xcfsH236xlXq$f*-dN?1LK5Xwbm3;3RZlLAXitj6m@j@I;yw0GVJ97sM$g oP{0K>-W#Z4&wc=&U>>f+8yq7;x3v(}KL7v#07*qoM6N<$f(r~)Hvj+t diff --git a/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_tenanea_planks.png b/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_tenanea_planks.png index 7bd2c9cb50480d0b7f83697fd43aaeb825cb73a3..b2b05c590787d6004fa2903a30d5d2468dc238ef 100644 GIT binary patch delta 159 zcmV;Q0AT;z0n!1G7zqdi0000eEe}(XE+>C=Nklo;{B0lyJ@mr|?lxIcT-JrqCF;@`V4)SX6|ZL{tFU XU@ejN<=i9y00008NkvXXu0mjf&3;IQ diff --git a/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_umbrella_tree_planks.png b/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_umbrella_tree_planks.png index 3477f27e525fc03531091244166059c087534ee4..9918a8468b4b0b0dd7bd63382381c4a886c7c0f7 100644 GIT binary patch delta 159 zcmV;Q0AT;z0n!1G7zqdi0000eEe}(XE+>C=Nklo;{B0lyJ@mr|?lxIcT-JrqCF;@`V4)SX6|ZL{tFU XU@ejN<=i9y00008NkvXXu0mjf&3;IQ diff --git a/src/client/resources/assets/rounded/textures/block/compat/betternether/treated_mushroom_fir_planks.png b/src/client/resources/assets/rounded/textures/block/compat/betternether/treated_mushroom_fir_planks.png index 1616bc5c7fe8545da278318dfeeba2eb9dc8bf3e..c849af1f9fb556c0c9f562d6c5040e0f27a3e74b 100644 GIT binary patch delta 159 zcmV;Q0AT;z0n!1G7zqdi0000eEe}(XE+>C=Nklo;{B0lyJ@mr|?lxIcT-JrqCF;@`V4)SX6|ZL{tFU XU@ejN<=i9y00008NkvXXu0mjf&3;IQ diff --git a/src/client/resources/assets/rounded/textures/block/compat/betternether/treated_nether_mushroom_planks.png b/src/client/resources/assets/rounded/textures/block/compat/betternether/treated_nether_mushroom_planks.png index b2b9c40c413791a99da823fb24ee8e230957f4b2..6b3deab4bd53d0dc114b7ffde4533135bc32ce3d 100644 GIT binary patch delta 233 zcmV1#o}+`JPlQ#=)L87YfKHYwr1xD`h`JngO!lsLzyqu);5*k^nN7iK)m1 zm)_f0?Eot;SSw4ltYsw91W>)^{W#yWqNG`31vqytzF!wUP%h62UjxjGEC^@6V?rtS z5CUFDKT43WE|q=xchK5#v}afvnV=*MAm48EBIs)M^7vu}1w5!V7)P?*KDo!F0<7eA j-?$<(HGPzA4EW?17BwCu*ez9900000NkvXXu0mjfkKk)e delta 244 zcmV%-;ni7A=HQ;`=#QXUmHdLr%!2#=E zrb^O%wBl0hV44D+w^3Fg;j2=u+g}fAW-}W)US=+7iT^1!8rp-T{eI{6;td6y>H)Z! u;^Rqi%?bPIp+*xQ$jTXdYnM6TKfVDLH6A2ROuLBy0000 zar}?Xa-(Wff%gK4s0at0?4pJss0NzsxQ5ZtdNn4SOpGE`@Z@FDR<*pQ1;cK;dJMN& zfS+GnF((^TZqNnucUF}sKo`M{lqm7RAXWs8+`Ifvj6Q1d4dG= T!M1k400000NkvXXu0mjfh4D(0 delta 164 zcmV;V09*g}0r&xsBnkm@Qb$4nuFf3kks&;Pc}YY;RCwA<$N^@?Ko~{Q^S+^K^zZ&x z8j#7W0L67V`40V;ugQF5ea8A_4}FqKm1I)u;%M@IbckFDS*CF|w%UDOsLE6{H6}w? zuf1@K;(n5s;}K9elW?h^Vw!Xd=}DPrq>!p1r{W6AV0oNPVpe{Jzx`xKU;v!YIeo_u Snx2&a0000r$Nc_*xLNAi`e;lSC&s2@1fyl$ls-4UV$(tdX9>eX z*}xxhpoa*iDa=cYmNd@HD~#H_nJ!=R<5M$9kI;m=wC@|vp?==QS^!Qx7OkM|%1Jwf zX=k^@xU;KC`v)%kKBNUtKXe{A{es;HT~aK#&n@kvdl@tLXH-D|0000{ z&yi7gQ(?b&>00O}^;2iw_!;#KS zQXnK62A=2nm&TdQA}X0iszt3-7PB~(DsyC*!ijtwj$f#wMy^d2II$KphuN?=p8NrX7OXwi!)bRhgz!5M~kh>GZx^prwCn~N307?7@oB#j- diff --git a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_empyreal_planks.png b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_empyreal_planks.png index 3472fd04b5b48d21be4eb8cfcba6567b9c32f881..8308885b02c788a878590da0165a27c714701f6d 100644 GIT binary patch delta 9 Qcmcb^c%E^B%0$D}027=8&j0`b delta 20 ccmX@lc!zO<3KwH>kh>GZx^prwCn~N307?7@oB#j- diff --git a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_fir_planks.png b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_fir_planks.png index 069edc49fb93093389e633770f4bfa461edafb83..51b0f4d77eefb0724ae96e19727348c76ab516db 100644 GIT binary patch delta 9 Qcmcb^c%E^B%0$D}027=8&j0`b delta 20 ccmX@lc!zO<3KwH>kh>GZx^prwCn~N307?7@oB#j- diff --git a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_hellbark_planks.png b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_hellbark_planks.png index 23d57cd8f5a08bed0fb61659ae7f67ed3e0aad59..587ee7df9ef3257b86d1a8f817f0f90c316a07b8 100644 GIT binary patch delta 9 Qcmcb^c%E^B%0$D}027=8&j0`b delta 20 ccmX@lc!zO<3KwH>kh>GZx^prwCn~N307?7@oB#j- diff --git a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_jacaranda_planks.png b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_jacaranda_planks.png index ec4f458039a244e926601f0e8184f34e29135402..0f2d6151508068c72c562d111582b39a76614a68 100644 GIT binary patch delta 9 Qcmcb^c%E^B%0$D}027=8&j0`b delta 20 ccmX@lc!zO<3KwH>kh>GZx^prwCn~N307?7@oB#j- diff --git a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_magic_planks.png b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_magic_planks.png index 503954798049c69b69b19ba35878ea057196b832..a526c3d81f450e022ffd4fd12d01fb7bb38b9603 100644 GIT binary patch delta 152 zcmV;J0B8T-0n!1G7zqdi0000eEe}(XE-rsnj(gppF{3HdWwaEoKh0;VxOi?y?9@d9Okv(O(?) z65we~Wfnu@)S;GY^O9p~c@`|z^5Uj9Fhz}0MXc>#egLVV1A3fGBTN7Q002ovPDBK* GLSTYLOFn)8 delta 165 zcmV;W09yaj0p9_T7#0Kr0002(-QrRJ0004VQb$4nuFf3kks&UBVqg>mlrYsu3kh>GZx^prwCn~N307?7@oB#j- diff --git a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_maple_planks.png b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_maple_planks.png index e5805b8891327ffee60acd520cc8af4131179dee..44c8b40de86a1a5107579c632bc5f1d9323cd64c 100644 GIT binary patch delta 9 Qcmcb^c%E^B%0$D}027=8&j0`b delta 20 ccmX@lc!zO<3KwH>kh>GZx^prwCn~N307?7@oB#j- diff --git a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_palm_planks.png b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_palm_planks.png index f8e1893187027adf0882897a681023c6b55333c4..517580b48a80cdd3efb5a1204f157eee7466c6ac 100644 GIT binary patch delta 9 Qcmcb^c%E^B%0$D}027=8&j0`b delta 20 ccmX@lc!zO<3KwH>kh>GZx^prwCn~N307?7@oB#j- diff --git a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_pine_planks.png b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_pine_planks.png index 90a9a8d4c9601478ba2f9af57b1c775362cb694c..994cbd4bb76184a73c4fccb41b9b2efc05ed5df6 100644 GIT binary patch delta 9 Qcmcb^c%E^B%0$D}027=8&j0`b delta 20 ccmX@lc!zO<3KwH>kh>GZx^prwCn~N307?7@oB#j- diff --git a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_redwood_planks.png b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_redwood_planks.png index ce3d92b159406655cefe9b661dacc9c69b7ea95b..ebfdfdfe12df2b18004e31af0c4077201cd79b62 100644 GIT binary patch delta 9 Qcmcb^c%E^B%0$D}027=8&j0`b delta 20 ccmX@lc!zO<3KwH>kh>GZx^prwCn~N307?7@oB#j- diff --git a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_umbran_planks.png b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_umbran_planks.png index df9dbb7036aa5936d8f30b9b95315d8c65a5f6e6..ea2c9614cc931926e23cca0580dac28c1001333d 100644 GIT binary patch delta 9 Qcmcb^c%E^B%0$D}027=8&j0`b delta 20 ccmX@lc!zO<3KwH>kh>GZx^prwCn~N307?7@oB#j- diff --git a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_willow_planks.png b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_willow_planks.png index 30d8851cd4aa14231c8a7f7ba5878ea3a8788a7b..b48da380d965aa4af7fe34950bb7f167bcb2f256 100644 GIT binary patch delta 9 Qcmcb^c%E^B%0$D}027=8&j0`b delta 20 ccmX@lc!zO<3KwH>kh>GZx^prwCn~N307?7@oB#j- diff --git a/src/client/resources/assets/rounded/textures/block/compat/cinderscapes/treated_scorched_planks.png b/src/client/resources/assets/rounded/textures/block/compat/cinderscapes/treated_scorched_planks.png index 6414d1be9caf7f773a0f906651b06efe38076e2c..1ca63cca0e2c090c112fc8f7435624fd45aaf5bf 100644 GIT binary patch delta 10 RcmdnTa-MO5^5jX3YXBD51Q-AS delta 377 zcmV-<0fzq10lox~BYy#7X+uL$X=7sm0C?J!ku!iEVGuyy?#8xlTU~71Sp2rxMP+Q8 zby9|9Y*#7M#OJ;H&c;-4ERfH;bx)|#IPiGG!Bz8T_1myIclw{lPFuJAf&%uwU?TpnsEYR}GME1EYck1A_EH z*tH`5A=oAu8NtCdt7e1T3Fv1l$67ho?LiO7lYl{n$7_JRp@9=Xhd+}Cd_CYc)xVsm+ee|nA6#xa0tycJT4O(x6jxV6aW^uPtKbPLanlvnV3MWp&5F51JQp4WO X%HOTlnBx2819FdYr+t_N?vWv`1{%H< diff --git a/src/client/resources/assets/rounded/textures/block/compat/cinderscapes/treated_umbral_planks.png b/src/client/resources/assets/rounded/textures/block/compat/cinderscapes/treated_umbral_planks.png index 42920c04406695dd718e07877e313d249281afab..33204fdef990528493fb8d1dbed5423524e3b0d5 100644 GIT binary patch delta 10 RcmdnTa-MO5^5jX3YXBD51Q-AS delta 377 zcmV-<0fzq10lox~BYy#7X+uL$X=7sm0C?J!ku#uHVHkj)qinnDCA%%#HV*D@TU#2l zZO%2uG22sPOLnKe|77=0&uf9aBVY#OYIg{R60yl62A9m7HM^wd18Sh5pwd=1rV zCywQ}^87jyz?Ckd7XK&pt?IZ5QVB57jKmTkEd=_e6A{51fPZGDN4G#a0(6dj91x_N z!frVHP_VnmGJ<1MCl3L+8BpT>hK+C7^u&T7_XaAgV8{Y_ro)!tg5Y2vY2t_k)T<6n znory&~NVB_LEAexfTM<2`1E2u1%LR}3L;YFM^di)mBkuOa&+Z#AwE$z!!NyHc<%WiHf3tV3 XZ}0ZUm{0fn0NQJEYT{5KW04`QM_Ra) diff --git a/src/client/resources/assets/rounded/textures/block/compat/terrestria/treated_hemlock_planks.png b/src/client/resources/assets/rounded/textures/block/compat/terrestria/treated_hemlock_planks.png index 21f7f8a745b3570733be3565c8777361cb8edd13..1102eb7cf24af5bf157abe9f06c13458f40d3abf 100644 GIT binary patch delta 351 zcmV-l0igbh1Ns7xB!6{KOjJc_S~_%QM0RLKi+5I}E}lTv0Dk}gz)3_wRCwA=NCS32 zK@7}fQQOx2FIAi0yU7$!O~$yO2>vnR^YyrV7?y_B+l|I%bwGMF^$NTufQ`-%Dqsmz z7B-}I5RoK-aBv+#=Q&}4*(06&S;HJ4$?CS`rDnl%Refp}y~iVKI9gyUVQwZYUa25` zbu;}mQqyEOOjt!YXV3Qm7L5dQ(O_E`+h7q|-a78y3I9f&lGIgd7M!;`)$({ta&cc28>gN?!l~002ovPDHLkV1j^LniT*5 delta 367 zcmV-#0g(Rs0*V8WB!2;OQb$4nuFf3k0001WP)t-sZeKp9mwcg*aG;KFo{Vjsi));U zYMO{>n1*JTg=Ln5W0itpl!0KAfM1b*U66fTj(b{-dRdHkSBrO6iFH+obX13PQigI- zgm6!RZA^e{OL}Wccxp&?Xhw8qL~~_Ba$`bqVnJ|WKy6+) z0K-W{K~#9!VqjuqWJJacG606BDp6t(2F?m4R-yhBsoejF%V#paPVHqX>AQ8=bO1)y z+`l>Rvy_<}4kInI*R+|-)B6R?^|5)2t8iNBT^U}Efdm`5xT&ii7S2`Mb7{G(BjNo2 zOAyhk{Qex95@_NOmYYdaur7Z)hbvHr&}bZ0{xcDko+@;_`!Hv%#GypvQ5V?1+7JL8z N002ovPDHLkV1k`qs;>Y5 diff --git a/src/client/resources/assets/rounded/textures/block/compat/treated_hevea_brasiliensis_planks.png b/src/client/resources/assets/rounded/textures/block/compat/treated_hevea_brasiliensis_planks.png index dd71339d80895021e76645a4827b4cb52ad60c75..5a5e86209dd45515a18bf4facf6991466b7e1d42 100644 GIT binary patch delta 145 zcmV;C0B--t0m1>07zqdi0000eEe}(XE+lg0e9Wzb$ zgP=n4l%D5#X|PH(K?Q4!1~v#%*<}yb*6j`0gU4(DQWFpPx!QE#>lxq15C#{bczdMF53icY`n(fWQOaEph)D8yvu5K7P+jy6W*43e;pY7slk+LXi)=sJwbV zx|^CC?`b^rrmAT(_!x%ZaYC;U6ZzQxF^LK)GbsxS0|0EPBMBH<{p0`u002ovPDHLk FV1kzkh>GZx^prwCn~N307?7@oB#j- diff --git a/src/client/resources/assets/rounded/textures/block/compat/wilderwild/treated_cypress_planks.png b/src/client/resources/assets/rounded/textures/block/compat/wilderwild/treated_cypress_planks.png index d4799c1663980c6e7cb7167e409517955b380174..722ddb5d73050b2be6a92757502a8f240b6ddf00 100644 GIT binary patch delta 9 Qcmcb^c%E^B%0$D}027=8&j0`b delta 20 ccmX@lc!zO<3KwH>kh>GZx^prwCn~N307?7@oB#j- diff --git a/src/client/resources/assets/rounded/textures/block/compat/wilderwild/treated_palm_planks.png b/src/client/resources/assets/rounded/textures/block/compat/wilderwild/treated_palm_planks.png index 907726289f0d0f977f16b2636dc24303a620d8ff..d5918ad33e094475107ec2d3dda7af7bc3886110 100644 GIT binary patch delta 9 Qcmcc3c#d&`%0$Ce027M?%m4rY delta 20 ccmX@dc$;y83KwH>kh>GZx^prwCn~N507=ycnE(I) diff --git a/src/client/resources/assets/rounded/textures/block/dead_bladderwrack.png b/src/client/resources/assets/rounded/textures/block/dead_bladderwrack.png new file mode 100644 index 0000000000000000000000000000000000000000..90781b9c644c1d9aae486f15f1e1bf79a458332a GIT binary patch literal 200 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Vt`MGtDKx%PisqUaZyQbPIhu) zLS#f}fWNQ1yMwj0g{i5ImUh94syRT#j3q&S!3+-1ZlnP@p`I>|Ar-fh78obEJY&$B z!pGdusPL%!!FPF!b=fTM*jiTZY=5?NU+32*(Ia}_T31YHDxG=kmDZ%h_1%RfNtg7) uPP6HJw0Ix+wkN?_)JT5q!h@?Xwaf3G!OXD0Y$GGk0tQc4KbLh*2~7a3R7FVu literal 0 HcmV?d00001 diff --git a/src/client/resources/assets/rounded/textures/block/dead_bladderwrack_block.png b/src/client/resources/assets/rounded/textures/block/dead_bladderwrack_block.png new file mode 100644 index 0000000000000000000000000000000000000000..697cf4110789239e8363cbccc753013d49682445 GIT binary patch literal 221 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!T!2rAtAn+*ue*C_fPX?{M0Rpw zPisqUaZyQbj*gbLg{f&xd3rifWtFFkV@Sm<)`N|V%#Iv~4V;T=_xwLJ)uL?gmUz*A z>jQh({9Rl>OTA~A7N+=kE{}J8BBP>YTT1!ORuhKZoM$#?nt^*kh>GZx^prwCn^>J06^FV=l}o! diff --git a/src/client/resources/assets/rounded/textures/block/lustershroom_block.png b/src/client/resources/assets/rounded/textures/block/lustershroom_block.png index 14d92b17123b86fc5225f835747d6b01e674dd64..1aeee425a21360dfd37ab76501fa55dfa2fd2bde 100644 GIT binary patch delta 133 zcmV;00DAw!0k8p(7zqdi0000eEe}(XE*^1QNklI~aVYQX7uW>#`UjaJhr((8kQmLiE)dXi?%Z8)NG zi?@L^YkWbsxGHb7nGt=s9YtdLM{bAE!*K&q+bsgJn+yH`B@N71bCMGP0000!f)tI9v;$lJ#8*EhctxtVoPNMf@?W#h7M3-!0p=1%#){a5USX$?v0*Dfjla%
    ^P)gMj|-s47|#nJ4?y!aARp%Gt17p;(m0V)s?V5<&kV6YCE{szG@%1mo}g-?G* z$rI%0eU?!x5Mj<4T;5=J#2BQB1B&=}oQd0!-t2bdlDSs|naO1E1Zr-D`*QzOo2nGL fFx1mKvTyzad!7X>aNG~V00000NkvXXu0mjfZrEkp literal 0 HcmV?d00001 diff --git a/src/client/resources/assets/rounded/textures/block/moisture_detector_top_level.png b/src/client/resources/assets/rounded/textures/block/moisture_detector_top_level.png new file mode 100644 index 0000000000000000000000000000000000000000..70abce601d51e131e28d4169b8109e2e04bb06c9 GIT binary patch literal 229 zcmV^P)gMj|-ss@K(_(#dYQu3E38VWpbR*o^f6004POL_t(|+GUPW z4g?_xLkkY5l>47|#nJ4?y!aARp%Gt17p;(m0V)s?V5<&kV6YCE{szG@%1mo}g-?G* z$rI%0eU?!x5Mj<4T;5=J#2BQB1B&=}oQd0!-t2bdlDSs|naO1E1Zr-D`*QzOo2nGL fFx1mKvTyzad!7X>aNG~V00000NkvXXu0mjfIh1EM literal 0 HcmV?d00001 diff --git a/src/client/resources/assets/rounded/textures/block/prismarine_lantern.png b/src/client/resources/assets/rounded/textures/block/prismarine_lantern.png new file mode 100644 index 0000000000000000000000000000000000000000..3541c81bfdb385c33bcebacf2bb2f6dd5553ea81 GIT binary patch literal 302 zcmV+}0nz@6P))+t&fzw&-recq-{{=f<=@)m*Vg3U+2q#B;oHyQ%D>jo#MZyJ*Uhxn z%(2wUuFuD<&Bm#5HxT|%opk0=UN`Z7qP-Q|&UOq%qB`iHTPm&1$0004W zQchCLJnb#%)6{LE)IEGZ*vh8K$I$|Kela`#xz&Ok7g^+x;)Ykz>pm5&NnLJnb#%)6{LB(IEGZ*%Iyo}JD|YhG?TyTzp{SPnYuJ3P5;|U^W?5wYyEQL zhQn3`OS#)U1wF6lFdty`yd*Y9BzJ1qd@n}tOK0{i&RjZQCgGjjlG4~qTcs`T?Ce>f pXE$FZ?_8NtR;T5u>CWz7nKmt9cD*Q)y8vh-gQu&X%Q~loCIH`KN5lXC literal 0 HcmV?d00001 diff --git a/src/client/resources/assets/rounded/textures/block/treated_acacia_planks.png b/src/client/resources/assets/rounded/textures/block/treated_acacia_planks.png index 72c773817bf535d3b0aacb8efdc440e4249050dc..95e9ee28cfb37d5c7cc714ffecb1af6230d4e88d 100644 GIT binary patch delta 157 zcmV;O0Al~!0nh=E7zqdi0000eEe}(XE+>C;Nkl(I-gXB2G>@JbTNxHN3*57WQlf{1?k9p zi5gHrb=XUgp4KYXV(A&88fxn$$Exv+w3y|^jW=k7hLoVS{m&nqRRdj>0+GA`000R9 LNkvXXu0mjfON~Ui delta 168 zcmV;Z09XIe0owtP7#0Kr0002(-QrRJ0004VQb$4nuFf3kks&94aY;l$RCwBAVibfx zrewuJ`Cn2*IKT`31IWXLI;No*B>)TD!19SQeRiNZZU WEs;>Di|zmb002n`MNUMnLSTZC)JL8G diff --git a/src/client/resources/assets/rounded/textures/block/treated_bamboo_planks.png b/src/client/resources/assets/rounded/textures/block/treated_bamboo_planks.png index 1a3f76a693dab607c71b44c21ba40cfa0dc38e42..8ad646bb754eba0b906c93576ab8c37ad256301d 100644 GIT binary patch delta 163 zcmV;U09^m(0p9_T7zqdi0000eEe}(XE--(2NklK&XfY7f zu5mizJFD$UjN76*MqpwYhGh(A055}BJsiuRJJ}k+xA4-6ufR*IDFy!S1D*>6{e};( RcT4~P002ovPDHLkV1mfML;U~% delta 170 zcmV;b09F6r0puDKXfW{9$Sm#-PTo_}D8YU&*%Yq)ZT>6tE}9W@jx zcEBrbYk)IX+BdvKVF?*iqI#hNQCw!Bjx|iCSi>V-!fF|za9zVQNWGrv-F~5a?fBfj Y!b~JqzKNGF0000907*qoM6N<$g8KwT3IG5A diff --git a/src/client/resources/assets/rounded/textures/block/treated_birch_planks.png b/src/client/resources/assets/rounded/textures/block/treated_birch_planks.png index 2c47de9fe9aaed5cf845e9cd29e59a6c0b634229..f6340ddd319ae8248999f735e813c2c51fee1dd7 100644 GIT binary patch delta 159 zcmV;Q0AT;z0n!1G7zqdi0000eEe}(XE+>C=Nklo;{B0lyJ@mr|?lxIcT-JrqCF;@`V4)SX6|ZL{tFU XU@ejN<=i9y00008NkvXXu0mjf&3;IQ diff --git a/src/client/resources/assets/rounded/textures/block/treated_cherry_planks.png b/src/client/resources/assets/rounded/textures/block/treated_cherry_planks.png index 9fdb91ad37af13784959c93f7aa495ba63d5dbf4..74df95e07c9e81b4fc379faceedbf8e0138a4428 100644 GIT binary patch delta 159 zcmV;Q0AT;z0n!1G7zqdi0000eEe}(XE+>C=Nklo;{B0lyJ@mr|?lxIcT-JrqCF;@`V4)SX6|ZL{tFU XU@ejN<=i9y00008NkvXXu0mjf&3;IQ diff --git a/src/client/resources/assets/rounded/textures/block/treated_crimson_planks.png b/src/client/resources/assets/rounded/textures/block/treated_crimson_planks.png index 889f42a6695c991434ebdb042a030ad6a940c79b..71b22b3006a58cd3f62d2f03444653389680dfa9 100644 GIT binary patch delta 159 zcmV;Q0AT;z0n!1G7zqdi0000eEe}(XE+>C=Nklo;{B0lyJ@mr|?lxIcT-JrqCF;@`V4)SX6|ZL{tFU XU@ejN<=i9y00008NkvXXu0mjf&3;IQ diff --git a/src/client/resources/assets/rounded/textures/block/treated_jungle_planks.png b/src/client/resources/assets/rounded/textures/block/treated_jungle_planks.png index e9109eead5e2b3c4486a7b97e4c2b4522dece6c5..f489ea3782eee4ed864b7ae602341c12f856b98a 100644 GIT binary patch delta 159 zcmV;Q0AT;z0n!1G7zqdi0000eEe}(XE+>C=Nklo;{B0lyJ@mr|?lxIcT-JrqCF;@`V4)SX6|ZL{tFU XU@ejN<=i9y00008NkvXXu0mjf&3;IQ diff --git a/src/client/resources/assets/rounded/textures/block/treated_mangrove_planks.png b/src/client/resources/assets/rounded/textures/block/treated_mangrove_planks.png index 0831f5f8e6addcf7ea6037d21bcb78d45d1ef048..6dd79ce77791f4a7f3c53f7b6b28459a869edffe 100644 GIT binary patch delta 159 zcmV;Q0AT;z0n!1G7zqdi0000eEe}(XE+>C=NklF5*54fH5ydRcqe%Ih5%KaSd(4d2Dts#E4MU@&c~5KZWSP54 zhBKmyANCS)g|#udeiPRb$?pI`Ye5p&s?Fy2gvP;ujC=Nklo;{B0lyJ@mr|?lxIcT-JrqCF;@`V4)SX6|ZL{tFU XU@ejN<=i9y00008NkvXXu0mjf&3;IQ diff --git a/src/client/resources/assets/rounded/textures/block/treated_spruce_planks.png b/src/client/resources/assets/rounded/textures/block/treated_spruce_planks.png index 5818dceabd83b90fb909a94d7897de2234d8618e..041c88363233991d96fbfd3f0e929ea2cc35510e 100644 GIT binary patch delta 159 zcmV;Q0AT;z0n!1G7zqdi0000eEe}(XE+>C=Nklo;{B0lyJ@mr|?lxIcT-JrqCF;@`V4)SX6|ZL{tFU XU@ejN<=i9y00008NkvXXu0mjf&3;IQ diff --git a/src/client/resources/assets/rounded/textures/block/treated_warped_planks.png b/src/client/resources/assets/rounded/textures/block/treated_warped_planks.png index a173de684318993b19595e155a2eef170e4e1df4..193d30d042b3e00e04cba3312508859c1b2ada36 100644 GIT binary patch delta 159 zcmV;Q0AT;z0n!1G7zqdi0000eEe}(XE+>C=Nklo;{B0lyJ@mr|?lxIcT-JrqCF;@`V4)SX6|ZL{tFU XU@ejN<=i9y00008NkvXXu0mjf&3;IQ diff --git a/src/client/resources/assets/rounded/textures/block/trough_feed.png b/src/client/resources/assets/rounded/textures/block/trough_feed.png index 0ffdc85288d48c0080024974b580055b916177f0..cc92e834a9b805a005175684274dfd565d2f7666 100644 GIT binary patch delta 9 QcmdnYxQuav%0$B^01)E?Q~&?~ delta 20 ccmZ3+xS4T+3KwH>kh>GZx^prwCn~lA07Jb8ApigX diff --git a/src/client/resources/assets/rounded/textures/block/trough_inside.png b/src/client/resources/assets/rounded/textures/block/trough_inside.png index 2e12ee92508cafcd7c24c9c7f4f74019f452776f..655d969b38fa0a5e6f082985b2bcde896b38c543 100644 GIT binary patch delta 9 QcmbQoIFWIJ%0$Cl01tix6#xJL delta 20 ccmbQpIFE6H3KwH>kh>GZx^prwCn^>I06>Zc;s5{u diff --git a/src/client/resources/assets/rounded/textures/block/trough_side.png b/src/client/resources/assets/rounded/textures/block/trough_side.png index bed44f4dc5ba6ea32966dda8eca4a4d25ab2990f..05eac2b27e662914e2de2ea2010c018a6de9d6e5 100644 GIT binary patch delta 129 zcmV-{0Dk}O0pS6VB#|*jcRY%R0mL8-1Ia(lLSXMdZA9APex&2#C+;B~x#av8Ik!^s z)M2khhi$T_?qke3RNQ@znM6cf_3khO!9~DCBoYQ-nW>TY-=(I04;EFbJ{VAuFaW0xfSlix(m9Le uUF!a0Y}5Vdraj37I_)=@eF%ygegOc?9|vTHwb{=A0000z@qLn>}1EwJ2B%=yoMV%qtJ zkWah}nQW3q8_ucU7TtK+>VLKAG={FlZN_Yi6k$cD%`|nTLP$yCS zqWQ&^o0mf!BeU`_}#=5wv*cf{&q4pr}dtFvrQ@s=t2fhS3j3^ HP6 { + if (LootTables.FISHING_JUNK_GAMEPLAY.equals(key)) { + LootPool.Builder poolBuilder = LootPool.builder().with(ItemEntry.builder(BLADDERWRACK_ITEM).weight(10)); + tableBuilder.pool(poolBuilder); + } + }); + } +} diff --git a/src/main/java/com/lumiscosity/rounded/Rounded.java b/src/main/java/com/lumiscosity/rounded/Rounded.java index 8ecc777..4b13405 100644 --- a/src/main/java/com/lumiscosity/rounded/Rounded.java +++ b/src/main/java/com/lumiscosity/rounded/Rounded.java @@ -4,6 +4,7 @@ import com.lumiscosity.rounded.compat.*; import com.lumiscosity.rounded.misc.RegisterSounds; import com.lumiscosity.rounded.misc.RegisterTrades; +import com.lumiscosity.rounded.worldgen.RegisterFeatures; import net.fabricmc.api.ModInitializer; import net.fabricmc.loader.api.FabricLoader; @@ -16,9 +17,11 @@ public class Rounded implements ModInitializer { @Override public void onInitialize() { + RegisterFeatures.initFeatures(); RegisterBlocks.initBlocks(); RegisterSounds.initSounds(); RegisterTrades.initTrades(); + RegisterMisc.initMisc(); if (FabricLoader.getInstance().isModLoaded("extravaganza")) { ExtravaganzaCompat.register(); diff --git a/src/main/java/com/lumiscosity/rounded/blocks/MoistureDetectorBlock.java b/src/main/java/com/lumiscosity/rounded/blocks/MoistureDetectorBlock.java new file mode 100644 index 0000000..fccb191 --- /dev/null +++ b/src/main/java/com/lumiscosity/rounded/blocks/MoistureDetectorBlock.java @@ -0,0 +1,133 @@ +package com.lumiscosity.rounded.blocks; + +import com.mojang.serialization.MapCodec; +import net.minecraft.block.*; +import net.minecraft.block.entity.BlockEntity; +import net.minecraft.block.entity.BlockEntityTicker; +import net.minecraft.block.entity.BlockEntityType; +import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.fluid.FluidState; +import net.minecraft.state.StateManager; +import net.minecraft.state.property.BooleanProperty; +import net.minecraft.state.property.IntProperty; +import net.minecraft.state.property.Properties; +import net.minecraft.util.ActionResult; +import net.minecraft.util.Hand; +import net.minecraft.util.hit.BlockHitResult; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.MathHelper; +import net.minecraft.world.BlockView; +import net.minecraft.world.World; +import net.minecraft.world.event.GameEvent; +import org.jetbrains.annotations.Nullable; + +import static com.lumiscosity.rounded.blocks.RegisterBlocks.MOISTURE_DETECTOR; +import static com.lumiscosity.rounded.blocks.RegisterBlocks.MOISTURE_DETECTOR_BE; + +public class MoistureDetectorBlock extends BlockWithEntity { + public static final IntProperty POWER = Properties.POWER; + public static final BooleanProperty CHECK_LEVEL = BooleanProperty.of("check_level"); + + public MoistureDetectorBlock(AbstractBlock.Settings settings) { + super(settings); + this.setDefaultState(this.stateManager.getDefaultState().with(POWER, 0).with(CHECK_LEVEL, false)); + } + + @Override + public BlockRenderType getRenderType(BlockState state) { + return BlockRenderType.MODEL; + } + + @Override + public int getWeakRedstonePower(BlockState state, BlockView world, BlockPos pos, Direction direction) { + return state.get(POWER); + } + + public static void updateState(BlockState state, World world, BlockPos pos) { + BlockPos check_pos = pos.up(); + if (state.get(CHECK_LEVEL)) { + if (world.getBlockState(check_pos).isOf(Blocks.WATER)) { + getWaterLevel(state, world, pos, world.getFluidState(check_pos)); + } else if (world.getBlockState(check_pos).contains(Properties.WATERLOGGED) ? world.getBlockState(check_pos).get(Properties.WATERLOGGED) : false) { + if (state.get(POWER) != 9) { + world.setBlockState(pos, state.with(POWER, 9), Block.NOTIFY_ALL); + } + } else { + if (state.get(POWER) != 0) { + world.setBlockState(pos, state.with(POWER, 0), Block.NOTIFY_ALL); + } + } + } else if (world.getBlockState(check_pos).isOf(Blocks.AIR) && world.hasRain(check_pos)) { + getRainLevel(state, world, pos); + } else { + if (state.get(POWER) != 0) { + world.setBlockState(pos, state.with(POWER, 0), Block.NOTIFY_ALL); + } + } + } + + public static void getWaterLevel(BlockState state, World world, BlockPos pos, FluidState water) { + int i = water.getLevel(); + if (state.get(POWER) != i) { + world.setBlockState(pos, state.with(POWER, i), Block.NOTIFY_ALL); + } + } + + public static void getRainLevel(BlockState state, World world, BlockPos pos) { + int i = world.isRaining() ? world.isThundering() ? 15 : 7 : 0; + if (state.get(POWER) != i) { + world.setBlockState(pos, state.with(POWER, i), Block.NOTIFY_ALL); + } + } + + @Override + public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { + if (player.canModifyBlocks()) { + if (world.isClient) { + return ActionResult.SUCCESS; + } else { + BlockState blockState = state.cycle(CHECK_LEVEL); + world.setBlockState(pos, blockState, Block.NOTIFY_LISTENERS); + world.emitGameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Emitter.of(player, blockState)); + updateState(blockState, world, pos); + return ActionResult.CONSUME; + } + } else { + return super.onUse(state, world, pos, player, hand, hit); + } + } + + @Override + public boolean emitsRedstonePower(BlockState state) { + return true; + } + + public static class MoistureDetectorBlockEntity extends BlockEntity { + public MoistureDetectorBlockEntity(BlockPos pos, BlockState state) { + super(MOISTURE_DETECTOR_BE, pos, state); + } + } + + @Override + public BlockEntity createBlockEntity(BlockPos pos, BlockState state) { + return new MoistureDetectorBlockEntity(pos, state); + } + + @Nullable + @Override + public BlockEntityTicker getTicker(World world, BlockState state, BlockEntityType type) { + return checkType(type, MOISTURE_DETECTOR_BE, MoistureDetectorBlock::tick); + } + + private static void tick(World world, BlockPos pos, BlockState state, MoistureDetectorBlockEntity blockEntity) { + if (world.getTime() % 2L == 0L) { + updateState(state, world, pos); + } + } + + @Override + protected void appendProperties(StateManager.Builder builder) { + builder.add(POWER, MoistureDetectorBlock.CHECK_LEVEL); + } +} diff --git a/src/main/java/com/lumiscosity/rounded/blocks/RegisterBlocks.java b/src/main/java/com/lumiscosity/rounded/blocks/RegisterBlocks.java index cea4f8d..8af7d60 100644 --- a/src/main/java/com/lumiscosity/rounded/blocks/RegisterBlocks.java +++ b/src/main/java/com/lumiscosity/rounded/blocks/RegisterBlocks.java @@ -1,32 +1,28 @@ package com.lumiscosity.rounded.blocks; -import com.lumiscosity.rounded.worldgen.HugeLustershroomFeature; -import net.fabricmc.fabric.api.biome.v1.BiomeModifications; -import net.fabricmc.fabric.api.biome.v1.BiomeSelectors; import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents; +import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder; import net.fabricmc.fabric.api.registry.LandPathNodeTypesRegistry; import net.minecraft.block.*; +import net.minecraft.block.entity.BlockEntityType; import net.minecraft.block.enums.Instrument; import net.minecraft.block.piston.PistonBehavior; import net.minecraft.entity.ai.pathing.PathNodeType; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.item.ItemGroups; -import net.minecraft.item.Items; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; -import net.minecraft.registry.tag.TagKey; import net.minecraft.sound.BlockSoundGroup; import net.minecraft.util.Identifier; -import net.minecraft.world.gen.GenerationStep; -import net.minecraft.world.gen.feature.*; import static com.lumiscosity.rounded.Rounded.MOD_ID; public class RegisterBlocks { + // Vanilla treated planks public static final Block TREATED_OAK_PLANKS = new TreatedPlank( AbstractBlock.Settings.create().mapColor(MapColor.OAK_TAN).instrument(Instrument.BASS).strength(2.0F, 3.0F).sounds(BlockSoundGroup.WOOD).burnable() ); @@ -86,6 +82,7 @@ public class RegisterBlocks { AbstractBlock.Settings.create().mapColor(MapColor.DARK_AQUA).instrument(Instrument.BASS).strength(2.0F, 3.0F).sounds(BlockSoundGroup.NETHER_WOOD) ); + public static final Item TREATED_OAK_PLANKS_ITEM = new BlockItem(TREATED_OAK_PLANKS, new Item.Settings()); public static final Item TREATED_SPRUCE_PLANKS_ITEM = new BlockItem(TREATED_SPRUCE_PLANKS, new Item.Settings()); public static final Item TREATED_BIRCH_PLANKS_ITEM = new BlockItem(TREATED_BIRCH_PLANKS, new Item.Settings()); @@ -98,13 +95,7 @@ public class RegisterBlocks { public static final Item TREATED_CRIMSON_PLANKS_ITEM = new BlockItem(TREATED_CRIMSON_PLANKS, new Item.Settings()); public static final Item TREATED_WARPED_PLANKS_ITEM = new BlockItem(TREATED_WARPED_PLANKS, new Item.Settings()); - - - // no time for good coding practices! get this thing over here - public static final Feature HUGE_LUSTERSHROOM = register_feature( - "huge_lustershroom", new HugeLustershroomFeature(HugeMushroomFeatureConfig.CODEC) - ); - + // Lustershroom and related blocks public static final Block LUSTERSHROOM_PLANT = new LustershroomPlant( RegistryKey.of(RegistryKeys.CONFIGURED_FEATURE, Identifier.of(MOD_ID, "huge_lustershroom")), AbstractBlock.Settings.create() @@ -130,11 +121,84 @@ public class RegisterBlocks { ); public static final BlockItem LUSTER_CLUSTER_ITEM = new BlockItem(LUSTER_CLUSTER, new Item.Settings()); + // Trough public static final Block TROUGH = new TroughBlock( AbstractBlock.Settings.create().mapColor(MapColor.OAK_TAN).instrument(Instrument.BASS).strength(0.6F).sounds(BlockSoundGroup.WOOD).burnable().ticksRandomly() ); public static final Item TROUGH_ITEM = new BlockItem(TROUGH, new Item.Settings()); + // Smooth Prismarine + public static final Block SMOOTH_PRISMARINE = new Block( + AbstractBlock.Settings.create().mapColor(MapColor.DIAMOND_BLUE).instrument(Instrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F) + ); + public static final Block SMOOTH_PRISMARINE_SLAB = new SlabBlock( + AbstractBlock.Settings.create().mapColor(MapColor.DIAMOND_BLUE).instrument(Instrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F) + ); + public static final BlockItem SMOOTH_PRISMARINE_ITEM= new BlockItem(SMOOTH_PRISMARINE, new Item.Settings()); + public static final BlockItem SMOOTH_PRISMARINE_SLAB_ITEM= new BlockItem(SMOOTH_PRISMARINE_SLAB, new Item.Settings()); + + // Chiseled Prismarine Bricks + public static final Block CHISELED_PRISMARINE_BRICKS = new Block( + AbstractBlock.Settings.create().mapColor(MapColor.DIAMOND_BLUE).instrument(Instrument.BASEDRUM).requiresTool().strength(1.5F, 6.0F) + ); + public static final BlockItem CHISELED_PRISMARINE_BRICKS_ITEM= new BlockItem(CHISELED_PRISMARINE_BRICKS, new Item.Settings()); + + // Prismarine Lantern + public static final Block PRISMARINE_LANTERN = new LanternBlock( + AbstractBlock.Settings.create() + .mapColor(MapColor.IRON_GRAY) + .solid() + .requiresTool() + .strength(3.5F) + .sounds(BlockSoundGroup.LANTERN) + .luminance(state -> 15) + .nonOpaque() + .pistonBehavior(PistonBehavior.DESTROY) + ); + public static final BlockItem PRISMARINE_LANTERN_ITEM = new BlockItem(PRISMARINE_LANTERN, new Item.Settings()); + + // Bladderwrack and related blocks + public static final Block DEAD_BLADDERWRACK = new DeadCoralFanBlock( + AbstractBlock.Settings.create().mapColor(MapColor.TERRACOTTA_BROWN).solid().instrument(Instrument.BASEDRUM).requiresTool().noCollision().breakInstantly() + ); + public static final Block BLADDERWRACK = new CoralFanBlock( + DEAD_BLADDERWRACK, + AbstractBlock.Settings.create() + .mapColor(MapColor.DIRT_BROWN) + .noCollision() + .breakInstantly() + .sounds(BlockSoundGroup.WET_GRASS) + .pistonBehavior(PistonBehavior.DESTROY) + ); + public static final Block DEAD_BLADDERWRACK_BLOCK = new Block(AbstractBlock.Settings.create() + .mapColor(MapColor.GRAY) + .solid() + .instrument(Instrument.BASEDRUM) + .requiresTool() + .strength(1.5F, 6.0F) + ); + public static final Block BLADDERWRACK_BLOCK = new CoralBlockBlock(DEAD_BLADDERWRACK_BLOCK, AbstractBlock.Settings.create() + .mapColor(MapColor.TERRACOTTA_BROWN) + .instrument(Instrument.BASEDRUM) + .requiresTool() + .strength(1.5F, 6.0F) + .sounds(BlockSoundGroup.CORAL)); + public static final BlockItem DEAD_BLADDERWRACK_ITEM = new BlockItem(DEAD_BLADDERWRACK, new Item.Settings()); + public static final BlockItem BLADDERWRACK_ITEM = new BlockItem(BLADDERWRACK, new Item.Settings()); + public static final BlockItem BLADDERWRACK_BLOCK_ITEM = new BlockItem(BLADDERWRACK_BLOCK, new Item.Settings()); + public static final BlockItem DEAD_BLADDERWRACK_BLOCK_ITEM = new BlockItem(DEAD_BLADDERWRACK_BLOCK, new Item.Settings()); + + // Moisture Detector + public static final Block MOISTURE_DETECTOR = new MoistureDetectorBlock( + AbstractBlock.Settings.create().mapColor(MapColor.DIAMOND_BLUE).instrument(Instrument.BASEDRUM).strength(1.5F, 6.0F) + ); + public static final BlockItem MOISTURE_DETECTOR_ITEM = new BlockItem(MOISTURE_DETECTOR, new Item.Settings()); + public static final BlockEntityType MOISTURE_DETECTOR_BE = Registry.register( + Registries.BLOCK_ENTITY_TYPE, + Identifier.of(MOD_ID, "moisture_detector"), + FabricBlockEntityTypeBuilder.create(MoistureDetectorBlock.MoistureDetectorBlockEntity::new, MOISTURE_DETECTOR).build() + ); + public static void initBlocks() { register_treated_plank("treated_oak_planks", TREATED_OAK_PLANKS, TREATED_OAK_PLANKS_ITEM, "minecraft", "oak"); register_treated_plank("treated_spruce_planks", TREATED_SPRUCE_PLANKS, TREATED_SPRUCE_PLANKS_ITEM, "minecraft", "spruce"); @@ -166,16 +230,46 @@ public static void initBlocks() { content.addAfter(Registries.BLOCK.get(Identifier.of("minecraft", "composter")), TROUGH_ITEM); }); - BiomeModifications.addFeature( - BiomeSelectors.tag(TagKey.of(RegistryKeys.BIOME, Identifier.of(MOD_ID, "has_lustershrooms"))), - GenerationStep.Feature.VEGETAL_DECORATION, - RegistryKey.of(RegistryKeys.PLACED_FEATURE, Identifier.of(MOD_ID, "lustershroom")) - ); - BiomeModifications.addFeature( - BiomeSelectors.tag(TagKey.of(RegistryKeys.BIOME, Identifier.of(MOD_ID, "has_more_lustershrooms"))), - GenerationStep.Feature.VEGETAL_DECORATION, - RegistryKey.of(RegistryKeys.PLACED_FEATURE, Identifier.of(MOD_ID, "lustershroom_extra")) - ); + register_block("smooth_prismarine", SMOOTH_PRISMARINE, SMOOTH_PRISMARINE_ITEM); + register_block("smooth_prismarine_slab", SMOOTH_PRISMARINE_SLAB, SMOOTH_PRISMARINE_SLAB_ITEM); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.BUILDING_BLOCKS).register(content -> { + content.addAfter(Registries.BLOCK.get(Identifier.of("minecraft", "prismarine_slab")), SMOOTH_PRISMARINE_ITEM); + }); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.BUILDING_BLOCKS).register(content -> { + content.addAfter(Registries.BLOCK.get(Identifier.of(MOD_ID, "smooth_prismarine")), SMOOTH_PRISMARINE_SLAB_ITEM); + }); + + register_block("chiseled_prismarine_bricks", CHISELED_PRISMARINE_BRICKS, CHISELED_PRISMARINE_BRICKS_ITEM); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.BUILDING_BLOCKS).register(content -> { + content.addAfter(Registries.BLOCK.get(Identifier.of("minecraft", "prismarine_brick_slab")), CHISELED_PRISMARINE_BRICKS_ITEM); + }); + + register_block("prismarine_lantern", PRISMARINE_LANTERN, PRISMARINE_LANTERN_ITEM); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.FUNCTIONAL).register(content -> { + content.addAfter(Registries.BLOCK.get(Identifier.of("minecraft", "soul_lantern")), PRISMARINE_LANTERN_ITEM); + }); + + register_block("dead_bladderwrack", DEAD_BLADDERWRACK, DEAD_BLADDERWRACK_ITEM); + register_block("bladderwrack", BLADDERWRACK, BLADDERWRACK_ITEM); + register_block("dead_bladderwrack_block", DEAD_BLADDERWRACK_BLOCK, DEAD_BLADDERWRACK_BLOCK_ITEM); + register_block("bladderwrack_block", BLADDERWRACK_BLOCK, BLADDERWRACK_BLOCK_ITEM); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register(content -> { + content.addAfter(Registries.BLOCK.get(Identifier.of("minecraft", "dead_horn_coral_fan")), DEAD_BLADDERWRACK_ITEM); + }); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register(content -> { + content.addAfter(Registries.BLOCK.get(Identifier.of("minecraft", "horn_coral_fan")), BLADDERWRACK_ITEM); + }); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register(content -> { + content.addAfter(Registries.BLOCK.get(Identifier.of("minecraft", "dead_horn_coral_block")), DEAD_BLADDERWRACK_BLOCK_ITEM); + }); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.NATURAL).register(content -> { + content.addAfter(Registries.BLOCK.get(Identifier.of("minecraft", "horn_coral_block")), BLADDERWRACK_BLOCK_ITEM); + }); + + register_block("moisture_detector", MOISTURE_DETECTOR, MOISTURE_DETECTOR_ITEM); + ItemGroupEvents.modifyEntriesEvent(ItemGroups.REDSTONE).register(content -> { + content.addAfter(Registries.BLOCK.get(Identifier.of("minecraft", "daylight_detector")), MOISTURE_DETECTOR_ITEM); + }); } public static void register_treated_plank(String name, Block block, Item item, String source_mod, String plank_type) { @@ -190,8 +284,4 @@ private static void register_block(String name, Block block, Item item) { Registry.register(Registries.BLOCK, Identifier.of(MOD_ID, name), block); Registry.register(Registries.ITEM, Identifier.of(MOD_ID, name), item); } - - private static > F register_feature(String name, F feature) { - return Registry.register(Registries.FEATURE, Identifier.of(MOD_ID, name), feature); - } } \ No newline at end of file diff --git a/src/main/java/com/lumiscosity/rounded/mixin/ExtraConduitPowerMixin.java b/src/main/java/com/lumiscosity/rounded/mixin/ExtraConduitPowerMixin.java new file mode 100644 index 0000000..8bbd51c --- /dev/null +++ b/src/main/java/com/lumiscosity/rounded/mixin/ExtraConduitPowerMixin.java @@ -0,0 +1,19 @@ +package com.lumiscosity.rounded.mixin; + +import com.lumiscosity.rounded.blocks.RegisterBlocks; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.block.entity.ConduitBlockEntity; +import org.spongepowered.asm.mixin.*; + +@Mixin(ConduitBlockEntity.class) +public class ExtraConduitPowerMixin { + @Shadow + @Final + @Mutable + private static Block[] ACTIVATING_BLOCKS; + + static { + ACTIVATING_BLOCKS = new Block[]{Blocks.PRISMARINE, Blocks.PRISMARINE_BRICKS, Blocks.SEA_LANTERN, Blocks.DARK_PRISMARINE, RegisterBlocks.CHISELED_PRISMARINE_BRICKS, RegisterBlocks.SMOOTH_PRISMARINE}; + } +} diff --git a/src/main/java/com/lumiscosity/rounded/worldgen/RegisterFeatures.java b/src/main/java/com/lumiscosity/rounded/worldgen/RegisterFeatures.java new file mode 100644 index 0000000..abe3036 --- /dev/null +++ b/src/main/java/com/lumiscosity/rounded/worldgen/RegisterFeatures.java @@ -0,0 +1,46 @@ +package com.lumiscosity.rounded.worldgen; + +import net.fabricmc.fabric.api.biome.v1.BiomeModifications; +import net.fabricmc.fabric.api.biome.v1.BiomeSelectors; +import net.minecraft.registry.Registries; +import net.minecraft.registry.Registry; +import net.minecraft.registry.RegistryKey; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; +import net.minecraft.world.gen.GenerationStep; +import net.minecraft.world.gen.feature.Feature; +import net.minecraft.world.gen.feature.FeatureConfig; +import net.minecraft.world.gen.feature.HugeMushroomFeatureConfig; + +import static com.lumiscosity.rounded.Rounded.MOD_ID; + +public class RegisterFeatures { + public static void initFeatures() { + // Lustershroom patch and Huge Lustershroom + register_feature("huge_lustershroom", new HugeLustershroomFeature(HugeMushroomFeatureConfig.CODEC)); + BiomeModifications.addFeature( + BiomeSelectors.tag(TagKey.of(RegistryKeys.BIOME, Identifier.of(MOD_ID, "has_lustershrooms"))), + GenerationStep.Feature.VEGETAL_DECORATION, + RegistryKey.of(RegistryKeys.PLACED_FEATURE, Identifier.of(MOD_ID, "lustershroom")) + ); + BiomeModifications.addFeature( + BiomeSelectors.tag(TagKey.of(RegistryKeys.BIOME, Identifier.of(MOD_ID, "has_more_lustershrooms"))), + GenerationStep.Feature.VEGETAL_DECORATION, + RegistryKey.of(RegistryKeys.PLACED_FEATURE, Identifier.of(MOD_ID, "lustershroom_extra")) + ); + + // Bladderwrack + BiomeModifications.addFeature( + BiomeSelectors.tag(TagKey.of(RegistryKeys.BIOME, Identifier.of(MOD_ID, "has_bladderwrack"))), + GenerationStep.Feature.VEGETAL_DECORATION, + RegistryKey.of(RegistryKeys.PLACED_FEATURE, Identifier.of(MOD_ID, "bladderwrack")) + ); + + // Ocean floor rocks + } + + private static > F register_feature(String name, F feature) { + return Registry.register(Registries.FEATURE, Identifier.of(MOD_ID, name), feature); + } +} diff --git a/src/main/resources/rounded.mixins.json b/src/main/resources/rounded.mixins.json index ab2a3e0..5d4e991 100644 --- a/src/main/resources/rounded.mixins.json +++ b/src/main/resources/rounded.mixins.json @@ -3,7 +3,8 @@ "package": "com.lumiscosity.rounded.mixin", "compatibilityLevel": "JAVA_17", "mixins": [ - "TroughFallCancelMixin" + "TroughFallCancelMixin", + "ExtraConduitPowerMixin" ], "injectors": { "defaultRequire": 1