diff --git a/src/generated/resources/assets/hybrid-aquatic/blockstates/driftwood_crate.json b/src/generated/resources/assets/hybrid-aquatic/blockstates/driftwood_crate.json new file mode 100644 index 000000000..158254f81 --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/blockstates/driftwood_crate.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "hybrid-aquatic:block/driftwood_crate" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/hybrid-aquatic/blockstates/driftwood_door.json b/src/generated/resources/assets/hybrid-aquatic/blockstates/driftwood_door.json new file mode 100644 index 000000000..be2df9dc1 --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/blockstates/driftwood_door.json @@ -0,0 +1,124 @@ +{ + "variants": { + "facing=east,half=lower,hinge=left,open=false": { + "model": "hybrid-aquatic:block/driftwood_door_bottom_left" + }, + "facing=east,half=lower,hinge=left,open=true": { + "model": "hybrid-aquatic:block/driftwood_door_bottom_left_open", + "y": 90 + }, + "facing=east,half=lower,hinge=right,open=false": { + "model": "hybrid-aquatic:block/driftwood_door_bottom_right" + }, + "facing=east,half=lower,hinge=right,open=true": { + "model": "hybrid-aquatic:block/driftwood_door_bottom_right_open", + "y": 270 + }, + "facing=east,half=upper,hinge=left,open=false": { + "model": "hybrid-aquatic:block/driftwood_door_top_left" + }, + "facing=east,half=upper,hinge=left,open=true": { + "model": "hybrid-aquatic:block/driftwood_door_top_left_open", + "y": 90 + }, + "facing=east,half=upper,hinge=right,open=false": { + "model": "hybrid-aquatic:block/driftwood_door_top_right" + }, + "facing=east,half=upper,hinge=right,open=true": { + "model": "hybrid-aquatic:block/driftwood_door_top_right_open", + "y": 270 + }, + "facing=north,half=lower,hinge=left,open=false": { + "model": "hybrid-aquatic:block/driftwood_door_bottom_left", + "y": 270 + }, + "facing=north,half=lower,hinge=left,open=true": { + "model": "hybrid-aquatic:block/driftwood_door_bottom_left_open" + }, + "facing=north,half=lower,hinge=right,open=false": { + "model": "hybrid-aquatic:block/driftwood_door_bottom_right", + "y": 270 + }, + "facing=north,half=lower,hinge=right,open=true": { + "model": "hybrid-aquatic:block/driftwood_door_bottom_right_open", + "y": 180 + }, + "facing=north,half=upper,hinge=left,open=false": { + "model": "hybrid-aquatic:block/driftwood_door_top_left", + "y": 270 + }, + "facing=north,half=upper,hinge=left,open=true": { + "model": "hybrid-aquatic:block/driftwood_door_top_left_open" + }, + "facing=north,half=upper,hinge=right,open=false": { + "model": "hybrid-aquatic:block/driftwood_door_top_right", + "y": 270 + }, + "facing=north,half=upper,hinge=right,open=true": { + "model": "hybrid-aquatic:block/driftwood_door_top_right_open", + "y": 180 + }, + "facing=south,half=lower,hinge=left,open=false": { + "model": "hybrid-aquatic:block/driftwood_door_bottom_left", + "y": 90 + }, + "facing=south,half=lower,hinge=left,open=true": { + "model": "hybrid-aquatic:block/driftwood_door_bottom_left_open", + "y": 180 + }, + "facing=south,half=lower,hinge=right,open=false": { + "model": "hybrid-aquatic:block/driftwood_door_bottom_right", + "y": 90 + }, + "facing=south,half=lower,hinge=right,open=true": { + "model": "hybrid-aquatic:block/driftwood_door_bottom_right_open" + }, + "facing=south,half=upper,hinge=left,open=false": { + "model": "hybrid-aquatic:block/driftwood_door_top_left", + "y": 90 + }, + "facing=south,half=upper,hinge=left,open=true": { + "model": "hybrid-aquatic:block/driftwood_door_top_left_open", + "y": 180 + }, + "facing=south,half=upper,hinge=right,open=false": { + "model": "hybrid-aquatic:block/driftwood_door_top_right", + "y": 90 + }, + "facing=south,half=upper,hinge=right,open=true": { + "model": "hybrid-aquatic:block/driftwood_door_top_right_open" + }, + "facing=west,half=lower,hinge=left,open=false": { + "model": "hybrid-aquatic:block/driftwood_door_bottom_left", + "y": 180 + }, + "facing=west,half=lower,hinge=left,open=true": { + "model": "hybrid-aquatic:block/driftwood_door_bottom_left_open", + "y": 270 + }, + "facing=west,half=lower,hinge=right,open=false": { + "model": "hybrid-aquatic:block/driftwood_door_bottom_right", + "y": 180 + }, + "facing=west,half=lower,hinge=right,open=true": { + "model": "hybrid-aquatic:block/driftwood_door_bottom_right_open", + "y": 90 + }, + "facing=west,half=upper,hinge=left,open=false": { + "model": "hybrid-aquatic:block/driftwood_door_top_left", + "y": 180 + }, + "facing=west,half=upper,hinge=left,open=true": { + "model": "hybrid-aquatic:block/driftwood_door_top_left_open", + "y": 270 + }, + "facing=west,half=upper,hinge=right,open=false": { + "model": "hybrid-aquatic:block/driftwood_door_top_right", + "y": 180 + }, + "facing=west,half=upper,hinge=right,open=true": { + "model": "hybrid-aquatic:block/driftwood_door_top_right_open", + "y": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/hybrid-aquatic/blockstates/driftwood_trapdoor.json b/src/generated/resources/assets/hybrid-aquatic/blockstates/driftwood_trapdoor.json new file mode 100644 index 000000000..fff435663 --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/blockstates/driftwood_trapdoor.json @@ -0,0 +1,58 @@ +{ + "variants": { + "facing=east,half=bottom,open=false": { + "model": "hybrid-aquatic:block/driftwood_trapdoor_bottom" + }, + "facing=east,half=bottom,open=true": { + "model": "hybrid-aquatic:block/driftwood_trapdoor_open", + "y": 90 + }, + "facing=east,half=top,open=false": { + "model": "hybrid-aquatic:block/driftwood_trapdoor_top" + }, + "facing=east,half=top,open=true": { + "model": "hybrid-aquatic:block/driftwood_trapdoor_open", + "y": 90 + }, + "facing=north,half=bottom,open=false": { + "model": "hybrid-aquatic:block/driftwood_trapdoor_bottom" + }, + "facing=north,half=bottom,open=true": { + "model": "hybrid-aquatic:block/driftwood_trapdoor_open" + }, + "facing=north,half=top,open=false": { + "model": "hybrid-aquatic:block/driftwood_trapdoor_top" + }, + "facing=north,half=top,open=true": { + "model": "hybrid-aquatic:block/driftwood_trapdoor_open" + }, + "facing=south,half=bottom,open=false": { + "model": "hybrid-aquatic:block/driftwood_trapdoor_bottom" + }, + "facing=south,half=bottom,open=true": { + "model": "hybrid-aquatic:block/driftwood_trapdoor_open", + "y": 180 + }, + "facing=south,half=top,open=false": { + "model": "hybrid-aquatic:block/driftwood_trapdoor_top" + }, + "facing=south,half=top,open=true": { + "model": "hybrid-aquatic:block/driftwood_trapdoor_open", + "y": 180 + }, + "facing=west,half=bottom,open=false": { + "model": "hybrid-aquatic:block/driftwood_trapdoor_bottom" + }, + "facing=west,half=bottom,open=true": { + "model": "hybrid-aquatic:block/driftwood_trapdoor_open", + "y": 270 + }, + "facing=west,half=top,open=false": { + "model": "hybrid-aquatic:block/driftwood_trapdoor_top" + }, + "facing=west,half=top,open=true": { + "model": "hybrid-aquatic:block/driftwood_trapdoor_open", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/hybrid-aquatic/blockstates/glowstick.json b/src/generated/resources/assets/hybrid-aquatic/blockstates/glowstick.json new file mode 100644 index 000000000..fa514bcf8 --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/blockstates/glowstick.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "hybrid-aquatic:block/glowstick" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/hybrid-aquatic/blockstates/wall_glowstick.json b/src/generated/resources/assets/hybrid-aquatic/blockstates/wall_glowstick.json new file mode 100644 index 000000000..c44bcd9ad --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/blockstates/wall_glowstick.json @@ -0,0 +1,19 @@ +{ + "variants": { + "facing=east": { + "model": "hybrid-aquatic:block/wall_glowstick" + }, + "facing=north": { + "model": "hybrid-aquatic:block/wall_glowstick", + "y": 270 + }, + "facing=south": { + "model": "hybrid-aquatic:block/wall_glowstick", + "y": 90 + }, + "facing=west": { + "model": "hybrid-aquatic:block/wall_glowstick", + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/hybrid-aquatic/lang/en_us.json b/src/generated/resources/assets/hybrid-aquatic/lang/en_us.json index 1d62c5028..c52851422 100644 --- a/src/generated/resources/assets/hybrid-aquatic/lang/en_us.json +++ b/src/generated/resources/assets/hybrid-aquatic/lang/en_us.json @@ -11,16 +11,23 @@ "block.hybrid-aquatic.cherry_crate.description": "Break with an axe to open", "block.hybrid-aquatic.dark_oak_crate": "Dark Oak Crate", "block.hybrid-aquatic.dark_oak_crate.description": "Break with an axe to open", + "block.hybrid-aquatic.dead_lophelia_coral": "Dead Lophelia Coral", + "block.hybrid-aquatic.dead_lophelia_coral_block": "Dead Lophelia Coral Block", + "block.hybrid-aquatic.dead_lophelia_coral_fan": "Dead Lophelia Coral Fan", "block.hybrid-aquatic.driftwood_button": "Driftwood Button", + "block.hybrid-aquatic.driftwood_crate": "Driftwood Crate", "block.hybrid-aquatic.driftwood_door": "Driftwood Door", "block.hybrid-aquatic.driftwood_fence": "Driftwood Fence", + "block.hybrid-aquatic.driftwood_log": "Driftwood Log", "block.hybrid-aquatic.driftwood_planks": "Driftwood Planks", "block.hybrid-aquatic.driftwood_pressure_plate": "Driftwood Pressure Plate", "block.hybrid-aquatic.driftwood_slab": "Driftwood Slab", "block.hybrid-aquatic.driftwood_stairs": "Driftwood Stairs", "block.hybrid-aquatic.driftwood_trapdoor": "Driftwood Trapdoor", + "block.hybrid-aquatic.driftwood_wood": "Driftwood Wood", "block.hybrid-aquatic.frilled_shark_plushie": "Frilled Shark Plushie", "block.hybrid-aquatic.giant_clam": "Giant Clam", + "block.hybrid-aquatic.glowstick": "Glowstick", "block.hybrid-aquatic.great_white_shark_plushie": "Great White Shark Plushie", "block.hybrid-aquatic.hammerhead_shark_plushie": "Hammerhead Shark Plushie", "block.hybrid-aquatic.hybrid_crate": "Hybrid Crate", @@ -28,6 +35,9 @@ "block.hybrid-aquatic.hydrothermal_vent": "Hydrothermal Vent", "block.hybrid-aquatic.jungle_crate": "Jungle Crate", "block.hybrid-aquatic.jungle_crate.description": "Break with an axe to open", + "block.hybrid-aquatic.lophelia_coral": "Lophelia Coral", + "block.hybrid-aquatic.lophelia_coral_block": "Lophelia Coral Block", + "block.hybrid-aquatic.lophelia_coral_fan": "Lophelia Coral Fan", "block.hybrid-aquatic.mangrove_crate": "Mangrove Crate", "block.hybrid-aquatic.mangrove_crate.description": "Break with an axe to open", "block.hybrid-aquatic.message_in_a_bottle": "Message in a Bottle", @@ -37,10 +47,13 @@ "block.hybrid-aquatic.oak_crate.description": "Break with an axe to open", "block.hybrid-aquatic.spruce_crate": "Spruce Crate", "block.hybrid-aquatic.spruce_crate.description": "Break with an axe to open", + "block.hybrid-aquatic.stripped_driftwood_log": "Stripped Driftwood Log", + "block.hybrid-aquatic.stripped_driftwood_wood": "Stripped Driftwood Wood", "block.hybrid-aquatic.thresher_shark_plushie": "Thresher Shark Plushie", "block.hybrid-aquatic.tiger_shark_plushie": "Tiger Shark Plushie", "block.hybrid-aquatic.tube_sponge": "Tube Sponge", "block.hybrid-aquatic.whale_shark_plushie": "Whale Shark Plushie", + "block.minecraft.air": "Wall Glowstick", "effect.hybrid-aquatic.bleeding": "Bleeding", "effect.hybrid-aquatic.clarity": "Clarity", "effect.hybrid-aquatic.thalassophobia": "Thalassophobia", diff --git a/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_crate.json b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_crate.json new file mode 100644 index 000000000..35bd31b8f --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_crate.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "hybrid-aquatic:block/driftwood_crate" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_bottom_left.json b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_bottom_left.json new file mode 100644 index 000000000..af7fa4dfd --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_bottom_left.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left", + "textures": { + "bottom": "hybrid-aquatic:block/driftwood_door_bottom", + "top": "hybrid-aquatic:block/driftwood_door_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_bottom_left_open.json b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_bottom_left_open.json new file mode 100644 index 000000000..101185540 --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_bottom_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_left_open", + "textures": { + "bottom": "hybrid-aquatic:block/driftwood_door_bottom", + "top": "hybrid-aquatic:block/driftwood_door_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_bottom_right.json b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_bottom_right.json new file mode 100644 index 000000000..4eb21d42c --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_bottom_right.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right", + "textures": { + "bottom": "hybrid-aquatic:block/driftwood_door_bottom", + "top": "hybrid-aquatic:block/driftwood_door_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_bottom_right_open.json b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_bottom_right_open.json new file mode 100644 index 000000000..26b05bb44 --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_bottom_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_bottom_right_open", + "textures": { + "bottom": "hybrid-aquatic:block/driftwood_door_bottom", + "top": "hybrid-aquatic:block/driftwood_door_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_top_left.json b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_top_left.json new file mode 100644 index 000000000..fe4ba6777 --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_top_left.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left", + "textures": { + "bottom": "hybrid-aquatic:block/driftwood_door_bottom", + "top": "hybrid-aquatic:block/driftwood_door_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_top_left_open.json b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_top_left_open.json new file mode 100644 index 000000000..608ee6aa1 --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_top_left_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_left_open", + "textures": { + "bottom": "hybrid-aquatic:block/driftwood_door_bottom", + "top": "hybrid-aquatic:block/driftwood_door_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_top_right.json b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_top_right.json new file mode 100644 index 000000000..6c56c63bb --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_top_right.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right", + "textures": { + "bottom": "hybrid-aquatic:block/driftwood_door_bottom", + "top": "hybrid-aquatic:block/driftwood_door_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_top_right_open.json b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_top_right_open.json new file mode 100644 index 000000000..0d1599243 --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_door_top_right_open.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/door_top_right_open", + "textures": { + "bottom": "hybrid-aquatic:block/driftwood_door_bottom", + "top": "hybrid-aquatic:block/driftwood_door_top" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_trapdoor_bottom.json b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_trapdoor_bottom.json new file mode 100644 index 000000000..0a777646c --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_trapdoor_bottom.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_trapdoor_bottom", + "textures": { + "texture": "hybrid-aquatic:block/driftwood_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_trapdoor_open.json b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_trapdoor_open.json new file mode 100644 index 000000000..18240591c --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_trapdoor_open.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_trapdoor_open", + "textures": { + "texture": "hybrid-aquatic:block/driftwood_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_trapdoor_top.json b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_trapdoor_top.json new file mode 100644 index 000000000..7c4f6beb0 --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/models/block/driftwood_trapdoor_top.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_trapdoor_top", + "textures": { + "texture": "hybrid-aquatic:block/driftwood_trapdoor" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/hybrid-aquatic/models/block/glowstick.json b/src/generated/resources/assets/hybrid-aquatic/models/block/glowstick.json new file mode 100644 index 000000000..921d9e5a7 --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/models/block/glowstick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_torch", + "textures": { + "torch": "hybrid-aquatic:block/glowstick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/hybrid-aquatic/models/block/wall_glowstick.json b/src/generated/resources/assets/hybrid-aquatic/models/block/wall_glowstick.json new file mode 100644 index 000000000..d6eceba67 --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/models/block/wall_glowstick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_torch_wall", + "textures": { + "torch": "hybrid-aquatic:block/glowstick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/hybrid-aquatic/models/item/driftwood_crate.json b/src/generated/resources/assets/hybrid-aquatic/models/item/driftwood_crate.json new file mode 100644 index 000000000..81b772187 --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/models/item/driftwood_crate.json @@ -0,0 +1,3 @@ +{ + "parent": "hybrid-aquatic:block/driftwood_crate" +} \ No newline at end of file diff --git a/src/generated/resources/assets/hybrid-aquatic/models/item/driftwood_door.json b/src/generated/resources/assets/hybrid-aquatic/models/item/driftwood_door.json new file mode 100644 index 000000000..34dc93ee7 --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/models/item/driftwood_door.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "hybrid-aquatic:item/driftwood_door" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/hybrid-aquatic/models/item/driftwood_trapdoor.json b/src/generated/resources/assets/hybrid-aquatic/models/item/driftwood_trapdoor.json new file mode 100644 index 000000000..131d0c7a4 --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/models/item/driftwood_trapdoor.json @@ -0,0 +1,3 @@ +{ + "parent": "hybrid-aquatic:block/driftwood_trapdoor_bottom" +} \ No newline at end of file diff --git a/src/generated/resources/assets/hybrid-aquatic/models/item/glowstick.json b/src/generated/resources/assets/hybrid-aquatic/models/item/glowstick.json new file mode 100644 index 000000000..79e43318a --- /dev/null +++ b/src/generated/resources/assets/hybrid-aquatic/models/item/glowstick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "hybrid-aquatic:block/glowstick" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_button.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_button.json index 1a13f9757..38fe9914a 100644 --- a/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_button.json +++ b/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_button.json @@ -3,6 +3,11 @@ "pools": [ { "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_crate.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_crate.json new file mode 100644 index 000000000..11ea1952e --- /dev/null +++ b/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_crate.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "hybrid-aquatic:driftwood_crate" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_fence.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_fence.json index 9af67aa09..912139ebf 100644 --- a/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_fence.json +++ b/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_fence.json @@ -3,6 +3,11 @@ "pools": [ { "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_fence_gate.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_fence_gate.json index 59f181a30..aec27a134 100644 --- a/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_fence_gate.json +++ b/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_fence_gate.json @@ -3,6 +3,11 @@ "pools": [ { "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_planks.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_planks.json index 6b8b6ffd1..088f21133 100644 --- a/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_planks.json +++ b/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_planks.json @@ -3,6 +3,11 @@ "pools": [ { "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_pressure_plate.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_pressure_plate.json index 1a13f9757..38fe9914a 100644 --- a/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_pressure_plate.json +++ b/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_pressure_plate.json @@ -3,6 +3,11 @@ "pools": [ { "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_stairs.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_stairs.json index 2968bdbcc..bf01dbc6c 100644 --- a/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_stairs.json +++ b/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_stairs.json @@ -3,6 +3,11 @@ "pools": [ { "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_trapdoor.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_trapdoor.json index 1a13f9757..453077f7a 100644 --- a/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_trapdoor.json +++ b/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/driftwood_trapdoor.json @@ -3,10 +3,15 @@ "pools": [ { "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], "entries": [ { "type": "minecraft:item", - "name": "minecraft:air" + "name": "hybrid-aquatic:driftwood_trapdoor" } ], "rolls": 1.0 diff --git a/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/glowstick.json b/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/glowstick.json new file mode 100644 index 000000000..eb45ede32 --- /dev/null +++ b/src/generated/resources/data/hybrid-aquatic/loot_tables/blocks/glowstick.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "hybrid-aquatic:glowstick" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/loot_tables/blocks/torch.json b/src/generated/resources/data/minecraft/loot_tables/blocks/torch.json new file mode 100644 index 000000000..38fe9914a --- /dev/null +++ b/src/generated/resources/data/minecraft/loot_tables/blocks/torch.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:air" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/logs_that_burn.json b/src/generated/resources/data/minecraft/tags/blocks/logs_that_burn.json new file mode 100644 index 000000000..96654d8af --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/logs_that_burn.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "hybrid-aquatic:driftwood_log", + "hybrid-aquatic:driftwood_wood", + "hybrid-aquatic:stripped_driftwood_log", + "hybrid-aquatic:stripped_driftwood_wood" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json b/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json new file mode 100644 index 000000000..96654d8af --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/logs_that_burn.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "hybrid-aquatic:driftwood_log", + "hybrid-aquatic:driftwood_wood", + "hybrid-aquatic:stripped_driftwood_log", + "hybrid-aquatic:stripped_driftwood_wood" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/planks.json b/src/generated/resources/data/minecraft/tags/items/planks.json new file mode 100644 index 000000000..7ba4a8324 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/planks.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "hybrid-aquatic:driftwood_planks" + ] +} \ No newline at end of file diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/HybridAquatic.kt b/src/main/kotlin/dev/hybridlabs/aquatic/HybridAquatic.kt index 2254ef76d..397f99763 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/HybridAquatic.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/HybridAquatic.kt @@ -23,6 +23,8 @@ import dev.hybridlabs.aquatic.world.gen.feature.HybridAquaticFeatures import net.fabricmc.api.ModInitializer import net.fabricmc.fabric.api.event.registry.DynamicRegistries import net.fabricmc.fabric.api.`object`.builder.v1.trade.TradeOfferHelper +import net.fabricmc.fabric.api.registry.FlammableBlockRegistry +import net.fabricmc.fabric.api.registry.StrippableBlockRegistry import net.minecraft.item.BlockItem import net.minecraft.registry.Registries import net.minecraft.village.TradeOffers.SellItemFactory @@ -39,6 +41,18 @@ object HybridAquatic : ModInitializer { HybridAquaticBlocks HybridAquaticBlockEntityTypes + StrippableBlockRegistry.register(HybridAquaticBlocks.DRIFTWOOD_LOG, HybridAquaticBlocks.STRIPPED_DRIFTWOOD_LOG) + StrippableBlockRegistry.register(HybridAquaticBlocks.DRIFTWOOD_WOOD, HybridAquaticBlocks.STRIPPED_DRIFTWOOD_WOOD) + + FlammableBlockRegistry.getDefaultInstance().add(HybridAquaticBlocks.DRIFTWOOD_LOG, 5, 5) + FlammableBlockRegistry.getDefaultInstance().add(HybridAquaticBlocks.STRIPPED_DRIFTWOOD_LOG, 5, 5) + FlammableBlockRegistry.getDefaultInstance().add(HybridAquaticBlocks.DRIFTWOOD_WOOD, 5, 5) + FlammableBlockRegistry.getDefaultInstance().add(HybridAquaticBlocks.STRIPPED_DRIFTWOOD_WOOD, 5, 5) + FlammableBlockRegistry.getDefaultInstance().add(HybridAquaticBlocks.DRIFTWOOD_PLANKS, 5, 20) + FlammableBlockRegistry.getDefaultInstance().add(HybridAquaticBlocks.DRIFTWOOD_SLAB, 5, 20) + FlammableBlockRegistry.getDefaultInstance().add(HybridAquaticBlocks.DRIFTWOOD_FENCE, 5, 20) + FlammableBlockRegistry.getDefaultInstance().add(HybridAquaticBlocks.DRIFTWOOD_FENCE_GATE, 5, 20) + HybridAquaticBiomeTags HybridAquaticEntityTypes diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/block/GlowstickBlock.kt b/src/main/kotlin/dev/hybridlabs/aquatic/block/GlowstickBlock.kt new file mode 100644 index 000000000..7338c11fc --- /dev/null +++ b/src/main/kotlin/dev/hybridlabs/aquatic/block/GlowstickBlock.kt @@ -0,0 +1,67 @@ +package dev.hybridlabs.aquatic.block + +import net.minecraft.block.* +import net.minecraft.fluid.FluidState +import net.minecraft.fluid.Fluids +import net.minecraft.item.ItemPlacementContext +import net.minecraft.particle.ParticleTypes.GLOW +import net.minecraft.particle.ParticleTypes.SMOKE +import net.minecraft.registry.tag.FluidTags +import net.minecraft.state.StateManager +import net.minecraft.state.property.Properties +import net.minecraft.util.math.BlockPos +import net.minecraft.util.math.Direction +import net.minecraft.util.shape.VoxelShape +import net.minecraft.world.BlockView +import net.minecraft.world.WorldAccess + +class GlowstickBlock(settings: Settings) : TorchBlock(settings, GLOW), Waterloggable { + init { + defaultState = stateManager.defaultState.with(Properties.WATERLOGGED, false) + } + + override fun getStateForNeighborUpdate( + state: BlockState, + direction: Direction, + neighborState: BlockState, + world: WorldAccess, + pos: BlockPos, + neighborPos: BlockPos + ): BlockState { + if (state.get(Properties.WATERLOGGED)) { + world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)) + } + + return if (!canPlaceAt(state, world, pos)) { + Blocks.AIR.defaultState + } else super.getStateForNeighborUpdate(state, direction, neighborState, world, pos, neighborPos) + } + + override fun getPlacementState(ctx: ItemPlacementContext): BlockState? { + val fluidState = ctx.world.getFluidState(ctx.blockPos) + return if (fluidState.isIn(FluidTags.WATER)) defaultState.with( + Properties.WATERLOGGED, ctx.world.getFluidState(ctx.blockPos).isOf( + Fluids.WATER)) else null + } + + override fun getOutlineShape( + state: BlockState?, + world: BlockView?, + pos: BlockPos?, + context: ShapeContext? + ): VoxelShape { + return BOUNDING_SHAPE + } + + override fun getFluidState(state: BlockState): FluidState { + return if (state.get(Properties.WATERLOGGED)) Fluids.WATER.getStill(false) else super.getFluidState(state) + } + + override fun getRenderType(state: BlockState): BlockRenderType { + return BlockRenderType.MODEL + } + + override fun appendProperties(builder: StateManager.Builder) { + builder.add(Properties.WATERLOGGED) + } +} \ No newline at end of file diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/block/HybridAquaticBlocks.kt b/src/main/kotlin/dev/hybridlabs/aquatic/block/HybridAquaticBlocks.kt index aff8ad4e2..1426d713c 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/block/HybridAquaticBlocks.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/block/HybridAquaticBlocks.kt @@ -9,6 +9,7 @@ import net.minecraft.block.entity.BlockEntity import net.minecraft.block.entity.BlockEntityType import net.minecraft.block.enums.Instrument import net.minecraft.block.piston.PistonBehavior +import net.minecraft.particle.ParticleTypes.GLOW import net.minecraft.registry.Registries import net.minecraft.registry.Registry import net.minecraft.sound.BlockSoundGroup @@ -48,6 +49,10 @@ object HybridAquaticBlocks { .hardness(0.75F) )) + val DRIFTWOOD_CRATE = register("driftwood_crate", CrateBlock(FabricBlockSettings.copyOf(Blocks.OAK_PLANKS) + .hardness(0.75F) + )) + val OAK_CRATE = register("oak_crate", CrateBlock(FabricBlockSettings.copyOf(Blocks.OAK_PLANKS) .hardness(0.75F) )) @@ -91,7 +96,7 @@ object HybridAquaticBlocks { val DRIFTWOOD_PRESSURE_PLATE = register("driftwood_pressure_plate", PressurePlateBlock(PressurePlateBlock.ActivationRule.EVERYTHING, FabricBlockSettings.copyOf(Blocks.OAK_PRESSURE_PLATE), BlockSetType.OAK)) val DRIFTWOOD_FENCE = register("driftwood_fence", FenceBlock(FabricBlockSettings.copyOf(Blocks.OAK_FENCE))) val DRIFTWOOD_FENCE_GATE = register("driftwood_fence_gate", FenceGateBlock(FabricBlockSettings.copyOf(Blocks.OAK_FENCE), HybridAquaticWoodTypes.DRIFTWOOD)) - val DRIFTWOOD_DOOR = register("driftwood_door", DoorBlock(FabricBlockSettings.copyOf(Blocks.OAK_DOOR), BlockSetType.OAK)) + val DRIFTWOOD_DOOR = register("driftwood_door", DoorBlock(FabricBlockSettings.copyOf(Blocks.OAK_DOOR).nonOpaque(), BlockSetType.OAK)) val DRIFTWOOD_TRAPDOOR = register("driftwood_trapdoor", TrapdoorBlock(FabricBlockSettings.copyOf(Blocks.OAK_TRAPDOOR), BlockSetType.OAK)) val DRIFTWOOD_SIGN = register("driftwood_sign", SignBlock(FabricBlockSettings.copyOf(Blocks.OAK_SIGN), HybridAquaticWoodTypes.DRIFTWOOD)) val DRIFTWOOD_WALL_SIGN = register("driftwood_wall_sign", WallSignBlock(FabricBlockSettings.copyOf(Blocks.OAK_HANGING_SIGN), HybridAquaticWoodTypes.DRIFTWOOD)) @@ -107,6 +112,9 @@ object HybridAquaticBlocks { val DEAD_LOPHELIA_CORAL = register("dead_lophelia_coral", DeadCoralBlock(FabricBlockSettings.copyOf(Blocks.DEAD_FIRE_CORAL))) val LOPHELIA_CORAL = register("lophelia_coral", CoralBlock(DEAD_LOPHELIA_CORAL, FabricBlockSettings.copyOf(Blocks.FIRE_CORAL))) + val GLOWSTICK = register("glowstick", GlowstickBlock(FabricBlockSettings.copyOf(Blocks.TORCH).noCollision().luminance(14).nonOpaque())) + val WALL_GLOWSTICK = register("wall_glowstick", WallTorchBlock(FabricBlockSettings.copyOf(Blocks.WALL_TORCH).noCollision().luminance(14).nonOpaque(), GLOW)) + val TUBE_SPONGE = register("tube_sponge", TubeSpongeBlock(FabricBlockSettings.copyOf(Blocks.WET_SPONGE) .nonOpaque() )) diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt index 5d3074c6b..cec79a11c 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/data/client/LanguageProvider.kt @@ -55,6 +55,7 @@ class LanguageProvider(output: FabricDataOutput) : FabricLanguageProvider(output HybridAquaticBlocks.ANEMONE to "Anemone", HybridAquaticBlocks.TUBE_SPONGE to "Tube Sponge", HybridAquaticBlocks.HYBRID_CRATE to "Hybrid Crate", + HybridAquaticBlocks.DRIFTWOOD_CRATE to "Driftwood Crate", HybridAquaticBlocks.OAK_CRATE to "Oak Crate", HybridAquaticBlocks.SPRUCE_CRATE to "Spruce Crate", HybridAquaticBlocks.BIRCH_CRATE to "Birch Crate", @@ -66,6 +67,18 @@ class LanguageProvider(output: FabricDataOutput) : FabricLanguageProvider(output HybridAquaticBlocks.BUOY to "Buoy", HybridAquaticBlocks.HYDROTHERMAL_VENT to "Hydrothermal Vent", HybridAquaticBlocks.GIANT_CLAM to "Giant Clam", + HybridAquaticBlocks.LOPHELIA_CORAL_BLOCK to "Lophelia Coral Block", + HybridAquaticBlocks.DEAD_LOPHELIA_CORAL_BLOCK to "Dead Lophelia Coral Block", + HybridAquaticBlocks.LOPHELIA_CORAL to "Lophelia Coral", + HybridAquaticBlocks.DEAD_LOPHELIA_CORAL to "Dead Lophelia Coral", + HybridAquaticBlocks.LOPHELIA_CORAL_FAN to "Lophelia Coral Fan", + HybridAquaticBlocks.DEAD_LOPHELIA_CORAL_FAN to "Dead Lophelia Coral Fan", + HybridAquaticBlocks.GLOWSTICK to "Glowstick", + HybridAquaticBlocks.WALL_GLOWSTICK to "Wall Glowstick", + HybridAquaticBlocks.DRIFTWOOD_LOG to "Driftwood Log", + HybridAquaticBlocks.DRIFTWOOD_WOOD to "Driftwood Wood", + HybridAquaticBlocks.STRIPPED_DRIFTWOOD_LOG to "Stripped Driftwood Log", + HybridAquaticBlocks.STRIPPED_DRIFTWOOD_WOOD to "Stripped Driftwood Wood", HybridAquaticBlocks.DRIFTWOOD_PLANKS to "Driftwood Planks", HybridAquaticBlocks.DRIFTWOOD_STAIRS to "Driftwood Stairs", HybridAquaticBlocks.DRIFTWOOD_SLAB to "Driftwood Slab", diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/client/ModelProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/client/ModelProvider.kt index 38fb0df5c..c56440044 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/data/client/ModelProvider.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/data/client/ModelProvider.kt @@ -8,15 +8,10 @@ import dev.hybridlabs.aquatic.item.HybridAquaticItems import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider import net.minecraft.block.Blocks -import net.minecraft.data.client.BlockStateModelGenerator -import net.minecraft.data.client.ItemModelGenerator -import net.minecraft.data.client.ModelIds -import net.minecraft.data.client.Models -import net.minecraft.data.client.TextureMap +import net.minecraft.data.client.* import net.minecraft.item.SpawnEggItem import net.minecraft.registry.Registries import net.minecraft.util.Identifier -import net.minecraft.world.biome.Biome class ModelProvider(output: FabricDataOutput) : FabricModelProvider(output) { override fun generateBlockStateModels(generator: BlockStateModelGenerator) { generator.run { @@ -34,10 +29,10 @@ class ModelProvider(output: FabricDataOutput) : FabricModelProvider(output) { Registries.ITEM .filter(filterHybridAquatic(Registries.ITEM)) .forEach { item -> - if (item is SpawnEggItem) { - registerParentedItemModel(item, ModelIds.getMinecraftNamespacedItem("template_spawn_egg")) + if (item is SpawnEggItem) { + registerParentedItemModel(item, ModelIds.getMinecraftNamespacedItem("template_spawn_egg")) + } } - } // builtin mapOf( @@ -59,6 +54,7 @@ class ModelProvider(output: FabricDataOutput) : FabricModelProvider(output) { // simple cubes setOf( HybridAquaticBlocks.HYBRID_CRATE, + HybridAquaticBlocks.DRIFTWOOD_CRATE, HybridAquaticBlocks.OAK_CRATE, HybridAquaticBlocks.SPRUCE_CRATE, HybridAquaticBlocks.BIRCH_CRATE, @@ -69,13 +65,22 @@ class ModelProvider(output: FabricDataOutput) : FabricModelProvider(output) { HybridAquaticBlocks.CHERRY_CRATE, HybridAquaticBlocks.DRIFTWOOD_PLANKS, ).forEach(generator::registerSimpleCubeAll) - + // wood - registerLog(HybridAquaticBlocks.DRIFTWOOD_LOG).log(HybridAquaticBlocks.DRIFTWOOD_LOG).wood(HybridAquaticBlocks.DRIFTWOOD_WOOD) - registerLog(HybridAquaticBlocks.STRIPPED_DRIFTWOOD_LOG).log(HybridAquaticBlocks.STRIPPED_DRIFTWOOD_LOG).wood(HybridAquaticBlocks.STRIPPED_DRIFTWOOD_WOOD) - registerHangingSign(HybridAquaticBlocks.STRIPPED_DRIFTWOOD_LOG, HybridAquaticBlocks.DRIFTWOOD_HANGING_SIGN, HybridAquaticBlocks.DRIFTWOOD_WALL_HANGING_SIGN) - //coral + registerLog(HybridAquaticBlocks.DRIFTWOOD_LOG).log(HybridAquaticBlocks.DRIFTWOOD_LOG) + .wood(HybridAquaticBlocks.DRIFTWOOD_WOOD) + registerLog(HybridAquaticBlocks.STRIPPED_DRIFTWOOD_LOG).log(HybridAquaticBlocks.STRIPPED_DRIFTWOOD_LOG) + .wood(HybridAquaticBlocks.STRIPPED_DRIFTWOOD_WOOD) + registerHangingSign( + HybridAquaticBlocks.STRIPPED_DRIFTWOOD_LOG, + HybridAquaticBlocks.DRIFTWOOD_HANGING_SIGN, + HybridAquaticBlocks.DRIFTWOOD_WALL_HANGING_SIGN + ) + registerDoor(HybridAquaticBlocks.DRIFTWOOD_DOOR) + registerTrapdoor(HybridAquaticBlocks.DRIFTWOOD_TRAPDOOR) + + registerTorch(HybridAquaticBlocks.GLOWSTICK, HybridAquaticBlocks.WALL_GLOWSTICK) } } diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/loot/BlockLootTableProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/loot/BlockLootTableProvider.kt index e4d45c412..703b2ac86 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/loot/BlockLootTableProvider.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/loot/BlockLootTableProvider.kt @@ -33,58 +33,24 @@ class BlockLootTableProvider(output: FabricDataOutput) : FabricBlockLootTablePro ) } - addDrop(HybridAquaticBlocks.DRIFTWOOD_PLANKS) { block -> - LootTable.builder().pool( - LootPool.builder() - .with(ItemEntry.builder(block)) - ) - } - - addDrop(HybridAquaticBlocks.DRIFTWOOD_STAIRS) { block -> - LootTable.builder().pool( - LootPool.builder() - .with(ItemEntry.builder(block)) - ) - } - + //region wood + + addDrop(HybridAquaticBlocks.DRIFTWOOD_LOG) + addDrop(HybridAquaticBlocks.DRIFTWOOD_WOOD) + addDrop(HybridAquaticBlocks.STRIPPED_DRIFTWOOD_LOG) + addDrop(HybridAquaticBlocks.STRIPPED_DRIFTWOOD_WOOD) + addDrop(HybridAquaticBlocks.DRIFTWOOD_PLANKS) + addDrop(HybridAquaticBlocks.DRIFTWOOD_STAIRS) + addDrop(HybridAquaticBlocks.DRIFTWOOD_TRAPDOOR) + addDrop(HybridAquaticBlocks.DRIFTWOOD_PRESSURE_PLATE) + addDrop(HybridAquaticBlocks.DRIFTWOOD_BUTTON) + addDrop(HybridAquaticBlocks.DRIFTWOOD_FENCE) + addDrop(HybridAquaticBlocks.DRIFTWOOD_FENCE_GATE) addDrop(HybridAquaticBlocks.DRIFTWOOD_SLAB, slabDrops(HybridAquaticBlocks.DRIFTWOOD_SLAB)) - - - addDrop(HybridAquaticBlocks.DRIFTWOOD_FENCE) { block -> - LootTable.builder().pool( - LootPool.builder() - .with(ItemEntry.builder(block)) - ) - } - - addDrop(HybridAquaticBlocks.DRIFTWOOD_FENCE_GATE) { block -> - LootTable.builder().pool( - LootPool.builder() - .with(ItemEntry.builder(block)) - ) - } - addDrop(HybridAquaticBlocks.DRIFTWOOD_DOOR, doorDrops(HybridAquaticBlocks.DRIFTWOOD_DOOR)) - addDrop(HybridAquaticBlocks.DRIFTWOOD_TRAPDOOR) { block -> - LootTable.builder().pool( - LootPool.builder() - .with(ItemEntry.builder(block)) - ) - } - addDrop(HybridAquaticBlocks.DRIFTWOOD_PRESSURE_PLATE) { block -> - LootTable.builder().pool( - LootPool.builder() - .with(ItemEntry.builder(block)) - ) - } + //endregion - addDrop(HybridAquaticBlocks.DRIFTWOOD_BUTTON) { block -> - LootTable.builder().pool( - LootPool.builder() - .with(ItemEntry.builder(block)) - ) - } // living sponge addDrop(HybridAquaticBlocks.TUBE_SPONGE) { block -> diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/BlockTagProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/BlockTagProvider.kt index 9a2776bce..764b35b4e 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/BlockTagProvider.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/BlockTagProvider.kt @@ -53,12 +53,18 @@ class BlockTagProvider(output: FabricDataOutput, registriesFuture: CompletableFu .add(Blocks.MANGROVE_ROOTS) .add(Blocks.GRAVEL) - getOrCreateTagBuilder(BlockTags.FENCES) + getOrCreateTagBuilder(BlockTags.WOODEN_FENCES) .add(HybridAquaticBlocks.DRIFTWOOD_FENCE) getOrCreateTagBuilder(BlockTags.FENCE_GATES) .add(HybridAquaticBlocks.DRIFTWOOD_FENCE_GATE) + getOrCreateTagBuilder(BlockTags.LOGS_THAT_BURN) + .add(HybridAquaticBlocks.DRIFTWOOD_LOG) + .add(HybridAquaticBlocks.DRIFTWOOD_WOOD) + .add(HybridAquaticBlocks.STRIPPED_DRIFTWOOD_LOG) + .add(HybridAquaticBlocks.STRIPPED_DRIFTWOOD_WOOD) + // plushies Registries.BLOCK .filter(filterHybridAquatic(Registries.BLOCK)) diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/ItemTagProvider.kt b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/ItemTagProvider.kt index f51af6d6a..92014b63b 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/ItemTagProvider.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/data/server/tag/ItemTagProvider.kt @@ -1,5 +1,6 @@ package dev.hybridlabs.aquatic.data.server.tag +import dev.hybridlabs.aquatic.block.HybridAquaticBlocks import dev.hybridlabs.aquatic.data.HybridAquaticDataGenerator.filterHybridAquatic import dev.hybridlabs.aquatic.item.HybridAquaticItems import dev.hybridlabs.aquatic.tag.HybridAquaticItemTags @@ -8,6 +9,7 @@ import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider import net.minecraft.item.Items import net.minecraft.registry.Registries import net.minecraft.registry.RegistryWrapper +import net.minecraft.registry.tag.ItemTags import java.util.concurrent.CompletableFuture class ItemTagProvider(output: FabricDataOutput, registriesFuture: CompletableFuture) : FabricTagProvider.ItemTagProvider(output, registriesFuture) { @@ -22,6 +24,19 @@ class ItemTagProvider(output: FabricDataOutput, registriesFuture: CompletableFut getOrCreateTagBuilder(HybridAquaticItemTags.LURE_ITEMS).add(item) } + //region wood + + getOrCreateTagBuilder(ItemTags.PLANKS) + .add(HybridAquaticBlocks.DRIFTWOOD_PLANKS.asItem()) + + getOrCreateTagBuilder(ItemTags.LOGS_THAT_BURN) + .add(HybridAquaticBlocks.DRIFTWOOD_LOG.asItem()) + .add(HybridAquaticBlocks.DRIFTWOOD_WOOD.asItem()) + .add(HybridAquaticBlocks.STRIPPED_DRIFTWOOD_LOG.asItem()) + .add(HybridAquaticBlocks.STRIPPED_DRIFTWOOD_WOOD.asItem()) + + //endregion + listOf( HybridAquaticItems.LIONFISH, HybridAquaticItems.ROCKFISH, diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItemGroups.kt b/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItemGroups.kt index e9201abc9..22fee7b2f 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItemGroups.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItemGroups.kt @@ -31,10 +31,18 @@ object HybridAquaticItemGroups { } // blocks + entries.add(HybridAquaticBlocks.GLOWSTICK) entries.add(HybridAquaticBlocks.DRIFTWOOD_LOG) entries.add(HybridAquaticBlocks.DRIFTWOOD_WOOD) + entries.add(HybridAquaticBlocks.STRIPPED_DRIFTWOOD_LOG) + entries.add(HybridAquaticBlocks.STRIPPED_DRIFTWOOD_WOOD) entries.add(HybridAquaticBlocks.DRIFTWOOD_PLANKS) + entries.add(HybridAquaticBlocks.DRIFTWOOD_STAIRS) + entries.add(HybridAquaticBlocks.DRIFTWOOD_SLAB) + entries.add(HybridAquaticBlocks.DRIFTWOOD_DOOR) + entries.add(HybridAquaticBlocks.DRIFTWOOD_TRAPDOOR) entries.add(HybridAquaticBlocks.HYBRID_CRATE) + entries.add(HybridAquaticBlocks.DRIFTWOOD_CRATE) entries.add(HybridAquaticBlocks.OAK_CRATE) entries.add(HybridAquaticBlocks.SPRUCE_CRATE) entries.add(HybridAquaticBlocks.BIRCH_CRATE) diff --git a/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItems.kt b/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItems.kt index 01a1c3562..fb69f1331 100644 --- a/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItems.kt +++ b/src/main/kotlin/dev/hybridlabs/aquatic/item/HybridAquaticItems.kt @@ -431,7 +431,9 @@ object HybridAquaticItems { val TIGER_SHARK_PLUSHIE = registerBlockItem("tiger_shark_plushie", HybridAquaticBlocks.TIGER_SHARK_PLUSHIE) val WHALE_SHARK_PLUSHIE = registerBlockItem("whale_shark_plushie", HybridAquaticBlocks.WHALE_SHARK_PLUSHIE) + val GLOWSTICK = registerBlockItem("glowstick", HybridAquaticBlocks.GLOWSTICK) val HYBRID_CRATE = registerBlockItem("hybrid_crate", HybridAquaticBlocks.HYBRID_CRATE) + val DRIFTWOOD_CRATE = registerBlockItem("driftwood_crate", HybridAquaticBlocks.DRIFTWOOD_CRATE) val OAK_CRATE = registerBlockItem("oak_crate", HybridAquaticBlocks.OAK_CRATE) val SPRUCE_CRATE = registerBlockItem("spruce_crate", HybridAquaticBlocks.SPRUCE_CRATE) val BIRCH_CRATE = registerBlockItem("birch_crate", HybridAquaticBlocks.BIRCH_CRATE) @@ -448,6 +450,7 @@ object HybridAquaticItems { val STRIPPED_DRIFTWOOD_LOG = registerBlockItem("stripped_driftwood_log", HybridAquaticBlocks.STRIPPED_DRIFTWOOD_LOG) val STRIPPED_DRIFTWOOD_WOOD = registerBlockItem("stripped_driftwood_wood", HybridAquaticBlocks.STRIPPED_DRIFTWOOD_WOOD) val DRIFTWOOD_DOOR = registerBlockItem("driftwood_door", HybridAquaticBlocks.DRIFTWOOD_DOOR) + val DRIFTWOOD_TRAPDOOR = registerBlockItem("driftwood_trapdoor", HybridAquaticBlocks.DRIFTWOOD_TRAPDOOR) val DRIFTWOOD_SLAB = registerBlockItem("driftwood_slab", HybridAquaticBlocks.DRIFTWOOD_SLAB) val DRIFTWOOD_STAIRS = registerBlockItem("driftwood_stairs", HybridAquaticBlocks.DRIFTWOOD_STAIRS) val DRIFTWOOD_FENCE = registerBlockItem("driftwood_fence", HybridAquaticBlocks.DRIFTWOOD_FENCE) diff --git a/src/main/resources/assets/hybrid-aquatic/textures/block/driftwood_crate.png b/src/main/resources/assets/hybrid-aquatic/textures/block/driftwood_crate.png new file mode 100644 index 000000000..87318aaac Binary files /dev/null and b/src/main/resources/assets/hybrid-aquatic/textures/block/driftwood_crate.png differ diff --git a/src/main/resources/assets/hybrid-aquatic/textures/block/glowstick.png b/src/main/resources/assets/hybrid-aquatic/textures/block/glowstick.png new file mode 100644 index 000000000..c916e447b Binary files /dev/null and b/src/main/resources/assets/hybrid-aquatic/textures/block/glowstick.png differ diff --git a/src/main/resources/assets/hybrid-aquatic/textures/item/clownfish.png b/src/main/resources/assets/hybrid-aquatic/textures/item/clownfish.png index 7efd171b8..679ed21bb 100644 Binary files a/src/main/resources/assets/hybrid-aquatic/textures/item/clownfish.png and b/src/main/resources/assets/hybrid-aquatic/textures/item/clownfish.png differ