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 0000000..6a76a73 Binary files /dev/null and b/src/client/resources/assets/rounded/textures/block/bladderwrack.png differ 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 0000000..567347c Binary files /dev/null and b/src/client/resources/assets/rounded/textures/block/bladderwrack_block.png differ 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 0000000..f4f4fb8 Binary files /dev/null and b/src/client/resources/assets/rounded/textures/block/chiseled_prismarine_bricks.png differ diff --git a/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_dragon_tree_planks.png b/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_dragon_tree_planks.png index a476278..d359b80 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_dragon_tree_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_dragon_tree_planks.png differ 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 8db8ba4..7167b2e 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_helix_tree_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_helix_tree_planks.png differ 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 8bb9d8e..976c6d6 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_jellyshroom_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_jellyshroom_planks.png differ 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 83a88f8..206c123 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_lacugrove_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_lacugrove_planks.png differ 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 400ffc3..acb9316 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_lucernia_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_lucernia_planks.png differ 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 f9fca4c..ceae334 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_mossy_glowshroom_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_mossy_glowshroom_planks.png differ 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 b978564..f41120a 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_pythadendron_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_pythadendron_planks.png differ 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 7bd2c9c..b2b05c5 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_tenanea_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_tenanea_planks.png differ 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 3477f27..9918a84 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_umbrella_tree_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/betterend/treated_umbrella_tree_planks.png differ 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 1616bc5..c849af1 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/betternether/treated_mushroom_fir_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/betternether/treated_mushroom_fir_planks.png differ 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 b2b9c40..6b3deab 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/betternether/treated_nether_mushroom_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/betternether/treated_nether_mushroom_planks.png differ diff --git a/src/client/resources/assets/rounded/textures/block/compat/betternether/treated_rubeus_planks.png b/src/client/resources/assets/rounded/textures/block/compat/betternether/treated_rubeus_planks.png index 929bd3c..32f0da9 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/betternether/treated_rubeus_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/betternether/treated_rubeus_planks.png differ diff --git a/src/client/resources/assets/rounded/textures/block/compat/betternether/treated_wart_planks.png b/src/client/resources/assets/rounded/textures/block/compat/betternether/treated_wart_planks.png index 26f9f43..b5024e5 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/betternether/treated_wart_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/betternether/treated_wart_planks.png differ diff --git a/src/client/resources/assets/rounded/textures/block/compat/betternether/treated_willow_planks.png b/src/client/resources/assets/rounded/textures/block/compat/betternether/treated_willow_planks.png index bfbff56..cc07de2 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/betternether/treated_willow_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/betternether/treated_willow_planks.png differ diff --git a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_dead_planks.png b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_dead_planks.png index ce836b8..39e8a13 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_dead_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_dead_planks.png differ 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 3472fd0..8308885 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_empyreal_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_empyreal_planks.png differ 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 069edc4..51b0f4d 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_fir_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_fir_planks.png differ 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 23d57cd..587ee7d 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_hellbark_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_hellbark_planks.png differ 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 ec4f458..0f2d615 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_jacaranda_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_jacaranda_planks.png differ 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 5039547..a526c3d 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_magic_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_magic_planks.png differ diff --git a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_mahogany_planks.png b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_mahogany_planks.png index 770ecbe..7273e53 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_mahogany_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_mahogany_planks.png differ 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 e5805b8..44c8b40 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_maple_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_maple_planks.png differ 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 f8e1893..517580b 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_palm_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_palm_planks.png differ 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 90a9a8d..994cbd4 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_pine_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_pine_planks.png differ 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 ce3d92b..ebfdfdf 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_redwood_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_redwood_planks.png differ 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 df9dbb7..ea2c961 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_umbran_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_umbran_planks.png differ 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 30d8851..b48da38 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_willow_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/biomesoplenty/treated_willow_planks.png differ 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 6414d1b..1ca63cc 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/cinderscapes/treated_scorched_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/cinderscapes/treated_scorched_planks.png differ 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 42920c0..33204fd 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/cinderscapes/treated_umbral_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/cinderscapes/treated_umbral_planks.png differ 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 21f7f8a..1102eb7 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/terrestria/treated_hemlock_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/terrestria/treated_hemlock_planks.png differ 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 dd71339..5a5e862 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/treated_hevea_brasiliensis_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/treated_hevea_brasiliensis_planks.png differ diff --git a/src/client/resources/assets/rounded/textures/block/compat/wilderwild/treated_baobab_planks.png b/src/client/resources/assets/rounded/textures/block/compat/wilderwild/treated_baobab_planks.png index 2b17167..2e8d923 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/wilderwild/treated_baobab_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/wilderwild/treated_baobab_planks.png differ 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 d4799c1..722ddb5 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/wilderwild/treated_cypress_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/wilderwild/treated_cypress_planks.png differ 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 9077262..d5918ad 100644 Binary files a/src/client/resources/assets/rounded/textures/block/compat/wilderwild/treated_palm_planks.png and b/src/client/resources/assets/rounded/textures/block/compat/wilderwild/treated_palm_planks.png differ 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 0000000..90781b9 Binary files /dev/null and b/src/client/resources/assets/rounded/textures/block/dead_bladderwrack.png differ 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 0000000..697cf41 Binary files /dev/null and b/src/client/resources/assets/rounded/textures/block/dead_bladderwrack_block.png differ diff --git a/src/client/resources/assets/rounded/textures/block/lustershroom.png b/src/client/resources/assets/rounded/textures/block/lustershroom.png index c6145a8..330d1b0 100644 Binary files a/src/client/resources/assets/rounded/textures/block/lustershroom.png and b/src/client/resources/assets/rounded/textures/block/lustershroom.png differ 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 14d92b1..1aeee42 100644 Binary files a/src/client/resources/assets/rounded/textures/block/lustershroom_block.png and b/src/client/resources/assets/rounded/textures/block/lustershroom_block.png differ diff --git a/src/client/resources/assets/rounded/textures/block/moisture_detector_side.png b/src/client/resources/assets/rounded/textures/block/moisture_detector_side.png new file mode 100644 index 0000000..48b38cd Binary files /dev/null and b/src/client/resources/assets/rounded/textures/block/moisture_detector_side.png differ diff --git a/src/client/resources/assets/rounded/textures/block/moisture_detector_top.png b/src/client/resources/assets/rounded/textures/block/moisture_detector_top.png new file mode 100644 index 0000000..ddf113a Binary files /dev/null and b/src/client/resources/assets/rounded/textures/block/moisture_detector_top.png differ 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 0000000..70abce6 Binary files /dev/null and b/src/client/resources/assets/rounded/textures/block/moisture_detector_top_level.png differ 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 0000000..3541c81 Binary files /dev/null and b/src/client/resources/assets/rounded/textures/block/prismarine_lantern.png differ diff --git a/src/client/resources/assets/rounded/textures/block/prismarine_lantern.png.mcmeta b/src/client/resources/assets/rounded/textures/block/prismarine_lantern.png.mcmeta new file mode 100644 index 0000000..5169aab --- /dev/null +++ b/src/client/resources/assets/rounded/textures/block/prismarine_lantern.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 8 + } +} \ No newline at end of file diff --git a/src/client/resources/assets/rounded/textures/block/smooth_prismarine.png b/src/client/resources/assets/rounded/textures/block/smooth_prismarine.png new file mode 100644 index 0000000..e8b246d Binary files /dev/null and b/src/client/resources/assets/rounded/textures/block/smooth_prismarine.png differ diff --git a/src/client/resources/assets/rounded/textures/block/smooth_prismarine_slab_side.png b/src/client/resources/assets/rounded/textures/block/smooth_prismarine_slab_side.png new file mode 100644 index 0000000..c08b1ab Binary files /dev/null and b/src/client/resources/assets/rounded/textures/block/smooth_prismarine_slab_side.png differ 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 72c7738..95e9ee2 100644 Binary files a/src/client/resources/assets/rounded/textures/block/treated_acacia_planks.png and b/src/client/resources/assets/rounded/textures/block/treated_acacia_planks.png differ 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 1a3f76a..8ad646b 100644 Binary files a/src/client/resources/assets/rounded/textures/block/treated_bamboo_planks.png and b/src/client/resources/assets/rounded/textures/block/treated_bamboo_planks.png differ 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 2c47de9..f6340dd 100644 Binary files a/src/client/resources/assets/rounded/textures/block/treated_birch_planks.png and b/src/client/resources/assets/rounded/textures/block/treated_birch_planks.png differ 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 9fdb91a..74df95e 100644 Binary files a/src/client/resources/assets/rounded/textures/block/treated_cherry_planks.png and b/src/client/resources/assets/rounded/textures/block/treated_cherry_planks.png differ 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 889f42a..71b22b3 100644 Binary files a/src/client/resources/assets/rounded/textures/block/treated_crimson_planks.png and b/src/client/resources/assets/rounded/textures/block/treated_crimson_planks.png differ 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 e9109ee..f489ea3 100644 Binary files a/src/client/resources/assets/rounded/textures/block/treated_jungle_planks.png and b/src/client/resources/assets/rounded/textures/block/treated_jungle_planks.png differ 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 0831f5f..6dd79ce 100644 Binary files a/src/client/resources/assets/rounded/textures/block/treated_mangrove_planks.png and b/src/client/resources/assets/rounded/textures/block/treated_mangrove_planks.png differ diff --git a/src/client/resources/assets/rounded/textures/block/treated_oak_planks.png b/src/client/resources/assets/rounded/textures/block/treated_oak_planks.png index 93053f5..1b56c27 100644 Binary files a/src/client/resources/assets/rounded/textures/block/treated_oak_planks.png and b/src/client/resources/assets/rounded/textures/block/treated_oak_planks.png differ 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 5818dce..041c883 100644 Binary files a/src/client/resources/assets/rounded/textures/block/treated_spruce_planks.png and b/src/client/resources/assets/rounded/textures/block/treated_spruce_planks.png differ 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 a173de6..193d30d 100644 Binary files a/src/client/resources/assets/rounded/textures/block/treated_warped_planks.png and b/src/client/resources/assets/rounded/textures/block/treated_warped_planks.png differ 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 0ffdc85..cc92e83 100644 Binary files a/src/client/resources/assets/rounded/textures/block/trough_feed.png and b/src/client/resources/assets/rounded/textures/block/trough_feed.png differ 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 2e12ee9..655d969 100644 Binary files a/src/client/resources/assets/rounded/textures/block/trough_inside.png and b/src/client/resources/assets/rounded/textures/block/trough_inside.png differ 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 bed44f4..05eac2b 100644 Binary files a/src/client/resources/assets/rounded/textures/block/trough_side.png and b/src/client/resources/assets/rounded/textures/block/trough_side.png differ diff --git a/src/client/resources/assets/rounded/textures/item/prismarine_lantern.png b/src/client/resources/assets/rounded/textures/item/prismarine_lantern.png new file mode 100644 index 0000000..279255c Binary files /dev/null and b/src/client/resources/assets/rounded/textures/item/prismarine_lantern.png differ diff --git a/src/main/java/com/lumiscosity/rounded/RegisterMisc.java b/src/main/java/com/lumiscosity/rounded/RegisterMisc.java new file mode 100644 index 0000000..a9030c9 --- /dev/null +++ b/src/main/java/com/lumiscosity/rounded/RegisterMisc.java @@ -0,0 +1,21 @@ +package com.lumiscosity.rounded; + +import net.fabricmc.fabric.api.loot.v2.LootTableEvents; +import net.fabricmc.fabric.api.registry.CompostingChanceRegistry; +import net.minecraft.loot.LootPool; +import net.minecraft.loot.LootTables; +import net.minecraft.loot.entry.ItemEntry; + +import static com.lumiscosity.rounded.blocks.RegisterBlocks.BLADDERWRACK_ITEM; + +public class RegisterMisc { + public static void initMisc() { + CompostingChanceRegistry.INSTANCE.add(BLADDERWRACK_ITEM, 0.3f); + LootTableEvents.MODIFY.register((resourceManager, lootManager, key, tableBuilder, source) -> { + 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