Glowsticks, item tags, language work

src/generated/resources/assets/hybrid-aquatic/blockstates/driftwood_crate.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "hybrid-aquatic:block/driftwood_crate"
+    }
+  }
+}

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
+    }
+  }
+}

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
+    }
+  }
+}

src/generated/resources/assets/hybrid-aquatic/blockstates/glowstick.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "hybrid-aquatic:block/glowstick"
+    }
+  }
+}

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
+    }
+  }
+}

src/generated/resources/assets/hybrid-aquatic/lang/en_us.json

@@ -11,23 +11,33 @@
   "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",
   "block.hybrid-aquatic.hybrid_crate.description": "Break with an axe to open",
   "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",

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

src/generated/resources/assets/hybrid-aquatic/models/item/driftwood_crate.json

@@ -0,0 +1,3 @@
+{
+  "parent": "hybrid-aquatic:block/driftwood_crate"
+}