diff --git a/TODO.md b/TODO.md index 32abcb3..9c8fd49 100644 --- a/TODO.md +++ b/TODO.md @@ -3,14 +3,15 @@ * Make good README.md stuff === STUFF TO ADD/FIX === +* Add slab and stair variations * Add fences * Add windows * Add (with functionality) present appliance/furniture/electronics textures -* Add advancements (with datagen) +* Add achievement criterion for dice and advancements +* PO2 wall (fix) * What's switch type 2? +* All the lamps (lamp posts too!) * Cigarette and handrail are BROKEN and the code is a MESS sorry, but it needs CLEANUP -* Concrete with bars should have proper hitbox, placeable upside down, and act like dripstone -* Fix post lamp hitboxes === ACHIEVEMENTS === Kolkhoz warrior - kill a zombie, skeleton, creeper and spider with a sickle \ No newline at end of file diff --git a/recipeTODO.txt b/recipeTODO.txt index 10b39d5..8a7ab18 100644 --- a/recipeTODO.txt +++ b/recipeTODO.txt @@ -1,18 +1,18 @@ -* aquamarine recipe -* whitewash recipe -* concrete recipe -* concrete with bars recipe -* parquet recipe -* linoleum recipe -* metal plating recipe -* crate recipe -* po-2 recipe -* no wallpaper recipes (intended?) -* no handrail recipe -* no nutrient block recipe (intended? compressed bread?) -* light bulb recipe -* cigarette recipe -* siren recipe -* no landmine recipe - intended -* switch recipe -* checkers and chess recipe +aquamarine recipe +whitewash recipe +concrete recipe +concrete with bars recipe +parquet recipe +linoleum recipe +metal plating recipe +crate recipe +po-2 recipe +no wallpaper recipes (intended?) +no handrail recipe +no nutrient block recipe (intended? compressed bread?) +light bulb recipe +sigarette recipe +siren recipe +no landmine recipe - intended +switch recipe +checkers and chess recipe diff --git a/src/client/java/su/a71/new_soviet/NewSovietClient.java b/src/client/java/su/a71/new_soviet/NewSovietClient.java index 7e70a06..925c627 100644 --- a/src/client/java/su/a71/new_soviet/NewSovietClient.java +++ b/src/client/java/su/a71/new_soviet/NewSovietClient.java @@ -6,6 +6,7 @@ import net.fabricmc.api.Environment; import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; import net.fabricmc.fabric.api.client.rendering.v1.BlockEntityRendererRegistry; import net.minecraft.client.render.RenderLayer; +import su.a71.new_soviet.entity.TVBlockEntity; import su.a71.new_soviet.registration.NSE_Blocks; import su.a71.new_soviet.registration.NSE_Custom; diff --git a/src/client/java/su/a71/new_soviet/TVBlockEntityRenderer.java b/src/client/java/su/a71/new_soviet/TVBlockEntityRenderer.java index 0c58eeb..4d9c5e9 100644 --- a/src/client/java/su/a71/new_soviet/TVBlockEntityRenderer.java +++ b/src/client/java/su/a71/new_soviet/TVBlockEntityRenderer.java @@ -4,23 +4,31 @@ import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; import net.minecraft.block.BlockState; import net.minecraft.block.SignBlock; +import net.minecraft.block.entity.SignText; +import net.minecraft.client.MinecraftClient; import net.minecraft.client.font.TextRenderer; import net.minecraft.client.render.VertexConsumerProvider; import net.minecraft.client.render.block.entity.BlockEntityRenderer; import net.minecraft.client.render.block.entity.BlockEntityRendererFactory; +import net.minecraft.client.render.block.entity.SignBlockEntityRenderer; import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.OrderedText; +import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RotationAxis; import net.minecraft.util.math.Vec3d; -import su.a71.new_soviet.entities.TVBlockEntity; +import org.joml.Matrix4f; +import su.a71.new_soviet.entity.TVBlockEntity; + +import java.util.List; @Environment(EnvType.CLIENT) public class TVBlockEntityRenderer implements BlockEntityRenderer { -// private static TextRenderer textRenderer; + private static TextRenderer textRenderer; private static final Vec3d TEXT_OFFSET = new Vec3d(0.0, 0.3333333432674408, 0.046666666865348816); public TVBlockEntityRenderer(BlockEntityRendererFactory.Context ctx) { -// textRenderer = ctx.getTextRenderer(); + textRenderer = ctx.getTextRenderer(); } @Override diff --git a/src/main/generated/assets/new_soviet/models/block/aquamarine_tiles.json b/src/main/generated/assets/new_soviet/models/block/aquamarine_tiles.json deleted file mode 100644 index aa7a070..0000000 --- a/src/main/generated/assets/new_soviet/models/block/aquamarine_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/aquamarine/aquamarine_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/beige_wallpaper.json b/src/main/generated/assets/new_soviet/models/block/beige_wallpaper.json deleted file mode 100644 index 9e51afc..0000000 --- a/src/main/generated/assets/new_soviet/models/block/beige_wallpaper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/wallpapers/beige_wallpaper" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/big_diorite_tiles.json b/src/main/generated/assets/new_soviet/models/block/big_diorite_tiles.json deleted file mode 100644 index 43c8013..0000000 --- a/src/main/generated/assets/new_soviet/models/block/big_diorite_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/diorite/big_diorite_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/big_granite_tiles.json b/src/main/generated/assets/new_soviet/models/block/big_granite_tiles.json deleted file mode 100644 index b29463d..0000000 --- a/src/main/generated/assets/new_soviet/models/block/big_granite_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/granite/big_granite_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/big_green_tiles.json b/src/main/generated/assets/new_soviet/models/block/big_green_tiles.json deleted file mode 100644 index a79974f..0000000 --- a/src/main/generated/assets/new_soviet/models/block/big_green_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/green/big_green_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/big_sand_bricks.json b/src/main/generated/assets/new_soviet/models/block/big_sand_bricks.json deleted file mode 100644 index 2fc10dd..0000000 --- a/src/main/generated/assets/new_soviet/models/block/big_sand_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/sand/big_sand_bricks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/big_sand_tiles.json b/src/main/generated/assets/new_soviet/models/block/big_sand_tiles.json deleted file mode 100644 index 757bd9b..0000000 --- a/src/main/generated/assets/new_soviet/models/block/big_sand_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/sand/big_sand_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/big_tuff_tiles.json b/src/main/generated/assets/new_soviet/models/block/big_tuff_tiles.json deleted file mode 100644 index 5b47f83..0000000 --- a/src/main/generated/assets/new_soviet/models/block/big_tuff_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/tuff/big_tuff_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/blue_linoleum.json b/src/main/generated/assets/new_soviet/models/block/blue_linoleum.json deleted file mode 100644 index 3c73c76..0000000 --- a/src/main/generated/assets/new_soviet/models/block/blue_linoleum.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/linoleum/blue_linoleum" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/blue_warning.json b/src/main/generated/assets/new_soviet/models/block/blue_warning.json deleted file mode 100644 index a28487c..0000000 --- a/src/main/generated/assets/new_soviet/models/block/blue_warning.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/industrial/warning/blue_warning" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/brick_tiles.json b/src/main/generated/assets/new_soviet/models/block/brick_tiles.json deleted file mode 100644 index 4ebe277..0000000 --- a/src/main/generated/assets/new_soviet/models/block/brick_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/brick/brick_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/brown_linoleum.json b/src/main/generated/assets/new_soviet/models/block/brown_linoleum.json deleted file mode 100644 index 1b6c2b9..0000000 --- a/src/main/generated/assets/new_soviet/models/block/brown_linoleum.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/linoleum/brown_linoleum" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/brown_wallpaper.json b/src/main/generated/assets/new_soviet/models/block/brown_wallpaper.json deleted file mode 100644 index 8037116..0000000 --- a/src/main/generated/assets/new_soviet/models/block/brown_wallpaper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/wallpapers/brown_wallpaper" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/calcite_tiles.json b/src/main/generated/assets/new_soviet/models/block/calcite_tiles.json deleted file mode 100644 index 0c4fe89..0000000 --- a/src/main/generated/assets/new_soviet/models/block/calcite_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/calcite/calcite_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_bottom_left.json b/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_bottom_left.json deleted file mode 100644 index fbdf05c..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_bottom_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_birch_door_bottom", - "top": "new_soviet:block/doors/chiseled_birch_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_bottom_left_open.json b/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_bottom_left_open.json deleted file mode 100644 index 5fe67a0..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_bottom_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left_open", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_birch_door_bottom", - "top": "new_soviet:block/doors/chiseled_birch_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_bottom_right.json b/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_bottom_right.json deleted file mode 100644 index 2fe50b4..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_bottom_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_birch_door_bottom", - "top": "new_soviet:block/doors/chiseled_birch_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_bottom_right_open.json b/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_bottom_right_open.json deleted file mode 100644 index b9b4363..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_bottom_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right_open", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_birch_door_bottom", - "top": "new_soviet:block/doors/chiseled_birch_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_top_left.json b/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_top_left.json deleted file mode 100644 index 9433ed6..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_top_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_birch_door_bottom", - "top": "new_soviet:block/doors/chiseled_birch_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_top_left_open.json b/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_top_left_open.json deleted file mode 100644 index 8825378..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_top_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left_open", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_birch_door_bottom", - "top": "new_soviet:block/doors/chiseled_birch_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_top_right.json b/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_top_right.json deleted file mode 100644 index 960fd0d..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_top_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_birch_door_bottom", - "top": "new_soviet:block/doors/chiseled_birch_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_top_right_open.json b/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_top_right_open.json deleted file mode 100644 index 8361b9e..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_birch_door_top_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right_open", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_birch_door_bottom", - "top": "new_soviet:block/doors/chiseled_birch_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_bottom_left.json b/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_bottom_left.json deleted file mode 100644 index 1a4dd9a..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_bottom_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_mangrove_door_bottom", - "top": "new_soviet:block/doors/chiseled_mangrove_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_bottom_left_open.json b/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_bottom_left_open.json deleted file mode 100644 index 977ea4a..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_bottom_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left_open", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_mangrove_door_bottom", - "top": "new_soviet:block/doors/chiseled_mangrove_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_bottom_right.json b/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_bottom_right.json deleted file mode 100644 index 4c52e15..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_bottom_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_mangrove_door_bottom", - "top": "new_soviet:block/doors/chiseled_mangrove_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_bottom_right_open.json b/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_bottom_right_open.json deleted file mode 100644 index 47fbbda..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_bottom_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right_open", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_mangrove_door_bottom", - "top": "new_soviet:block/doors/chiseled_mangrove_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_top_left.json b/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_top_left.json deleted file mode 100644 index 80b93fa..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_top_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_mangrove_door_bottom", - "top": "new_soviet:block/doors/chiseled_mangrove_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_top_left_open.json b/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_top_left_open.json deleted file mode 100644 index 6430721..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_top_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left_open", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_mangrove_door_bottom", - "top": "new_soviet:block/doors/chiseled_mangrove_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_top_right.json b/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_top_right.json deleted file mode 100644 index 86815bc..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_top_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_mangrove_door_bottom", - "top": "new_soviet:block/doors/chiseled_mangrove_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_top_right_open.json b/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_top_right_open.json deleted file mode 100644 index b11fbfa..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_mangrove_door_top_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right_open", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_mangrove_door_bottom", - "top": "new_soviet:block/doors/chiseled_mangrove_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_bottom_left.json b/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_bottom_left.json deleted file mode 100644 index 9c25b53..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_bottom_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_oak_door_bottom", - "top": "new_soviet:block/doors/chiseled_oak_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_bottom_left_open.json b/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_bottom_left_open.json deleted file mode 100644 index ecfd7ff..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_bottom_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left_open", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_oak_door_bottom", - "top": "new_soviet:block/doors/chiseled_oak_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_bottom_right.json b/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_bottom_right.json deleted file mode 100644 index 6d50dc2..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_bottom_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_oak_door_bottom", - "top": "new_soviet:block/doors/chiseled_oak_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_bottom_right_open.json b/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_bottom_right_open.json deleted file mode 100644 index 4827c8e..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_bottom_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right_open", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_oak_door_bottom", - "top": "new_soviet:block/doors/chiseled_oak_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_top_left.json b/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_top_left.json deleted file mode 100644 index b87429b..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_top_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_oak_door_bottom", - "top": "new_soviet:block/doors/chiseled_oak_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_top_left_open.json b/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_top_left_open.json deleted file mode 100644 index 2d0ed4b..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_top_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left_open", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_oak_door_bottom", - "top": "new_soviet:block/doors/chiseled_oak_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_top_right.json b/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_top_right.json deleted file mode 100644 index 53f66c4..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_top_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_oak_door_bottom", - "top": "new_soviet:block/doors/chiseled_oak_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_top_right_open.json b/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_top_right_open.json deleted file mode 100644 index 7636c49..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_oak_door_top_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right_open", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_oak_door_bottom", - "top": "new_soviet:block/doors/chiseled_oak_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_bottom_left.json b/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_bottom_left.json deleted file mode 100644 index e88a45e..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_bottom_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_spruce_door_bottom", - "top": "new_soviet:block/doors/chiseled_spruce_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_bottom_left_open.json b/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_bottom_left_open.json deleted file mode 100644 index 5a53ff0..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_bottom_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_left_open", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_spruce_door_bottom", - "top": "new_soviet:block/doors/chiseled_spruce_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_bottom_right.json b/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_bottom_right.json deleted file mode 100644 index 6136612..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_bottom_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_spruce_door_bottom", - "top": "new_soviet:block/doors/chiseled_spruce_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_bottom_right_open.json b/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_bottom_right_open.json deleted file mode 100644 index 915d553..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_bottom_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_bottom_right_open", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_spruce_door_bottom", - "top": "new_soviet:block/doors/chiseled_spruce_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_top_left.json b/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_top_left.json deleted file mode 100644 index 172002a..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_top_left.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_spruce_door_bottom", - "top": "new_soviet:block/doors/chiseled_spruce_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_top_left_open.json b/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_top_left_open.json deleted file mode 100644 index db0874a..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_top_left_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_left_open", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_spruce_door_bottom", - "top": "new_soviet:block/doors/chiseled_spruce_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_top_right.json b/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_top_right.json deleted file mode 100644 index 5153b65..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_top_right.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_spruce_door_bottom", - "top": "new_soviet:block/doors/chiseled_spruce_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_top_right_open.json b/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_top_right_open.json deleted file mode 100644 index 2bfaa10..0000000 --- a/src/main/generated/assets/new_soviet/models/block/chiseled_spruce_door_top_right_open.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "parent": "minecraft:block/door_top_right_open", - "textures": { - "bottom": "new_soviet:block/doors/chiseled_spruce_door_bottom", - "top": "new_soviet:block/doors/chiseled_spruce_door_top" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_aquamarine_tiles.json b/src/main/generated/assets/new_soviet/models/block/cracked_aquamarine_tiles.json deleted file mode 100644 index 74896e7..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_aquamarine_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/aquamarine/cracked_aquamarine_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_brick_tiles.json b/src/main/generated/assets/new_soviet/models/block/cracked_brick_tiles.json deleted file mode 100644 index 20fb0cc..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_brick_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/brick/cracked_brick_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_calcite_tiles.json b/src/main/generated/assets/new_soviet/models/block/cracked_calcite_tiles.json deleted file mode 100644 index f8bb6c9..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_calcite_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/calcite/cracked_calcite_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_dark_brick_tiles.json b/src/main/generated/assets/new_soviet/models/block/cracked_dark_brick_tiles.json deleted file mode 100644 index 91b0588..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_dark_brick_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/brick/cracked_dark_brick_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_deepslate_tiles.json b/src/main/generated/assets/new_soviet/models/block/cracked_deepslate_tiles.json deleted file mode 100644 index e2a1e51..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_deepslate_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/deepslate/cracked_deepslate_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_diorite_bricks.json b/src/main/generated/assets/new_soviet/models/block/cracked_diorite_bricks.json deleted file mode 100644 index 9363e3b..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_diorite_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/diorite/cracked_diorite_bricks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_dripstone_tiles.json b/src/main/generated/assets/new_soviet/models/block/cracked_dripstone_tiles.json deleted file mode 100644 index a00daad..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_dripstone_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/dripstone/cracked_dripstone_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_glazed_aquamarine_tiles.json b/src/main/generated/assets/new_soviet/models/block/cracked_glazed_aquamarine_tiles.json deleted file mode 100644 index 6c5945f..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_glazed_aquamarine_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/aquamarine/cracked_glazed_aquamarine_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_glazed_brick_tiles.json b/src/main/generated/assets/new_soviet/models/block/cracked_glazed_brick_tiles.json deleted file mode 100644 index 297880c..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_glazed_brick_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/brick/cracked_glazed_brick_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_glazed_light_blue_tiles.json b/src/main/generated/assets/new_soviet/models/block/cracked_glazed_light_blue_tiles.json deleted file mode 100644 index 472b1b6..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_glazed_light_blue_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/light_blue/cracked_glazed_light_blue_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_glazed_teal_tiles.json b/src/main/generated/assets/new_soviet/models/block/cracked_glazed_teal_tiles.json deleted file mode 100644 index 59b6002..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_glazed_teal_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/teal/cracked_glazed_teal_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_glazed_white_tiles.json b/src/main/generated/assets/new_soviet/models/block/cracked_glazed_white_tiles.json deleted file mode 100644 index 378b580..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_glazed_white_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/white/cracked_glazed_white_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_green_bricks.json b/src/main/generated/assets/new_soviet/models/block/cracked_green_bricks.json deleted file mode 100644 index 8cab307..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_green_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/green/cracked_green_bricks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_green_bricks_2.json b/src/main/generated/assets/new_soviet/models/block/cracked_green_bricks_2.json deleted file mode 100644 index d87d721..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_green_bricks_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/green/cracked_green_bricks_2" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_green_white_tiles.json b/src/main/generated/assets/new_soviet/models/block/cracked_green_white_tiles.json deleted file mode 100644 index 1418b89..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_green_white_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/green_white/cracked_green_white_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_light_blue_tiles.json b/src/main/generated/assets/new_soviet/models/block/cracked_light_blue_tiles.json deleted file mode 100644 index 7be62d4..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_light_blue_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/light_blue/cracked_light_blue_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_nii_wall_1.json b/src/main/generated/assets/new_soviet/models/block/cracked_nii_wall_1.json deleted file mode 100644 index a3b27e6..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_nii_wall_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/research_institute/cracked_nii_wall_1" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_red_bricks.json b/src/main/generated/assets/new_soviet/models/block/cracked_red_bricks.json deleted file mode 100644 index d1eeaa6..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_red_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/red/cracked_red_bricks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_sand_bricks.json b/src/main/generated/assets/new_soviet/models/block/cracked_sand_bricks.json deleted file mode 100644 index 9b9eb86..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_sand_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/sand/cracked_sand_bricks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_sand_tiles.json b/src/main/generated/assets/new_soviet/models/block/cracked_sand_tiles.json deleted file mode 100644 index 5824b08..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_sand_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/sand/cracked_sand_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_teal_tiles.json b/src/main/generated/assets/new_soviet/models/block/cracked_teal_tiles.json deleted file mode 100644 index 6433086..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_teal_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/teal/cracked_teal_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_tuff_bricks.json b/src/main/generated/assets/new_soviet/models/block/cracked_tuff_bricks.json deleted file mode 100644 index bf41f91..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_tuff_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/tuff/cracked_tuff_bricks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_tuff_tiles.json b/src/main/generated/assets/new_soviet/models/block/cracked_tuff_tiles.json deleted file mode 100644 index c5b669b..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_tuff_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/tuff/cracked_tuff_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cracked_whitewash.json b/src/main/generated/assets/new_soviet/models/block/cracked_whitewash.json deleted file mode 100644 index 2d89427..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cracked_whitewash.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/whitewash/cracked_whitewash" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cross_acacia_planks.json b/src/main/generated/assets/new_soviet/models/block/cross_acacia_planks.json deleted file mode 100644 index cea22d3..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cross_acacia_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/planks/cross_acacia_planks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cross_birch_planks.json b/src/main/generated/assets/new_soviet/models/block/cross_birch_planks.json deleted file mode 100644 index b9cceb6..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cross_birch_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/planks/cross_birch_planks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cross_brown_linoleum.json b/src/main/generated/assets/new_soviet/models/block/cross_brown_linoleum.json deleted file mode 100644 index 50482c0..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cross_brown_linoleum.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/linoleum/cross_brown_linoleum" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cross_crimson_planks.json b/src/main/generated/assets/new_soviet/models/block/cross_crimson_planks.json deleted file mode 100644 index f7e1bc5..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cross_crimson_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/planks/cross_crimson_planks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cross_dark_oak_planks.json b/src/main/generated/assets/new_soviet/models/block/cross_dark_oak_planks.json deleted file mode 100644 index 61ce183..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cross_dark_oak_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/planks/cross_dark_oak_planks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cross_jungle_planks.json b/src/main/generated/assets/new_soviet/models/block/cross_jungle_planks.json deleted file mode 100644 index 6e51887..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cross_jungle_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/planks/cross_jungle_planks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cross_mangrove_planks.json b/src/main/generated/assets/new_soviet/models/block/cross_mangrove_planks.json deleted file mode 100644 index cb3936a..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cross_mangrove_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/planks/cross_mangrove_planks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cross_oak_planks.json b/src/main/generated/assets/new_soviet/models/block/cross_oak_planks.json deleted file mode 100644 index de72de8..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cross_oak_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/planks/cross_oak_planks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cross_orange_linoleum.json b/src/main/generated/assets/new_soviet/models/block/cross_orange_linoleum.json deleted file mode 100644 index 7d18bb6..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cross_orange_linoleum.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/linoleum/cross_orange_linoleum" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cross_sand_tiles.json b/src/main/generated/assets/new_soviet/models/block/cross_sand_tiles.json deleted file mode 100644 index 6495d88..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cross_sand_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/sand/cross_sand_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cross_spruce_planks.json b/src/main/generated/assets/new_soviet/models/block/cross_spruce_planks.json deleted file mode 100644 index 8da11c9..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cross_spruce_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/planks/cross_spruce_planks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cyan_linoleum.json b/src/main/generated/assets/new_soviet/models/block/cyan_linoleum.json deleted file mode 100644 index 6f61225..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cyan_linoleum.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/linoleum/cyan_linoleum" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/cyan_warning.json b/src/main/generated/assets/new_soviet/models/block/cyan_warning.json deleted file mode 100644 index 94be3ae..0000000 --- a/src/main/generated/assets/new_soviet/models/block/cyan_warning.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/industrial/warning/cyan_warning" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/dark_brick_tiles.json b/src/main/generated/assets/new_soviet/models/block/dark_brick_tiles.json deleted file mode 100644 index ff896db..0000000 --- a/src/main/generated/assets/new_soviet/models/block/dark_brick_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/brick/dark_brick_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/deepslate_tiles.json b/src/main/generated/assets/new_soviet/models/block/deepslate_tiles.json deleted file mode 100644 index 6ceb630..0000000 --- a/src/main/generated/assets/new_soviet/models/block/deepslate_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/deepslate/deepslate_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/diagonal_calcite_tiles.json b/src/main/generated/assets/new_soviet/models/block/diagonal_calcite_tiles.json deleted file mode 100644 index eccf222..0000000 --- a/src/main/generated/assets/new_soviet/models/block/diagonal_calcite_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/calcite/diagonal_calcite_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/diagonal_deepslate_tiles.json b/src/main/generated/assets/new_soviet/models/block/diagonal_deepslate_tiles.json deleted file mode 100644 index 41760c2..0000000 --- a/src/main/generated/assets/new_soviet/models/block/diagonal_deepslate_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/deepslate/diagonal_deepslate_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/diorite_bricks.json b/src/main/generated/assets/new_soviet/models/block/diorite_bricks.json deleted file mode 100644 index d2c514c..0000000 --- a/src/main/generated/assets/new_soviet/models/block/diorite_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/diorite/diorite_bricks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/dirty_aquamarine_tiles.json b/src/main/generated/assets/new_soviet/models/block/dirty_aquamarine_tiles.json deleted file mode 100644 index ce2d3be..0000000 --- a/src/main/generated/assets/new_soviet/models/block/dirty_aquamarine_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/aquamarine/dirty_aquamarine_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/dirty_brick_tiles.json b/src/main/generated/assets/new_soviet/models/block/dirty_brick_tiles.json deleted file mode 100644 index 2ccd993..0000000 --- a/src/main/generated/assets/new_soviet/models/block/dirty_brick_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/brick/dirty_brick_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/dirty_dark_brick_tiles.json b/src/main/generated/assets/new_soviet/models/block/dirty_dark_brick_tiles.json deleted file mode 100644 index dc612ea..0000000 --- a/src/main/generated/assets/new_soviet/models/block/dirty_dark_brick_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/brick/dirty_dark_brick_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/dripstone_bricks.json b/src/main/generated/assets/new_soviet/models/block/dripstone_bricks.json deleted file mode 100644 index 010c840..0000000 --- a/src/main/generated/assets/new_soviet/models/block/dripstone_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/dripstone/dripstone_bricks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/dripstone_tiles.json b/src/main/generated/assets/new_soviet/models/block/dripstone_tiles.json deleted file mode 100644 index d3e4fb8..0000000 --- a/src/main/generated/assets/new_soviet/models/block/dripstone_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/dripstone/dripstone_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/glazed_aquamarine_tiles.json b/src/main/generated/assets/new_soviet/models/block/glazed_aquamarine_tiles.json deleted file mode 100644 index 79e22e2..0000000 --- a/src/main/generated/assets/new_soviet/models/block/glazed_aquamarine_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/aquamarine/glazed_aquamarine_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/glazed_brick_tiles.json b/src/main/generated/assets/new_soviet/models/block/glazed_brick_tiles.json deleted file mode 100644 index 38df432..0000000 --- a/src/main/generated/assets/new_soviet/models/block/glazed_brick_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/brick/glazed_brick_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/glazed_light_blue_tiles.json b/src/main/generated/assets/new_soviet/models/block/glazed_light_blue_tiles.json deleted file mode 100644 index df92325..0000000 --- a/src/main/generated/assets/new_soviet/models/block/glazed_light_blue_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/light_blue/glazed_light_blue_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/glazed_teal_tiles.json b/src/main/generated/assets/new_soviet/models/block/glazed_teal_tiles.json deleted file mode 100644 index 1621ced..0000000 --- a/src/main/generated/assets/new_soviet/models/block/glazed_teal_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/teal/glazed_teal_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/glazed_white_tiles.json b/src/main/generated/assets/new_soviet/models/block/glazed_white_tiles.json deleted file mode 100644 index 07397b9..0000000 --- a/src/main/generated/assets/new_soviet/models/block/glazed_white_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/white/glazed_white_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/gray_linoleum.json b/src/main/generated/assets/new_soviet/models/block/gray_linoleum.json deleted file mode 100644 index b1e95c7..0000000 --- a/src/main/generated/assets/new_soviet/models/block/gray_linoleum.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/linoleum/gray_linoleum" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/gray_warning.json b/src/main/generated/assets/new_soviet/models/block/gray_warning.json deleted file mode 100644 index 24416f7..0000000 --- a/src/main/generated/assets/new_soviet/models/block/gray_warning.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/industrial/warning/gray_warning" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/green_bricks.json b/src/main/generated/assets/new_soviet/models/block/green_bricks.json deleted file mode 100644 index 97e8f6a..0000000 --- a/src/main/generated/assets/new_soviet/models/block/green_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/green/green_bricks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/green_bricks_2.json b/src/main/generated/assets/new_soviet/models/block/green_bricks_2.json deleted file mode 100644 index 23aafad..0000000 --- a/src/main/generated/assets/new_soviet/models/block/green_bricks_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/green/green_bricks_2" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/green_linoleum.json b/src/main/generated/assets/new_soviet/models/block/green_linoleum.json deleted file mode 100644 index 8a9b190..0000000 --- a/src/main/generated/assets/new_soviet/models/block/green_linoleum.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/linoleum/green_linoleum" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/green_wallpaper.json b/src/main/generated/assets/new_soviet/models/block/green_wallpaper.json deleted file mode 100644 index c9d3548..0000000 --- a/src/main/generated/assets/new_soviet/models/block/green_wallpaper.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/wallpapers/green_wallpaper" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/green_warning.json b/src/main/generated/assets/new_soviet/models/block/green_warning.json deleted file mode 100644 index d786f27..0000000 --- a/src/main/generated/assets/new_soviet/models/block/green_warning.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/industrial/warning/green_warning" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/green_white_tiles.json b/src/main/generated/assets/new_soviet/models/block/green_white_tiles.json deleted file mode 100644 index 848016f..0000000 --- a/src/main/generated/assets/new_soviet/models/block/green_white_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/green_white/green_white_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_acacia_planks.json b/src/main/generated/assets/new_soviet/models/block/herringbone_acacia_planks.json deleted file mode 100644 index 3e0eaa9..0000000 --- a/src/main/generated/assets/new_soviet/models/block/herringbone_acacia_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/planks/herringbone_acacia_planks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_birch_planks.json b/src/main/generated/assets/new_soviet/models/block/herringbone_birch_planks.json deleted file mode 100644 index c2e7292..0000000 --- a/src/main/generated/assets/new_soviet/models/block/herringbone_birch_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/planks/herringbone_birch_planks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_crimson_planks.json b/src/main/generated/assets/new_soviet/models/block/herringbone_crimson_planks.json deleted file mode 100644 index 0330b37..0000000 --- a/src/main/generated/assets/new_soviet/models/block/herringbone_crimson_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/planks/herringbone_crimson_planks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_dark_oak_planks.json b/src/main/generated/assets/new_soviet/models/block/herringbone_dark_oak_planks.json deleted file mode 100644 index ad2bdcf..0000000 --- a/src/main/generated/assets/new_soviet/models/block/herringbone_dark_oak_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/planks/herringbone_dark_oak_planks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_jungle_planks.json b/src/main/generated/assets/new_soviet/models/block/herringbone_jungle_planks.json deleted file mode 100644 index d8d4a17..0000000 --- a/src/main/generated/assets/new_soviet/models/block/herringbone_jungle_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/planks/herringbone_jungle_planks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_mangrove_planks.json b/src/main/generated/assets/new_soviet/models/block/herringbone_mangrove_planks.json deleted file mode 100644 index 980282d..0000000 --- a/src/main/generated/assets/new_soviet/models/block/herringbone_mangrove_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/planks/herringbone_mangrove_planks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_oak_planks.json b/src/main/generated/assets/new_soviet/models/block/herringbone_oak_planks.json deleted file mode 100644 index ed31e17..0000000 --- a/src/main/generated/assets/new_soviet/models/block/herringbone_oak_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/planks/herringbone_oak_planks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_parquet.json b/src/main/generated/assets/new_soviet/models/block/herringbone_parquet.json deleted file mode 100644 index 272867d..0000000 --- a/src/main/generated/assets/new_soviet/models/block/herringbone_parquet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/planks/herringbone_parquet" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_sand_tiles.json b/src/main/generated/assets/new_soviet/models/block/herringbone_sand_tiles.json deleted file mode 100644 index 3e80835..0000000 --- a/src/main/generated/assets/new_soviet/models/block/herringbone_sand_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/sand/herringbone_sand_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/herringbone_spruce_planks.json b/src/main/generated/assets/new_soviet/models/block/herringbone_spruce_planks.json deleted file mode 100644 index 6399db5..0000000 --- a/src/main/generated/assets/new_soviet/models/block/herringbone_spruce_planks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/planks/herringbone_spruce_planks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/industrial_warning.json b/src/main/generated/assets/new_soviet/models/block/industrial_warning.json deleted file mode 100644 index cfa7d23..0000000 --- a/src/main/generated/assets/new_soviet/models/block/industrial_warning.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/industrial/warning/industrial_warning" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/light_blue_bricks.json b/src/main/generated/assets/new_soviet/models/block/light_blue_bricks.json deleted file mode 100644 index 7babfc1..0000000 --- a/src/main/generated/assets/new_soviet/models/block/light_blue_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/light_blue/light_blue_bricks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/light_blue_tiles.json b/src/main/generated/assets/new_soviet/models/block/light_blue_tiles.json deleted file mode 100644 index 8a0a898..0000000 --- a/src/main/generated/assets/new_soviet/models/block/light_blue_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/light_blue/light_blue_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/light_blue_warning.json b/src/main/generated/assets/new_soviet/models/block/light_blue_warning.json deleted file mode 100644 index 5974dba..0000000 --- a/src/main/generated/assets/new_soviet/models/block/light_blue_warning.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/industrial/warning/light_blue_warning" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/lime_warning.json b/src/main/generated/assets/new_soviet/models/block/lime_warning.json deleted file mode 100644 index cf263c0..0000000 --- a/src/main/generated/assets/new_soviet/models/block/lime_warning.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/industrial/warning/lime_warning" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/magenta_warning.json b/src/main/generated/assets/new_soviet/models/block/magenta_warning.json deleted file mode 100644 index 0aa0fd4..0000000 --- a/src/main/generated/assets/new_soviet/models/block/magenta_warning.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/industrial/warning/magenta_warning" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/metal_plating.json b/src/main/generated/assets/new_soviet/models/block/metal_plating.json deleted file mode 100644 index 0d4a653..0000000 --- a/src/main/generated/assets/new_soviet/models/block/metal_plating.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/industrial/metal_plating" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_aquamarine_tiles.json b/src/main/generated/assets/new_soviet/models/block/mossy_aquamarine_tiles.json deleted file mode 100644 index f166adc..0000000 --- a/src/main/generated/assets/new_soviet/models/block/mossy_aquamarine_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/aquamarine/mossy_aquamarine_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_brick_tiles.json b/src/main/generated/assets/new_soviet/models/block/mossy_brick_tiles.json deleted file mode 100644 index ac7aceb..0000000 --- a/src/main/generated/assets/new_soviet/models/block/mossy_brick_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/brick/mossy_brick_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_calcite_tiles.json b/src/main/generated/assets/new_soviet/models/block/mossy_calcite_tiles.json deleted file mode 100644 index 04a66f8..0000000 --- a/src/main/generated/assets/new_soviet/models/block/mossy_calcite_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/calcite/mossy_calcite_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_dark_brick_tiles.json b/src/main/generated/assets/new_soviet/models/block/mossy_dark_brick_tiles.json deleted file mode 100644 index de58467..0000000 --- a/src/main/generated/assets/new_soviet/models/block/mossy_dark_brick_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/brick/mossy_dark_brick_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_deepslate_tiles.json b/src/main/generated/assets/new_soviet/models/block/mossy_deepslate_tiles.json deleted file mode 100644 index df6aa2f..0000000 --- a/src/main/generated/assets/new_soviet/models/block/mossy_deepslate_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/deepslate/mossy_deepslate_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_diorite_bricks.json b/src/main/generated/assets/new_soviet/models/block/mossy_diorite_bricks.json deleted file mode 100644 index 1925ecd..0000000 --- a/src/main/generated/assets/new_soviet/models/block/mossy_diorite_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/diorite/mossy_diorite_bricks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_dripstone_tiles.json b/src/main/generated/assets/new_soviet/models/block/mossy_dripstone_tiles.json deleted file mode 100644 index 7b27f08..0000000 --- a/src/main/generated/assets/new_soviet/models/block/mossy_dripstone_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/dripstone/mossy_dripstone_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_green_bricks.json b/src/main/generated/assets/new_soviet/models/block/mossy_green_bricks.json deleted file mode 100644 index 2b013f2..0000000 --- a/src/main/generated/assets/new_soviet/models/block/mossy_green_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/green/mossy_green_bricks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_green_bricks_2.json b/src/main/generated/assets/new_soviet/models/block/mossy_green_bricks_2.json deleted file mode 100644 index b60db1f..0000000 --- a/src/main/generated/assets/new_soviet/models/block/mossy_green_bricks_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/green/mossy_green_bricks_2" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_green_white_tiles.json b/src/main/generated/assets/new_soviet/models/block/mossy_green_white_tiles.json deleted file mode 100644 index ad9b0d3..0000000 --- a/src/main/generated/assets/new_soviet/models/block/mossy_green_white_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/green_white/mossy_green_white_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_light_blue_bricks.json b/src/main/generated/assets/new_soviet/models/block/mossy_light_blue_bricks.json deleted file mode 100644 index ef81e72..0000000 --- a/src/main/generated/assets/new_soviet/models/block/mossy_light_blue_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/light_blue/mossy_light_blue_bricks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_light_blue_tiles.json b/src/main/generated/assets/new_soviet/models/block/mossy_light_blue_tiles.json deleted file mode 100644 index a3280c5..0000000 --- a/src/main/generated/assets/new_soviet/models/block/mossy_light_blue_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/light_blue/mossy_light_blue_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_red_bricks.json b/src/main/generated/assets/new_soviet/models/block/mossy_red_bricks.json deleted file mode 100644 index 9729a99..0000000 --- a/src/main/generated/assets/new_soviet/models/block/mossy_red_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/red/mossy_red_bricks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_sand_bricks.json b/src/main/generated/assets/new_soviet/models/block/mossy_sand_bricks.json deleted file mode 100644 index 6b2df98..0000000 --- a/src/main/generated/assets/new_soviet/models/block/mossy_sand_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/sand/mossy_sand_bricks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_sand_tiles.json b/src/main/generated/assets/new_soviet/models/block/mossy_sand_tiles.json deleted file mode 100644 index c12b5d6..0000000 --- a/src/main/generated/assets/new_soviet/models/block/mossy_sand_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/sand/mossy_sand_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_teal_tiles.json b/src/main/generated/assets/new_soviet/models/block/mossy_teal_tiles.json deleted file mode 100644 index c64a1c4..0000000 --- a/src/main/generated/assets/new_soviet/models/block/mossy_teal_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/teal/mossy_teal_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_tuff_bricks.json b/src/main/generated/assets/new_soviet/models/block/mossy_tuff_bricks.json deleted file mode 100644 index 43d9562..0000000 --- a/src/main/generated/assets/new_soviet/models/block/mossy_tuff_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/tuff/mossy_tuff_bricks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/mossy_tuff_tiles.json b/src/main/generated/assets/new_soviet/models/block/mossy_tuff_tiles.json deleted file mode 100644 index ac3d5db..0000000 --- a/src/main/generated/assets/new_soviet/models/block/mossy_tuff_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/tuff/mossy_tuff_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/nii_floor.json b/src/main/generated/assets/new_soviet/models/block/nii_floor.json deleted file mode 100644 index 3836b70..0000000 --- a/src/main/generated/assets/new_soviet/models/block/nii_floor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/research_institute/nii_floor" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/nii_wall_1.json b/src/main/generated/assets/new_soviet/models/block/nii_wall_1.json deleted file mode 100644 index 853f6c0..0000000 --- a/src/main/generated/assets/new_soviet/models/block/nii_wall_1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/research_institute/nii_wall_1" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/nii_wall_2.json b/src/main/generated/assets/new_soviet/models/block/nii_wall_2.json deleted file mode 100644 index 64f8cb8..0000000 --- a/src/main/generated/assets/new_soviet/models/block/nii_wall_2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/research_institute/nii_wall_2" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/nii_wall_3.json b/src/main/generated/assets/new_soviet/models/block/nii_wall_3.json deleted file mode 100644 index 980e616..0000000 --- a/src/main/generated/assets/new_soviet/models/block/nii_wall_3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/research_institute/nii_wall_3" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/orange_linoleum.json b/src/main/generated/assets/new_soviet/models/block/orange_linoleum.json deleted file mode 100644 index a01315d..0000000 --- a/src/main/generated/assets/new_soviet/models/block/orange_linoleum.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/linoleum/orange_linoleum" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/orange_warning.json b/src/main/generated/assets/new_soviet/models/block/orange_warning.json deleted file mode 100644 index a3f11d7..0000000 --- a/src/main/generated/assets/new_soviet/models/block/orange_warning.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/industrial/warning/orange_warning" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/purple_warning.json b/src/main/generated/assets/new_soviet/models/block/purple_warning.json deleted file mode 100644 index 00106cb..0000000 --- a/src/main/generated/assets/new_soviet/models/block/purple_warning.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/industrial/warning/purple_warning" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/red_bricks.json b/src/main/generated/assets/new_soviet/models/block/red_bricks.json deleted file mode 100644 index 1759b50..0000000 --- a/src/main/generated/assets/new_soviet/models/block/red_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/red/red_bricks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/red_linoleum.json b/src/main/generated/assets/new_soviet/models/block/red_linoleum.json deleted file mode 100644 index 329361e..0000000 --- a/src/main/generated/assets/new_soviet/models/block/red_linoleum.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/linoleum/red_linoleum" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/red_warning.json b/src/main/generated/assets/new_soviet/models/block/red_warning.json deleted file mode 100644 index 8cce2ed..0000000 --- a/src/main/generated/assets/new_soviet/models/block/red_warning.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/industrial/warning/red_warning" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/sand_bricks.json b/src/main/generated/assets/new_soviet/models/block/sand_bricks.json deleted file mode 100644 index a632afb..0000000 --- a/src/main/generated/assets/new_soviet/models/block/sand_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/sand/sand_bricks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/sand_tiles.json b/src/main/generated/assets/new_soviet/models/block/sand_tiles.json deleted file mode 100644 index ec55dc9..0000000 --- a/src/main/generated/assets/new_soviet/models/block/sand_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/sand/sand_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/separated_parquet.json b/src/main/generated/assets/new_soviet/models/block/separated_parquet.json deleted file mode 100644 index 377c80d..0000000 --- a/src/main/generated/assets/new_soviet/models/block/separated_parquet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/planks/separated_parquet" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/small_aquamarine_tiles.json b/src/main/generated/assets/new_soviet/models/block/small_aquamarine_tiles.json deleted file mode 100644 index 930a4dc..0000000 --- a/src/main/generated/assets/new_soviet/models/block/small_aquamarine_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/aquamarine/small_aquamarine_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/small_cracked_aquamarine_tiles.json b/src/main/generated/assets/new_soviet/models/block/small_cracked_aquamarine_tiles.json deleted file mode 100644 index 9f83ec5..0000000 --- a/src/main/generated/assets/new_soviet/models/block/small_cracked_aquamarine_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/aquamarine/small_cracked_aquamarine_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/small_cracked_deepslate_tiles.json b/src/main/generated/assets/new_soviet/models/block/small_cracked_deepslate_tiles.json deleted file mode 100644 index 415bbfe..0000000 --- a/src/main/generated/assets/new_soviet/models/block/small_cracked_deepslate_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/deepslate/small_cracked_deepslate_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/small_cracked_diorite_tiles.json b/src/main/generated/assets/new_soviet/models/block/small_cracked_diorite_tiles.json deleted file mode 100644 index 7e63914..0000000 --- a/src/main/generated/assets/new_soviet/models/block/small_cracked_diorite_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/diorite/small_cracked_diorite_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/small_cracked_granite_tiles.json b/src/main/generated/assets/new_soviet/models/block/small_cracked_granite_tiles.json deleted file mode 100644 index f87bf1c..0000000 --- a/src/main/generated/assets/new_soviet/models/block/small_cracked_granite_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/granite/small_cracked_granite_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/small_cracked_light_blue_tiles.json b/src/main/generated/assets/new_soviet/models/block/small_cracked_light_blue_tiles.json deleted file mode 100644 index 0d2cde5..0000000 --- a/src/main/generated/assets/new_soviet/models/block/small_cracked_light_blue_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/light_blue/small_cracked_light_blue_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/small_cracked_sand_tiles.json b/src/main/generated/assets/new_soviet/models/block/small_cracked_sand_tiles.json deleted file mode 100644 index 126cab4..0000000 --- a/src/main/generated/assets/new_soviet/models/block/small_cracked_sand_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/sand/small_cracked_sand_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/small_cracked_teal_tiles.json b/src/main/generated/assets/new_soviet/models/block/small_cracked_teal_tiles.json deleted file mode 100644 index 7fce3aa..0000000 --- a/src/main/generated/assets/new_soviet/models/block/small_cracked_teal_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/teal/small_cracked_teal_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/small_cracked_white_tiles.json b/src/main/generated/assets/new_soviet/models/block/small_cracked_white_tiles.json deleted file mode 100644 index fca0844..0000000 --- a/src/main/generated/assets/new_soviet/models/block/small_cracked_white_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/white/small_cracked_white_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/small_cracked_yellow_tiles.json b/src/main/generated/assets/new_soviet/models/block/small_cracked_yellow_tiles.json deleted file mode 100644 index 2ff5e3c..0000000 --- a/src/main/generated/assets/new_soviet/models/block/small_cracked_yellow_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/yellow/small_cracked_yellow_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/small_deepslate_tiles.json b/src/main/generated/assets/new_soviet/models/block/small_deepslate_tiles.json deleted file mode 100644 index c7199ee..0000000 --- a/src/main/generated/assets/new_soviet/models/block/small_deepslate_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/deepslate/small_deepslate_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/small_diorite_tiles.json b/src/main/generated/assets/new_soviet/models/block/small_diorite_tiles.json deleted file mode 100644 index aed75ef..0000000 --- a/src/main/generated/assets/new_soviet/models/block/small_diorite_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/diorite/small_diorite_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/small_granite_tiles.json b/src/main/generated/assets/new_soviet/models/block/small_granite_tiles.json deleted file mode 100644 index 9ff8952..0000000 --- a/src/main/generated/assets/new_soviet/models/block/small_granite_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/granite/small_granite_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/small_light_blue_tiles.json b/src/main/generated/assets/new_soviet/models/block/small_light_blue_tiles.json deleted file mode 100644 index e68d7ed..0000000 --- a/src/main/generated/assets/new_soviet/models/block/small_light_blue_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/light_blue/small_light_blue_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/small_sand_tiles.json b/src/main/generated/assets/new_soviet/models/block/small_sand_tiles.json deleted file mode 100644 index be7a9a5..0000000 --- a/src/main/generated/assets/new_soviet/models/block/small_sand_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/sand/small_sand_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/small_teal_tiles.json b/src/main/generated/assets/new_soviet/models/block/small_teal_tiles.json deleted file mode 100644 index deba6f8..0000000 --- a/src/main/generated/assets/new_soviet/models/block/small_teal_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/teal/small_teal_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/small_white_tiles.json b/src/main/generated/assets/new_soviet/models/block/small_white_tiles.json deleted file mode 100644 index 21c5cfb..0000000 --- a/src/main/generated/assets/new_soviet/models/block/small_white_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/white/small_white_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/small_yellow_tiles.json b/src/main/generated/assets/new_soviet/models/block/small_yellow_tiles.json deleted file mode 100644 index 25e8cc7..0000000 --- a/src/main/generated/assets/new_soviet/models/block/small_yellow_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/yellow/small_yellow_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/straight_parquet.json b/src/main/generated/assets/new_soviet/models/block/straight_parquet.json deleted file mode 100644 index c059365..0000000 --- a/src/main/generated/assets/new_soviet/models/block/straight_parquet.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/floor/planks/straight_parquet" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/teal_tiles.json b/src/main/generated/assets/new_soviet/models/block/teal_tiles.json deleted file mode 100644 index b62ac26..0000000 --- a/src/main/generated/assets/new_soviet/models/block/teal_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/teal/teal_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/tuff_bricks.json b/src/main/generated/assets/new_soviet/models/block/tuff_bricks.json deleted file mode 100644 index 8a156b9..0000000 --- a/src/main/generated/assets/new_soviet/models/block/tuff_bricks.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/tuff/tuff_bricks" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/tuff_tiles.json b/src/main/generated/assets/new_soviet/models/block/tuff_tiles.json deleted file mode 100644 index 197d420..0000000 --- a/src/main/generated/assets/new_soviet/models/block/tuff_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/tuff/tuff_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/variated_light_blue_tiles.json b/src/main/generated/assets/new_soviet/models/block/variated_light_blue_tiles.json deleted file mode 100644 index 938f4ac..0000000 --- a/src/main/generated/assets/new_soviet/models/block/variated_light_blue_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/light_blue/variated_light_blue_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/variated_teal_tiles.json b/src/main/generated/assets/new_soviet/models/block/variated_teal_tiles.json deleted file mode 100644 index 0b80ece..0000000 --- a/src/main/generated/assets/new_soviet/models/block/variated_teal_tiles.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/teal/variated_teal_tiles" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/very_cracked_whitewash.json b/src/main/generated/assets/new_soviet/models/block/very_cracked_whitewash.json deleted file mode 100644 index 35148f7..0000000 --- a/src/main/generated/assets/new_soviet/models/block/very_cracked_whitewash.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/whitewash/very_cracked_whitewash" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/whitewash.json b/src/main/generated/assets/new_soviet/models/block/whitewash.json deleted file mode 100644 index 29aaf28..0000000 --- a/src/main/generated/assets/new_soviet/models/block/whitewash.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/whitewash/whitewash" - } -} \ No newline at end of file diff --git a/src/main/generated/assets/new_soviet/models/block/yellow_warning.json b/src/main/generated/assets/new_soviet/models/block/yellow_warning.json deleted file mode 100644 index 476b296..0000000 --- a/src/main/generated/assets/new_soviet/models/block/yellow_warning.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "new_soviet:block/industrial/warning/yellow_warning" - } -} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/tags/blocks/post_lamps.json b/src/main/generated/data/new_soviet/tags/blocks/post_lamps.json deleted file mode 100644 index 3c02194..0000000 --- a/src/main/generated/data/new_soviet/tags/blocks/post_lamps.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "new_soviet:caged_post_lamp", - "new_soviet:vintage_post_lamp", - "new_soviet:modern_post_lamp", - "new_soviet:big_post_lamp" - ] -} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/tags/items/dice.json b/src/main/generated/data/new_soviet/tags/items/dice.json deleted file mode 100644 index 365296f..0000000 --- a/src/main/generated/data/new_soviet/tags/items/dice.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "new_soviet:dice_d4", - "new_soviet:dice_d6", - "new_soviet:dice_d20" - ] -} \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/Config.java b/src/main/java/su/a71/new_soviet/Config.java index a8ed583..0d70fea 100644 --- a/src/main/java/su/a71/new_soviet/Config.java +++ b/src/main/java/su/a71/new_soviet/Config.java @@ -17,21 +17,18 @@ public class Config { private static void generateDefault() { - INSTANCE = new Config(); - NewSoviet.LOG.info("Generated config file at config/new_soviet.json"); File file = new File("config/new_soviet.json"); - if(!file.getParentFile().exists() && !file.getParentFile().mkdirs()) { - NewSoviet.LOG.error("Error making dir for config, using default"); - INSTANCE = new Config(); // Something went wrong with mkdir - return; + if(!file.getParentFile().exists()) { + file.getParentFile().mkdirs(); } + INSTANCE = new Config(); try { FileWriter writer = new FileWriter(file); writer.write(NewSoviet.GSON.toJson(INSTANCE)); writer.close(); } catch (Exception e) { - NewSoviet.LOG.error("Error creating config, using default", e); + INSTANCE = new Config(); } } diff --git a/src/main/java/su/a71/new_soviet/DataGeneration.java b/src/main/java/su/a71/new_soviet/DataGeneration.java index 5dd26a8..4458b5a 100644 --- a/src/main/java/su/a71/new_soviet/DataGeneration.java +++ b/src/main/java/su/a71/new_soviet/DataGeneration.java @@ -1,15 +1,1808 @@ package su.a71.new_soviet; +// === ABANDON HOPE, YE WHO ENTER HERE === +import com.google.common.collect.Lists; import net.fabricmc.fabric.api.datagen.v1.DataGeneratorEntrypoint; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; +import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; +import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.data.client.BlockStateModelGenerator; +import net.minecraft.data.client.ItemModelGenerator; +import net.minecraft.data.server.recipe.RecipeJsonProvider; +import net.minecraft.data.server.recipe.RecipeProvider; +import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; +import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder; +import net.minecraft.item.ItemConvertible; +import net.minecraft.item.Items; +import net.minecraft.recipe.Ingredient; +import net.minecraft.recipe.book.RecipeCategory; +import net.minecraft.registry.RegistryWrapper; +import net.minecraft.registry.tag.BlockTags; +import net.minecraft.registry.tag.ItemTags; +import net.minecraft.util.Util; +import su.a71.new_soviet.registration.NSE_Blocks; +import su.a71.new_soviet.registration.NSE_Custom; +import su.a71.new_soviet.registration.NSE_Items; +import su.a71.new_soviet.registration.NSE_Tags; -import su.a71.new_soviet.datagen.BlockLootTables; -import su.a71.new_soviet.datagen.BlockTagGenerator; -import su.a71.new_soviet.datagen.RecipeGenerator; -import su.a71.new_soviet.datagen.ModelGenerator; -import su.a71.new_soviet.datagen.ItemTagGenerator; +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.function.Consumer; public class DataGeneration implements DataGeneratorEntrypoint { + private class BlockLootTables extends FabricBlockLootTableProvider { + public BlockLootTables(FabricDataOutput dataOutput) { + super(dataOutput); + } + + @Override + public void generate() { + // Drops for building blocks + addDrop(NSE_Blocks.SAND_TILES); + addDrop(NSE_Blocks.NII_FLOOR); + addDrop(NSE_Blocks.BIG_GREEN_TILES); + addDrop(NSE_Blocks.BIG_GREEN_TILES_CRACKED); + addDrop(NSE_Blocks.GREEN_BRICKS); + addDrop(NSE_Blocks.CRACKED_GREEN_BRICKS); + addDrop(NSE_Blocks.MOSSY_GREEN_BRICKS); + addDrop(NSE_Blocks.GREEN_BRICKS_2); + addDrop(NSE_Blocks.CRACKED_GREEN_BRICKS_2); + addDrop(NSE_Blocks.MOSSY_GREEN_BRICKS_2); + addDrop(NSE_Blocks.CRACKED_SAND_TILES); + addDrop(NSE_Blocks.MOSSY_SAND_TILES); + addDrop(NSE_Blocks.SMALL_SAND_TILES); + addDrop(NSE_Blocks.SMALL_CRACKED_SAND_TILES); + addDrop(NSE_Blocks.HERRINGBONE_SAND_TILES); + addDrop(NSE_Blocks.CROSS_SAND_TILES); + addDrop(NSE_Blocks.BIG_SAND_TILES); + addDrop(NSE_Blocks.SAND_BRICKS); + addDrop(NSE_Blocks.CRACKED_SAND_BRICKS); + addDrop(NSE_Blocks.MOSSY_SAND_BRICKS); + addDrop(NSE_Blocks.BIG_SAND_BRICKS); + addDrop(NSE_Blocks.BRICK_TILES); + addDrop(NSE_Blocks.CRACKED_BRICK_TILES); + addDrop(NSE_Blocks.MOSSY_BRICK_TILES); + addDrop(NSE_Blocks.DIRTY_BRICK_TILES); + addDrop(NSE_Blocks.DARK_BRICK_TILES); + addDrop(NSE_Blocks.CRACKED_DARK_BRICK_TILES); + addDrop(NSE_Blocks.MOSSY_DARK_BRICK_TILES); + addDrop(NSE_Blocks.DIRTY_DARK_BRICK_TILES); + addDrop(NSE_Blocks.TEAL_TILES); + addDrop(NSE_Blocks.CRACKED_TEAL_TILES); + addDrop(NSE_Blocks.MOSSY_TEAL_TILES); + addDrop(NSE_Blocks.SMALL_TEAL_TILES); + addDrop(NSE_Blocks.SMALL_CRACKED_TEAL_TILES); + addDrop(NSE_Blocks.GLAZED_TEAL_TILES); + addDrop(NSE_Blocks.CRACKED_GLAZED_TEAL_TILES); + addDrop(NSE_Blocks.VARIATED_TEAL_TILES); + addDrop(NSE_Blocks.AQUAMARINE_TILES); + addDrop(NSE_Blocks.CRACKED_AQUAMARINE_TILES); + addDrop(NSE_Blocks.MOSSY_AQUAMARINE_TILES); + addDrop(NSE_Blocks.DIRTY_AQUAMARINE_TILES); + addDrop(NSE_Blocks.SMALL_AQUAMARINE_TILES); + addDrop(NSE_Blocks.SMALL_CRACKED_AQUAMARINE_TILES); + addDrop(NSE_Blocks.GLAZED_AQUAMARINE_TILES); + addDrop(NSE_Blocks.CRACKED_GLAZED_AQUAMARINE_TILES); + addDrop(NSE_Blocks.SMALL_DIORITE_TILES); + addDrop(NSE_Blocks.SMALL_CRACKED_DIORITE_TILES); + addDrop(NSE_Blocks.BIG_DIORITE_TILES); + addDrop(NSE_Blocks.DIORITE_BRICKS); + addDrop(NSE_Blocks.CRACKED_DIORITE_BRICKS); + addDrop(NSE_Blocks.MOSSY_DIORITE_BRICKS); + addDrop(NSE_Blocks.CALCITE_TILES); + addDrop(NSE_Blocks.CRACKED_CALCITE_TILES); + addDrop(NSE_Blocks.MOSSY_CALCITE_TILES); + addDrop(NSE_Blocks.DIAGONAL_CALCITE_TILES); + addDrop(NSE_Blocks.NII_WALL_1); + addDrop(NSE_Blocks.CRACKED_NII_WALL_1); + addDrop(NSE_Blocks.NII_WALL_2); + addDrop(NSE_Blocks.NII_WALL_3); + addDrop(NSE_Blocks.DRIPSTONE_TILES); + addDrop(NSE_Blocks.CRACKED_DRIPSTONE_TILES); + addDrop(NSE_Blocks.MOSSY_DRIPSTONE_TILES); + addDrop(NSE_Blocks.DRIPSTONE_BRICKS); + addDrop(NSE_Blocks.DEEPSLATE_TILES); + addDrop(NSE_Blocks.CRACKED_DEEPSLATE_TILES); + addDrop(NSE_Blocks.MOSSY_DEEPSLATE_TILES); + addDrop(NSE_Blocks.SMALL_DEEPSLATE_TILES); + addDrop(NSE_Blocks.SMALL_CRACKED_DEEPSLATE_TILES); + addDrop(NSE_Blocks.DIAGONAL_DEEPSLATE_TILES); + addDrop(NSE_Blocks.LIGHT_BLUE_TILES); + addDrop(NSE_Blocks.CRACKED_LIGHT_BLUE_TILES); + addDrop(NSE_Blocks.MOSSY_LIGHT_BLUE_TILES); + addDrop(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES); + addDrop(NSE_Blocks.SMALL_LIGHT_BLUE_TILES); + addDrop(NSE_Blocks.SMALL_CRACKED_LIGHT_BLUE_TILES); + addDrop(NSE_Blocks.GLAZED_LIGHT_BLUE_TILES); + addDrop(NSE_Blocks.CRACKED_GLAZED_LIGHT_BLUE_TILES); + addDrop(NSE_Blocks.LIGHT_BLUE_BRICKS); + addDrop(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS); + addDrop(NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS); + addDrop(NSE_Blocks.BIG_GRANITE_TILES); + addDrop(NSE_Blocks.SMALL_GRANITE_TILES); + addDrop(NSE_Blocks.SMALL_CRACKED_GRANITE_TILES); + addDrop(NSE_Blocks.GREEN_WHITE_TILES); + addDrop(NSE_Blocks.CRACKED_GREEN_WHITE_TILES); + addDrop(NSE_Blocks.MOSSY_GREEN_WHITE_TILES); + addDrop(NSE_Blocks.TUFF_TILES); + addDrop(NSE_Blocks.CRACKED_TUFF_TILES); + addDrop(NSE_Blocks.MOSSY_TUFF_TILES); + addDrop(NSE_Blocks.BIG_TUFF_TILES); + addDrop(NSE_Blocks.TUFF_BRICKS); + addDrop(NSE_Blocks.CRACKED_TUFF_BRICKS); + addDrop(NSE_Blocks.MOSSY_TUFF_BRICKS); + addDrop(NSE_Blocks.INDUSTRIAL_WARNING); + addDrop(NSE_Blocks.GRAY_WARNING); + addDrop(NSE_Blocks.RED_WARNING); + addDrop(NSE_Blocks.ORANGE_WARNING); + addDrop(NSE_Blocks.YELLOW_WARNING); + addDrop(NSE_Blocks.LIME_WARNING); + addDrop(NSE_Blocks.GREEN_WARNING); + addDrop(NSE_Blocks.CYAN_WARNING); + addDrop(NSE_Blocks.LIGHT_BLUE_WARNING); + addDrop(NSE_Blocks.BLUE_WARNING); + addDrop(NSE_Blocks.PURPLE_WARNING); + addDrop(NSE_Blocks.MAGENTA_WARNING); + addDrop(NSE_Blocks.METAL_PLATING); + addDrop(NSE_Blocks.CRATE); + addDrop(NSE_Blocks.CONCRETE_WALL); + addDrop(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS); + addDrop(NSE_Blocks.CROSS_ACACIA_PLANKS); + addDrop(NSE_Blocks.HERRINGBONE_OAK_PLANKS); + addDrop(NSE_Blocks.CROSS_OAK_PLANKS); + addDrop(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS); + addDrop(NSE_Blocks.CROSS_BIRCH_PLANKS); + addDrop(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS); + addDrop(NSE_Blocks.CROSS_CRIMSON_PLANKS); + addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS); + addDrop(NSE_Blocks.CROSS_DARK_OAK_PLANKS); + addDrop(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS); + addDrop(NSE_Blocks.CROSS_JUNGLE_PLANKS); + addDrop(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS); + addDrop(NSE_Blocks.CROSS_MANGROVE_PLANKS); + addDrop(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS); + addDrop(NSE_Blocks.CROSS_SPRUCE_PLANKS); + addDrop(NSE_Blocks.HERRINGBONE_PARQUET); + addDrop(NSE_Blocks.STRAIGHT_PARQUET); + addDrop(NSE_Blocks.SEPARATED_PARQUET); + addDrop(NSE_Blocks.GREEN_LINOLEUM); + addDrop(NSE_Blocks.BLUE_LINOLEUM); + addDrop(NSE_Blocks.RED_LINOLEUM); + addDrop(NSE_Blocks.GRAY_LINOLEUM); + addDrop(NSE_Blocks.ORANGE_LINOLEUM); + addDrop(NSE_Blocks.BROWN_LINOLEUM); + addDrop(NSE_Blocks.CYAN_LINOLEUM); + addDrop(NSE_Blocks.CROSS_ORANGE_LINOLEUM); + addDrop(NSE_Blocks.CROSS_BROWN_LINOLEUM); + addDrop(NSE_Blocks.WHITE_CONCRETE); + addDrop(NSE_Blocks.CRACKED_WHITE_CONCRETE); + addDrop(NSE_Blocks.BEIGE_CONCRETE); + addDrop(NSE_Blocks.CRACKED_BEIGE_CONCRETE); + addDrop(NSE_Blocks.BLUE_CONCRETE); + addDrop(NSE_Blocks.CRACKED_BLUE_CONCRETE); + addDrop(NSE_Blocks.RED_CONCRETE); + addDrop(NSE_Blocks.CRACKED_RED_CONCRETE); + addDrop(NSE_Blocks.YELLOW_CONCRETE); + addDrop(NSE_Blocks.CRACKED_YELLOW_CONCRETE); + addDrop(NSE_Blocks.GREEN_CONCRETE); + addDrop(NSE_Blocks.CRACKED_GREEN_CONCRETE); + addDrop(NSE_Blocks.WHITEWASH); + addDrop(NSE_Blocks.CRACKED_WHITEWASH); + addDrop(NSE_Blocks.VERY_CRACKED_WHITEWASH); + addDrop(NSE_Blocks.SMALL_YELLOW_TILES); + addDrop(NSE_Blocks.SMALL_CRACKED_YELLOW_TILES); + addDrop(NSE_Blocks.MEAT); + addDrop(NSE_Blocks.MEAT_EYE); + addDrop(NSE_Blocks.MEAT_TEETH); + addDrop(NSE_Blocks.CHISELED_BIRCH_DOOR, doorDrops(NSE_Blocks.CHISELED_BIRCH_DOOR)); + addDrop(NSE_Blocks.CHISELED_MANGROVE_DOOR, doorDrops(NSE_Blocks.CHISELED_MANGROVE_DOOR));; + addDrop(NSE_Blocks.CHISELED_OAK_DOOR, doorDrops(NSE_Blocks.CHISELED_OAK_DOOR)); + addDrop(NSE_Blocks.CHISELED_SPRUCE_DOOR, doorDrops(NSE_Blocks.CHISELED_SPRUCE_DOOR));; + addDrop(NSE_Blocks.BEIGE_WALLPAPER); + addDrop(NSE_Blocks.BROWN_WALLPAPER); + addDrop(NSE_Blocks.GREEN_WALLPAPER); + addDrop(NSE_Blocks.HANDRAIL); + + // Drops for furniture/electronics/appliances + addDrop(NSE_Custom.WHITE_PAWN); + addDrop(NSE_Custom.WHITE_BISHOP); + addDrop(NSE_Custom.WHITE_KING); + addDrop(NSE_Custom.WHITE_KNIGHT); + addDrop(NSE_Custom.WHITE_QUEEN); + addDrop(NSE_Custom.WHITE_ROOK); + addDrop(NSE_Custom.BLACK_KNIGHT); + addDrop(NSE_Custom.BLACK_PAWN); + addDrop(NSE_Custom.BLACK_KING); + addDrop(NSE_Custom.BLACK_QUEEN); + addDrop(NSE_Custom.BLACK_BISHOP); + addDrop(NSE_Custom.BLACK_ROOK); + + addDrop(NSE_Custom.TV); + addDrop(NSE_Custom.RED_TV); + addDrop(NSE_Custom.BROWN_TV); + addDrop(NSE_Custom.RADIO_RECEIVER); + addDrop(NSE_Custom.SIREN); + addDrop(NSE_Custom.TABLE_LAMP); + addDrop(NSE_Custom.VINTAGE_LAMP); + addDrop(NSE_Custom.CEILING_FAN); + addDrop(NSE_Custom.SWITCH); + + // Generated stairs and slabs drops + addDrop(NSE_Blocks.SAND_TILES_SLAB); + addDrop(NSE_Blocks.SAND_TILES_STAIRS); + addDrop(NSE_Blocks.CRACKED_SAND_TILES_SLAB); + addDrop(NSE_Blocks.CRACKED_SAND_TILES_STAIRS); + addDrop(NSE_Blocks.MOSSY_SAND_TILES_SLAB); + addDrop(NSE_Blocks.MOSSY_SAND_TILES_STAIRS); + addDrop(NSE_Blocks.HERRINGBONE_SAND_TILES_SLAB); + addDrop(NSE_Blocks.HERRINGBONE_SAND_TILES_STAIRS); + addDrop(NSE_Blocks.CROSS_SAND_TILES_SLAB); + addDrop(NSE_Blocks.CROSS_SAND_TILES_STAIRS); + addDrop(NSE_Blocks.SAND_BRICKS_SLAB); + addDrop(NSE_Blocks.SAND_BRICKS_STAIRS); + addDrop(NSE_Blocks.CRACKED_SAND_BRICKS_SLAB); + addDrop(NSE_Blocks.CRACKED_SAND_BRICKS_STAIRS); + addDrop(NSE_Blocks.MOSSY_SAND_BRICKS_SLAB); + addDrop(NSE_Blocks.MOSSY_SAND_BRICKS_STAIRS); + addDrop(NSE_Blocks.BIG_SAND_BRICKS_SLAB); + addDrop(NSE_Blocks.BIG_SAND_BRICKS_STAIRS); + addDrop(NSE_Blocks.BRICK_TILES_SLAB); + addDrop(NSE_Blocks.BRICK_TILES_STAIRS); + addDrop(NSE_Blocks.CRACKED_BRICK_TILES_SLAB); + addDrop(NSE_Blocks.CRACKED_BRICK_TILES_STAIRS); + addDrop(NSE_Blocks.MOSSY_BRICK_TILES_SLAB); + addDrop(NSE_Blocks.MOSSY_BRICK_TILES_STAIRS); + addDrop(NSE_Blocks.DIRTY_BRICK_TILES_SLAB); + addDrop(NSE_Blocks.DIRTY_BRICK_TILES_STAIRS); + addDrop(NSE_Blocks.DARK_BRICK_TILES_SLAB); + addDrop(NSE_Blocks.DARK_BRICK_TILES_STAIRS); + addDrop(NSE_Blocks.CRACKED_DARK_BRICK_TILES_SLAB); + addDrop(NSE_Blocks.CRACKED_DARK_BRICK_TILES_STAIRS); + addDrop(NSE_Blocks.MOSSY_DARK_BRICK_TILES_SLAB); + addDrop(NSE_Blocks.MOSSY_DARK_BRICK_TILES_STAIRS); + addDrop(NSE_Blocks.DIRTY_DARK_BRICK_TILES_SLAB); + addDrop(NSE_Blocks.DIRTY_DARK_BRICK_TILES_STAIRS); + addDrop(NSE_Blocks.RED_BRICKS_SLAB); + addDrop(NSE_Blocks.RED_BRICKS_STAIRS); + addDrop(NSE_Blocks.CRACKED_RED_BRICKS_SLAB); + addDrop(NSE_Blocks.CRACKED_RED_BRICKS_STAIRS); + addDrop(NSE_Blocks.MOSSY_RED_BRICKS_SLAB); + addDrop(NSE_Blocks.MOSSY_RED_BRICKS_STAIRS); + addDrop(NSE_Blocks.TEAL_TILES_SLAB); + addDrop(NSE_Blocks.TEAL_TILES_STAIRS); + addDrop(NSE_Blocks.CRACKED_TEAL_TILES_SLAB); + addDrop(NSE_Blocks.CRACKED_TEAL_TILES_STAIRS); + addDrop(NSE_Blocks.MOSSY_TEAL_TILES_SLAB); + addDrop(NSE_Blocks.MOSSY_TEAL_TILES_STAIRS); + addDrop(NSE_Blocks.VARIATED_TEAL_TILES_SLAB); + addDrop(NSE_Blocks.VARIATED_TEAL_TILES_STAIRS); + addDrop(NSE_Blocks.GREEN_BRICKS_SLAB); + addDrop(NSE_Blocks.GREEN_BRICKS_STAIRS); + addDrop(NSE_Blocks.CRACKED_GREEN_BRICKS_SLAB); + addDrop(NSE_Blocks.CRACKED_GREEN_BRICKS_STAIRS); + addDrop(NSE_Blocks.MOSSY_GREEN_BRICKS_SLAB); + addDrop(NSE_Blocks.MOSSY_GREEN_BRICKS_STAIRS); + addDrop(NSE_Blocks.GREEN_BRICKS_2_SLAB); + addDrop(NSE_Blocks.GREEN_BRICKS_2_STAIRS); + addDrop(NSE_Blocks.CRACKED_GREEN_BRICKS_2_SLAB); + addDrop(NSE_Blocks.CRACKED_GREEN_BRICKS_2_STAIRS); + addDrop(NSE_Blocks.MOSSY_GREEN_BRICKS_2_SLAB); + addDrop(NSE_Blocks.MOSSY_GREEN_BRICKS_2_STAIRS); + addDrop(NSE_Blocks.AQUAMARINE_TILES_SLAB); + addDrop(NSE_Blocks.AQUAMARINE_TILES_STAIRS); + addDrop(NSE_Blocks.CRACKED_AQUAMARINE_TILES_SLAB); + addDrop(NSE_Blocks.CRACKED_AQUAMARINE_TILES_STAIRS); + addDrop(NSE_Blocks.MOSSY_AQUAMARINE_TILES_SLAB); + addDrop(NSE_Blocks.MOSSY_AQUAMARINE_TILES_STAIRS); + addDrop(NSE_Blocks.DIRTY_AQUAMARINE_TILES_SLAB); + addDrop(NSE_Blocks.DIRTY_AQUAMARINE_TILES_STAIRS); + addDrop(NSE_Blocks.DIORITE_BRICKS_SLAB); + addDrop(NSE_Blocks.DIORITE_BRICKS_STAIRS); + addDrop(NSE_Blocks.CRACKED_DIORITE_BRICKS_SLAB); + addDrop(NSE_Blocks.CRACKED_DIORITE_BRICKS_STAIRS); + addDrop(NSE_Blocks.MOSSY_DIORITE_BRICKS_SLAB); + addDrop(NSE_Blocks.MOSSY_DIORITE_BRICKS_STAIRS); + addDrop(NSE_Blocks.CALCITE_TILES_SLAB); + addDrop(NSE_Blocks.CALCITE_TILES_STAIRS); + addDrop(NSE_Blocks.CRACKED_CALCITE_TILES_SLAB); + addDrop(NSE_Blocks.CRACKED_CALCITE_TILES_STAIRS); + addDrop(NSE_Blocks.MOSSY_CALCITE_TILES_SLAB); + addDrop(NSE_Blocks.MOSSY_CALCITE_TILES_STAIRS); + addDrop(NSE_Blocks.DRIPSTONE_TILES_SLAB); + addDrop(NSE_Blocks.DRIPSTONE_TILES_STAIRS); + addDrop(NSE_Blocks.CRACKED_DRIPSTONE_TILES_SLAB); + addDrop(NSE_Blocks.CRACKED_DRIPSTONE_TILES_STAIRS); + addDrop(NSE_Blocks.MOSSY_DRIPSTONE_TILES_SLAB); + addDrop(NSE_Blocks.MOSSY_DRIPSTONE_TILES_STAIRS); + addDrop(NSE_Blocks.DEEPSLATE_TILES_SLAB); + addDrop(NSE_Blocks.DEEPSLATE_TILES_STAIRS); + addDrop(NSE_Blocks.CRACKED_DEEPSLATE_TILES_SLAB); + addDrop(NSE_Blocks.CRACKED_DEEPSLATE_TILES_STAIRS); + addDrop(NSE_Blocks.MOSSY_DEEPSLATE_TILES_SLAB); + addDrop(NSE_Blocks.MOSSY_DEEPSLATE_TILES_STAIRS); + addDrop(NSE_Blocks.LIGHT_BLUE_TILES_SLAB); + addDrop(NSE_Blocks.LIGHT_BLUE_TILES_STAIRS); + addDrop(NSE_Blocks.CRACKED_LIGHT_BLUE_TILES_SLAB); + addDrop(NSE_Blocks.CRACKED_LIGHT_BLUE_TILES_STAIRS); + addDrop(NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_SLAB); + addDrop(NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_STAIRS); + addDrop(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES_SLAB); + addDrop(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES_STAIRS); + addDrop(NSE_Blocks.LIGHT_BLUE_BRICKS_SLAB); + addDrop(NSE_Blocks.LIGHT_BLUE_BRICKS_STAIRS); + addDrop(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS_SLAB); + addDrop(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS_STAIRS); + addDrop(NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_SLAB); + addDrop(NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_STAIRS); + addDrop(NSE_Blocks.GREEN_WHITE_TILES_SLAB); + addDrop(NSE_Blocks.GREEN_WHITE_TILES_STAIRS); + addDrop(NSE_Blocks.CRACKED_GREEN_WHITE_TILES_SLAB); + addDrop(NSE_Blocks.CRACKED_GREEN_WHITE_TILES_STAIRS); + addDrop(NSE_Blocks.MOSSY_GREEN_WHITE_TILES_SLAB); + addDrop(NSE_Blocks.MOSSY_GREEN_WHITE_TILES_STAIRS); + addDrop(NSE_Blocks.TUFF_TILES_SLAB); + addDrop(NSE_Blocks.TUFF_TILES_STAIRS); + addDrop(NSE_Blocks.CRACKED_TUFF_TILES_SLAB); + addDrop(NSE_Blocks.CRACKED_TUFF_TILES_STAIRS); + addDrop(NSE_Blocks.MOSSY_TUFF_TILES_SLAB); + addDrop(NSE_Blocks.MOSSY_TUFF_TILES_STAIRS); + addDrop(NSE_Blocks.TUFF_BRICKS_SLAB); + addDrop(NSE_Blocks.TUFF_BRICKS_STAIRS); + addDrop(NSE_Blocks.CRACKED_TUFF_BRICKS_SLAB); + addDrop(NSE_Blocks.CRACKED_TUFF_BRICKS_STAIRS); + addDrop(NSE_Blocks.MOSSY_TUFF_BRICKS_SLAB); + addDrop(NSE_Blocks.MOSSY_TUFF_BRICKS_STAIRS); + addDrop(NSE_Blocks.WHITE_CONCRETE_SLAB); + addDrop(NSE_Blocks.WHITE_CONCRETE_STAIRS); + addDrop(NSE_Blocks.CRACKED_WHITE_CONCRETE_SLAB); + addDrop(NSE_Blocks.CRACKED_WHITE_CONCRETE_STAIRS); + addDrop(NSE_Blocks.BEIGE_CONCRETE_SLAB); + addDrop(NSE_Blocks.BEIGE_CONCRETE_STAIRS); + addDrop(NSE_Blocks.CRACKED_BEIGE_CONCRETE_SLAB); + addDrop(NSE_Blocks.CRACKED_BEIGE_CONCRETE_STAIRS); + addDrop(NSE_Blocks.BLUE_CONCRETE_SLAB); + addDrop(NSE_Blocks.BLUE_CONCRETE_STAIRS); + addDrop(NSE_Blocks.CRACKED_BLUE_CONCRETE_SLAB); + addDrop(NSE_Blocks.CRACKED_BLUE_CONCRETE_STAIRS); + addDrop(NSE_Blocks.RED_CONCRETE_SLAB); + addDrop(NSE_Blocks.RED_CONCRETE_STAIRS); + addDrop(NSE_Blocks.CRACKED_RED_CONCRETE_SLAB); + addDrop(NSE_Blocks.CRACKED_RED_CONCRETE_STAIRS); + addDrop(NSE_Blocks.YELLOW_CONCRETE_SLAB); + addDrop(NSE_Blocks.YELLOW_CONCRETE_STAIRS); + addDrop(NSE_Blocks.CRACKED_YELLOW_CONCRETE_SLAB); + addDrop(NSE_Blocks.CRACKED_YELLOW_CONCRETE_STAIRS); + addDrop(NSE_Blocks.GREEN_CONCRETE_SLAB); + addDrop(NSE_Blocks.GREEN_CONCRETE_STAIRS); + addDrop(NSE_Blocks.CRACKED_GREEN_CONCRETE_SLAB); + addDrop(NSE_Blocks.CRACKED_GREEN_CONCRETE_STAIRS); + addDrop(NSE_Blocks.NII_FLOOR_SLAB); + addDrop(NSE_Blocks.NII_FLOOR_STAIRS); + addDrop(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_SLAB); + addDrop(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_STAIRS); + addDrop(NSE_Blocks.CROSS_ACACIA_PLANKS_SLAB); + addDrop(NSE_Blocks.CROSS_ACACIA_PLANKS_STAIRS); + addDrop(NSE_Blocks.HERRINGBONE_OAK_PLANKS_SLAB); + addDrop(NSE_Blocks.HERRINGBONE_OAK_PLANKS_STAIRS); + addDrop(NSE_Blocks.CROSS_OAK_PLANKS_SLAB); + addDrop(NSE_Blocks.CROSS_OAK_PLANKS_STAIRS); + addDrop(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_SLAB); + addDrop(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_STAIRS); + addDrop(NSE_Blocks.CROSS_BIRCH_PLANKS_SLAB); + addDrop(NSE_Blocks.CROSS_BIRCH_PLANKS_STAIRS); + addDrop(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_SLAB); + addDrop(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_STAIRS); + addDrop(NSE_Blocks.CROSS_CRIMSON_PLANKS_SLAB); + addDrop(NSE_Blocks.CROSS_CRIMSON_PLANKS_STAIRS); + addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_SLAB); + addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_STAIRS); + addDrop(NSE_Blocks.CROSS_DARK_OAK_PLANKS_SLAB); + addDrop(NSE_Blocks.CROSS_DARK_OAK_PLANKS_STAIRS); + addDrop(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_SLAB); + addDrop(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_STAIRS); + addDrop(NSE_Blocks.CROSS_JUNGLE_PLANKS_SLAB); + addDrop(NSE_Blocks.CROSS_JUNGLE_PLANKS_STAIRS); + addDrop(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS_SLAB); + addDrop(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS_STAIRS); + addDrop(NSE_Blocks.CROSS_MANGROVE_PLANKS_SLAB); + addDrop(NSE_Blocks.CROSS_MANGROVE_PLANKS_STAIRS); + addDrop(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_SLAB); + addDrop(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_STAIRS); + addDrop(NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB); + addDrop(NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS); + addDrop(NSE_Blocks.HERRINGBONE_PARQUET_SLAB); + addDrop(NSE_Blocks.HERRINGBONE_PARQUET_STAIRS); + addDrop(NSE_Blocks.STRAIGHT_PARQUET_SLAB); + addDrop(NSE_Blocks.STRAIGHT_PARQUET_STAIRS); + addDrop(NSE_Blocks.SEPARATED_PARQUET_SLAB); + addDrop(NSE_Blocks.SEPARATED_PARQUET_STAIRS); + addDrop(NSE_Blocks.GREEN_LINOLEUM_SLAB); + addDrop(NSE_Blocks.GREEN_LINOLEUM_STAIRS); + addDrop(NSE_Blocks.BLUE_LINOLEUM_SLAB); + addDrop(NSE_Blocks.BLUE_LINOLEUM_STAIRS); + addDrop(NSE_Blocks.RED_LINOLEUM_SLAB); + addDrop(NSE_Blocks.RED_LINOLEUM_STAIRS); + addDrop(NSE_Blocks.GRAY_LINOLEUM_SLAB); + addDrop(NSE_Blocks.GRAY_LINOLEUM_STAIRS); + addDrop(NSE_Blocks.ORANGE_LINOLEUM_SLAB); + addDrop(NSE_Blocks.ORANGE_LINOLEUM_STAIRS); + addDrop(NSE_Blocks.BROWN_LINOLEUM_SLAB); + addDrop(NSE_Blocks.BROWN_LINOLEUM_STAIRS); + addDrop(NSE_Blocks.CYAN_LINOLEUM_SLAB); + addDrop(NSE_Blocks.CYAN_LINOLEUM_STAIRS); + addDrop(NSE_Blocks.METAL_PLATING_SLAB); + addDrop(NSE_Blocks.METAL_PLATING_STAIRS); + + addDropWithSilkTouch(NSE_Custom.LIGHT_BULB_LAMP); + } + } + + private static class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { + + public BlockTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { + super(output, completableFuture); + } + + @Override + protected void configure(RegistryWrapper.WrapperLookup arg) { + // Blocks mined with a pickaxe + getOrCreateTagBuilder(BlockTags.PICKAXE_MINEABLE) + .add(NSE_Blocks.SAND_TILES) + .add(NSE_Blocks.HANDRAIL) + .add(NSE_Blocks.NII_FLOOR) + .add(NSE_Blocks.BIG_GREEN_TILES) + .add(NSE_Blocks.BIG_GREEN_TILES_CRACKED) + .add(NSE_Blocks.GREEN_BRICKS) + .add(NSE_Blocks.CRACKED_GREEN_BRICKS) + .add(NSE_Blocks.MOSSY_GREEN_BRICKS) + .add(NSE_Blocks.GREEN_BRICKS_2) + .add(NSE_Blocks.CRACKED_GREEN_BRICKS_2) + .add(NSE_Blocks.MOSSY_GREEN_BRICKS_2) + .add(NSE_Blocks.CRACKED_SAND_TILES) + .add(NSE_Blocks.MOSSY_SAND_TILES) + .add(NSE_Blocks.SMALL_SAND_TILES) + .add(NSE_Blocks.SMALL_CRACKED_SAND_TILES) + .add(NSE_Blocks.HERRINGBONE_SAND_TILES) + .add(NSE_Blocks.CROSS_SAND_TILES) + .add(NSE_Blocks.BIG_SAND_TILES) + .add(NSE_Blocks.SAND_BRICKS) + .add(NSE_Blocks.CRACKED_SAND_BRICKS) + .add(NSE_Blocks.MOSSY_SAND_BRICKS) + .add(NSE_Blocks.BIG_SAND_BRICKS) + .add(NSE_Blocks.BRICK_TILES) + .add(NSE_Blocks.CRACKED_BRICK_TILES) + .add(NSE_Blocks.MOSSY_BRICK_TILES) + .add(NSE_Blocks.DIRTY_BRICK_TILES) + .add(NSE_Blocks.DARK_BRICK_TILES) + .add(NSE_Blocks.CRACKED_DARK_BRICK_TILES) + .add(NSE_Blocks.MOSSY_DARK_BRICK_TILES) + .add(NSE_Blocks.DIRTY_DARK_BRICK_TILES) + .add(NSE_Blocks.GLAZED_BRICK_TILES) + .add(NSE_Blocks.CRACKED_GLAZED_BRICK_TILES) + .add(NSE_Blocks.RED_BRICKS) + .add(NSE_Blocks.CRACKED_RED_BRICKS) + .add(NSE_Blocks.MOSSY_RED_BRICKS) + .add(NSE_Blocks.TEAL_TILES) + .add(NSE_Blocks.CRACKED_TEAL_TILES) + .add(NSE_Blocks.MOSSY_TEAL_TILES) + .add(NSE_Blocks.SMALL_TEAL_TILES) + .add(NSE_Blocks.SMALL_CRACKED_TEAL_TILES) + .add(NSE_Blocks.GLAZED_TEAL_TILES) + .add(NSE_Blocks.CRACKED_GLAZED_TEAL_TILES) + .add(NSE_Blocks.VARIATED_TEAL_TILES) + .add(NSE_Blocks.AQUAMARINE_TILES) + .add(NSE_Blocks.CRACKED_AQUAMARINE_TILES) + .add(NSE_Blocks.MOSSY_AQUAMARINE_TILES) + .add(NSE_Blocks.DIRTY_AQUAMARINE_TILES) + .add(NSE_Blocks.SMALL_AQUAMARINE_TILES) + .add(NSE_Blocks.SMALL_CRACKED_AQUAMARINE_TILES) + .add(NSE_Blocks.GLAZED_AQUAMARINE_TILES) + .add(NSE_Blocks.CRACKED_GLAZED_AQUAMARINE_TILES) + .add(NSE_Blocks.SMALL_DIORITE_TILES) + .add(NSE_Blocks.SMALL_CRACKED_DIORITE_TILES) + .add(NSE_Blocks.BIG_DIORITE_TILES) + .add(NSE_Blocks.DIORITE_BRICKS) + .add(NSE_Blocks.CRACKED_DIORITE_BRICKS) + .add(NSE_Blocks.MOSSY_DIORITE_BRICKS) + .add(NSE_Blocks.CALCITE_TILES) + .add(NSE_Blocks.CRACKED_CALCITE_TILES) + .add(NSE_Blocks.MOSSY_CALCITE_TILES) + .add(NSE_Blocks.DIAGONAL_CALCITE_TILES) + .add(NSE_Blocks.NII_WALL_1) + .add(NSE_Blocks.CRACKED_NII_WALL_1) + .add(NSE_Blocks.NII_WALL_2) + .add(NSE_Blocks.NII_WALL_3) + .add(NSE_Blocks.DRIPSTONE_TILES) + .add(NSE_Blocks.CRACKED_DRIPSTONE_TILES) + .add(NSE_Blocks.MOSSY_DRIPSTONE_TILES) + .add(NSE_Blocks.DRIPSTONE_BRICKS) + .add(NSE_Blocks.DEEPSLATE_TILES) + .add(NSE_Blocks.CRACKED_DEEPSLATE_TILES) + .add(NSE_Blocks.MOSSY_DEEPSLATE_TILES) + .add(NSE_Blocks.SMALL_DEEPSLATE_TILES) + .add(NSE_Blocks.SMALL_CRACKED_DEEPSLATE_TILES) + .add(NSE_Blocks.DIAGONAL_DEEPSLATE_TILES) + .add(NSE_Blocks.LIGHT_BLUE_TILES) + .add(NSE_Blocks.CRACKED_LIGHT_BLUE_TILES) + .add(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES) + .add(NSE_Blocks.MOSSY_LIGHT_BLUE_TILES) + .add(NSE_Blocks.SMALL_LIGHT_BLUE_TILES) + .add(NSE_Blocks.SMALL_CRACKED_LIGHT_BLUE_TILES) + .add(NSE_Blocks.GLAZED_LIGHT_BLUE_TILES) + .add(NSE_Blocks.CRACKED_GLAZED_LIGHT_BLUE_TILES) + .add(NSE_Blocks.LIGHT_BLUE_BRICKS) + .add(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS) + .add(NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS) + .add(NSE_Blocks.BIG_GRANITE_TILES) + .add(NSE_Blocks.SMALL_GRANITE_TILES) + .add(NSE_Blocks.SMALL_CRACKED_GRANITE_TILES) + .add(NSE_Blocks.GREEN_WHITE_TILES) + .add(NSE_Blocks.CRACKED_GREEN_WHITE_TILES) + .add(NSE_Blocks.MOSSY_GREEN_WHITE_TILES) + .add(NSE_Blocks.TUFF_TILES) + .add(NSE_Blocks.CRACKED_TUFF_TILES) + .add(NSE_Blocks.MOSSY_TUFF_TILES) + .add(NSE_Blocks.BIG_TUFF_TILES) + .add(NSE_Blocks.TUFF_BRICKS) + .add(NSE_Blocks.CRACKED_TUFF_BRICKS) + .add(NSE_Blocks.MOSSY_TUFF_BRICKS) + .add(NSE_Blocks.INDUSTRIAL_WARNING) + .add(NSE_Blocks.GRAY_WARNING) + .add(NSE_Blocks.RED_WARNING) + .add(NSE_Blocks.ORANGE_WARNING) + .add(NSE_Blocks.YELLOW_WARNING) + .add(NSE_Blocks.LIME_WARNING) + .add(NSE_Blocks.GREEN_WARNING) + .add(NSE_Blocks.CYAN_WARNING) + .add(NSE_Blocks.LIGHT_BLUE_WARNING) + .add(NSE_Blocks.BLUE_WARNING) + .add(NSE_Blocks.PURPLE_WARNING) + .add(NSE_Blocks.MAGENTA_WARNING) + .add(NSE_Blocks.METAL_PLATING) + .add(NSE_Blocks.CONCRETE_WALL) + .add(NSE_Blocks.SMALL_YELLOW_TILES) + .add(NSE_Blocks.SMALL_CRACKED_YELLOW_TILES) + .add(NSE_Blocks.SAND_TILES_STAIRS) + .add(NSE_Blocks.SAND_TILES_SLAB) + .add(NSE_Blocks.CRACKED_SAND_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_SAND_TILES_SLAB) + .add(NSE_Blocks.MOSSY_SAND_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_SAND_TILES_SLAB) + .add(NSE_Blocks.HERRINGBONE_SAND_TILES_STAIRS) + .add(NSE_Blocks.HERRINGBONE_SAND_TILES_SLAB) + .add(NSE_Blocks.CROSS_SAND_TILES_STAIRS) + .add(NSE_Blocks.CROSS_SAND_TILES_SLAB) + .add(NSE_Blocks.SAND_BRICKS_STAIRS) + .add(NSE_Blocks.SAND_BRICKS_SLAB) + .add(NSE_Blocks.CRACKED_SAND_BRICKS_STAIRS) + .add(NSE_Blocks.CRACKED_SAND_BRICKS_SLAB) + .add(NSE_Blocks.MOSSY_SAND_BRICKS_STAIRS) + .add(NSE_Blocks.MOSSY_SAND_BRICKS_SLAB) + .add(NSE_Blocks.BIG_SAND_BRICKS_STAIRS) + .add(NSE_Blocks.BIG_SAND_BRICKS_SLAB) + .add(NSE_Blocks.BRICK_TILES_STAIRS) + .add(NSE_Blocks.BRICK_TILES_SLAB) + .add(NSE_Blocks.CRACKED_BRICK_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_BRICK_TILES_SLAB) + .add(NSE_Blocks.MOSSY_BRICK_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_BRICK_TILES_SLAB) + .add(NSE_Blocks.DIRTY_BRICK_TILES_STAIRS) + .add(NSE_Blocks.DIRTY_BRICK_TILES_SLAB) + .add(NSE_Blocks.DARK_BRICK_TILES_STAIRS) + .add(NSE_Blocks.DARK_BRICK_TILES_SLAB) + .add(NSE_Blocks.CRACKED_DARK_BRICK_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_DARK_BRICK_TILES_SLAB) + .add(NSE_Blocks.MOSSY_DARK_BRICK_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_DARK_BRICK_TILES_SLAB) + .add(NSE_Blocks.DIRTY_DARK_BRICK_TILES_STAIRS) + .add(NSE_Blocks.DIRTY_DARK_BRICK_TILES_SLAB) + .add(NSE_Blocks.RED_BRICKS_STAIRS) + .add(NSE_Blocks.RED_BRICKS_SLAB) + .add(NSE_Blocks.CRACKED_RED_BRICKS_STAIRS) + .add(NSE_Blocks.CRACKED_RED_BRICKS_SLAB) + .add(NSE_Blocks.MOSSY_RED_BRICKS_STAIRS) + .add(NSE_Blocks.MOSSY_RED_BRICKS_SLAB) + .add(NSE_Blocks.TEAL_TILES_STAIRS) + .add(NSE_Blocks.TEAL_TILES_SLAB) + .add(NSE_Blocks.CRACKED_TEAL_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_TEAL_TILES_SLAB) + .add(NSE_Blocks.MOSSY_TEAL_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_TEAL_TILES_SLAB) + .add(NSE_Blocks.VARIATED_TEAL_TILES_STAIRS) + .add(NSE_Blocks.VARIATED_TEAL_TILES_SLAB) + .add(NSE_Blocks.GREEN_BRICKS_STAIRS) + .add(NSE_Blocks.GREEN_BRICKS_SLAB) + .add(NSE_Blocks.CRACKED_GREEN_BRICKS_STAIRS) + .add(NSE_Blocks.CRACKED_GREEN_BRICKS_SLAB) + .add(NSE_Blocks.MOSSY_GREEN_BRICKS_STAIRS) + .add(NSE_Blocks.MOSSY_GREEN_BRICKS_SLAB) + .add(NSE_Blocks.GREEN_BRICKS_2_STAIRS) + .add(NSE_Blocks.GREEN_BRICKS_2_SLAB) + .add(NSE_Blocks.CRACKED_GREEN_BRICKS_2_STAIRS) + .add(NSE_Blocks.CRACKED_GREEN_BRICKS_2_SLAB) + .add(NSE_Blocks.MOSSY_GREEN_BRICKS_2_STAIRS) + .add(NSE_Blocks.MOSSY_GREEN_BRICKS_2_SLAB) + .add(NSE_Blocks.AQUAMARINE_TILES_STAIRS) + .add(NSE_Blocks.AQUAMARINE_TILES_SLAB) + .add(NSE_Blocks.CRACKED_AQUAMARINE_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_AQUAMARINE_TILES_SLAB) + .add(NSE_Blocks.MOSSY_AQUAMARINE_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_AQUAMARINE_TILES_SLAB) + .add(NSE_Blocks.DIRTY_AQUAMARINE_TILES_STAIRS) + .add(NSE_Blocks.DIRTY_AQUAMARINE_TILES_SLAB) + .add(NSE_Blocks.DIORITE_BRICKS_STAIRS) + .add(NSE_Blocks.DIORITE_BRICKS_SLAB) + .add(NSE_Blocks.CRACKED_DIORITE_BRICKS_STAIRS) + .add(NSE_Blocks.CRACKED_DIORITE_BRICKS_SLAB) + .add(NSE_Blocks.MOSSY_DIORITE_BRICKS_STAIRS) + .add(NSE_Blocks.MOSSY_DIORITE_BRICKS_SLAB) + .add(NSE_Blocks.CALCITE_TILES_STAIRS) + .add(NSE_Blocks.CALCITE_TILES_SLAB) + .add(NSE_Blocks.CRACKED_CALCITE_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_CALCITE_TILES_SLAB) + .add(NSE_Blocks.MOSSY_CALCITE_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_CALCITE_TILES_SLAB) + .add(NSE_Blocks.DRIPSTONE_TILES_STAIRS) + .add(NSE_Blocks.DRIPSTONE_TILES_SLAB) + .add(NSE_Blocks.CRACKED_DRIPSTONE_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_DRIPSTONE_TILES_SLAB) + .add(NSE_Blocks.MOSSY_DRIPSTONE_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_DRIPSTONE_TILES_SLAB) + .add(NSE_Blocks.DEEPSLATE_TILES_STAIRS) + .add(NSE_Blocks.DEEPSLATE_TILES_SLAB) + .add(NSE_Blocks.CRACKED_DEEPSLATE_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_DEEPSLATE_TILES_SLAB) + .add(NSE_Blocks.MOSSY_DEEPSLATE_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_DEEPSLATE_TILES_SLAB) + .add(NSE_Blocks.LIGHT_BLUE_TILES_STAIRS) + .add(NSE_Blocks.LIGHT_BLUE_TILES_SLAB) + .add(NSE_Blocks.CRACKED_LIGHT_BLUE_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_LIGHT_BLUE_TILES_SLAB) + .add(NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_SLAB) + .add(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES_STAIRS) + .add(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES_SLAB) + .add(NSE_Blocks.LIGHT_BLUE_BRICKS_STAIRS) + .add(NSE_Blocks.LIGHT_BLUE_BRICKS_SLAB) + .add(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS_STAIRS) + .add(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS_SLAB) + .add(NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_STAIRS) + .add(NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_SLAB) + .add(NSE_Blocks.GREEN_WHITE_TILES_STAIRS) + .add(NSE_Blocks.GREEN_WHITE_TILES_SLAB) + .add(NSE_Blocks.CRACKED_GREEN_WHITE_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_GREEN_WHITE_TILES_SLAB) + .add(NSE_Blocks.MOSSY_GREEN_WHITE_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_GREEN_WHITE_TILES_SLAB) + .add(NSE_Blocks.TUFF_TILES_STAIRS) + .add(NSE_Blocks.TUFF_TILES_SLAB) + .add(NSE_Blocks.CRACKED_TUFF_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_TUFF_TILES_SLAB) + .add(NSE_Blocks.MOSSY_TUFF_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_TUFF_TILES_SLAB) + .add(NSE_Blocks.TUFF_BRICKS_STAIRS) + .add(NSE_Blocks.TUFF_BRICKS_SLAB) + .add(NSE_Blocks.CRACKED_TUFF_BRICKS_STAIRS) + .add(NSE_Blocks.CRACKED_TUFF_BRICKS_SLAB) + .add(NSE_Blocks.MOSSY_TUFF_BRICKS_STAIRS) + .add(NSE_Blocks.MOSSY_TUFF_BRICKS_SLAB) + .add(NSE_Blocks.WHITE_CONCRETE_STAIRS) + .add(NSE_Blocks.WHITE_CONCRETE_SLAB) + .add(NSE_Blocks.CRACKED_WHITE_CONCRETE_STAIRS) + .add(NSE_Blocks.CRACKED_WHITE_CONCRETE_SLAB) + .add(NSE_Blocks.BEIGE_CONCRETE_STAIRS) + .add(NSE_Blocks.BEIGE_CONCRETE_SLAB) + .add(NSE_Blocks.CRACKED_BEIGE_CONCRETE_STAIRS) + .add(NSE_Blocks.CRACKED_BEIGE_CONCRETE_SLAB) + .add(NSE_Blocks.BLUE_CONCRETE_STAIRS) + .add(NSE_Blocks.BLUE_CONCRETE_SLAB) + .add(NSE_Blocks.CRACKED_BLUE_CONCRETE_STAIRS) + .add(NSE_Blocks.CRACKED_BLUE_CONCRETE_SLAB) + .add(NSE_Blocks.RED_CONCRETE_STAIRS) + .add(NSE_Blocks.RED_CONCRETE_SLAB) + .add(NSE_Blocks.CRACKED_RED_CONCRETE_STAIRS) + .add(NSE_Blocks.CRACKED_RED_CONCRETE_SLAB) + .add(NSE_Blocks.YELLOW_CONCRETE_STAIRS) + .add(NSE_Blocks.YELLOW_CONCRETE_SLAB) + .add(NSE_Blocks.CRACKED_YELLOW_CONCRETE_STAIRS) + .add(NSE_Blocks.CRACKED_YELLOW_CONCRETE_SLAB) + .add(NSE_Blocks.GREEN_CONCRETE_STAIRS) + .add(NSE_Blocks.GREEN_CONCRETE_SLAB) + .add(NSE_Blocks.CRACKED_GREEN_CONCRETE_STAIRS) + .add(NSE_Blocks.CRACKED_GREEN_CONCRETE_SLAB) + .add(NSE_Blocks.NII_FLOOR_STAIRS) + .add(NSE_Blocks.NII_FLOOR_SLAB) + .add(NSE_Blocks.METAL_PLATING_STAIRS) + .add(NSE_Blocks.METAL_PLATING_SLAB) + .add(NSE_Custom.VINTAGE_LAMP) + .add(NSE_Custom.LIGHT_BULB_LAMP); + + // Blocks mined with an axe + getOrCreateTagBuilder(BlockTags.AXE_MINEABLE) + .add(NSE_Blocks.CRATE) + .add(NSE_Blocks.CONCRETE_WALL) + .add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS) + .add(NSE_Blocks.CROSS_ACACIA_PLANKS) + .add(NSE_Blocks.HERRINGBONE_OAK_PLANKS) + .add(NSE_Blocks.CROSS_OAK_PLANKS) + .add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS) + .add(NSE_Blocks.CROSS_BIRCH_PLANKS) + .add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS) + .add(NSE_Blocks.CROSS_CRIMSON_PLANKS) + .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS) + .add(NSE_Blocks.CROSS_DARK_OAK_PLANKS) + .add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS) + .add(NSE_Blocks.CROSS_JUNGLE_PLANKS) + .add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS) + .add(NSE_Blocks.CROSS_MANGROVE_PLANKS) + .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS) + .add(NSE_Blocks.CROSS_SPRUCE_PLANKS) + .add(NSE_Blocks.HERRINGBONE_PARQUET) + .add(NSE_Blocks.STRAIGHT_PARQUET) + .add(NSE_Blocks.SEPARATED_PARQUET) + .add(NSE_Blocks.GREEN_LINOLEUM) + .add(NSE_Blocks.BLUE_LINOLEUM) + .add(NSE_Blocks.RED_LINOLEUM) + .add(NSE_Blocks.GRAY_LINOLEUM) + .add(NSE_Blocks.ORANGE_LINOLEUM) + .add(NSE_Blocks.BROWN_LINOLEUM) + .add(NSE_Blocks.CYAN_LINOLEUM) + .add(NSE_Blocks.CROSS_ORANGE_LINOLEUM) + .add(NSE_Blocks.CROSS_BROWN_LINOLEUM) + .add(NSE_Blocks.CHISELED_BIRCH_DOOR) + .add(NSE_Blocks.CHISELED_MANGROVE_DOOR) + .add(NSE_Blocks.CHISELED_OAK_DOOR) + .add(NSE_Blocks.CHISELED_SPRUCE_DOOR) + .add(NSE_Blocks.GREEN_WALLPAPER) + .add(NSE_Blocks.BROWN_WALLPAPER) + .add(NSE_Blocks.BEIGE_WALLPAPER) + .add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_ACACIA_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_ACACIA_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_OAK_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_OAK_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_OAK_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_OAK_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_BIRCH_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_BIRCH_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_CRIMSON_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_CRIMSON_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_DARK_OAK_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_DARK_OAK_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_JUNGLE_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_JUNGLE_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_MANGROVE_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_MANGROVE_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_PARQUET_STAIRS) + .add(NSE_Blocks.HERRINGBONE_PARQUET_SLAB) + .add(NSE_Blocks.STRAIGHT_PARQUET_STAIRS) + .add(NSE_Blocks.STRAIGHT_PARQUET_SLAB) + .add(NSE_Blocks.SEPARATED_PARQUET_STAIRS) + .add(NSE_Blocks.SEPARATED_PARQUET_SLAB) + .add(NSE_Blocks.GREEN_LINOLEUM_STAIRS) + .add(NSE_Blocks.GREEN_LINOLEUM_SLAB) + .add(NSE_Blocks.BLUE_LINOLEUM_STAIRS) + .add(NSE_Blocks.BLUE_LINOLEUM_SLAB) + .add(NSE_Blocks.RED_LINOLEUM_STAIRS) + .add(NSE_Blocks.RED_LINOLEUM_SLAB) + .add(NSE_Blocks.GRAY_LINOLEUM_STAIRS) + .add(NSE_Blocks.GRAY_LINOLEUM_SLAB) + .add(NSE_Blocks.ORANGE_LINOLEUM_STAIRS) + .add(NSE_Blocks.ORANGE_LINOLEUM_SLAB) + .add(NSE_Blocks.BROWN_LINOLEUM_STAIRS) + .add(NSE_Blocks.BROWN_LINOLEUM_SLAB) + .add(NSE_Blocks.CYAN_LINOLEUM_STAIRS) + .add(NSE_Blocks.CYAN_LINOLEUM_SLAB) + .add(NSE_Custom.TABLE_LAMP); + + getOrCreateTagBuilder(NSE_Tags.Blocks.RAKE_MINEABLE) + .add(NSE_Blocks.MEAT) + .add(NSE_Blocks.MEAT_EYE) + .add(NSE_Blocks.MEAT_TEETH) + .add(NSE_Blocks.PURPLE_GOO); + + getOrCreateTagBuilder(NSE_Tags.Blocks.TV) + .add(NSE_Custom.TV) + .add(NSE_Custom.RED_TV) + .add(NSE_Custom.BROWN_TV); + + getOrCreateTagBuilder(NSE_Tags.Blocks.POST_LAMPS) + .add(NSE_Custom.CAGED_POST_LAMP) + .add(NSE_Custom.VINTAGE_POST_LAMP) + .add(NSE_Custom.MODERN_POST_LAMP) + .add(NSE_Custom.BIG_POST_LAMP); + + getOrCreateTagBuilder(BlockTags.DOORS) + .add(NSE_Blocks.CHISELED_BIRCH_DOOR) + .add(NSE_Blocks.CHISELED_OAK_DOOR) + .add(NSE_Blocks.CHISELED_MANGROVE_DOOR) + .add(NSE_Blocks.CHISELED_SPRUCE_DOOR); + + getOrCreateTagBuilder(BlockTags.WOODEN_DOORS) + .add(NSE_Blocks.CHISELED_BIRCH_DOOR) + .add(NSE_Blocks.CHISELED_OAK_DOOR) + .add(NSE_Blocks.CHISELED_MANGROVE_DOOR) + .add(NSE_Blocks.CHISELED_SPRUCE_DOOR); + + getOrCreateTagBuilder(BlockTags.WALLS).add(NSE_Blocks.CONCRETE_WALL); + + getOrCreateTagBuilder(BlockTags.PLANKS) + .add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS) + .add(NSE_Blocks.CROSS_ACACIA_PLANKS) + .add(NSE_Blocks.HERRINGBONE_OAK_PLANKS) + .add(NSE_Blocks.CROSS_OAK_PLANKS) + .add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS) + .add(NSE_Blocks.CROSS_BIRCH_PLANKS) + .add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS) + .add(NSE_Blocks.CROSS_CRIMSON_PLANKS) + .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS) + .add(NSE_Blocks.CROSS_DARK_OAK_PLANKS) + .add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS) + .add(NSE_Blocks.CROSS_JUNGLE_PLANKS) + .add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS) + .add(NSE_Blocks.CROSS_MANGROVE_PLANKS) + .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS) + .add(NSE_Blocks.CROSS_SPRUCE_PLANKS); + + getOrCreateTagBuilder(BlockTags.STAIRS) + .add(NSE_Blocks.SAND_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_SAND_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_SAND_TILES_STAIRS) + .add(NSE_Blocks.HERRINGBONE_SAND_TILES_STAIRS) + .add(NSE_Blocks.CROSS_SAND_TILES_STAIRS) + .add(NSE_Blocks.SAND_BRICKS_STAIRS) + .add(NSE_Blocks.CRACKED_SAND_BRICKS_STAIRS) + .add(NSE_Blocks.MOSSY_SAND_BRICKS_STAIRS) + .add(NSE_Blocks.BIG_SAND_BRICKS_STAIRS) + .add(NSE_Blocks.BRICK_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_BRICK_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_BRICK_TILES_STAIRS) + .add(NSE_Blocks.DIRTY_BRICK_TILES_STAIRS) + .add(NSE_Blocks.DARK_BRICK_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_DARK_BRICK_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_DARK_BRICK_TILES_STAIRS) + .add(NSE_Blocks.DIRTY_DARK_BRICK_TILES_STAIRS) + .add(NSE_Blocks.RED_BRICKS_STAIRS) + .add(NSE_Blocks.CRACKED_RED_BRICKS_STAIRS) + .add(NSE_Blocks.MOSSY_RED_BRICKS_STAIRS) + .add(NSE_Blocks.TEAL_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_TEAL_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_TEAL_TILES_STAIRS) + .add(NSE_Blocks.VARIATED_TEAL_TILES_STAIRS) + .add(NSE_Blocks.GREEN_BRICKS_STAIRS) + .add(NSE_Blocks.CRACKED_GREEN_BRICKS_STAIRS) + .add(NSE_Blocks.MOSSY_GREEN_BRICKS_STAIRS) + .add(NSE_Blocks.GREEN_BRICKS_2_STAIRS) + .add(NSE_Blocks.CRACKED_GREEN_BRICKS_2_STAIRS) + .add(NSE_Blocks.MOSSY_GREEN_BRICKS_2_STAIRS) + .add(NSE_Blocks.AQUAMARINE_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_AQUAMARINE_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_AQUAMARINE_TILES_STAIRS) + .add(NSE_Blocks.DIRTY_AQUAMARINE_TILES_STAIRS) + .add(NSE_Blocks.DIORITE_BRICKS_STAIRS) + .add(NSE_Blocks.CRACKED_DIORITE_BRICKS_STAIRS) + .add(NSE_Blocks.MOSSY_DIORITE_BRICKS_STAIRS) + .add(NSE_Blocks.CALCITE_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_CALCITE_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_CALCITE_TILES_STAIRS) + .add(NSE_Blocks.DRIPSTONE_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_DRIPSTONE_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_DRIPSTONE_TILES_STAIRS) + .add(NSE_Blocks.DEEPSLATE_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_DEEPSLATE_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_DEEPSLATE_TILES_STAIRS) + .add(NSE_Blocks.LIGHT_BLUE_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_LIGHT_BLUE_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_STAIRS) + .add(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES_STAIRS) + .add(NSE_Blocks.LIGHT_BLUE_BRICKS_STAIRS) + .add(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS_STAIRS) + .add(NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_STAIRS) + .add(NSE_Blocks.GREEN_WHITE_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_GREEN_WHITE_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_GREEN_WHITE_TILES_STAIRS) + .add(NSE_Blocks.TUFF_TILES_STAIRS) + .add(NSE_Blocks.CRACKED_TUFF_TILES_STAIRS) + .add(NSE_Blocks.MOSSY_TUFF_TILES_STAIRS) + .add(NSE_Blocks.TUFF_BRICKS_STAIRS) + .add(NSE_Blocks.CRACKED_TUFF_BRICKS_STAIRS) + .add(NSE_Blocks.MOSSY_TUFF_BRICKS_STAIRS) + .add(NSE_Blocks.WHITE_CONCRETE_STAIRS) + .add(NSE_Blocks.CRACKED_WHITE_CONCRETE_STAIRS) + .add(NSE_Blocks.BEIGE_CONCRETE_STAIRS) + .add(NSE_Blocks.CRACKED_BEIGE_CONCRETE_STAIRS) + .add(NSE_Blocks.BLUE_CONCRETE_STAIRS) + .add(NSE_Blocks.CRACKED_BLUE_CONCRETE_STAIRS) + .add(NSE_Blocks.RED_CONCRETE_STAIRS) + .add(NSE_Blocks.CRACKED_RED_CONCRETE_STAIRS) + .add(NSE_Blocks.YELLOW_CONCRETE_STAIRS) + .add(NSE_Blocks.CRACKED_YELLOW_CONCRETE_STAIRS) + .add(NSE_Blocks.GREEN_CONCRETE_STAIRS) + .add(NSE_Blocks.CRACKED_GREEN_CONCRETE_STAIRS) + .add(NSE_Blocks.NII_FLOOR_STAIRS) + .add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_ACACIA_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_OAK_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_OAK_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_BIRCH_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_CRIMSON_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_DARK_OAK_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_JUNGLE_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_MANGROVE_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_PARQUET_STAIRS) + .add(NSE_Blocks.STRAIGHT_PARQUET_STAIRS) + .add(NSE_Blocks.SEPARATED_PARQUET_STAIRS) + .add(NSE_Blocks.GREEN_LINOLEUM_STAIRS) + .add(NSE_Blocks.BLUE_LINOLEUM_STAIRS) + .add(NSE_Blocks.RED_LINOLEUM_STAIRS) + .add(NSE_Blocks.GRAY_LINOLEUM_STAIRS) + .add(NSE_Blocks.ORANGE_LINOLEUM_STAIRS) + .add(NSE_Blocks.BROWN_LINOLEUM_STAIRS) + .add(NSE_Blocks.CYAN_LINOLEUM_STAIRS) + .add(NSE_Blocks.METAL_PLATING_STAIRS); + + getOrCreateTagBuilder(BlockTags.SLABS) + .add(NSE_Blocks.SAND_TILES_SLAB) + .add(NSE_Blocks.CRACKED_SAND_TILES_SLAB) + .add(NSE_Blocks.MOSSY_SAND_TILES_SLAB) + .add(NSE_Blocks.HERRINGBONE_SAND_TILES_SLAB) + .add(NSE_Blocks.CROSS_SAND_TILES_SLAB) + .add(NSE_Blocks.SAND_BRICKS_SLAB) + .add(NSE_Blocks.CRACKED_SAND_BRICKS_SLAB) + .add(NSE_Blocks.MOSSY_SAND_BRICKS_SLAB) + .add(NSE_Blocks.BIG_SAND_BRICKS_SLAB) + .add(NSE_Blocks.BRICK_TILES_SLAB) + .add(NSE_Blocks.CRACKED_BRICK_TILES_SLAB) + .add(NSE_Blocks.MOSSY_BRICK_TILES_SLAB) + .add(NSE_Blocks.DIRTY_BRICK_TILES_SLAB) + .add(NSE_Blocks.DARK_BRICK_TILES_SLAB) + .add(NSE_Blocks.CRACKED_DARK_BRICK_TILES_SLAB) + .add(NSE_Blocks.MOSSY_DARK_BRICK_TILES_SLAB) + .add(NSE_Blocks.DIRTY_DARK_BRICK_TILES_SLAB) + .add(NSE_Blocks.RED_BRICKS_SLAB) + .add(NSE_Blocks.CRACKED_RED_BRICKS_SLAB) + .add(NSE_Blocks.MOSSY_RED_BRICKS_SLAB) + .add(NSE_Blocks.TEAL_TILES_SLAB) + .add(NSE_Blocks.CRACKED_TEAL_TILES_SLAB) + .add(NSE_Blocks.MOSSY_TEAL_TILES_SLAB) + .add(NSE_Blocks.VARIATED_TEAL_TILES_SLAB) + .add(NSE_Blocks.GREEN_BRICKS_SLAB) + .add(NSE_Blocks.CRACKED_GREEN_BRICKS_SLAB) + .add(NSE_Blocks.MOSSY_GREEN_BRICKS_SLAB) + .add(NSE_Blocks.GREEN_BRICKS_2_SLAB) + .add(NSE_Blocks.CRACKED_GREEN_BRICKS_2_SLAB) + .add(NSE_Blocks.MOSSY_GREEN_BRICKS_2_SLAB) + .add(NSE_Blocks.AQUAMARINE_TILES_SLAB) + .add(NSE_Blocks.CRACKED_AQUAMARINE_TILES_SLAB) + .add(NSE_Blocks.MOSSY_AQUAMARINE_TILES_SLAB) + .add(NSE_Blocks.DIRTY_AQUAMARINE_TILES_SLAB) + .add(NSE_Blocks.DIORITE_BRICKS_SLAB) + .add(NSE_Blocks.CRACKED_DIORITE_BRICKS_SLAB) + .add(NSE_Blocks.MOSSY_DIORITE_BRICKS_SLAB) + .add(NSE_Blocks.CALCITE_TILES_SLAB) + .add(NSE_Blocks.CRACKED_CALCITE_TILES_SLAB) + .add(NSE_Blocks.MOSSY_CALCITE_TILES_SLAB) + .add(NSE_Blocks.DRIPSTONE_TILES_SLAB) + .add(NSE_Blocks.CRACKED_DRIPSTONE_TILES_SLAB) + .add(NSE_Blocks.MOSSY_DRIPSTONE_TILES_SLAB) + .add(NSE_Blocks.DEEPSLATE_TILES_SLAB) + .add(NSE_Blocks.CRACKED_DEEPSLATE_TILES_SLAB) + .add(NSE_Blocks.MOSSY_DEEPSLATE_TILES_SLAB) + .add(NSE_Blocks.LIGHT_BLUE_TILES_SLAB) + .add(NSE_Blocks.CRACKED_LIGHT_BLUE_TILES_SLAB) + .add(NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_SLAB) + .add(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES_SLAB) + .add(NSE_Blocks.LIGHT_BLUE_BRICKS_SLAB) + .add(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS_SLAB) + .add(NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_SLAB) + .add(NSE_Blocks.GREEN_WHITE_TILES_SLAB) + .add(NSE_Blocks.CRACKED_GREEN_WHITE_TILES_SLAB) + .add(NSE_Blocks.MOSSY_GREEN_WHITE_TILES_SLAB) + .add(NSE_Blocks.TUFF_TILES_SLAB) + .add(NSE_Blocks.CRACKED_TUFF_TILES_SLAB) + .add(NSE_Blocks.MOSSY_TUFF_TILES_SLAB) + .add(NSE_Blocks.TUFF_BRICKS_SLAB) + .add(NSE_Blocks.CRACKED_TUFF_BRICKS_SLAB) + .add(NSE_Blocks.MOSSY_TUFF_BRICKS_SLAB) + .add(NSE_Blocks.WHITE_CONCRETE_SLAB) + .add(NSE_Blocks.CRACKED_WHITE_CONCRETE_SLAB) + .add(NSE_Blocks.BEIGE_CONCRETE_SLAB) + .add(NSE_Blocks.CRACKED_BEIGE_CONCRETE_SLAB) + .add(NSE_Blocks.BLUE_CONCRETE_SLAB) + .add(NSE_Blocks.CRACKED_BLUE_CONCRETE_SLAB) + .add(NSE_Blocks.RED_CONCRETE_SLAB) + .add(NSE_Blocks.CRACKED_RED_CONCRETE_SLAB) + .add(NSE_Blocks.YELLOW_CONCRETE_SLAB) + .add(NSE_Blocks.CRACKED_YELLOW_CONCRETE_SLAB) + .add(NSE_Blocks.GREEN_CONCRETE_SLAB) + .add(NSE_Blocks.CRACKED_GREEN_CONCRETE_SLAB) + .add(NSE_Blocks.NII_FLOOR_SLAB) + .add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_ACACIA_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_OAK_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_OAK_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_BIRCH_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_CRIMSON_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_DARK_OAK_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_JUNGLE_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_MANGROVE_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_PARQUET_SLAB) + .add(NSE_Blocks.STRAIGHT_PARQUET_SLAB) + .add(NSE_Blocks.SEPARATED_PARQUET_SLAB) + .add(NSE_Blocks.GREEN_LINOLEUM_SLAB) + .add(NSE_Blocks.BLUE_LINOLEUM_SLAB) + .add(NSE_Blocks.RED_LINOLEUM_SLAB) + .add(NSE_Blocks.GRAY_LINOLEUM_SLAB) + .add(NSE_Blocks.ORANGE_LINOLEUM_SLAB) + .add(NSE_Blocks.BROWN_LINOLEUM_SLAB) + .add(NSE_Blocks.CYAN_LINOLEUM_SLAB) + .add(NSE_Blocks.METAL_PLATING_SLAB); + + getOrCreateTagBuilder(BlockTags.WOODEN_STAIRS) + .add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_ACACIA_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_OAK_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_OAK_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_BIRCH_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_CRIMSON_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_DARK_OAK_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_JUNGLE_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_MANGROVE_PLANKS_STAIRS) + .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_STAIRS) + .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS); + + getOrCreateTagBuilder(BlockTags.WOODEN_SLABS) + .add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_ACACIA_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_OAK_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_OAK_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_BIRCH_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_CRIMSON_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_DARK_OAK_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_JUNGLE_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_MANGROVE_PLANKS_SLAB) + .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_SLAB) + .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB); + } + } + + + private static class RecipeGenerator extends FabricRecipeProvider { + private RecipeGenerator(FabricDataOutput generator) { + super(generator); + } + + private void mossRecipe(Consumer exporter, ItemConvertible output, ItemConvertible input) { + var path = convertBetween(output, input); + ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output).input(input).input(Items.VINE).criterion(FabricRecipeProvider.hasItem(output), + FabricRecipeProvider.conditionsFromItem(output)).criterion(FabricRecipeProvider.hasItem(input), + FabricRecipeProvider.conditionsFromItem(output)).criterion(FabricRecipeProvider.hasItem(Items.VINE), + FabricRecipeProvider.conditionsFromItem(output)).offerTo(exporter, path + "_vine"); + + ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output).input(input).input(Items.MOSS_BLOCK).criterion(FabricRecipeProvider.hasItem(output), + FabricRecipeProvider.conditionsFromItem(output)).criterion(FabricRecipeProvider.hasItem(input), + FabricRecipeProvider.conditionsFromItem(output)).criterion(FabricRecipeProvider.hasItem(Items.MOSS_BLOCK), + FabricRecipeProvider.conditionsFromItem(output)).offerTo(exporter, path + "_moss"); + } + + private void dirtyRecipe(Consumer exporter, ItemConvertible output, ItemConvertible input) { + var path = convertBetween(output, input); + ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output).input(input).input(Items.DIRT).criterion(FabricRecipeProvider.hasItem(output), + FabricRecipeProvider.conditionsFromItem(output)).criterion(FabricRecipeProvider.hasItem(input), + FabricRecipeProvider.conditionsFromItem(output)).criterion(FabricRecipeProvider.hasItem(Items.DIRT), + FabricRecipeProvider.conditionsFromItem(output)).offerTo(exporter, path + "_dirt"); + + ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output).input(input).input(Items.GLOW_LICHEN).criterion(FabricRecipeProvider.hasItem(output), + FabricRecipeProvider.conditionsFromItem(output)).criterion(FabricRecipeProvider.hasItem(input), + FabricRecipeProvider.conditionsFromItem(output)).criterion(FabricRecipeProvider.hasItem(Items.GLOW_LICHEN), + FabricRecipeProvider.conditionsFromItem(output)).offerTo(exporter, path + "_lichen"); + } + + private void stoneCuttingCategory(Consumer exporter, List category, RecipeCategory recipe_category) { + for (int i = 0; i < category.size(); i++) { + for (int j = 0; j < category.size(); j++) { + if (i != j) { + offerStonecuttingRecipe(exporter, recipe_category, + category.get(i), category.get(j)); + } + } + } + } + + private void diceRecipe(Consumer exporter, ItemConvertible dice) { + // why can't we use BlockTags.WOODEN_BUTTONS + var buttons = Util.make(Lists.newArrayList(), list -> { + list.add(Blocks.OAK_BUTTON); + list.add(Blocks.BAMBOO_BUTTON); + list.add(Blocks.BIRCH_BUTTON); + list.add(Blocks.CHERRY_BUTTON); + list.add(Blocks.ACACIA_BUTTON); + list.add(Blocks.CRIMSON_BUTTON); + list.add(Blocks.DARK_OAK_BUTTON); + list.add(Blocks.JUNGLE_BUTTON); + list.add(Blocks.MANGROVE_BUTTON); + list.add(Blocks.SPRUCE_BUTTON); + list.add(Blocks.WARPED_BUTTON); + }); + for (Object button : buttons) { + offerStonecuttingRecipe(exporter, RecipeCategory.MISC, dice, (ItemConvertible) button); + } + } + + private void warningStripeRecipe(Consumer exporter, ItemConvertible output, ItemConvertible dye) { + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output, 4) + .pattern("D#D") + .pattern("#D#") + .pattern("D#D") + .input('D', dye) + .input('#', Items.IRON_INGOT) + .criterion(RecipeProvider.hasItem(Items.IRON_INGOT), + RecipeProvider.conditionsFromItem(Items.IRON_INGOT)) + .criterion(RecipeProvider.hasItem(dye), + RecipeProvider.conditionsFromItem(dye)) + .offerTo(exporter); + } + + private void crissCrossRecipe(Consumer exporter, ItemConvertible output, ItemConvertible input1, ItemConvertible input2) { + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output, 4) + .pattern("XY") + .pattern("YX") + .input('X', input1) + .input('Y', input2) + .criterion(RecipeProvider.hasItem(input1), + RecipeProvider.conditionsFromItem(input1)) + .criterion(RecipeProvider.hasItem(input2), + RecipeProvider.conditionsFromItem(input2)) + .offerTo(exporter); + } + + private void tvRecipe(Consumer exporter, ItemConvertible output, ItemConvertible dye) { + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, output, 1) + .pattern("N N") + .pattern("DGD") + .pattern("DRD") + .input('D', dye) + .input('N', Items.IRON_NUGGET) + .input('R', Items.REDSTONE) + .input('G', Items.GLASS_PANE) + .criterion(RecipeProvider.hasItem(Items.IRON_NUGGET), + RecipeProvider.conditionsFromItem(Items.IRON_NUGGET)) + .criterion(RecipeProvider.hasItem(Items.GLASS_PANE), + RecipeProvider.conditionsFromItem(Items.GLASS_PANE)) + .criterion(RecipeProvider.hasItem(Items.REDSTONE), + RecipeProvider.conditionsFromItem(Items.REDSTONE)) + .criterion(RecipeProvider.hasItem(dye), + RecipeProvider.conditionsFromItem(dye)) + .offerTo(exporter); + } + + private void radioRecipe(Consumer exporter, ItemConvertible output) { + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, output, 1) + .pattern(" N") + .pattern("MMM") + .pattern("III") + .input('M', Blocks.NOTE_BLOCK) + .input('N', Items.IRON_NUGGET) + .input('I', Items.IRON_INGOT) + .criterion(RecipeProvider.hasItem(Items.IRON_NUGGET), + RecipeProvider.conditionsFromItem(Items.IRON_NUGGET)) + .criterion(RecipeProvider.hasItem(Items.NOTE_BLOCK), + RecipeProvider.conditionsFromItem(Items.NOTE_BLOCK)) + .criterion(RecipeProvider.hasItem(Items.IRON_INGOT), + RecipeProvider.conditionsFromItem(Items.IRON_INGOT)) + .offerTo(exporter); + } + + private void ceilingFanRecipe(Consumer exporter, ItemConvertible output) { + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, output, 1) + .pattern(" S ") + .pattern("WNW") + .input('S', Items.STICK) + .input('N', Items.IRON_NUGGET) + .input('W', Items.WHITE_WOOL) + .criterion(RecipeProvider.hasItem(Items.IRON_NUGGET), + RecipeProvider.conditionsFromItem(Items.IRON_NUGGET)) + .criterion(RecipeProvider.hasItem(Items.STICK), + RecipeProvider.conditionsFromItem(Items.STICK)) + .criterion(RecipeProvider.hasItem(Items.WHITE_WOOL), + RecipeProvider.conditionsFromItem(Items.WHITE_WOOL)) + .offerTo(exporter); + } + + private void tableLampRecipe(Consumer exporter, ItemConvertible output) { + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, output, 3) + .pattern("WWW") + .pattern("WTW") + .pattern(" S ") + + .input('S', Items.STICK) + .input('T', Items.TORCH) + .input('W', ItemTags.WOOL) + .criterion(RecipeProvider.hasItem(Items.TORCH), + RecipeProvider.conditionsFromItem(Items.TORCH)) + .criterion(RecipeProvider.hasItem(Items.STICK), + RecipeProvider.conditionsFromItem(Items.STICK)) + .criterion("has_wool", RecipeProvider.conditionsFromTag(ItemTags.WOOL)) + .offerTo(exporter); + } + + private void vintageLampRecipe(Consumer exporter, ItemConvertible output) { + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, output, 3) + .pattern("NNN") + .pattern("GTG") + .pattern(" N ") + + .input('N', Items.IRON_NUGGET) + .input('T', Items.TORCH) + .input('G', Items.GREEN_STAINED_GLASS) + .criterion(RecipeProvider.hasItem(Items.TORCH), + RecipeProvider.conditionsFromItem(Items.TORCH)) + .criterion(RecipeProvider.hasItem(Items.IRON_NUGGET), + RecipeProvider.conditionsFromItem(Items.IRON_NUGGET)) + .criterion(RecipeProvider.hasItem(Items.GREEN_STAINED_GLASS), + RecipeProvider.conditionsFromItem(Items.GREEN_STAINED_GLASS)) + .offerTo(exporter); + } + + private void sickleRecipe(Consumer exporter, ItemConvertible output) { + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, output, 1) + .pattern(" I ") + .pattern(" I") + .pattern(" S ") + .input('S', Items.STICK) + .input('I', Items.IRON_INGOT) + .criterion(RecipeProvider.hasItem(Items.STICK), + RecipeProvider.conditionsFromItem(Items.STICK)) + .criterion(RecipeProvider.hasItem(Items.IRON_INGOT), + RecipeProvider.conditionsFromItem(Items.IRON_INGOT)) + .offerTo(exporter); + } + + private void rakeRecipe(Consumer exporter, ItemConvertible output) { + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, output, 1) + .pattern("III") + .pattern(" N ") + .pattern(" S ") + .input('S', Items.STICK) + .input('I', Items.IRON_INGOT) + .input('N', Items.IRON_NUGGET) + .criterion(RecipeProvider.hasItem(Items.STICK), + RecipeProvider.conditionsFromItem(Items.STICK)) + .criterion(RecipeProvider.hasItem(Items.IRON_INGOT), + RecipeProvider.conditionsFromItem(Items.IRON_INGOT)) + .criterion(RecipeProvider.hasItem(Items.IRON_NUGGET), + RecipeProvider.conditionsFromItem(Items.IRON_NUGGET)) + .offerTo(exporter); + } + + private void offerStairsAndSlab(Consumer exporter, ItemConvertible output_stairs, ItemConvertible output_slab, ItemConvertible input) { + createStairsRecipe(output_stairs, Ingredient.ofItems(input)) + .criterion(hasItem(input), conditionsFromItem(input)).offerTo(exporter); + createSlabRecipe(RecipeCategory.BUILDING_BLOCKS, output_slab, Ingredient.ofItems(input)) + .criterion(hasItem(input), conditionsFromItem(input)).offerTo(exporter); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, output_stairs, input); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, output_slab, input); + } + + @Override + public void generate(Consumer exporter) { + crissCrossRecipe(exporter, NSE_Blocks.SAND_TILES, Blocks.SMOOTH_SANDSTONE, Blocks.SMOOTH_RED_SANDSTONE); + crissCrossRecipe(exporter, NSE_Blocks.LIGHT_BLUE_TILES, Blocks.STONE, Items.LIGHT_BLUE_DYE); + crissCrossRecipe(exporter, NSE_Blocks.SMALL_WHITE_TILES, Blocks.STONE, Items.WHITE_DYE); + crissCrossRecipe(exporter, NSE_Blocks.GREEN_WHITE_TILES, Blocks.POLISHED_DIORITE, Items.GREEN_DYE); + + tvRecipe(exporter, NSE_Custom.TV, Items.ORANGE_DYE); + tvRecipe(exporter, NSE_Custom.BROWN_TV, Items.BROWN_DYE); + tvRecipe(exporter, NSE_Custom.RED_TV, Items.RED_DYE); + radioRecipe(exporter, NSE_Custom.RADIO_RECEIVER); + ceilingFanRecipe(exporter, NSE_Custom.CEILING_FAN); + tableLampRecipe(exporter, NSE_Custom.TABLE_LAMP); + vintageLampRecipe(exporter, NSE_Custom.VINTAGE_LAMP); + sickleRecipe(exporter, NSE_Items.SICKLE); + rakeRecipe(exporter, NSE_Items.RAKE); + + // Cracked blocks + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_BRICK_TILES, NSE_Blocks.BRICK_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GLAZED_BRICK_TILES, NSE_Blocks.GLAZED_BRICK_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_DARK_BRICK_TILES, NSE_Blocks.DARK_BRICK_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_NII_WALL_1, NSE_Blocks.NII_WALL_1); + offerCrackingRecipe(exporter, NSE_Blocks.SMALL_CRACKED_YELLOW_TILES, NSE_Blocks.SMALL_YELLOW_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_SAND_TILES, NSE_Blocks.SAND_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.SMALL_CRACKED_SAND_TILES, NSE_Blocks.SMALL_SAND_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_SAND_BRICKS, NSE_Blocks.SAND_BRICKS); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_TEAL_TILES, NSE_Blocks.TEAL_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.SMALL_CRACKED_TEAL_TILES, NSE_Blocks.SMALL_TEAL_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GLAZED_TEAL_TILES, NSE_Blocks.GLAZED_TEAL_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_AQUAMARINE_TILES, NSE_Blocks.AQUAMARINE_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.SMALL_CRACKED_AQUAMARINE_TILES, NSE_Blocks.SMALL_AQUAMARINE_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GLAZED_AQUAMARINE_TILES, NSE_Blocks.GLAZED_AQUAMARINE_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.SMALL_CRACKED_DIORITE_TILES, NSE_Blocks.SMALL_DIORITE_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_DIORITE_BRICKS, NSE_Blocks.DIORITE_BRICKS); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_CALCITE_TILES, NSE_Blocks.CALCITE_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_DRIPSTONE_TILES, NSE_Blocks.DRIPSTONE_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_DEEPSLATE_TILES, NSE_Blocks.DEEPSLATE_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.SMALL_CRACKED_DEEPSLATE_TILES, NSE_Blocks.SMALL_DEEPSLATE_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_LIGHT_BLUE_TILES, NSE_Blocks.LIGHT_BLUE_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.SMALL_CRACKED_LIGHT_BLUE_TILES, NSE_Blocks.SMALL_LIGHT_BLUE_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GLAZED_LIGHT_BLUE_TILES, NSE_Blocks.GLAZED_LIGHT_BLUE_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS, NSE_Blocks.LIGHT_BLUE_BRICKS); + offerCrackingRecipe(exporter, NSE_Blocks.SMALL_CRACKED_GRANITE_TILES, NSE_Blocks.SMALL_GRANITE_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GREEN_WHITE_TILES, NSE_Blocks.GREEN_WHITE_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_TUFF_TILES, NSE_Blocks.TUFF_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_TUFF_BRICKS, NSE_Blocks.TUFF_BRICKS); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_WHITEWASH, NSE_Blocks.WHITEWASH); + offerCrackingRecipe(exporter, NSE_Blocks.VERY_CRACKED_WHITEWASH, NSE_Blocks.CRACKED_WHITEWASH); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_WHITE_CONCRETE, NSE_Blocks.WHITE_CONCRETE); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_BEIGE_CONCRETE, NSE_Blocks.BEIGE_CONCRETE); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_BLUE_CONCRETE, NSE_Blocks.BLUE_CONCRETE); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_RED_CONCRETE, NSE_Blocks.RED_CONCRETE); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_YELLOW_CONCRETE, NSE_Blocks.YELLOW_CONCRETE); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GREEN_CONCRETE, NSE_Blocks.GREEN_CONCRETE); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GREEN_BRICKS, NSE_Blocks.GREEN_BRICKS); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GREEN_BRICKS_2, NSE_Blocks.GREEN_BRICKS_2); + offerCrackingRecipe(exporter, NSE_Blocks.BIG_GREEN_TILES_CRACKED, NSE_Blocks.BIG_GREEN_TILES); + offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_RED_BRICKS, NSE_Blocks.RED_BRICKS); + + // Mossy variants + mossRecipe(exporter, NSE_Blocks.MOSSY_SAND_TILES, NSE_Blocks.SAND_TILES); + mossRecipe(exporter, NSE_Blocks.MOSSY_SAND_BRICKS, NSE_Blocks.SAND_BRICKS); + mossRecipe(exporter, NSE_Blocks.MOSSY_TEAL_TILES, NSE_Blocks.TEAL_TILES); + mossRecipe(exporter, NSE_Blocks.MOSSY_AQUAMARINE_TILES, NSE_Blocks.AQUAMARINE_TILES); + mossRecipe(exporter, NSE_Blocks.MOSSY_DIORITE_BRICKS, NSE_Blocks.DIORITE_BRICKS); + mossRecipe(exporter, NSE_Blocks.MOSSY_CALCITE_TILES, NSE_Blocks.CALCITE_TILES); + mossRecipe(exporter, NSE_Blocks.MOSSY_DRIPSTONE_TILES, NSE_Blocks.DRIPSTONE_TILES); + mossRecipe(exporter, NSE_Blocks.MOSSY_DEEPSLATE_TILES, NSE_Blocks.DEEPSLATE_TILES); + mossRecipe(exporter, NSE_Blocks.MOSSY_LIGHT_BLUE_TILES, NSE_Blocks.LIGHT_BLUE_TILES); + mossRecipe(exporter, NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS, NSE_Blocks.LIGHT_BLUE_BRICKS); + mossRecipe(exporter, NSE_Blocks.MOSSY_GREEN_WHITE_TILES, NSE_Blocks.GREEN_WHITE_TILES); + mossRecipe(exporter, NSE_Blocks.MOSSY_TUFF_TILES, NSE_Blocks.TUFF_TILES); + mossRecipe(exporter, NSE_Blocks.MOSSY_TUFF_BRICKS, NSE_Blocks.TUFF_BRICKS); + mossRecipe(exporter, NSE_Blocks.MOSSY_GREEN_BRICKS, NSE_Blocks.GREEN_BRICKS); + mossRecipe(exporter, NSE_Blocks.MOSSY_GREEN_BRICKS_2, NSE_Blocks.GREEN_BRICKS_2); + mossRecipe(exporter, NSE_Blocks.MOSSY_RED_BRICKS, NSE_Blocks.RED_BRICKS); + mossRecipe(exporter, NSE_Blocks.MOSSY_BRICK_TILES, NSE_Blocks.BRICK_TILES); + mossRecipe(exporter, NSE_Blocks.MOSSY_DARK_BRICK_TILES, NSE_Blocks.DARK_BRICK_TILES); + mossRecipe(exporter, NSE_Blocks.MOSSY_SAND_TILES_STAIRS, NSE_Blocks.SAND_TILES_STAIRS); + mossRecipe(exporter, NSE_Blocks.MOSSY_SAND_TILES_SLAB, NSE_Blocks.SAND_TILES_SLAB); + mossRecipe(exporter, NSE_Blocks.MOSSY_SAND_BRICKS_STAIRS, NSE_Blocks.SAND_BRICKS_STAIRS); + mossRecipe(exporter, NSE_Blocks.MOSSY_SAND_BRICKS_SLAB, NSE_Blocks.SAND_BRICKS_SLAB); + mossRecipe(exporter, NSE_Blocks.MOSSY_BRICK_TILES_STAIRS, NSE_Blocks.BRICK_TILES_STAIRS); + mossRecipe(exporter, NSE_Blocks.MOSSY_BRICK_TILES_SLAB, NSE_Blocks.BRICK_TILES_SLAB); + mossRecipe(exporter, NSE_Blocks.MOSSY_DARK_BRICK_TILES_STAIRS, NSE_Blocks.DARK_BRICK_TILES_STAIRS); + mossRecipe(exporter, NSE_Blocks.MOSSY_DARK_BRICK_TILES_SLAB, NSE_Blocks.DARK_BRICK_TILES_SLAB); + mossRecipe(exporter, NSE_Blocks.MOSSY_RED_BRICKS_STAIRS, NSE_Blocks.RED_BRICKS_STAIRS); + mossRecipe(exporter, NSE_Blocks.MOSSY_RED_BRICKS_SLAB, NSE_Blocks.RED_BRICKS_SLAB); + mossRecipe(exporter, NSE_Blocks.MOSSY_TEAL_TILES_STAIRS, NSE_Blocks.TEAL_TILES_STAIRS); + mossRecipe(exporter, NSE_Blocks.MOSSY_TEAL_TILES_SLAB, NSE_Blocks.TEAL_TILES_SLAB); + mossRecipe(exporter, NSE_Blocks.MOSSY_GREEN_BRICKS_STAIRS, NSE_Blocks.GREEN_BRICKS_STAIRS); + mossRecipe(exporter, NSE_Blocks.MOSSY_GREEN_BRICKS_SLAB, NSE_Blocks.GREEN_BRICKS_SLAB); + mossRecipe(exporter, NSE_Blocks.MOSSY_GREEN_BRICKS_2_STAIRS, NSE_Blocks.GREEN_BRICKS_2_STAIRS); + mossRecipe(exporter, NSE_Blocks.MOSSY_GREEN_BRICKS_2_SLAB, NSE_Blocks.GREEN_BRICKS_2_SLAB); + mossRecipe(exporter, NSE_Blocks.MOSSY_AQUAMARINE_TILES_STAIRS, NSE_Blocks.AQUAMARINE_TILES_STAIRS); + mossRecipe(exporter, NSE_Blocks.MOSSY_AQUAMARINE_TILES_SLAB, NSE_Blocks.AQUAMARINE_TILES_SLAB); + mossRecipe(exporter, NSE_Blocks.MOSSY_DIORITE_BRICKS_STAIRS, NSE_Blocks.DIORITE_BRICKS_STAIRS); + mossRecipe(exporter, NSE_Blocks.MOSSY_DIORITE_BRICKS_SLAB, NSE_Blocks.DIORITE_BRICKS_SLAB); + mossRecipe(exporter, NSE_Blocks.MOSSY_CALCITE_TILES_STAIRS, NSE_Blocks.CALCITE_TILES_STAIRS); + mossRecipe(exporter, NSE_Blocks.MOSSY_CALCITE_TILES_SLAB, NSE_Blocks.CALCITE_TILES_SLAB); + mossRecipe(exporter, NSE_Blocks.MOSSY_DRIPSTONE_TILES_STAIRS, NSE_Blocks.DRIPSTONE_TILES_STAIRS); + mossRecipe(exporter, NSE_Blocks.MOSSY_DRIPSTONE_TILES_SLAB, NSE_Blocks.DRIPSTONE_TILES_SLAB); + mossRecipe(exporter, NSE_Blocks.MOSSY_DEEPSLATE_TILES_STAIRS, NSE_Blocks.DEEPSLATE_TILES_STAIRS); + mossRecipe(exporter, NSE_Blocks.MOSSY_DEEPSLATE_TILES_SLAB, NSE_Blocks.DEEPSLATE_TILES_SLAB); + mossRecipe(exporter, NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_STAIRS, NSE_Blocks.LIGHT_BLUE_TILES_STAIRS); + mossRecipe(exporter, NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_SLAB, NSE_Blocks.LIGHT_BLUE_TILES_SLAB); + mossRecipe(exporter, NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_STAIRS, NSE_Blocks.LIGHT_BLUE_BRICKS_STAIRS); + mossRecipe(exporter, NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_SLAB, NSE_Blocks.LIGHT_BLUE_BRICKS_SLAB); + mossRecipe(exporter, NSE_Blocks.MOSSY_GREEN_WHITE_TILES_STAIRS, NSE_Blocks.GREEN_WHITE_TILES_STAIRS); + mossRecipe(exporter, NSE_Blocks.MOSSY_GREEN_WHITE_TILES_SLAB, NSE_Blocks.GREEN_WHITE_TILES_SLAB); + mossRecipe(exporter, NSE_Blocks.MOSSY_TUFF_TILES_STAIRS, NSE_Blocks.TUFF_TILES_STAIRS); + mossRecipe(exporter, NSE_Blocks.MOSSY_TUFF_TILES_SLAB, NSE_Blocks.TUFF_TILES_SLAB); + mossRecipe(exporter, NSE_Blocks.MOSSY_TUFF_BRICKS_STAIRS, NSE_Blocks.TUFF_BRICKS_STAIRS); + mossRecipe(exporter, NSE_Blocks.MOSSY_TUFF_BRICKS_SLAB, NSE_Blocks.TUFF_BRICKS_SLAB); + + // Dirty blocks recipe + dirtyRecipe(exporter, NSE_Blocks.DIRTY_AQUAMARINE_TILES, NSE_Blocks.AQUAMARINE_TILES); + dirtyRecipe(exporter, NSE_Blocks.DIRTY_AQUAMARINE_TILES_SLAB, NSE_Blocks.AQUAMARINE_TILES_SLAB); + dirtyRecipe(exporter, NSE_Blocks.DIRTY_AQUAMARINE_TILES_STAIRS, NSE_Blocks.AQUAMARINE_TILES_STAIRS); + dirtyRecipe(exporter, NSE_Blocks.DIRTY_BRICK_TILES, NSE_Blocks.BRICK_TILES); + dirtyRecipe(exporter, NSE_Blocks.DIRTY_BRICK_TILES_SLAB, NSE_Blocks.BRICK_TILES_SLAB); + dirtyRecipe(exporter, NSE_Blocks.DIRTY_BRICK_TILES_STAIRS, NSE_Blocks.BRICK_TILES_STAIRS); + dirtyRecipe(exporter, NSE_Blocks.DIRTY_DARK_BRICK_TILES, NSE_Blocks.DARK_BRICK_TILES); + dirtyRecipe(exporter, NSE_Blocks.DIRTY_DARK_BRICK_TILES_SLAB, NSE_Blocks.DARK_BRICK_TILES_SLAB); + dirtyRecipe(exporter, NSE_Blocks.DIRTY_DARK_BRICK_TILES_STAIRS, NSE_Blocks.DARK_BRICK_TILES_STAIRS); + + // Warning stripes + warningStripeRecipe(exporter, NSE_Blocks.INDUSTRIAL_WARNING, Items.BLACK_DYE); + warningStripeRecipe(exporter, NSE_Blocks.RED_WARNING, Items.RED_DYE); + warningStripeRecipe(exporter, NSE_Blocks.BLUE_WARNING, Items.BLUE_DYE); + warningStripeRecipe(exporter, NSE_Blocks.LIGHT_BLUE_WARNING, Items.LIGHT_BLUE_DYE); + warningStripeRecipe(exporter, NSE_Blocks.CYAN_WARNING, Items.CYAN_DYE); + warningStripeRecipe(exporter, NSE_Blocks.YELLOW_WARNING, Items.YELLOW_DYE); + warningStripeRecipe(exporter, NSE_Blocks.ORANGE_WARNING, Items.ORANGE_DYE); + warningStripeRecipe(exporter, NSE_Blocks.GREEN_WARNING, Items.GREEN_DYE); + warningStripeRecipe(exporter, NSE_Blocks.LIME_WARNING, Items.LIME_DYE); + warningStripeRecipe(exporter, NSE_Blocks.PURPLE_WARNING, Items.PURPLE_DYE); + warningStripeRecipe(exporter, NSE_Blocks.MAGENTA_WARNING, Items.MAGENTA_DYE); + warningStripeRecipe(exporter, NSE_Blocks.GRAY_WARNING, Items.GRAY_DYE); + + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.SAND_TILES); + list.add(NSE_Blocks.SAND_BRICKS); + list.add(NSE_Blocks.SMALL_SAND_TILES); + list.add(NSE_Blocks.BIG_SAND_TILES); + list.add(NSE_Blocks.BIG_SAND_BRICKS); + list.add(NSE_Blocks.CROSS_SAND_TILES); + list.add(NSE_Blocks.HERRINGBONE_SAND_TILES); + }), RecipeCategory.BUILDING_BLOCKS); + + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.TEAL_TILES); + list.add(NSE_Blocks.SMALL_TEAL_TILES); + list.add(NSE_Blocks.GLAZED_TEAL_TILES); + list.add(NSE_Blocks.VARIATED_TEAL_TILES); + list.add(Blocks.PRISMARINE_BRICKS); + }), RecipeCategory.BUILDING_BLOCKS); + + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.AQUAMARINE_TILES); + list.add(NSE_Blocks.GLAZED_AQUAMARINE_TILES); + list.add(NSE_Blocks.SMALL_AQUAMARINE_TILES); + }), RecipeCategory.BUILDING_BLOCKS); + + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.DIORITE_BRICKS); + list.add(NSE_Blocks.BIG_DIORITE_TILES); + list.add(NSE_Blocks.SMALL_DIORITE_TILES); + list.add(NSE_Blocks.NII_WALL_1); + list.add(Blocks.POLISHED_DIORITE); + }), RecipeCategory.BUILDING_BLOCKS); + + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.CALCITE_TILES); + list.add(NSE_Blocks.DIAGONAL_CALCITE_TILES); + list.add(Blocks.CALCITE); + }), RecipeCategory.BUILDING_BLOCKS); + + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.DRIPSTONE_TILES); + list.add(NSE_Blocks.DRIPSTONE_BRICKS); + list.add(Blocks.DRIPSTONE_BLOCK); + }), RecipeCategory.BUILDING_BLOCKS); + + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.DEEPSLATE_TILES); + list.add(NSE_Blocks.DIAGONAL_DEEPSLATE_TILES); + list.add(NSE_Blocks.SMALL_DEEPSLATE_TILES); + list.add(Blocks.POLISHED_DEEPSLATE); + }), RecipeCategory.BUILDING_BLOCKS); + + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.LIGHT_BLUE_TILES); + list.add(NSE_Blocks.LIGHT_BLUE_BRICKS); + list.add(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES); + list.add(NSE_Blocks.GLAZED_LIGHT_BLUE_TILES); + list.add(NSE_Blocks.SMALL_LIGHT_BLUE_TILES); + }), RecipeCategory.BUILDING_BLOCKS); + + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.BIG_GRANITE_TILES); + list.add(NSE_Blocks.SMALL_GRANITE_TILES); + list.add(Blocks.POLISHED_GRANITE); + }), RecipeCategory.BUILDING_BLOCKS); + + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.TUFF_TILES); + list.add(NSE_Blocks.TUFF_BRICKS); + list.add(NSE_Blocks.BIG_TUFF_TILES); + list.add(Blocks.TUFF); + }), RecipeCategory.BUILDING_BLOCKS); + + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.SMALL_WHITE_TILES); + list.add(NSE_Blocks.SMALL_CRACKED_WHITE_TILES); + list.add(NSE_Blocks.GLAZED_WHITE_TILES); + list.add(NSE_Blocks.CRACKED_GLAZED_WHITE_TILES); + }), RecipeCategory.BUILDING_BLOCKS); + + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.CROSS_ACACIA_PLANKS); + list.add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS); + list.add(Blocks.ACACIA_PLANKS); + }), RecipeCategory.BUILDING_BLOCKS); + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.CROSS_OAK_PLANKS); + list.add(NSE_Blocks.HERRINGBONE_OAK_PLANKS); + list.add(Blocks.OAK_PLANKS); + }), RecipeCategory.BUILDING_BLOCKS); + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.CROSS_BIRCH_PLANKS); + list.add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS); + list.add(Blocks.BIRCH_PLANKS); + }), RecipeCategory.BUILDING_BLOCKS); + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.CROSS_CRIMSON_PLANKS); + list.add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS); + list.add(Blocks.CRIMSON_PLANKS); + }), RecipeCategory.BUILDING_BLOCKS); + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.CROSS_DARK_OAK_PLANKS); + list.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS); + list.add(Blocks.DARK_OAK_PLANKS); + }), RecipeCategory.BUILDING_BLOCKS); + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.CROSS_JUNGLE_PLANKS); + list.add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS); + list.add(Blocks.JUNGLE_PLANKS); + }), RecipeCategory.BUILDING_BLOCKS); + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.CROSS_MANGROVE_PLANKS); + list.add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS); + list.add(Blocks.MANGROVE_PLANKS); + }), RecipeCategory.BUILDING_BLOCKS); + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.CROSS_SPRUCE_PLANKS); + list.add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS); + list.add(Blocks.SPRUCE_PLANKS); + }), RecipeCategory.BUILDING_BLOCKS); + + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.BRICK_TILES); + list.add(NSE_Blocks.GLAZED_BRICK_TILES); + list.add(Blocks.BRICKS); + }), RecipeCategory.BUILDING_BLOCKS); + + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.NII_WALL_3); + list.add(Blocks.STONE); + list.add(Blocks.STONE_BRICKS); + }), RecipeCategory.BUILDING_BLOCKS); + + stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { + list.add(NSE_Blocks.NII_WALL_2); + list.add(Blocks.SMOOTH_STONE); + }), RecipeCategory.BUILDING_BLOCKS); + + diceRecipe(exporter, NSE_Items.DICE_D4); + diceRecipe(exporter, NSE_Items.DICE_D6); + diceRecipe(exporter, NSE_Items.DICE_D20); + + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_MANGROVE_DOOR, Blocks.MANGROVE_DOOR); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_OAK_DOOR, Blocks.OAK_DOOR); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_SPRUCE_DOOR, Blocks.SPRUCE_DOOR); + offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_BIRCH_DOOR, Blocks.BIRCH_DOOR); + + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Custom.LIGHT_BULB_LAMP, 1) + .input('X', Items.IRON_INGOT).input('Y', Items.IRON_NUGGET).input('Z', NSE_Items.LIGHT_BULB) + .pattern(" X ").pattern(" Y ").pattern(" Z ") + .criterion(hasItem(NSE_Items.LIGHT_BULB), conditionsFromItem(NSE_Items.LIGHT_BULB)).offerTo(exporter); + + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.NII_FLOOR, 4) + .input('#', Items.DIORITE).input('G', Items.GRANITE).input('C', Items.COBBLESTONE) + .pattern("#G").pattern("GC") + .criterion(hasItem(Items.GRANITE), conditionsFromItem(Items.GRANITE)) + .criterion(hasItem(Items.DIORITE), conditionsFromItem(Items.DIORITE)) + .criterion(hasItem(Items.COBBLESTONE), conditionsFromItem(Items.COBBLESTONE)) + .offerTo(exporter); + + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.BIG_GREEN_TILES, 8) + .input('#', NSE_Blocks.BIG_DIORITE_TILES).input('G', Items.GREEN_DYE) + .pattern("###") + .pattern("#G#") + .pattern("###") + .criterion(hasItem(Items.GREEN_DYE), conditionsFromItem(Items.GREEN_DYE)) + .criterion(hasItem(NSE_Blocks.BIG_DIORITE_TILES), conditionsFromItem(NSE_Blocks.BIG_DIORITE_TILES)) + .offerTo(exporter); + + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.GREEN_BRICKS, 8) + .input('#', Items.BRICKS).input('G', Items.GREEN_DYE) + .pattern("###") + .pattern("#G#") + .pattern("###") + .criterion(hasItem(Items.GREEN_DYE), conditionsFromItem(Items.GREEN_DYE)) + .criterion(hasItem(Items.BRICKS), conditionsFromItem(Items.BRICKS)) + .offerTo(exporter); + + ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.GREEN_BRICKS_2, 2) + .input(Items.BRICKS).input(NSE_Blocks.GREEN_BRICKS) + .criterion(hasItem(NSE_Blocks.GREEN_BRICKS), conditionsFromItem(NSE_Blocks.GREEN_BRICKS)) + .criterion(hasItem(Items.BRICKS), conditionsFromItem(Items.BRICKS)) + .offerTo(exporter); + + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.SMALL_YELLOW_TILES, 8) + .pattern("###") + .pattern("#Y#") + .pattern("###") + .input('#', NSE_Blocks.SMALL_WHITE_TILES).input('Y', Items.YELLOW_DYE) + .criterion(hasItem(NSE_Blocks.SMALL_WHITE_TILES), conditionsFromItem(NSE_Blocks.SMALL_WHITE_TILES)) + .criterion(hasItem(Items.YELLOW_DYE), conditionsFromItem(Items.YELLOW_DYE)) + .offerTo(exporter); + + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.RED_BRICKS, 8) + .pattern("###") + .pattern("#R#") + .pattern("###") + .input('#', Items.BRICKS).input('R', Items.RED_DYE) + .criterion(hasItem(Items.BRICKS), conditionsFromItem(Items.BRICKS)) + .criterion(hasItem(Items.RED_DYE), conditionsFromItem(Items.RED_DYE)) + .offerTo(exporter); + + ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.DARK_BRICK_TILES, 8) + .pattern("###") + .pattern("#D#") + .pattern("###") + .input('#', NSE_Blocks.BRICK_TILES).input('D', Items.BROWN_DYE) + .criterion(hasItem(NSE_Blocks.BRICK_TILES), conditionsFromItem(NSE_Blocks.BRICK_TILES)) + .criterion(hasItem(Items.BROWN_DYE), conditionsFromItem(Items.BROWN_DYE)) + .offerTo(exporter); + + // Generated stairs and slabs recipes + offerStairsAndSlab(exporter, NSE_Blocks.SAND_TILES_STAIRS, NSE_Blocks.SAND_TILES_SLAB, NSE_Blocks.SAND_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_SAND_TILES_STAIRS, NSE_Blocks.CRACKED_SAND_TILES_SLAB, NSE_Blocks.CRACKED_SAND_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_SAND_TILES_STAIRS, NSE_Blocks.MOSSY_SAND_TILES_SLAB, NSE_Blocks.MOSSY_SAND_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_SAND_TILES_STAIRS, NSE_Blocks.HERRINGBONE_SAND_TILES_SLAB, NSE_Blocks.HERRINGBONE_SAND_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.CROSS_SAND_TILES_STAIRS, NSE_Blocks.CROSS_SAND_TILES_SLAB, NSE_Blocks.CROSS_SAND_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.SAND_BRICKS_STAIRS, NSE_Blocks.SAND_BRICKS_SLAB, NSE_Blocks.SAND_BRICKS); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_SAND_BRICKS_STAIRS, NSE_Blocks.CRACKED_SAND_BRICKS_SLAB, NSE_Blocks.CRACKED_SAND_BRICKS); + offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_SAND_BRICKS_STAIRS, NSE_Blocks.MOSSY_SAND_BRICKS_SLAB, NSE_Blocks.MOSSY_SAND_BRICKS); + offerStairsAndSlab(exporter, NSE_Blocks.BIG_SAND_BRICKS_STAIRS, NSE_Blocks.BIG_SAND_BRICKS_SLAB, NSE_Blocks.BIG_SAND_BRICKS); + offerStairsAndSlab(exporter, NSE_Blocks.BRICK_TILES_STAIRS, NSE_Blocks.BRICK_TILES_SLAB, NSE_Blocks.BRICK_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_BRICK_TILES_STAIRS, NSE_Blocks.CRACKED_BRICK_TILES_SLAB, NSE_Blocks.CRACKED_BRICK_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_BRICK_TILES_STAIRS, NSE_Blocks.MOSSY_BRICK_TILES_SLAB, NSE_Blocks.MOSSY_BRICK_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.DIRTY_BRICK_TILES_STAIRS, NSE_Blocks.DIRTY_BRICK_TILES_SLAB, NSE_Blocks.DIRTY_BRICK_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.DARK_BRICK_TILES_STAIRS, NSE_Blocks.DARK_BRICK_TILES_SLAB, NSE_Blocks.DARK_BRICK_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_DARK_BRICK_TILES_STAIRS, NSE_Blocks.CRACKED_DARK_BRICK_TILES_SLAB, NSE_Blocks.CRACKED_DARK_BRICK_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_DARK_BRICK_TILES_STAIRS, NSE_Blocks.MOSSY_DARK_BRICK_TILES_SLAB, NSE_Blocks.MOSSY_DARK_BRICK_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.DIRTY_DARK_BRICK_TILES_STAIRS, NSE_Blocks.DIRTY_DARK_BRICK_TILES_SLAB, NSE_Blocks.DIRTY_DARK_BRICK_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.RED_BRICKS_STAIRS, NSE_Blocks.RED_BRICKS_SLAB, NSE_Blocks.RED_BRICKS); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_RED_BRICKS_STAIRS, NSE_Blocks.CRACKED_RED_BRICKS_SLAB, NSE_Blocks.CRACKED_RED_BRICKS); + offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_RED_BRICKS_STAIRS, NSE_Blocks.MOSSY_RED_BRICKS_SLAB, NSE_Blocks.MOSSY_RED_BRICKS); + offerStairsAndSlab(exporter, NSE_Blocks.TEAL_TILES_STAIRS, NSE_Blocks.TEAL_TILES_SLAB, NSE_Blocks.TEAL_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_TEAL_TILES_STAIRS, NSE_Blocks.CRACKED_TEAL_TILES_SLAB, NSE_Blocks.CRACKED_TEAL_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_TEAL_TILES_STAIRS, NSE_Blocks.MOSSY_TEAL_TILES_SLAB, NSE_Blocks.MOSSY_TEAL_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.VARIATED_TEAL_TILES_STAIRS, NSE_Blocks.VARIATED_TEAL_TILES_SLAB, NSE_Blocks.VARIATED_TEAL_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.GREEN_BRICKS_STAIRS, NSE_Blocks.GREEN_BRICKS_SLAB, NSE_Blocks.GREEN_BRICKS); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_GREEN_BRICKS_STAIRS, NSE_Blocks.CRACKED_GREEN_BRICKS_SLAB, NSE_Blocks.CRACKED_GREEN_BRICKS); + offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_GREEN_BRICKS_STAIRS, NSE_Blocks.MOSSY_GREEN_BRICKS_SLAB, NSE_Blocks.MOSSY_GREEN_BRICKS); + offerStairsAndSlab(exporter, NSE_Blocks.GREEN_BRICKS_2_STAIRS, NSE_Blocks.GREEN_BRICKS_2_SLAB, NSE_Blocks.GREEN_BRICKS_2); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_GREEN_BRICKS_2_STAIRS, NSE_Blocks.CRACKED_GREEN_BRICKS_2_SLAB, NSE_Blocks.CRACKED_GREEN_BRICKS_2); + offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_GREEN_BRICKS_2_STAIRS, NSE_Blocks.MOSSY_GREEN_BRICKS_2_SLAB, NSE_Blocks.MOSSY_GREEN_BRICKS_2); + offerStairsAndSlab(exporter, NSE_Blocks.AQUAMARINE_TILES_STAIRS, NSE_Blocks.AQUAMARINE_TILES_SLAB, NSE_Blocks.AQUAMARINE_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_AQUAMARINE_TILES_STAIRS, NSE_Blocks.CRACKED_AQUAMARINE_TILES_SLAB, NSE_Blocks.CRACKED_AQUAMARINE_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_AQUAMARINE_TILES_STAIRS, NSE_Blocks.MOSSY_AQUAMARINE_TILES_SLAB, NSE_Blocks.MOSSY_AQUAMARINE_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.DIRTY_AQUAMARINE_TILES_STAIRS, NSE_Blocks.DIRTY_AQUAMARINE_TILES_SLAB, NSE_Blocks.DIRTY_AQUAMARINE_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.DIORITE_BRICKS_STAIRS, NSE_Blocks.DIORITE_BRICKS_SLAB, NSE_Blocks.DIORITE_BRICKS); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_DIORITE_BRICKS_STAIRS, NSE_Blocks.CRACKED_DIORITE_BRICKS_SLAB, NSE_Blocks.CRACKED_DIORITE_BRICKS); + offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_DIORITE_BRICKS_STAIRS, NSE_Blocks.MOSSY_DIORITE_BRICKS_SLAB, NSE_Blocks.MOSSY_DIORITE_BRICKS); + offerStairsAndSlab(exporter, NSE_Blocks.CALCITE_TILES_STAIRS, NSE_Blocks.CALCITE_TILES_SLAB, NSE_Blocks.CALCITE_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_CALCITE_TILES_STAIRS, NSE_Blocks.CRACKED_CALCITE_TILES_SLAB, NSE_Blocks.CRACKED_CALCITE_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_CALCITE_TILES_STAIRS, NSE_Blocks.MOSSY_CALCITE_TILES_SLAB, NSE_Blocks.MOSSY_CALCITE_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.DRIPSTONE_TILES_STAIRS, NSE_Blocks.DRIPSTONE_TILES_SLAB, NSE_Blocks.DRIPSTONE_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_DRIPSTONE_TILES_STAIRS, NSE_Blocks.CRACKED_DRIPSTONE_TILES_SLAB, NSE_Blocks.CRACKED_DRIPSTONE_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_DRIPSTONE_TILES_STAIRS, NSE_Blocks.MOSSY_DRIPSTONE_TILES_SLAB, NSE_Blocks.MOSSY_DRIPSTONE_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.DEEPSLATE_TILES_STAIRS, NSE_Blocks.DEEPSLATE_TILES_SLAB, NSE_Blocks.DEEPSLATE_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_DEEPSLATE_TILES_STAIRS, NSE_Blocks.CRACKED_DEEPSLATE_TILES_SLAB, NSE_Blocks.CRACKED_DEEPSLATE_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_DEEPSLATE_TILES_STAIRS, NSE_Blocks.MOSSY_DEEPSLATE_TILES_SLAB, NSE_Blocks.MOSSY_DEEPSLATE_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.LIGHT_BLUE_TILES_STAIRS, NSE_Blocks.LIGHT_BLUE_TILES_SLAB, NSE_Blocks.LIGHT_BLUE_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_LIGHT_BLUE_TILES_STAIRS, NSE_Blocks.CRACKED_LIGHT_BLUE_TILES_SLAB, NSE_Blocks.CRACKED_LIGHT_BLUE_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_STAIRS, NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_SLAB, NSE_Blocks.MOSSY_LIGHT_BLUE_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.VARIATED_LIGHT_BLUE_TILES_STAIRS, NSE_Blocks.VARIATED_LIGHT_BLUE_TILES_SLAB, NSE_Blocks.VARIATED_LIGHT_BLUE_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.LIGHT_BLUE_BRICKS_STAIRS, NSE_Blocks.LIGHT_BLUE_BRICKS_SLAB, NSE_Blocks.LIGHT_BLUE_BRICKS); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS_STAIRS, NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS_SLAB, NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS); + offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_STAIRS, NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_SLAB, NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS); + offerStairsAndSlab(exporter, NSE_Blocks.GREEN_WHITE_TILES_STAIRS, NSE_Blocks.GREEN_WHITE_TILES_SLAB, NSE_Blocks.GREEN_WHITE_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_GREEN_WHITE_TILES_STAIRS, NSE_Blocks.CRACKED_GREEN_WHITE_TILES_SLAB, NSE_Blocks.CRACKED_GREEN_WHITE_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_GREEN_WHITE_TILES_STAIRS, NSE_Blocks.MOSSY_GREEN_WHITE_TILES_SLAB, NSE_Blocks.MOSSY_GREEN_WHITE_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.TUFF_TILES_STAIRS, NSE_Blocks.TUFF_TILES_SLAB, NSE_Blocks.TUFF_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_TUFF_TILES_STAIRS, NSE_Blocks.CRACKED_TUFF_TILES_SLAB, NSE_Blocks.CRACKED_TUFF_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_TUFF_TILES_STAIRS, NSE_Blocks.MOSSY_TUFF_TILES_SLAB, NSE_Blocks.MOSSY_TUFF_TILES); + offerStairsAndSlab(exporter, NSE_Blocks.TUFF_BRICKS_STAIRS, NSE_Blocks.TUFF_BRICKS_SLAB, NSE_Blocks.TUFF_BRICKS); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_TUFF_BRICKS_STAIRS, NSE_Blocks.CRACKED_TUFF_BRICKS_SLAB, NSE_Blocks.CRACKED_TUFF_BRICKS); + offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_TUFF_BRICKS_STAIRS, NSE_Blocks.MOSSY_TUFF_BRICKS_SLAB, NSE_Blocks.MOSSY_TUFF_BRICKS); + offerStairsAndSlab(exporter, NSE_Blocks.WHITE_CONCRETE_STAIRS, NSE_Blocks.WHITE_CONCRETE_SLAB, NSE_Blocks.WHITE_CONCRETE); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_WHITE_CONCRETE_STAIRS, NSE_Blocks.CRACKED_WHITE_CONCRETE_SLAB, NSE_Blocks.CRACKED_WHITE_CONCRETE); + offerStairsAndSlab(exporter, NSE_Blocks.BEIGE_CONCRETE_STAIRS, NSE_Blocks.BEIGE_CONCRETE_SLAB, NSE_Blocks.BEIGE_CONCRETE); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_BEIGE_CONCRETE_STAIRS, NSE_Blocks.CRACKED_BEIGE_CONCRETE_SLAB, NSE_Blocks.CRACKED_BEIGE_CONCRETE); + offerStairsAndSlab(exporter, NSE_Blocks.BLUE_CONCRETE_STAIRS, NSE_Blocks.BLUE_CONCRETE_SLAB, NSE_Blocks.BLUE_CONCRETE); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_BLUE_CONCRETE_STAIRS, NSE_Blocks.CRACKED_BLUE_CONCRETE_SLAB, NSE_Blocks.CRACKED_BLUE_CONCRETE); + offerStairsAndSlab(exporter, NSE_Blocks.RED_CONCRETE_STAIRS, NSE_Blocks.RED_CONCRETE_SLAB, NSE_Blocks.RED_CONCRETE); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_RED_CONCRETE_STAIRS, NSE_Blocks.CRACKED_RED_CONCRETE_SLAB, NSE_Blocks.CRACKED_RED_CONCRETE); + offerStairsAndSlab(exporter, NSE_Blocks.YELLOW_CONCRETE_STAIRS, NSE_Blocks.YELLOW_CONCRETE_SLAB, NSE_Blocks.YELLOW_CONCRETE); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_YELLOW_CONCRETE_STAIRS, NSE_Blocks.CRACKED_YELLOW_CONCRETE_SLAB, NSE_Blocks.CRACKED_YELLOW_CONCRETE); + offerStairsAndSlab(exporter, NSE_Blocks.GREEN_CONCRETE_STAIRS, NSE_Blocks.GREEN_CONCRETE_SLAB, NSE_Blocks.GREEN_CONCRETE); + offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_GREEN_CONCRETE_STAIRS, NSE_Blocks.CRACKED_GREEN_CONCRETE_SLAB, NSE_Blocks.CRACKED_GREEN_CONCRETE); + offerStairsAndSlab(exporter, NSE_Blocks.NII_FLOOR_STAIRS, NSE_Blocks.NII_FLOOR_SLAB, NSE_Blocks.NII_FLOOR); + offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_ACACIA_PLANKS); + offerStairsAndSlab(exporter, NSE_Blocks.CROSS_ACACIA_PLANKS_STAIRS, NSE_Blocks.CROSS_ACACIA_PLANKS_SLAB, NSE_Blocks.CROSS_ACACIA_PLANKS); + offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_OAK_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_OAK_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_OAK_PLANKS); + offerStairsAndSlab(exporter, NSE_Blocks.CROSS_OAK_PLANKS_STAIRS, NSE_Blocks.CROSS_OAK_PLANKS_SLAB, NSE_Blocks.CROSS_OAK_PLANKS); + offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_BIRCH_PLANKS); + offerStairsAndSlab(exporter, NSE_Blocks.CROSS_BIRCH_PLANKS_STAIRS, NSE_Blocks.CROSS_BIRCH_PLANKS_SLAB, NSE_Blocks.CROSS_BIRCH_PLANKS); + offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS); + offerStairsAndSlab(exporter, NSE_Blocks.CROSS_CRIMSON_PLANKS_STAIRS, NSE_Blocks.CROSS_CRIMSON_PLANKS_SLAB, NSE_Blocks.CROSS_CRIMSON_PLANKS); + offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS); + offerStairsAndSlab(exporter, NSE_Blocks.CROSS_DARK_OAK_PLANKS_STAIRS, NSE_Blocks.CROSS_DARK_OAK_PLANKS_SLAB, NSE_Blocks.CROSS_DARK_OAK_PLANKS); + offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS); + offerStairsAndSlab(exporter, NSE_Blocks.CROSS_JUNGLE_PLANKS_STAIRS, NSE_Blocks.CROSS_JUNGLE_PLANKS_SLAB, NSE_Blocks.CROSS_JUNGLE_PLANKS); + offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS); + offerStairsAndSlab(exporter, NSE_Blocks.CROSS_MANGROVE_PLANKS_STAIRS, NSE_Blocks.CROSS_MANGROVE_PLANKS_SLAB, NSE_Blocks.CROSS_MANGROVE_PLANKS); + offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS); + offerStairsAndSlab(exporter, NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS, NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB, NSE_Blocks.CROSS_SPRUCE_PLANKS); + offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_PARQUET_STAIRS, NSE_Blocks.HERRINGBONE_PARQUET_SLAB, NSE_Blocks.HERRINGBONE_PARQUET); + offerStairsAndSlab(exporter, NSE_Blocks.STRAIGHT_PARQUET_STAIRS, NSE_Blocks.STRAIGHT_PARQUET_SLAB, NSE_Blocks.STRAIGHT_PARQUET); + offerStairsAndSlab(exporter, NSE_Blocks.SEPARATED_PARQUET_STAIRS, NSE_Blocks.SEPARATED_PARQUET_SLAB, NSE_Blocks.SEPARATED_PARQUET); + offerStairsAndSlab(exporter, NSE_Blocks.GREEN_LINOLEUM_STAIRS, NSE_Blocks.GREEN_LINOLEUM_SLAB, NSE_Blocks.GREEN_LINOLEUM); + offerStairsAndSlab(exporter, NSE_Blocks.BLUE_LINOLEUM_STAIRS, NSE_Blocks.BLUE_LINOLEUM_SLAB, NSE_Blocks.BLUE_LINOLEUM); + offerStairsAndSlab(exporter, NSE_Blocks.RED_LINOLEUM_STAIRS, NSE_Blocks.RED_LINOLEUM_SLAB, NSE_Blocks.RED_LINOLEUM); + offerStairsAndSlab(exporter, NSE_Blocks.GRAY_LINOLEUM_STAIRS, NSE_Blocks.GRAY_LINOLEUM_SLAB, NSE_Blocks.GRAY_LINOLEUM); + offerStairsAndSlab(exporter, NSE_Blocks.ORANGE_LINOLEUM_STAIRS, NSE_Blocks.ORANGE_LINOLEUM_SLAB, NSE_Blocks.ORANGE_LINOLEUM); + offerStairsAndSlab(exporter, NSE_Blocks.BROWN_LINOLEUM_STAIRS, NSE_Blocks.BROWN_LINOLEUM_SLAB, NSE_Blocks.BROWN_LINOLEUM); + offerStairsAndSlab(exporter, NSE_Blocks.CYAN_LINOLEUM_STAIRS, NSE_Blocks.CYAN_LINOLEUM_SLAB, NSE_Blocks.CYAN_LINOLEUM); + offerStairsAndSlab(exporter, NSE_Blocks.METAL_PLATING_STAIRS, NSE_Blocks.METAL_PLATING_SLAB, NSE_Blocks.METAL_PLATING); + } + } + + // This is often used once to generate some model and then move it into "proper" assets folder + private static class ModelGenerator extends FabricModelProvider { + private ModelGenerator(FabricDataOutput generator) { + super(generator); + } + + @Override + public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) { +// BlockStateModelGenerator.createSlabBlockState() +// BlockStateModelGenerator.createWallBlockState() +// BlockStateModelGenerator.createStairsBlockState(NSE_Blocks.SAND_TILES_STAIRS, new Identifier(NewSoviet.MOD_ID, "sand_tiles_stairs")); + } + + @Override + public void generateItemModels(ItemModelGenerator itemModelGenerator) { + } + } + @Override public void onInitializeDataGenerator(FabricDataGenerator fabricDataGenerator) { FabricDataGenerator.Pack NSEPack = fabricDataGenerator.createPack(); @@ -17,6 +1810,5 @@ public class DataGeneration implements DataGeneratorEntrypoint { NSEPack.addProvider(RecipeGenerator::new); NSEPack.addProvider(BlockTagGenerator::new); NSEPack.addProvider(ModelGenerator::new); - NSEPack.addProvider(ItemTagGenerator::new); } } \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_ToolMaterials.java b/src/main/java/su/a71/new_soviet/Materials/NSE_ToolMaterials.java similarity index 83% rename from src/main/java/su/a71/new_soviet/registration/NSE_ToolMaterials.java rename to src/main/java/su/a71/new_soviet/Materials/NSE_ToolMaterials.java index 7528841..213d571 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_ToolMaterials.java +++ b/src/main/java/su/a71/new_soviet/Materials/NSE_ToolMaterials.java @@ -1,4 +1,4 @@ -package su.a71.new_soviet.registration; +package su.a71.new_soviet.Materials; import net.fabricmc.yarn.constants.MiningLevels; import net.minecraft.item.Items; @@ -19,13 +19,13 @@ public enum NSE_ToolMaterials implements ToolMaterial private final int enchantability; private final Lazy repairIngredient; - NSE_ToolMaterials(int miningLevel, int itemDurability, float miningSpeed, float attackDamage, int enchantability, Supplier repairIngredient) { + private NSE_ToolMaterials(int miningLevel, int itemDurability, float miningSpeed, float attackDamage, int enchantability, Supplier repairIngredient) { this.miningLevel = miningLevel; this.itemDurability = itemDurability; this.miningSpeed = miningSpeed; this.attackDamage = attackDamage; this.enchantability = enchantability; - this.repairIngredient = new Lazy<>(repairIngredient); + this.repairIngredient = new Lazy(repairIngredient); } @Override diff --git a/src/main/java/su/a71/new_soviet/NewSoviet.java b/src/main/java/su/a71/new_soviet/NewSoviet.java index 568f1c8..3fab95f 100644 --- a/src/main/java/su/a71/new_soviet/NewSoviet.java +++ b/src/main/java/su/a71/new_soviet/NewSoviet.java @@ -10,7 +10,6 @@ import org.slf4j.LoggerFactory; import su.a71.new_soviet.registration.NSE_Blocks; import su.a71.new_soviet.registration.NSE_Custom; import su.a71.new_soviet.registration.NSE_Items; -import su.a71.new_soviet.registration.NSE_Stats; public class NewSoviet implements ModInitializer { public static final String MOD_ID = "new_soviet"; @@ -32,6 +31,5 @@ public class NewSoviet implements ModInitializer { NSE_Blocks.init(); NSE_Items.init(); NSE_Custom.init(); - NSE_Stats.init(); } } \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/blocks/CeilingFanBlock.java b/src/main/java/su/a71/new_soviet/blocks/CeilingFanBlock.java index ed69602..fcb4aab 100644 --- a/src/main/java/su/a71/new_soviet/blocks/CeilingFanBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/CeilingFanBlock.java @@ -8,6 +8,7 @@ import net.minecraft.server.world.ServerWorld; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.Properties; +import net.minecraft.state.property.Property; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.math.random.Random; @@ -27,25 +28,25 @@ public class CeilingFanBlock extends Block implements Waterloggable { public CeilingFanBlock(Block.Settings settings) { super(settings); - this.setDefaultState(this.getDefaultState().with(ON, false).with(WATERLOGGED, false)); + this.setDefaultState((BlockState)this.getDefaultState().with(ON, false).with(WATERLOGGED, false)); } @Nullable public BlockState getPlacementState(ItemPlacementContext ctx) { - return this.getDefaultState() + return (BlockState)this.getDefaultState() .with(ON, ctx.getWorld().isReceivingRedstonePower(ctx.getBlockPos())) .with(WATERLOGGED, ctx.getWorld().getFluidState(ctx.getBlockPos()).getFluid() == Fluids.WATER); } public void neighborUpdate(BlockState state, World world, BlockPos pos, Block sourceBlock, BlockPos sourcePos, boolean notify) { if (!world.isClient) { - boolean bl = state.get(ON); + boolean bl = (Boolean)state.get(ON); if (bl != world.isReceivingRedstonePower(pos)) { if (bl) { world.scheduleBlockTick(pos, this, 4); } else { - world.setBlockState(pos, state.cycle(ON), 2); + world.setBlockState(pos, (BlockState)state.cycle(ON), 2); } } } @@ -60,13 +61,13 @@ public class CeilingFanBlock extends Block implements Waterloggable { } public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random random) { - if (state.get(ON) && !world.isReceivingRedstonePower(pos)) { - world.setBlockState(pos, state.cycle(ON), 2); + if ((Boolean)state.get(ON) && !world.isReceivingRedstonePower(pos)) { + world.setBlockState(pos, (BlockState)state.cycle(ON), 2); } } protected void appendProperties(StateManager.Builder builder) { - builder.add(ON, WATERLOGGED); + builder.add(new Property[]{ON, WATERLOGGED}); } public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { diff --git a/src/main/java/su/a71/new_soviet/blocks/CheckerBlock.java b/src/main/java/su/a71/new_soviet/blocks/CheckerBlock.java index 9eee71e..2283c40 100644 --- a/src/main/java/su/a71/new_soviet/blocks/CheckerBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/CheckerBlock.java @@ -2,6 +2,7 @@ package su.a71.new_soviet.blocks; import net.minecraft.block.*; import net.minecraft.entity.ai.pathing.NavigationType; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.FluidState; import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemPlacementContext; @@ -9,15 +10,18 @@ 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.state.property.Property; 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.World; import net.minecraft.world.WorldAccess; import net.minecraft.world.WorldView; import org.jetbrains.annotations.Nullable; public class CheckerBlock extends Block implements Waterloggable { + public static final int MAX_PICKLES = 4; public static final IntProperty CHECKERS; public static final BooleanProperty WATERLOGGED; protected static final VoxelShape ONE_CHECKER; @@ -27,18 +31,18 @@ public class CheckerBlock extends Block implements Waterloggable { public CheckerBlock(AbstractBlock.Settings settings) { super(settings); - this.setDefaultState(this.stateManager.getDefaultState().with(CHECKERS, 1).with(WATERLOGGED, true)); + this.setDefaultState((BlockState)((BlockState)((BlockState)this.stateManager.getDefaultState()).with(CHECKERS, 1)).with(WATERLOGGED, true)); } @Nullable public BlockState getPlacementState(ItemPlacementContext ctx) { BlockState blockState = ctx.getWorld().getBlockState(ctx.getBlockPos()); if (blockState.isOf(this)) { - return blockState.with(CHECKERS, Math.min(4, blockState.get(CHECKERS) + 1)); + return (BlockState)blockState.with(CHECKERS, Math.min(4, (Integer)blockState.get(CHECKERS) + 1)); } else { FluidState fluidState = ctx.getWorld().getFluidState(ctx.getBlockPos()); boolean bl = fluidState.getFluid() == Fluids.WATER; - return super.getPlacementState(ctx).with(WATERLOGGED, bl); + return (BlockState)super.getPlacementState(ctx).with(WATERLOGGED, bl); } } @@ -55,7 +59,7 @@ public class CheckerBlock extends Block implements Waterloggable { if (!state.canPlaceAt(world, pos)) { return Blocks.AIR.getDefaultState(); } else { - if (state.get(WATERLOGGED)) { + if ((Boolean)state.get(WATERLOGGED)) { world.scheduleFluidTick(pos, Fluids.WATER, Fluids.WATER.getTickRate(world)); } @@ -64,24 +68,29 @@ public class CheckerBlock extends Block implements Waterloggable { } public boolean canReplace(BlockState state, ItemPlacementContext context) { - return !context.shouldCancelInteraction() && context.getStack().isOf(this.asItem()) && state.get(CHECKERS) < 4 || super.canReplace(state, context); + return !context.shouldCancelInteraction() && context.getStack().isOf(this.asItem()) && (Integer) state.get(CHECKERS) < 4 || super.canReplace(state, context); } public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { - return switch (state.get(CHECKERS)) { - default -> ONE_CHECKER; - case 2 -> TWO_CHECKER; - case 3 -> THREE_CHECKER; - case 4 -> FOUR_CHECKER; - }; + switch ((Integer)state.get(CHECKERS)) { + case 1: + default: + return ONE_CHECKER; + case 2: + return TWO_CHECKER; + case 3: + return THREE_CHECKER; + case 4: + return FOUR_CHECKER; + } } public FluidState getFluidState(BlockState state) { - return state.get(WATERLOGGED) ? Fluids.WATER.getStill(false) : super.getFluidState(state); + return (Boolean)state.get(WATERLOGGED) ? Fluids.WATER.getStill(false) : super.getFluidState(state); } protected void appendProperties(StateManager.Builder builder) { - builder.add(CHECKERS, WATERLOGGED); + builder.add(new Property[]{CHECKERS, WATERLOGGED}); } public boolean canPathfindThrough(BlockState state, BlockView world, BlockPos pos, NavigationType type) { @@ -89,7 +98,7 @@ public class CheckerBlock extends Block implements Waterloggable { } static { - CHECKERS = IntProperty.of("checkers", 1, 4); + CHECKERS = IntProperty.of("checkers", 1, 4);; WATERLOGGED = Properties.WATERLOGGED; ONE_CHECKER = Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 4.0, 14.0); TWO_CHECKER = Block.createCuboidShape(2.0, 0.0, 2.0, 14.0, 8.0, 14.0); diff --git a/src/main/java/su/a71/new_soviet/blocks/ChessBlock.java b/src/main/java/su/a71/new_soviet/blocks/ChessBlock.java index fcca0d8..ade8934 100644 --- a/src/main/java/su/a71/new_soviet/blocks/ChessBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/ChessBlock.java @@ -1,8 +1,10 @@ package su.a71.new_soviet.blocks; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.block.piston.PistonBehavior; import net.minecraft.item.ItemPlacementContext; +import net.minecraft.sound.BlockSoundGroup; import net.minecraft.state.StateManager; import net.minecraft.state.property.Properties; import net.minecraft.util.math.BlockPos; @@ -14,7 +16,7 @@ import net.minecraft.world.WorldView; public class ChessBlock extends HorizontalFacingBlock { - private final VoxelShape blockShape; + private VoxelShape blockShape; public ChessBlock(AbstractBlock.Settings settings, VoxelShape blockShape) { super(settings.notSolid().nonOpaque().noBlockBreakParticles().pistonBehavior(PistonBehavior.DESTROY).strength(0.1f, 2f)); diff --git a/src/main/java/su/a71/new_soviet/blocks/ChessBlockKnight.java b/src/main/java/su/a71/new_soviet/blocks/ChessBlockKnight.java index f0053b8..d7f4065 100644 --- a/src/main/java/su/a71/new_soviet/blocks/ChessBlockKnight.java +++ b/src/main/java/su/a71/new_soviet/blocks/ChessBlockKnight.java @@ -1,5 +1,6 @@ package su.a71.new_soviet.blocks; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.HorizontalFacingBlock; @@ -14,6 +15,7 @@ import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; import net.minecraft.world.WorldView; +import su.a71.new_soviet.util.Shapes; public class ChessBlockKnight extends HorizontalFacingBlock { diff --git a/src/main/java/su/a71/new_soviet/blocks/HandrailBlock.java b/src/main/java/su/a71/new_soviet/blocks/HandrailBlock.java index 2d7988f..48bac06 100644 --- a/src/main/java/su/a71/new_soviet/blocks/HandrailBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/HandrailBlock.java @@ -21,7 +21,7 @@ import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; import net.minecraft.world.WorldAccess; -import su.a71.new_soviet.entities.TVBlockEntity; +import su.a71.new_soviet.entity.TVBlockEntity; import su.a71.new_soviet.util.Shapes; import java.util.List; @@ -32,9 +32,9 @@ import static net.minecraft.block.StairsBlock.SHAPE; // By the way, Blockstate not updating when removing stairs is a "creative decision" apparently // - Andrew71 public class HandrailBlock extends HorizontalFacingBlock implements BlockEntityProvider, Waterloggable { - protected static final Shapes.HorizontalShape SHAPE1; - protected static final Shapes.HorizontalShape SHAPE2; - protected static final Shapes.HorizontalShape SHAPE3; + protected static final Shapes.HorizontalShape2 SHAPE1; + protected static final Shapes.HorizontalShape2 SHAPE2; + protected static final Shapes.HorizontalShape2 SHAPE3; public static final BooleanProperty WATERLOGGED; public static final IntProperty ROTATION; @@ -128,10 +128,10 @@ public class HandrailBlock extends HorizontalFacingBlock implements BlockEntityP } static { - SHAPE2 = new Shapes.HorizontalShape(List.of(List.of(0.0, 0.0, 15.0, 16.0, 17.0, 16.0), List.of(0.0, 17.0, 14.5, 16.0, 19.0, 16.5))); - SHAPE1 = new Shapes.HorizontalShape(List.of(List.of(0.0, 0.0, 15.0, 8.0, 18.0, 16.0), List.of(8.0, -8.0, 15.0, 16.0, 10.0, 16.0))); - SHAPE3 = new Shapes.HorizontalShape(List.of(List.of(0.0, -8.0, 15.0, 8.0, 10.0, 16.0), List.of(8.0, 0.0, 15.0, 16.0, 18.0, 16.0))); - ROTATION = IntProperty.of("rotate", 1, 3); + SHAPE2 = new Shapes.HorizontalShape2(List.of(List.of(0.0, 0.0, 15.0, 16.0, 17.0, 16.0), List.of(0.0, 17.0, 14.5, 16.0, 19.0, 16.5))); + SHAPE1 = new Shapes.HorizontalShape2(List.of(List.of(0.0, 0.0, 15.0, 8.0, 18.0, 16.0), List.of(8.0, -8.0, 15.0, 16.0, 10.0, 16.0))); + SHAPE3 = new Shapes.HorizontalShape2(List.of(List.of(0.0, -8.0, 15.0, 8.0, 10.0, 16.0), List.of(8.0, 0.0, 15.0, 16.0, 18.0, 16.0))); + ROTATION = IntProperty.of("rotate", 1, 3);; WATERLOGGED = Properties.WATERLOGGED; } } \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/blocks/LandMineBlock.java b/src/main/java/su/a71/new_soviet/blocks/LandMineBlock.java index db1444a..1a72186 100644 --- a/src/main/java/su/a71/new_soviet/blocks/LandMineBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/LandMineBlock.java @@ -121,7 +121,7 @@ public class LandMineBlock extends HorizontalFacingBlock implements Waterloggabl @Nullable public BlockState getPlacementState(ItemPlacementContext ctx) { FluidState fluidState = ctx.getWorld().getFluidState(ctx.getBlockPos()); - return this.getDefaultState().with(WATERLOGGED, fluidState.getFluid() == Fluids.WATER).with(Properties.HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite()); + return (BlockState)this.getDefaultState().with(WATERLOGGED, fluidState.getFluid() == Fluids.WATER).with(Properties.HORIZONTAL_FACING, ctx.getHorizontalPlayerFacing().getOpposite()); } public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { diff --git a/src/main/java/su/a71/new_soviet/blocks/SirenBlock.java b/src/main/java/su/a71/new_soviet/blocks/SirenBlock.java index 4f718d1..ae84777 100644 --- a/src/main/java/su/a71/new_soviet/blocks/SirenBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/SirenBlock.java @@ -3,6 +3,7 @@ package su.a71.new_soviet.blocks; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.block.piston.PistonBehavior; +import net.minecraft.entity.player.PlayerEntity; import net.minecraft.fluid.FluidState; import net.minecraft.fluid.Fluids; import net.minecraft.item.ItemPlacementContext; @@ -40,13 +41,13 @@ public class SirenBlock extends HorizontalFacingBlock implements Waterloggable { public void neighborUpdate(BlockState state, World world, BlockPos pos, Block sourceBlock, BlockPos sourcePos, boolean notify) { if (!world.isClient) { - boolean bl = state.get(ON); + boolean bl = (Boolean)state.get(ON); if (bl != world.isReceivingRedstonePower(pos)) { if (bl) { world.scheduleBlockTick(pos, this, 4); } else { - world.playSound(null, pos.getX(), pos.getY(), pos.getZ(), NSE_Sounds.SIREN_SOUND, SoundCategory.NEUTRAL, getSirenVolume(world, pos), 1f); - world.setBlockState(pos, state.cycle(ON), 2); + world.playSound((PlayerEntity)null, pos.getX(), pos.getY(), pos.getZ(), NSE_Sounds.SIREN_SOUND, SoundCategory.NEUTRAL, getSirenVolume(world, pos), 1f); + world.setBlockState(pos, (BlockState)state.cycle(ON), 2); world.scheduleBlockTick(pos, this, 140); } } @@ -56,13 +57,18 @@ public class SirenBlock extends HorizontalFacingBlock implements Waterloggable { @Override public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext ctx) { Direction dir = state.get(FACING); - return switch (dir) { - case NORTH -> Block.createCuboidShape(3.5, 2, 11, 12.5, 15, 16); - case SOUTH -> Block.createCuboidShape(3.5, 2, 0, 12.5, 15, 5); - case EAST -> Block.createCuboidShape(0, 2, 3.5, 5, 15, 12.5); - case WEST -> Block.createCuboidShape(11, 2, 3.5, 16, 15, 12.5); - default -> VoxelShapes.fullCube(); - }; + switch(dir) { + case NORTH: + return Block.createCuboidShape(3.5, 2, 11, 12.5, 15, 16); + case SOUTH: + return Block.createCuboidShape(3.5, 2, 0, 12.5, 15, 5); + case EAST: + return Block.createCuboidShape(0, 2, 3.5, 5, 15, 12.5); + case WEST: + return Block.createCuboidShape(11, 2, 3.5, 16, 15, 12.5); + default: + return VoxelShapes.fullCube(); + } } @Override @@ -74,17 +80,17 @@ public class SirenBlock extends HorizontalFacingBlock implements Waterloggable { } public boolean canPlaceAt(BlockState state, WorldView world, BlockPos pos) { - Direction direction = state.get(FACING); + Direction direction = (Direction)state.get(FACING); BlockPos blockPos = pos.offset(direction.getOpposite()); BlockState blockState = world.getBlockState(blockPos); return direction.getAxis().isHorizontal() && blockState.isSideSolidFullSquare(world, blockPos, direction); } public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random random) { - if (state.get(ON) && !world.isReceivingRedstonePower(pos)) { - world.setBlockState(pos, state.cycle(ON), 2); + if ((Boolean)state.get(ON) && !world.isReceivingRedstonePower(pos)) { + world.setBlockState(pos, (BlockState)state.cycle(ON), 2); } else { - world.playSound(null, pos.getX(), pos.getY(), pos.getZ(), NSE_Sounds.SIREN_SOUND, SoundCategory.NEUTRAL, getSirenVolume(world, pos), 1f); + world.playSound((PlayerEntity)null, pos.getX(), pos.getY(), pos.getZ(), NSE_Sounds.SIREN_SOUND, SoundCategory.NEUTRAL, getSirenVolume(world, pos), 1f); world.scheduleBlockTick(pos, this, 140); } } diff --git a/src/main/java/su/a71/new_soviet/blocks/StoveBlock.java b/src/main/java/su/a71/new_soviet/blocks/StoveBlock.java index 7608133..5aa8b40 100644 --- a/src/main/java/su/a71/new_soviet/blocks/StoveBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/StoveBlock.java @@ -40,11 +40,15 @@ public class StoveBlock extends BlockWithEntity { @Override public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext ctx) { - return switch (state.get(FACING)) { - case NORTH, SOUTH -> VoxelShapes.cuboid(0.0625f, 0.0f, 0.3125f, 0.9375f, 0.5625f, 0.6875f); - case EAST, WEST -> VoxelShapes.cuboid(0.3125f, 0.0f, 0.0625f, 0.6875f, 0.5625f, 0.9375f); - default -> VoxelShapes.fullCube(); - }; + Direction dir = state.get(FACING); + switch(dir) { + case NORTH, SOUTH: + return VoxelShapes.cuboid(0.0625f, 0.0f, 0.3125f, 0.9375f, 0.5625f, 0.6875f); + case EAST, WEST: + return VoxelShapes.cuboid(0.3125f, 0.0f, 0.0625f, 0.6875f, 0.5625f, 0.9375f); + default: + return VoxelShapes.fullCube(); + } } @Override @@ -53,11 +57,11 @@ public class StoveBlock extends BlockWithEntity { } public BlockState rotate(BlockState state, BlockRotation rotation) { - return state.with(FACING, rotation.rotate(state.get(FACING))); + return (BlockState)state.with(FACING, rotation.rotate((Direction)state.get(FACING))); } public BlockState mirror(BlockState state, BlockMirror mirror) { - return state.rotate(mirror.getRotation(state.get(FACING))); + return state.rotate(mirror.getRotation((Direction)state.get(FACING))); } static { diff --git a/src/main/java/su/a71/new_soviet/blocks/SwitchBlock.java b/src/main/java/su/a71/new_soviet/blocks/SwitchBlock.java index 33673d1..159db2f 100644 --- a/src/main/java/su/a71/new_soviet/blocks/SwitchBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/SwitchBlock.java @@ -4,6 +4,7 @@ import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.*; import net.minecraft.block.enums.WallMountLocation; import net.minecraft.block.piston.PistonBehavior; +import net.minecraft.entity.Entity; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.particle.DustParticleEffect; import net.minecraft.sound.BlockSoundGroup; @@ -16,6 +17,7 @@ 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.random.Random; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.BlockView; import net.minecraft.world.World; @@ -24,8 +26,6 @@ import net.minecraft.world.event.GameEvent; import su.a71.new_soviet.registration.NSE_Sounds; -import java.util.Objects; - public class SwitchBlock extends LeverBlock { public static final BooleanProperty POWERED = Properties.POWERED; protected static final VoxelShape NORTH_WALL_SHAPE = Block.createCuboidShape(5.5, 5.5, 15, 10.5, 10.5, 16); @@ -39,29 +39,39 @@ public class SwitchBlock extends LeverBlock { public SwitchBlock(FabricBlockSettings fabricBlockSettings) { super(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).notSolid().pistonBehavior(PistonBehavior.DESTROY).strength(1f, 2f).mapColor(MapColor.TERRACOTTA_WHITE).noCollision()); - this.setDefaultState(this.stateManager.getDefaultState().with(FACING, Direction.NORTH).with(POWERED, false).with(FACE, WallMountLocation.WALL)); + this.setDefaultState((BlockState)((BlockState)((BlockState)((BlockState)this.stateManager.getDefaultState()).with(FACING, Direction.NORTH)).with(POWERED, false)).with(FACE, WallMountLocation.WALL)); } @Override public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { - switch (state.get(FACE)) { + switch ((WallMountLocation)state.get(FACE)) { case FLOOR: { - if (Objects.requireNonNull(state.get(FACING).getAxis()) == Direction.Axis.X) { - return FLOOR_X_AXIS_SHAPE; + switch (state.get(FACING).getAxis()) { + case X: { + return FLOOR_X_AXIS_SHAPE; + } } return FLOOR_Z_AXIS_SHAPE; } case WALL: { - return switch (state.get(FACING)) { - case EAST -> EAST_WALL_SHAPE; - case WEST -> WEST_WALL_SHAPE; - case SOUTH -> SOUTH_WALL_SHAPE; - default -> NORTH_WALL_SHAPE; - }; + switch (state.get(FACING)) { + case EAST: { + return EAST_WALL_SHAPE; + } + case WEST: { + return WEST_WALL_SHAPE; + } + case SOUTH: { + return SOUTH_WALL_SHAPE; + } + } + return NORTH_WALL_SHAPE; } } - if (Objects.requireNonNull(state.get(FACING).getAxis()) == Direction.Axis.X) { - return CEILING_X_AXIS_SHAPE; + switch (state.get(FACING).getAxis()) { + case X: { + return CEILING_X_AXIS_SHAPE; + } } return CEILING_Z_AXIS_SHAPE; } @@ -69,13 +79,13 @@ public class SwitchBlock extends LeverBlock { @Override public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { if (world.isClient) { - state.cycle(POWERED); + BlockState blockState = (BlockState)state.cycle(POWERED); return ActionResult.SUCCESS; } BlockState blockState = this.togglePower(state, world, pos); float f = blockState.get(POWERED) ? 1f : 0.9f; world.playSound(null, pos, NSE_Sounds.SWITCH_PRESS, SoundCategory.BLOCKS, 0.6f, f); - world.emitGameEvent(player, blockState.get(POWERED) ? GameEvent.BLOCK_ACTIVATE : GameEvent.BLOCK_DEACTIVATE, pos); + world.emitGameEvent((Entity)player, blockState.get(POWERED) ? GameEvent.BLOCK_ACTIVATE : GameEvent.BLOCK_DEACTIVATE, pos); return ActionResult.CONSUME; } @@ -88,6 +98,14 @@ public class SwitchBlock extends LeverBlock { world.addParticle(new DustParticleEffect(DustParticleEffect.RED, alpha), d, e, f, 0.0, 0.0, 0.0); } + @Override + public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random random) { + if (state.get(POWERED) && random.nextFloat() < 0.25f) { + //SwitchBlock.spawnParticles(state, world, pos, 0.5f); + } + } + + @Override protected void appendProperties(StateManager.Builder builder) { builder.add(FACE, FACING, POWERED); diff --git a/src/main/java/su/a71/new_soviet/blocks/TVBlock.java b/src/main/java/su/a71/new_soviet/blocks/TVBlock.java index 156d974..9afd9f0 100644 --- a/src/main/java/su/a71/new_soviet/blocks/TVBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/TVBlock.java @@ -13,13 +13,13 @@ import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; -import su.a71.new_soviet.entities.TVBlockEntity; +import su.a71.new_soviet.entity.TVBlockEntity; import su.a71.new_soviet.util.Shapes; import java.util.List; public class TVBlock extends HorizontalFacingBlock implements BlockEntityProvider { - protected static final Shapes.HorizontalShapeLegacy SHAPE; + protected static final Shapes.HorizontalShape SHAPE; public TVBlock(AbstractBlock.Settings settings) { super(settings.sounds(BlockSoundGroup.METAL).pistonBehavior(PistonBehavior.BLOCK).strength(1f, 2f)); @@ -54,6 +54,6 @@ public class TVBlock extends HorizontalFacingBlock implements BlockEntityProvide } static { - SHAPE = new Shapes.HorizontalShapeLegacy(List.of(List.of(0.0, 1.0, 3.0, 16.0, 13.0, 13.0), List.of(2.0, 0.0, 4.0, 14.0, 1.0, 12.0), List.of(6.0, 13.0, 7.0, 10.0, 14.0, 9.0))); + SHAPE = new Shapes.HorizontalShape(List.of(List.of(0.0, 1.0, 3.0, 16.0, 13.0, 13.0), List.of(2.0, 0.0, 4.0, 14.0, 1.0, 12.0), List.of(6.0, 13.0, 7.0, 10.0, 14.0, 9.0))); } } \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/blocks/lamps/DevTableLampBlock.java b/src/main/java/su/a71/new_soviet/blocks/lamps/DevTableLampBlock.java index d2892b2..cf47de9 100644 --- a/src/main/java/su/a71/new_soviet/blocks/lamps/DevTableLampBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/lamps/DevTableLampBlock.java @@ -1,5 +1,14 @@ package su.a71.new_soviet.blocks.lamps; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.ShapeContext; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.shape.VoxelShape; +import net.minecraft.util.shape.VoxelShapes; +import net.minecraft.world.BlockView; +import net.minecraft.world.WorldView; import su.a71.new_soviet.util.Shapes; import java.util.List; @@ -8,7 +17,7 @@ public class DevTableLampBlock extends GoldenTableLampBlock { public DevTableLampBlock(Settings settings) { super(settings); - SHAPE = new Shapes.HorizontalShapeLegacy(List.of( + SHAPE = new Shapes.HorizontalShape(List.of( List.of(5.0, 0.0, 5.0, 11.0, 2.0, 11.0), List.of(7.0, 2.0, 7.0, 9.0, 4.0, 9.0), List.of(6.0, 4.0, 6.0, 10.0, 5.0, 10.0), diff --git a/src/main/java/su/a71/new_soviet/blocks/lamps/GoldenTableLampBlock.java b/src/main/java/su/a71/new_soviet/blocks/lamps/GoldenTableLampBlock.java index 301189c..f51f6f9 100644 --- a/src/main/java/su/a71/new_soviet/blocks/lamps/GoldenTableLampBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/lamps/GoldenTableLampBlock.java @@ -21,7 +21,7 @@ import java.util.List; public class GoldenTableLampBlock extends LampBlock { public static final DirectionProperty FACING; - public Shapes.HorizontalShapeLegacy SHAPE = new Shapes.HorizontalShapeLegacy(List.of( + public Shapes.HorizontalShape SHAPE = new Shapes.HorizontalShape(List.of( List.of(5.0, 0.0, 5.0, 11.0, 2.0, 11.0), List.of(7.0, 2.0, 7.0, 9.0, 4.0, 9.0), List.of(6.0, 4.0, 6.0, 10.0, 5.0, 10.0), @@ -43,7 +43,8 @@ public class GoldenTableLampBlock extends LampBlock { } public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { - return switch (state.get(FACING)) { + Direction dir = state.get(FACING); + return switch (dir) { case NORTH -> SHAPE.north(); case SOUTH -> SHAPE.south(); case EAST -> SHAPE.east(); @@ -64,11 +65,11 @@ public class GoldenTableLampBlock extends LampBlock { } public BlockState rotate(BlockState state, BlockRotation rotation) { - return state.with(FACING, rotation.rotate(state.get(FACING))); + return (BlockState)state.with(FACING, rotation.rotate((Direction)state.get(FACING))); } public BlockState mirror(BlockState state, BlockMirror mirror) { - return state.rotate(mirror.getRotation(state.get(FACING))); + return state.rotate(mirror.getRotation((Direction)state.get(FACING))); } static { diff --git a/src/main/java/su/a71/new_soviet/blocks/lamps/LampBlock.java b/src/main/java/su/a71/new_soviet/blocks/lamps/LampBlock.java index 3f43f8c..7d00e96 100644 --- a/src/main/java/su/a71/new_soviet/blocks/lamps/LampBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/lamps/LampBlock.java @@ -11,6 +11,7 @@ import net.minecraft.sound.SoundCategory; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.Properties; +import net.minecraft.state.property.Property; import net.minecraft.util.ActionResult; import net.minecraft.util.Hand; import net.minecraft.util.hit.BlockHitResult; @@ -64,7 +65,7 @@ public abstract class LampBlock extends Block implements Waterloggable { @Override public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) { if (!world.isClient) { - world.setBlockState(pos, state.cycle(INVERTED), 2); + world.setBlockState(pos, (BlockState)state.cycle(INVERTED), 2); } float f = state.get(ON) ? 1f : 0.9f; world.playSound(null, pos, NSE_Sounds.SWITCH_PRESS, SoundCategory.BLOCKS, 0.6f, f); @@ -72,7 +73,7 @@ public abstract class LampBlock extends Block implements Waterloggable { } protected void appendProperties(StateManager.Builder builder) { - builder.add(ON, WATERLOGGED, INVERTED); + builder.add(new Property[]{ON, WATERLOGGED, INVERTED}); } public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { @@ -93,20 +94,20 @@ public abstract class LampBlock extends Block implements Waterloggable { public void neighborUpdate(BlockState state, World world, BlockPos pos, Block sourceBlock, BlockPos sourcePos, boolean notify) { if (!world.isClient) { - boolean bl = state.get(ON); + boolean bl = (Boolean)state.get(ON); if (bl != world.isReceivingRedstonePower(pos)) { if (bl) { world.scheduleBlockTick(pos, this, 4); } else { - world.setBlockState(pos, state.cycle(ON), 2); + world.setBlockState(pos, (BlockState)state.cycle(ON), 2); } } } } public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random random) { - if (state.get(ON) && !world.isReceivingRedstonePower(pos)) { - world.setBlockState(pos, state.cycle(ON), 2); + if ((Boolean)state.get(ON) && !world.isReceivingRedstonePower(pos)) { + world.setBlockState(pos, (BlockState)state.cycle(ON), 2); } } diff --git a/src/main/java/su/a71/new_soviet/blocks/lamps/LightBulbLampBlock.java b/src/main/java/su/a71/new_soviet/blocks/lamps/LightBulbLampBlock.java index 750700d..3c5a1a4 100644 --- a/src/main/java/su/a71/new_soviet/blocks/lamps/LightBulbLampBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/lamps/LightBulbLampBlock.java @@ -9,6 +9,7 @@ import net.minecraft.sound.SoundCategory; import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.Properties; +import net.minecraft.state.property.Property; import net.minecraft.util.ActionResult; import net.minecraft.util.Formatting; import net.minecraft.util.Hand; @@ -23,6 +24,7 @@ import net.minecraft.world.WorldView; import org.jetbrains.annotations.Nullable; import su.a71.new_soviet.NewSoviet; +import su.a71.new_soviet.blocks.lamps.LampBlock; import su.a71.new_soviet.registration.NSE_Items; import su.a71.new_soviet.registration.NSE_Sounds; @@ -45,7 +47,7 @@ public class LightBulbLampBlock extends LampBlock { @Nullable public BlockState getPlacementState(ItemPlacementContext ctx) { - return this.getDefaultState() + return (BlockState)this.getDefaultState() .with(BROKEN, false); } @@ -55,12 +57,12 @@ public class LightBulbLampBlock extends LampBlock { if (world.isReceivingRedstonePower(pos) == state.get(INVERTED) || (NewSoviet.RANDOM.nextBetween(1, 32) == 1)) { if (!player.isCreative()) player.getInventory().getMainHandStack().decrement(1); - world.setBlockState(pos, state.with(BROKEN, false)); + world.setBlockState(pos, (BlockState)state.with(BROKEN, false)); return ActionResult.SUCCESS; } else { player.getItemCooldownManager().set(NSE_Items.LIGHT_BULB, 10); player.sendMessage(Text.translatable("block.new_soviet.light_bulb_block.energized").formatted(Formatting.YELLOW), true); - world.playSound(null, pos.getX(), pos.getY(), pos.getZ(), NSE_Sounds.ELECTRIC_HIT, SoundCategory.AMBIENT, 0.8f, 1f); + world.playSound((PlayerEntity)null, pos.getX(), pos.getY(), pos.getZ(), NSE_Sounds.ELECTRIC_HIT, SoundCategory.AMBIENT, 0.8f, 1f); if (!player.isCreative()) { player.damage(world.getDamageSources().lightningBolt(), NewSoviet.RANDOM.nextBetween(1, 4)); } @@ -77,14 +79,14 @@ public class LightBulbLampBlock extends LampBlock { @Override public void onProjectileHit(World world, BlockState state, BlockHitResult hit, ProjectileEntity projectile) { if (!state.get(BROKEN)) { - world.playSound(null, hit.getBlockPos().getX(), hit.getBlockPos().getY(), hit.getBlockPos().getZ(), NSE_Sounds.LIGHT_BULB_BROKEN_SOUND, SoundCategory.NEUTRAL, 0.8f, 1f); + world.playSound((PlayerEntity)null, hit.getBlockPos().getX(), hit.getBlockPos().getY(), hit.getBlockPos().getZ(), NSE_Sounds.LIGHT_BULB_BROKEN_SOUND, SoundCategory.NEUTRAL, 0.8f, 1f); } - world.setBlockState(hit.getBlockPos(), state.with(BROKEN, true), 2); + world.setBlockState(hit.getBlockPos(), (BlockState)state.with(BROKEN, true), 2); super.onProjectileHit(world, state, hit, projectile); } protected void appendProperties(StateManager.Builder builder) { - builder.add(ON, BROKEN, WATERLOGGED, INVERTED); + builder.add(new Property[]{ON, BROKEN, WATERLOGGED, INVERTED}); } public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { diff --git a/src/main/java/su/a71/new_soviet/blocks/lamps/TableLampBlock.java b/src/main/java/su/a71/new_soviet/blocks/lamps/TableLampBlock.java index 3c6fe1e..7f215fe 100644 --- a/src/main/java/su/a71/new_soviet/blocks/lamps/TableLampBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/lamps/TableLampBlock.java @@ -10,7 +10,7 @@ import net.minecraft.world.WorldView; import su.a71.new_soviet.blocks.lamps.LampBlock; public class TableLampBlock extends LampBlock { - protected final VoxelShape SHAPE = getStandingShape(); + protected final VoxelShape SHAPE = getStandingShape();; public TableLampBlock(AbstractBlock.Settings settings) { super(settings, true, null); diff --git a/src/main/java/su/a71/new_soviet/blocks/lamps/lamp_post/LampPostBaseBlock.java b/src/main/java/su/a71/new_soviet/blocks/lamps/lamp_post/LampPostBaseBlock.java index 779b310..8b08cd2 100644 --- a/src/main/java/su/a71/new_soviet/blocks/lamps/lamp_post/LampPostBaseBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/lamps/lamp_post/LampPostBaseBlock.java @@ -36,7 +36,7 @@ public class LampPostBaseBlock extends Block implements Waterloggable { public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext ctx) { if (state.get(Properties.ATTACHED)) { return SHAPE_ATTACHED; - } + }; return SHAPE_BASE; } diff --git a/src/main/java/su/a71/new_soviet/blocks/lamps/lamp_post/LampPostLampBlock.java b/src/main/java/su/a71/new_soviet/blocks/lamps/lamp_post/LampPostLampBlock.java index 560b171..fda08f7 100644 --- a/src/main/java/su/a71/new_soviet/blocks/lamps/lamp_post/LampPostLampBlock.java +++ b/src/main/java/su/a71/new_soviet/blocks/lamps/lamp_post/LampPostLampBlock.java @@ -9,6 +9,7 @@ import net.minecraft.state.StateManager; import net.minecraft.state.property.BooleanProperty; import net.minecraft.state.property.DirectionProperty; import net.minecraft.state.property.Properties; +import net.minecraft.state.property.Property; import net.minecraft.util.BlockMirror; import net.minecraft.util.BlockRotation; import net.minecraft.util.math.BlockPos; @@ -22,12 +23,14 @@ import net.minecraft.world.WorldView; import org.jetbrains.annotations.Nullable; import su.a71.new_soviet.util.Shapes; +import java.util.List; + public class LampPostLampBlock extends Block implements Waterloggable { public static final DirectionProperty FACING; public static final BooleanProperty WATERLOGGED; - public Shapes.HorizontalShapeLegacy SHAPE; + public Shapes.HorizontalShape SHAPE; - public LampPostLampBlock(AbstractBlock.Settings settings, Shapes.HorizontalShapeLegacy shape) { + public LampPostLampBlock(AbstractBlock.Settings settings, Shapes.HorizontalShape shape) { super(settings.luminance((state) -> 14)); SHAPE = shape; this.setDefaultState(this.stateManager.getDefaultState() @@ -36,7 +39,8 @@ public class LampPostLampBlock extends Block implements Waterloggable { } public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos pos, ShapeContext context) { - return switch (state.get(FACING)) { + Direction dir = state.get(FACING); + return switch (dir) { case NORTH -> SHAPE.north(); case SOUTH -> SHAPE.south(); case EAST -> SHAPE.east(); @@ -68,7 +72,7 @@ public class LampPostLampBlock extends Block implements Waterloggable { } protected void appendProperties(StateManager.Builder builder) { - builder.add(WATERLOGGED, Properties.HORIZONTAL_FACING); + builder.add(new Property[]{WATERLOGGED, Properties.HORIZONTAL_FACING}); } public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState neighborState, WorldAccess world, BlockPos pos, BlockPos neighborPos) { @@ -88,11 +92,11 @@ public class LampPostLampBlock extends Block implements Waterloggable { } public BlockState rotate(BlockState state, BlockRotation rotation) { - return state.with(FACING, rotation.rotate(state.get(FACING))); + return (BlockState)state.with(FACING, rotation.rotate((Direction)state.get(FACING))); } public BlockState mirror(BlockState state, BlockMirror mirror) { - return state.rotate(mirror.getRotation(state.get(FACING))); + return state.rotate(mirror.getRotation((Direction)state.get(FACING))); } static { diff --git a/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java b/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java deleted file mode 100644 index 0bec83d..0000000 --- a/src/main/java/su/a71/new_soviet/datagen/BlockLootTables.java +++ /dev/null @@ -1,414 +0,0 @@ -package su.a71.new_soviet.datagen; -// === ABANDON HOPE, YE WHO ENTER HERE === - -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider; -import su.a71.new_soviet.registration.NSE_Blocks; -import su.a71.new_soviet.registration.NSE_Custom; - -public class BlockLootTables extends FabricBlockLootTableProvider { - public BlockLootTables(FabricDataOutput dataOutput) { - super(dataOutput); - } - - @Override - public void generate() { - // Drops for building blocks - addDrop(NSE_Blocks.SAND_TILES); - addDrop(NSE_Blocks.NII_FLOOR); - addDrop(NSE_Blocks.BIG_GREEN_TILES); - addDrop(NSE_Blocks.BIG_GREEN_TILES_CRACKED); - addDrop(NSE_Blocks.GREEN_BRICKS); - addDrop(NSE_Blocks.CRACKED_GREEN_BRICKS); - addDrop(NSE_Blocks.MOSSY_GREEN_BRICKS); - addDrop(NSE_Blocks.GREEN_BRICKS_2); - addDrop(NSE_Blocks.CRACKED_GREEN_BRICKS_2); - addDrop(NSE_Blocks.MOSSY_GREEN_BRICKS_2); - addDrop(NSE_Blocks.CRACKED_SAND_TILES); - addDrop(NSE_Blocks.MOSSY_SAND_TILES); - addDrop(NSE_Blocks.SMALL_SAND_TILES); - addDrop(NSE_Blocks.SMALL_CRACKED_SAND_TILES); - addDrop(NSE_Blocks.HERRINGBONE_SAND_TILES); - addDrop(NSE_Blocks.CROSS_SAND_TILES); - addDrop(NSE_Blocks.BIG_SAND_TILES); - addDrop(NSE_Blocks.SAND_BRICKS); - addDrop(NSE_Blocks.CRACKED_SAND_BRICKS); - addDrop(NSE_Blocks.MOSSY_SAND_BRICKS); - addDrop(NSE_Blocks.BIG_SAND_BRICKS); - addDrop(NSE_Blocks.BRICK_TILES); - addDrop(NSE_Blocks.CRACKED_BRICK_TILES); - addDrop(NSE_Blocks.MOSSY_BRICK_TILES); - addDrop(NSE_Blocks.DIRTY_BRICK_TILES); - addDrop(NSE_Blocks.DARK_BRICK_TILES); - addDrop(NSE_Blocks.CRACKED_DARK_BRICK_TILES); - addDrop(NSE_Blocks.MOSSY_DARK_BRICK_TILES); - addDrop(NSE_Blocks.DIRTY_DARK_BRICK_TILES); - addDrop(NSE_Blocks.TEAL_TILES); - addDrop(NSE_Blocks.CRACKED_TEAL_TILES); - addDrop(NSE_Blocks.MOSSY_TEAL_TILES); - addDrop(NSE_Blocks.SMALL_TEAL_TILES); - addDrop(NSE_Blocks.SMALL_CRACKED_TEAL_TILES); - addDrop(NSE_Blocks.GLAZED_TEAL_TILES); - addDrop(NSE_Blocks.CRACKED_GLAZED_TEAL_TILES); - addDrop(NSE_Blocks.VARIATED_TEAL_TILES); - addDrop(NSE_Blocks.AQUAMARINE_TILES); - addDrop(NSE_Blocks.CRACKED_AQUAMARINE_TILES); - addDrop(NSE_Blocks.MOSSY_AQUAMARINE_TILES); - addDrop(NSE_Blocks.DIRTY_AQUAMARINE_TILES); - addDrop(NSE_Blocks.SMALL_AQUAMARINE_TILES); - addDrop(NSE_Blocks.SMALL_CRACKED_AQUAMARINE_TILES); - addDrop(NSE_Blocks.GLAZED_AQUAMARINE_TILES); - addDrop(NSE_Blocks.CRACKED_GLAZED_AQUAMARINE_TILES); - addDrop(NSE_Blocks.SMALL_DIORITE_TILES); - addDrop(NSE_Blocks.SMALL_CRACKED_DIORITE_TILES); - addDrop(NSE_Blocks.BIG_DIORITE_TILES); - addDrop(NSE_Blocks.DIORITE_BRICKS); - addDrop(NSE_Blocks.CRACKED_DIORITE_BRICKS); - addDrop(NSE_Blocks.MOSSY_DIORITE_BRICKS); - addDrop(NSE_Blocks.CALCITE_TILES); - addDrop(NSE_Blocks.CRACKED_CALCITE_TILES); - addDrop(NSE_Blocks.MOSSY_CALCITE_TILES); - addDrop(NSE_Blocks.DIAGONAL_CALCITE_TILES); - addDrop(NSE_Blocks.NII_WALL_1); - addDrop(NSE_Blocks.CRACKED_NII_WALL_1); - addDrop(NSE_Blocks.NII_WALL_2); - addDrop(NSE_Blocks.NII_WALL_3); - addDrop(NSE_Blocks.DRIPSTONE_TILES); - addDrop(NSE_Blocks.CRACKED_DRIPSTONE_TILES); - addDrop(NSE_Blocks.MOSSY_DRIPSTONE_TILES); - addDrop(NSE_Blocks.DRIPSTONE_BRICKS); - addDrop(NSE_Blocks.DEEPSLATE_TILES); - addDrop(NSE_Blocks.CRACKED_DEEPSLATE_TILES); - addDrop(NSE_Blocks.MOSSY_DEEPSLATE_TILES); - addDrop(NSE_Blocks.SMALL_DEEPSLATE_TILES); - addDrop(NSE_Blocks.SMALL_CRACKED_DEEPSLATE_TILES); - addDrop(NSE_Blocks.DIAGONAL_DEEPSLATE_TILES); - addDrop(NSE_Blocks.LIGHT_BLUE_TILES); - addDrop(NSE_Blocks.CRACKED_LIGHT_BLUE_TILES); - addDrop(NSE_Blocks.MOSSY_LIGHT_BLUE_TILES); - addDrop(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES); - addDrop(NSE_Blocks.SMALL_LIGHT_BLUE_TILES); - addDrop(NSE_Blocks.SMALL_CRACKED_LIGHT_BLUE_TILES); - addDrop(NSE_Blocks.GLAZED_LIGHT_BLUE_TILES); - addDrop(NSE_Blocks.CRACKED_GLAZED_LIGHT_BLUE_TILES); - addDrop(NSE_Blocks.LIGHT_BLUE_BRICKS); - addDrop(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS); - addDrop(NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS); - addDrop(NSE_Blocks.BIG_GRANITE_TILES); - addDrop(NSE_Blocks.SMALL_GRANITE_TILES); - addDrop(NSE_Blocks.SMALL_CRACKED_GRANITE_TILES); - addDrop(NSE_Blocks.GREEN_WHITE_TILES); - addDrop(NSE_Blocks.CRACKED_GREEN_WHITE_TILES); - addDrop(NSE_Blocks.MOSSY_GREEN_WHITE_TILES); - addDrop(NSE_Blocks.TUFF_TILES); - addDrop(NSE_Blocks.CRACKED_TUFF_TILES); - addDrop(NSE_Blocks.MOSSY_TUFF_TILES); - addDrop(NSE_Blocks.BIG_TUFF_TILES); - addDrop(NSE_Blocks.TUFF_BRICKS); - addDrop(NSE_Blocks.CRACKED_TUFF_BRICKS); - addDrop(NSE_Blocks.MOSSY_TUFF_BRICKS); - addDrop(NSE_Blocks.INDUSTRIAL_WARNING); - addDrop(NSE_Blocks.GRAY_WARNING); - addDrop(NSE_Blocks.RED_WARNING); - addDrop(NSE_Blocks.ORANGE_WARNING); - addDrop(NSE_Blocks.YELLOW_WARNING); - addDrop(NSE_Blocks.LIME_WARNING); - addDrop(NSE_Blocks.GREEN_WARNING); - addDrop(NSE_Blocks.CYAN_WARNING); - addDrop(NSE_Blocks.LIGHT_BLUE_WARNING); - addDrop(NSE_Blocks.BLUE_WARNING); - addDrop(NSE_Blocks.PURPLE_WARNING); - addDrop(NSE_Blocks.MAGENTA_WARNING); - addDrop(NSE_Blocks.METAL_PLATING); - addDrop(NSE_Blocks.CRATE); - addDrop(NSE_Blocks.CONCRETE_WALL); - addDrop(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS); - addDrop(NSE_Blocks.CROSS_ACACIA_PLANKS); - addDrop(NSE_Blocks.HERRINGBONE_OAK_PLANKS); - addDrop(NSE_Blocks.CROSS_OAK_PLANKS); - addDrop(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS); - addDrop(NSE_Blocks.CROSS_BIRCH_PLANKS); - addDrop(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS); - addDrop(NSE_Blocks.CROSS_CRIMSON_PLANKS); - addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS); - addDrop(NSE_Blocks.CROSS_DARK_OAK_PLANKS); - addDrop(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS); - addDrop(NSE_Blocks.CROSS_JUNGLE_PLANKS); - addDrop(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS); - addDrop(NSE_Blocks.CROSS_MANGROVE_PLANKS); - addDrop(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS); - addDrop(NSE_Blocks.CROSS_SPRUCE_PLANKS); - addDrop(NSE_Blocks.HERRINGBONE_PARQUET); - addDrop(NSE_Blocks.STRAIGHT_PARQUET); - addDrop(NSE_Blocks.SEPARATED_PARQUET); - addDrop(NSE_Blocks.GREEN_LINOLEUM); - addDrop(NSE_Blocks.BLUE_LINOLEUM); - addDrop(NSE_Blocks.RED_LINOLEUM); - addDrop(NSE_Blocks.GRAY_LINOLEUM); - addDrop(NSE_Blocks.ORANGE_LINOLEUM); - addDrop(NSE_Blocks.BROWN_LINOLEUM); - addDrop(NSE_Blocks.CYAN_LINOLEUM); - addDrop(NSE_Blocks.CROSS_ORANGE_LINOLEUM); - addDrop(NSE_Blocks.CROSS_BROWN_LINOLEUM); - addDrop(NSE_Blocks.WHITE_CONCRETE); - addDrop(NSE_Blocks.CRACKED_WHITE_CONCRETE); - addDrop(NSE_Blocks.BEIGE_CONCRETE); - addDrop(NSE_Blocks.CRACKED_BEIGE_CONCRETE); - addDrop(NSE_Blocks.BLUE_CONCRETE); - addDrop(NSE_Blocks.CRACKED_BLUE_CONCRETE); - addDrop(NSE_Blocks.RED_CONCRETE); - addDrop(NSE_Blocks.CRACKED_RED_CONCRETE); - addDrop(NSE_Blocks.YELLOW_CONCRETE); - addDrop(NSE_Blocks.CRACKED_YELLOW_CONCRETE); - addDrop(NSE_Blocks.GREEN_CONCRETE); - addDrop(NSE_Blocks.CRACKED_GREEN_CONCRETE); - addDrop(NSE_Blocks.WHITEWASH); - addDrop(NSE_Blocks.CRACKED_WHITEWASH); - addDrop(NSE_Blocks.VERY_CRACKED_WHITEWASH); - addDrop(NSE_Blocks.SMALL_YELLOW_TILES); - addDrop(NSE_Blocks.SMALL_CRACKED_YELLOW_TILES); - addDrop(NSE_Blocks.MEAT); - addDrop(NSE_Blocks.MEAT_EYE); - addDrop(NSE_Blocks.MEAT_TEETH); - addDrop(NSE_Blocks.CHISELED_BIRCH_DOOR, doorDrops(NSE_Blocks.CHISELED_BIRCH_DOOR)); - addDrop(NSE_Blocks.CHISELED_MANGROVE_DOOR, doorDrops(NSE_Blocks.CHISELED_MANGROVE_DOOR)); - addDrop(NSE_Blocks.CHISELED_OAK_DOOR, doorDrops(NSE_Blocks.CHISELED_OAK_DOOR)); - addDrop(NSE_Blocks.CHISELED_SPRUCE_DOOR, doorDrops(NSE_Blocks.CHISELED_SPRUCE_DOOR)); - addDrop(NSE_Blocks.BEIGE_WALLPAPER); - addDrop(NSE_Blocks.BROWN_WALLPAPER); - addDrop(NSE_Blocks.GREEN_WALLPAPER); - addDrop(NSE_Blocks.HANDRAIL); - - // Drops for furniture/electronics/appliances - addDrop(NSE_Custom.WHITE_PAWN); - addDrop(NSE_Custom.WHITE_BISHOP); - addDrop(NSE_Custom.WHITE_KING); - addDrop(NSE_Custom.WHITE_KNIGHT); - addDrop(NSE_Custom.WHITE_QUEEN); - addDrop(NSE_Custom.WHITE_ROOK); - addDrop(NSE_Custom.BLACK_KNIGHT); - addDrop(NSE_Custom.BLACK_PAWN); - addDrop(NSE_Custom.BLACK_KING); - addDrop(NSE_Custom.BLACK_QUEEN); - addDrop(NSE_Custom.BLACK_BISHOP); - addDrop(NSE_Custom.BLACK_ROOK); - - addDrop(NSE_Custom.TV); - addDrop(NSE_Custom.RED_TV); - addDrop(NSE_Custom.BROWN_TV); - addDrop(NSE_Custom.RADIO_RECEIVER); - addDrop(NSE_Custom.SIREN); - addDrop(NSE_Custom.TABLE_LAMP); - addDrop(NSE_Custom.VINTAGE_LAMP); - addDrop(NSE_Custom.CEILING_FAN); - addDrop(NSE_Custom.SWITCH); - - // Generated stairs and slabs drops - addDrop(NSE_Blocks.SAND_TILES_SLAB); - addDrop(NSE_Blocks.SAND_TILES_STAIRS); - addDrop(NSE_Blocks.CRACKED_SAND_TILES_SLAB); - addDrop(NSE_Blocks.CRACKED_SAND_TILES_STAIRS); - addDrop(NSE_Blocks.MOSSY_SAND_TILES_SLAB); - addDrop(NSE_Blocks.MOSSY_SAND_TILES_STAIRS); - addDrop(NSE_Blocks.HERRINGBONE_SAND_TILES_SLAB); - addDrop(NSE_Blocks.HERRINGBONE_SAND_TILES_STAIRS); - addDrop(NSE_Blocks.CROSS_SAND_TILES_SLAB); - addDrop(NSE_Blocks.CROSS_SAND_TILES_STAIRS); - addDrop(NSE_Blocks.SAND_BRICKS_SLAB); - addDrop(NSE_Blocks.SAND_BRICKS_STAIRS); - addDrop(NSE_Blocks.CRACKED_SAND_BRICKS_SLAB); - addDrop(NSE_Blocks.CRACKED_SAND_BRICKS_STAIRS); - addDrop(NSE_Blocks.MOSSY_SAND_BRICKS_SLAB); - addDrop(NSE_Blocks.MOSSY_SAND_BRICKS_STAIRS); - addDrop(NSE_Blocks.BIG_SAND_BRICKS_SLAB); - addDrop(NSE_Blocks.BIG_SAND_BRICKS_STAIRS); - addDrop(NSE_Blocks.BRICK_TILES_SLAB); - addDrop(NSE_Blocks.BRICK_TILES_STAIRS); - addDrop(NSE_Blocks.CRACKED_BRICK_TILES_SLAB); - addDrop(NSE_Blocks.CRACKED_BRICK_TILES_STAIRS); - addDrop(NSE_Blocks.MOSSY_BRICK_TILES_SLAB); - addDrop(NSE_Blocks.MOSSY_BRICK_TILES_STAIRS); - addDrop(NSE_Blocks.DIRTY_BRICK_TILES_SLAB); - addDrop(NSE_Blocks.DIRTY_BRICK_TILES_STAIRS); - addDrop(NSE_Blocks.DARK_BRICK_TILES_SLAB); - addDrop(NSE_Blocks.DARK_BRICK_TILES_STAIRS); - addDrop(NSE_Blocks.CRACKED_DARK_BRICK_TILES_SLAB); - addDrop(NSE_Blocks.CRACKED_DARK_BRICK_TILES_STAIRS); - addDrop(NSE_Blocks.MOSSY_DARK_BRICK_TILES_SLAB); - addDrop(NSE_Blocks.MOSSY_DARK_BRICK_TILES_STAIRS); - addDrop(NSE_Blocks.DIRTY_DARK_BRICK_TILES_SLAB); - addDrop(NSE_Blocks.DIRTY_DARK_BRICK_TILES_STAIRS); - addDrop(NSE_Blocks.RED_BRICKS_SLAB); - addDrop(NSE_Blocks.RED_BRICKS_STAIRS); - addDrop(NSE_Blocks.CRACKED_RED_BRICKS_SLAB); - addDrop(NSE_Blocks.CRACKED_RED_BRICKS_STAIRS); - addDrop(NSE_Blocks.MOSSY_RED_BRICKS_SLAB); - addDrop(NSE_Blocks.MOSSY_RED_BRICKS_STAIRS); - addDrop(NSE_Blocks.TEAL_TILES_SLAB); - addDrop(NSE_Blocks.TEAL_TILES_STAIRS); - addDrop(NSE_Blocks.CRACKED_TEAL_TILES_SLAB); - addDrop(NSE_Blocks.CRACKED_TEAL_TILES_STAIRS); - addDrop(NSE_Blocks.MOSSY_TEAL_TILES_SLAB); - addDrop(NSE_Blocks.MOSSY_TEAL_TILES_STAIRS); - addDrop(NSE_Blocks.VARIATED_TEAL_TILES_SLAB); - addDrop(NSE_Blocks.VARIATED_TEAL_TILES_STAIRS); - addDrop(NSE_Blocks.GREEN_BRICKS_SLAB); - addDrop(NSE_Blocks.GREEN_BRICKS_STAIRS); - addDrop(NSE_Blocks.CRACKED_GREEN_BRICKS_SLAB); - addDrop(NSE_Blocks.CRACKED_GREEN_BRICKS_STAIRS); - addDrop(NSE_Blocks.MOSSY_GREEN_BRICKS_SLAB); - addDrop(NSE_Blocks.MOSSY_GREEN_BRICKS_STAIRS); - addDrop(NSE_Blocks.GREEN_BRICKS_2_SLAB); - addDrop(NSE_Blocks.GREEN_BRICKS_2_STAIRS); - addDrop(NSE_Blocks.CRACKED_GREEN_BRICKS_2_SLAB); - addDrop(NSE_Blocks.CRACKED_GREEN_BRICKS_2_STAIRS); - addDrop(NSE_Blocks.MOSSY_GREEN_BRICKS_2_SLAB); - addDrop(NSE_Blocks.MOSSY_GREEN_BRICKS_2_STAIRS); - addDrop(NSE_Blocks.AQUAMARINE_TILES_SLAB); - addDrop(NSE_Blocks.AQUAMARINE_TILES_STAIRS); - addDrop(NSE_Blocks.CRACKED_AQUAMARINE_TILES_SLAB); - addDrop(NSE_Blocks.CRACKED_AQUAMARINE_TILES_STAIRS); - addDrop(NSE_Blocks.MOSSY_AQUAMARINE_TILES_SLAB); - addDrop(NSE_Blocks.MOSSY_AQUAMARINE_TILES_STAIRS); - addDrop(NSE_Blocks.DIRTY_AQUAMARINE_TILES_SLAB); - addDrop(NSE_Blocks.DIRTY_AQUAMARINE_TILES_STAIRS); - addDrop(NSE_Blocks.DIORITE_BRICKS_SLAB); - addDrop(NSE_Blocks.DIORITE_BRICKS_STAIRS); - addDrop(NSE_Blocks.CRACKED_DIORITE_BRICKS_SLAB); - addDrop(NSE_Blocks.CRACKED_DIORITE_BRICKS_STAIRS); - addDrop(NSE_Blocks.MOSSY_DIORITE_BRICKS_SLAB); - addDrop(NSE_Blocks.MOSSY_DIORITE_BRICKS_STAIRS); - addDrop(NSE_Blocks.CALCITE_TILES_SLAB); - addDrop(NSE_Blocks.CALCITE_TILES_STAIRS); - addDrop(NSE_Blocks.CRACKED_CALCITE_TILES_SLAB); - addDrop(NSE_Blocks.CRACKED_CALCITE_TILES_STAIRS); - addDrop(NSE_Blocks.MOSSY_CALCITE_TILES_SLAB); - addDrop(NSE_Blocks.MOSSY_CALCITE_TILES_STAIRS); - addDrop(NSE_Blocks.DRIPSTONE_TILES_SLAB); - addDrop(NSE_Blocks.DRIPSTONE_TILES_STAIRS); - addDrop(NSE_Blocks.CRACKED_DRIPSTONE_TILES_SLAB); - addDrop(NSE_Blocks.CRACKED_DRIPSTONE_TILES_STAIRS); - addDrop(NSE_Blocks.MOSSY_DRIPSTONE_TILES_SLAB); - addDrop(NSE_Blocks.MOSSY_DRIPSTONE_TILES_STAIRS); - addDrop(NSE_Blocks.DEEPSLATE_TILES_SLAB); - addDrop(NSE_Blocks.DEEPSLATE_TILES_STAIRS); - addDrop(NSE_Blocks.CRACKED_DEEPSLATE_TILES_SLAB); - addDrop(NSE_Blocks.CRACKED_DEEPSLATE_TILES_STAIRS); - addDrop(NSE_Blocks.MOSSY_DEEPSLATE_TILES_SLAB); - addDrop(NSE_Blocks.MOSSY_DEEPSLATE_TILES_STAIRS); - addDrop(NSE_Blocks.LIGHT_BLUE_TILES_SLAB); - addDrop(NSE_Blocks.LIGHT_BLUE_TILES_STAIRS); - addDrop(NSE_Blocks.CRACKED_LIGHT_BLUE_TILES_SLAB); - addDrop(NSE_Blocks.CRACKED_LIGHT_BLUE_TILES_STAIRS); - addDrop(NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_SLAB); - addDrop(NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_STAIRS); - addDrop(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES_SLAB); - addDrop(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES_STAIRS); - addDrop(NSE_Blocks.LIGHT_BLUE_BRICKS_SLAB); - addDrop(NSE_Blocks.LIGHT_BLUE_BRICKS_STAIRS); - addDrop(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS_SLAB); - addDrop(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS_STAIRS); - addDrop(NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_SLAB); - addDrop(NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_STAIRS); - addDrop(NSE_Blocks.GREEN_WHITE_TILES_SLAB); - addDrop(NSE_Blocks.GREEN_WHITE_TILES_STAIRS); - addDrop(NSE_Blocks.CRACKED_GREEN_WHITE_TILES_SLAB); - addDrop(NSE_Blocks.CRACKED_GREEN_WHITE_TILES_STAIRS); - addDrop(NSE_Blocks.MOSSY_GREEN_WHITE_TILES_SLAB); - addDrop(NSE_Blocks.MOSSY_GREEN_WHITE_TILES_STAIRS); - addDrop(NSE_Blocks.TUFF_TILES_SLAB); - addDrop(NSE_Blocks.TUFF_TILES_STAIRS); - addDrop(NSE_Blocks.CRACKED_TUFF_TILES_SLAB); - addDrop(NSE_Blocks.CRACKED_TUFF_TILES_STAIRS); - addDrop(NSE_Blocks.MOSSY_TUFF_TILES_SLAB); - addDrop(NSE_Blocks.MOSSY_TUFF_TILES_STAIRS); - addDrop(NSE_Blocks.TUFF_BRICKS_SLAB); - addDrop(NSE_Blocks.TUFF_BRICKS_STAIRS); - addDrop(NSE_Blocks.CRACKED_TUFF_BRICKS_SLAB); - addDrop(NSE_Blocks.CRACKED_TUFF_BRICKS_STAIRS); - addDrop(NSE_Blocks.MOSSY_TUFF_BRICKS_SLAB); - addDrop(NSE_Blocks.MOSSY_TUFF_BRICKS_STAIRS); - addDrop(NSE_Blocks.WHITE_CONCRETE_SLAB); - addDrop(NSE_Blocks.WHITE_CONCRETE_STAIRS); - addDrop(NSE_Blocks.CRACKED_WHITE_CONCRETE_SLAB); - addDrop(NSE_Blocks.CRACKED_WHITE_CONCRETE_STAIRS); - addDrop(NSE_Blocks.BEIGE_CONCRETE_SLAB); - addDrop(NSE_Blocks.BEIGE_CONCRETE_STAIRS); - addDrop(NSE_Blocks.CRACKED_BEIGE_CONCRETE_SLAB); - addDrop(NSE_Blocks.CRACKED_BEIGE_CONCRETE_STAIRS); - addDrop(NSE_Blocks.BLUE_CONCRETE_SLAB); - addDrop(NSE_Blocks.BLUE_CONCRETE_STAIRS); - addDrop(NSE_Blocks.CRACKED_BLUE_CONCRETE_SLAB); - addDrop(NSE_Blocks.CRACKED_BLUE_CONCRETE_STAIRS); - addDrop(NSE_Blocks.RED_CONCRETE_SLAB); - addDrop(NSE_Blocks.RED_CONCRETE_STAIRS); - addDrop(NSE_Blocks.CRACKED_RED_CONCRETE_SLAB); - addDrop(NSE_Blocks.CRACKED_RED_CONCRETE_STAIRS); - addDrop(NSE_Blocks.YELLOW_CONCRETE_SLAB); - addDrop(NSE_Blocks.YELLOW_CONCRETE_STAIRS); - addDrop(NSE_Blocks.CRACKED_YELLOW_CONCRETE_SLAB); - addDrop(NSE_Blocks.CRACKED_YELLOW_CONCRETE_STAIRS); - addDrop(NSE_Blocks.GREEN_CONCRETE_SLAB); - addDrop(NSE_Blocks.GREEN_CONCRETE_STAIRS); - addDrop(NSE_Blocks.CRACKED_GREEN_CONCRETE_SLAB); - addDrop(NSE_Blocks.CRACKED_GREEN_CONCRETE_STAIRS); - addDrop(NSE_Blocks.NII_FLOOR_SLAB); - addDrop(NSE_Blocks.NII_FLOOR_STAIRS); - addDrop(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_SLAB); - addDrop(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_STAIRS); - addDrop(NSE_Blocks.CROSS_ACACIA_PLANKS_SLAB); - addDrop(NSE_Blocks.CROSS_ACACIA_PLANKS_STAIRS); - addDrop(NSE_Blocks.HERRINGBONE_OAK_PLANKS_SLAB); - addDrop(NSE_Blocks.HERRINGBONE_OAK_PLANKS_STAIRS); - addDrop(NSE_Blocks.CROSS_OAK_PLANKS_SLAB); - addDrop(NSE_Blocks.CROSS_OAK_PLANKS_STAIRS); - addDrop(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_SLAB); - addDrop(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_STAIRS); - addDrop(NSE_Blocks.CROSS_BIRCH_PLANKS_SLAB); - addDrop(NSE_Blocks.CROSS_BIRCH_PLANKS_STAIRS); - addDrop(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_SLAB); - addDrop(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_STAIRS); - addDrop(NSE_Blocks.CROSS_CRIMSON_PLANKS_SLAB); - addDrop(NSE_Blocks.CROSS_CRIMSON_PLANKS_STAIRS); - addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_SLAB); - addDrop(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_STAIRS); - addDrop(NSE_Blocks.CROSS_DARK_OAK_PLANKS_SLAB); - addDrop(NSE_Blocks.CROSS_DARK_OAK_PLANKS_STAIRS); - addDrop(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_SLAB); - addDrop(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_STAIRS); - addDrop(NSE_Blocks.CROSS_JUNGLE_PLANKS_SLAB); - addDrop(NSE_Blocks.CROSS_JUNGLE_PLANKS_STAIRS); - addDrop(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS_SLAB); - addDrop(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS_STAIRS); - addDrop(NSE_Blocks.CROSS_MANGROVE_PLANKS_SLAB); - addDrop(NSE_Blocks.CROSS_MANGROVE_PLANKS_STAIRS); - addDrop(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_SLAB); - addDrop(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_STAIRS); - addDrop(NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB); - addDrop(NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS); - addDrop(NSE_Blocks.HERRINGBONE_PARQUET_SLAB); - addDrop(NSE_Blocks.HERRINGBONE_PARQUET_STAIRS); - addDrop(NSE_Blocks.STRAIGHT_PARQUET_SLAB); - addDrop(NSE_Blocks.STRAIGHT_PARQUET_STAIRS); - addDrop(NSE_Blocks.SEPARATED_PARQUET_SLAB); - addDrop(NSE_Blocks.SEPARATED_PARQUET_STAIRS); - addDrop(NSE_Blocks.GREEN_LINOLEUM_SLAB); - addDrop(NSE_Blocks.GREEN_LINOLEUM_STAIRS); - addDrop(NSE_Blocks.BLUE_LINOLEUM_SLAB); - addDrop(NSE_Blocks.BLUE_LINOLEUM_STAIRS); - addDrop(NSE_Blocks.RED_LINOLEUM_SLAB); - addDrop(NSE_Blocks.RED_LINOLEUM_STAIRS); - addDrop(NSE_Blocks.GRAY_LINOLEUM_SLAB); - addDrop(NSE_Blocks.GRAY_LINOLEUM_STAIRS); - addDrop(NSE_Blocks.ORANGE_LINOLEUM_SLAB); - addDrop(NSE_Blocks.ORANGE_LINOLEUM_STAIRS); - addDrop(NSE_Blocks.BROWN_LINOLEUM_SLAB); - addDrop(NSE_Blocks.BROWN_LINOLEUM_STAIRS); - addDrop(NSE_Blocks.CYAN_LINOLEUM_SLAB); - addDrop(NSE_Blocks.CYAN_LINOLEUM_STAIRS); - addDrop(NSE_Blocks.METAL_PLATING_SLAB); - addDrop(NSE_Blocks.METAL_PLATING_STAIRS); - - addDropWithSilkTouch(NSE_Custom.LIGHT_BULB_LAMP); - } -} \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java b/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java deleted file mode 100644 index c28012d..0000000 --- a/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java +++ /dev/null @@ -1,680 +0,0 @@ -package su.a71.new_soviet.datagen; -// === ABANDON HOPE, YE WHO ENTER HERE === - -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.minecraft.registry.RegistryWrapper; -import net.minecraft.registry.tag.BlockTags; -import su.a71.new_soviet.registration.NSE_Blocks; -import su.a71.new_soviet.registration.NSE_Custom; -import su.a71.new_soviet.registration.NSE_Tags; - -import java.util.concurrent.CompletableFuture; - -public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { - - public BlockTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { - super(output, completableFuture); - } - - @Override - protected void configure(RegistryWrapper.WrapperLookup arg) { - // Blocks mined with a pickaxe - getOrCreateTagBuilder(BlockTags.PICKAXE_MINEABLE) - .add(NSE_Blocks.SAND_TILES) - .add(NSE_Blocks.HANDRAIL) - .add(NSE_Blocks.NII_FLOOR) - .add(NSE_Blocks.BIG_GREEN_TILES) - .add(NSE_Blocks.BIG_GREEN_TILES_CRACKED) - .add(NSE_Blocks.GREEN_BRICKS) - .add(NSE_Blocks.CRACKED_GREEN_BRICKS) - .add(NSE_Blocks.MOSSY_GREEN_BRICKS) - .add(NSE_Blocks.GREEN_BRICKS_2) - .add(NSE_Blocks.CRACKED_GREEN_BRICKS_2) - .add(NSE_Blocks.MOSSY_GREEN_BRICKS_2) - .add(NSE_Blocks.CRACKED_SAND_TILES) - .add(NSE_Blocks.MOSSY_SAND_TILES) - .add(NSE_Blocks.SMALL_SAND_TILES) - .add(NSE_Blocks.SMALL_CRACKED_SAND_TILES) - .add(NSE_Blocks.HERRINGBONE_SAND_TILES) - .add(NSE_Blocks.CROSS_SAND_TILES) - .add(NSE_Blocks.BIG_SAND_TILES) - .add(NSE_Blocks.SAND_BRICKS) - .add(NSE_Blocks.CRACKED_SAND_BRICKS) - .add(NSE_Blocks.MOSSY_SAND_BRICKS) - .add(NSE_Blocks.BIG_SAND_BRICKS) - .add(NSE_Blocks.BRICK_TILES) - .add(NSE_Blocks.CRACKED_BRICK_TILES) - .add(NSE_Blocks.MOSSY_BRICK_TILES) - .add(NSE_Blocks.DIRTY_BRICK_TILES) - .add(NSE_Blocks.DARK_BRICK_TILES) - .add(NSE_Blocks.CRACKED_DARK_BRICK_TILES) - .add(NSE_Blocks.MOSSY_DARK_BRICK_TILES) - .add(NSE_Blocks.DIRTY_DARK_BRICK_TILES) - .add(NSE_Blocks.GLAZED_BRICK_TILES) - .add(NSE_Blocks.CRACKED_GLAZED_BRICK_TILES) - .add(NSE_Blocks.RED_BRICKS) - .add(NSE_Blocks.CRACKED_RED_BRICKS) - .add(NSE_Blocks.MOSSY_RED_BRICKS) - .add(NSE_Blocks.TEAL_TILES) - .add(NSE_Blocks.CRACKED_TEAL_TILES) - .add(NSE_Blocks.MOSSY_TEAL_TILES) - .add(NSE_Blocks.SMALL_TEAL_TILES) - .add(NSE_Blocks.SMALL_CRACKED_TEAL_TILES) - .add(NSE_Blocks.GLAZED_TEAL_TILES) - .add(NSE_Blocks.CRACKED_GLAZED_TEAL_TILES) - .add(NSE_Blocks.VARIATED_TEAL_TILES) - .add(NSE_Blocks.AQUAMARINE_TILES) - .add(NSE_Blocks.CRACKED_AQUAMARINE_TILES) - .add(NSE_Blocks.MOSSY_AQUAMARINE_TILES) - .add(NSE_Blocks.DIRTY_AQUAMARINE_TILES) - .add(NSE_Blocks.SMALL_AQUAMARINE_TILES) - .add(NSE_Blocks.SMALL_CRACKED_AQUAMARINE_TILES) - .add(NSE_Blocks.GLAZED_AQUAMARINE_TILES) - .add(NSE_Blocks.CRACKED_GLAZED_AQUAMARINE_TILES) - .add(NSE_Blocks.SMALL_DIORITE_TILES) - .add(NSE_Blocks.SMALL_CRACKED_DIORITE_TILES) - .add(NSE_Blocks.BIG_DIORITE_TILES) - .add(NSE_Blocks.DIORITE_BRICKS) - .add(NSE_Blocks.CRACKED_DIORITE_BRICKS) - .add(NSE_Blocks.MOSSY_DIORITE_BRICKS) - .add(NSE_Blocks.CALCITE_TILES) - .add(NSE_Blocks.CRACKED_CALCITE_TILES) - .add(NSE_Blocks.MOSSY_CALCITE_TILES) - .add(NSE_Blocks.DIAGONAL_CALCITE_TILES) - .add(NSE_Blocks.NII_WALL_1) - .add(NSE_Blocks.CRACKED_NII_WALL_1) - .add(NSE_Blocks.NII_WALL_2) - .add(NSE_Blocks.NII_WALL_3) - .add(NSE_Blocks.DRIPSTONE_TILES) - .add(NSE_Blocks.CRACKED_DRIPSTONE_TILES) - .add(NSE_Blocks.MOSSY_DRIPSTONE_TILES) - .add(NSE_Blocks.DRIPSTONE_BRICKS) - .add(NSE_Blocks.DEEPSLATE_TILES) - .add(NSE_Blocks.CRACKED_DEEPSLATE_TILES) - .add(NSE_Blocks.MOSSY_DEEPSLATE_TILES) - .add(NSE_Blocks.SMALL_DEEPSLATE_TILES) - .add(NSE_Blocks.SMALL_CRACKED_DEEPSLATE_TILES) - .add(NSE_Blocks.DIAGONAL_DEEPSLATE_TILES) - .add(NSE_Blocks.LIGHT_BLUE_TILES) - .add(NSE_Blocks.CRACKED_LIGHT_BLUE_TILES) - .add(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES) - .add(NSE_Blocks.MOSSY_LIGHT_BLUE_TILES) - .add(NSE_Blocks.SMALL_LIGHT_BLUE_TILES) - .add(NSE_Blocks.SMALL_CRACKED_LIGHT_BLUE_TILES) - .add(NSE_Blocks.GLAZED_LIGHT_BLUE_TILES) - .add(NSE_Blocks.CRACKED_GLAZED_LIGHT_BLUE_TILES) - .add(NSE_Blocks.LIGHT_BLUE_BRICKS) - .add(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS) - .add(NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS) - .add(NSE_Blocks.BIG_GRANITE_TILES) - .add(NSE_Blocks.SMALL_GRANITE_TILES) - .add(NSE_Blocks.SMALL_CRACKED_GRANITE_TILES) - .add(NSE_Blocks.GREEN_WHITE_TILES) - .add(NSE_Blocks.CRACKED_GREEN_WHITE_TILES) - .add(NSE_Blocks.MOSSY_GREEN_WHITE_TILES) - .add(NSE_Blocks.TUFF_TILES) - .add(NSE_Blocks.CRACKED_TUFF_TILES) - .add(NSE_Blocks.MOSSY_TUFF_TILES) - .add(NSE_Blocks.BIG_TUFF_TILES) - .add(NSE_Blocks.TUFF_BRICKS) - .add(NSE_Blocks.CRACKED_TUFF_BRICKS) - .add(NSE_Blocks.MOSSY_TUFF_BRICKS) - .add(NSE_Blocks.INDUSTRIAL_WARNING) - .add(NSE_Blocks.GRAY_WARNING) - .add(NSE_Blocks.RED_WARNING) - .add(NSE_Blocks.ORANGE_WARNING) - .add(NSE_Blocks.YELLOW_WARNING) - .add(NSE_Blocks.LIME_WARNING) - .add(NSE_Blocks.GREEN_WARNING) - .add(NSE_Blocks.CYAN_WARNING) - .add(NSE_Blocks.LIGHT_BLUE_WARNING) - .add(NSE_Blocks.BLUE_WARNING) - .add(NSE_Blocks.PURPLE_WARNING) - .add(NSE_Blocks.MAGENTA_WARNING) - .add(NSE_Blocks.METAL_PLATING) - .add(NSE_Blocks.CONCRETE_WALL) - .add(NSE_Blocks.SMALL_YELLOW_TILES) - .add(NSE_Blocks.SMALL_CRACKED_YELLOW_TILES) - .add(NSE_Blocks.SAND_TILES_STAIRS) - .add(NSE_Blocks.SAND_TILES_SLAB) - .add(NSE_Blocks.CRACKED_SAND_TILES_STAIRS) - .add(NSE_Blocks.CRACKED_SAND_TILES_SLAB) - .add(NSE_Blocks.MOSSY_SAND_TILES_STAIRS) - .add(NSE_Blocks.MOSSY_SAND_TILES_SLAB) - .add(NSE_Blocks.HERRINGBONE_SAND_TILES_STAIRS) - .add(NSE_Blocks.HERRINGBONE_SAND_TILES_SLAB) - .add(NSE_Blocks.CROSS_SAND_TILES_STAIRS) - .add(NSE_Blocks.CROSS_SAND_TILES_SLAB) - .add(NSE_Blocks.SAND_BRICKS_STAIRS) - .add(NSE_Blocks.SAND_BRICKS_SLAB) - .add(NSE_Blocks.CRACKED_SAND_BRICKS_STAIRS) - .add(NSE_Blocks.CRACKED_SAND_BRICKS_SLAB) - .add(NSE_Blocks.MOSSY_SAND_BRICKS_STAIRS) - .add(NSE_Blocks.MOSSY_SAND_BRICKS_SLAB) - .add(NSE_Blocks.BIG_SAND_BRICKS_STAIRS) - .add(NSE_Blocks.BIG_SAND_BRICKS_SLAB) - .add(NSE_Blocks.BRICK_TILES_STAIRS) - .add(NSE_Blocks.BRICK_TILES_SLAB) - .add(NSE_Blocks.CRACKED_BRICK_TILES_STAIRS) - .add(NSE_Blocks.CRACKED_BRICK_TILES_SLAB) - .add(NSE_Blocks.MOSSY_BRICK_TILES_STAIRS) - .add(NSE_Blocks.MOSSY_BRICK_TILES_SLAB) - .add(NSE_Blocks.DIRTY_BRICK_TILES_STAIRS) - .add(NSE_Blocks.DIRTY_BRICK_TILES_SLAB) - .add(NSE_Blocks.DARK_BRICK_TILES_STAIRS) - .add(NSE_Blocks.DARK_BRICK_TILES_SLAB) - .add(NSE_Blocks.CRACKED_DARK_BRICK_TILES_STAIRS) - .add(NSE_Blocks.CRACKED_DARK_BRICK_TILES_SLAB) - .add(NSE_Blocks.MOSSY_DARK_BRICK_TILES_STAIRS) - .add(NSE_Blocks.MOSSY_DARK_BRICK_TILES_SLAB) - .add(NSE_Blocks.DIRTY_DARK_BRICK_TILES_STAIRS) - .add(NSE_Blocks.DIRTY_DARK_BRICK_TILES_SLAB) - .add(NSE_Blocks.RED_BRICKS_STAIRS) - .add(NSE_Blocks.RED_BRICKS_SLAB) - .add(NSE_Blocks.CRACKED_RED_BRICKS_STAIRS) - .add(NSE_Blocks.CRACKED_RED_BRICKS_SLAB) - .add(NSE_Blocks.MOSSY_RED_BRICKS_STAIRS) - .add(NSE_Blocks.MOSSY_RED_BRICKS_SLAB) - .add(NSE_Blocks.TEAL_TILES_STAIRS) - .add(NSE_Blocks.TEAL_TILES_SLAB) - .add(NSE_Blocks.CRACKED_TEAL_TILES_STAIRS) - .add(NSE_Blocks.CRACKED_TEAL_TILES_SLAB) - .add(NSE_Blocks.MOSSY_TEAL_TILES_STAIRS) - .add(NSE_Blocks.MOSSY_TEAL_TILES_SLAB) - .add(NSE_Blocks.VARIATED_TEAL_TILES_STAIRS) - .add(NSE_Blocks.VARIATED_TEAL_TILES_SLAB) - .add(NSE_Blocks.GREEN_BRICKS_STAIRS) - .add(NSE_Blocks.GREEN_BRICKS_SLAB) - .add(NSE_Blocks.CRACKED_GREEN_BRICKS_STAIRS) - .add(NSE_Blocks.CRACKED_GREEN_BRICKS_SLAB) - .add(NSE_Blocks.MOSSY_GREEN_BRICKS_STAIRS) - .add(NSE_Blocks.MOSSY_GREEN_BRICKS_SLAB) - .add(NSE_Blocks.GREEN_BRICKS_2_STAIRS) - .add(NSE_Blocks.GREEN_BRICKS_2_SLAB) - .add(NSE_Blocks.CRACKED_GREEN_BRICKS_2_STAIRS) - .add(NSE_Blocks.CRACKED_GREEN_BRICKS_2_SLAB) - .add(NSE_Blocks.MOSSY_GREEN_BRICKS_2_STAIRS) - .add(NSE_Blocks.MOSSY_GREEN_BRICKS_2_SLAB) - .add(NSE_Blocks.AQUAMARINE_TILES_STAIRS) - .add(NSE_Blocks.AQUAMARINE_TILES_SLAB) - .add(NSE_Blocks.CRACKED_AQUAMARINE_TILES_STAIRS) - .add(NSE_Blocks.CRACKED_AQUAMARINE_TILES_SLAB) - .add(NSE_Blocks.MOSSY_AQUAMARINE_TILES_STAIRS) - .add(NSE_Blocks.MOSSY_AQUAMARINE_TILES_SLAB) - .add(NSE_Blocks.DIRTY_AQUAMARINE_TILES_STAIRS) - .add(NSE_Blocks.DIRTY_AQUAMARINE_TILES_SLAB) - .add(NSE_Blocks.DIORITE_BRICKS_STAIRS) - .add(NSE_Blocks.DIORITE_BRICKS_SLAB) - .add(NSE_Blocks.CRACKED_DIORITE_BRICKS_STAIRS) - .add(NSE_Blocks.CRACKED_DIORITE_BRICKS_SLAB) - .add(NSE_Blocks.MOSSY_DIORITE_BRICKS_STAIRS) - .add(NSE_Blocks.MOSSY_DIORITE_BRICKS_SLAB) - .add(NSE_Blocks.CALCITE_TILES_STAIRS) - .add(NSE_Blocks.CALCITE_TILES_SLAB) - .add(NSE_Blocks.CRACKED_CALCITE_TILES_STAIRS) - .add(NSE_Blocks.CRACKED_CALCITE_TILES_SLAB) - .add(NSE_Blocks.MOSSY_CALCITE_TILES_STAIRS) - .add(NSE_Blocks.MOSSY_CALCITE_TILES_SLAB) - .add(NSE_Blocks.DRIPSTONE_TILES_STAIRS) - .add(NSE_Blocks.DRIPSTONE_TILES_SLAB) - .add(NSE_Blocks.CRACKED_DRIPSTONE_TILES_STAIRS) - .add(NSE_Blocks.CRACKED_DRIPSTONE_TILES_SLAB) - .add(NSE_Blocks.MOSSY_DRIPSTONE_TILES_STAIRS) - .add(NSE_Blocks.MOSSY_DRIPSTONE_TILES_SLAB) - .add(NSE_Blocks.DEEPSLATE_TILES_STAIRS) - .add(NSE_Blocks.DEEPSLATE_TILES_SLAB) - .add(NSE_Blocks.CRACKED_DEEPSLATE_TILES_STAIRS) - .add(NSE_Blocks.CRACKED_DEEPSLATE_TILES_SLAB) - .add(NSE_Blocks.MOSSY_DEEPSLATE_TILES_STAIRS) - .add(NSE_Blocks.MOSSY_DEEPSLATE_TILES_SLAB) - .add(NSE_Blocks.LIGHT_BLUE_TILES_STAIRS) - .add(NSE_Blocks.LIGHT_BLUE_TILES_SLAB) - .add(NSE_Blocks.CRACKED_LIGHT_BLUE_TILES_STAIRS) - .add(NSE_Blocks.CRACKED_LIGHT_BLUE_TILES_SLAB) - .add(NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_STAIRS) - .add(NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_SLAB) - .add(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES_STAIRS) - .add(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES_SLAB) - .add(NSE_Blocks.LIGHT_BLUE_BRICKS_STAIRS) - .add(NSE_Blocks.LIGHT_BLUE_BRICKS_SLAB) - .add(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS_STAIRS) - .add(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS_SLAB) - .add(NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_STAIRS) - .add(NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_SLAB) - .add(NSE_Blocks.GREEN_WHITE_TILES_STAIRS) - .add(NSE_Blocks.GREEN_WHITE_TILES_SLAB) - .add(NSE_Blocks.CRACKED_GREEN_WHITE_TILES_STAIRS) - .add(NSE_Blocks.CRACKED_GREEN_WHITE_TILES_SLAB) - .add(NSE_Blocks.MOSSY_GREEN_WHITE_TILES_STAIRS) - .add(NSE_Blocks.MOSSY_GREEN_WHITE_TILES_SLAB) - .add(NSE_Blocks.TUFF_TILES_STAIRS) - .add(NSE_Blocks.TUFF_TILES_SLAB) - .add(NSE_Blocks.CRACKED_TUFF_TILES_STAIRS) - .add(NSE_Blocks.CRACKED_TUFF_TILES_SLAB) - .add(NSE_Blocks.MOSSY_TUFF_TILES_STAIRS) - .add(NSE_Blocks.MOSSY_TUFF_TILES_SLAB) - .add(NSE_Blocks.TUFF_BRICKS_STAIRS) - .add(NSE_Blocks.TUFF_BRICKS_SLAB) - .add(NSE_Blocks.CRACKED_TUFF_BRICKS_STAIRS) - .add(NSE_Blocks.CRACKED_TUFF_BRICKS_SLAB) - .add(NSE_Blocks.MOSSY_TUFF_BRICKS_STAIRS) - .add(NSE_Blocks.MOSSY_TUFF_BRICKS_SLAB) - .add(NSE_Blocks.WHITE_CONCRETE_STAIRS) - .add(NSE_Blocks.WHITE_CONCRETE_SLAB) - .add(NSE_Blocks.CRACKED_WHITE_CONCRETE_STAIRS) - .add(NSE_Blocks.CRACKED_WHITE_CONCRETE_SLAB) - .add(NSE_Blocks.BEIGE_CONCRETE_STAIRS) - .add(NSE_Blocks.BEIGE_CONCRETE_SLAB) - .add(NSE_Blocks.CRACKED_BEIGE_CONCRETE_STAIRS) - .add(NSE_Blocks.CRACKED_BEIGE_CONCRETE_SLAB) - .add(NSE_Blocks.BLUE_CONCRETE_STAIRS) - .add(NSE_Blocks.BLUE_CONCRETE_SLAB) - .add(NSE_Blocks.CRACKED_BLUE_CONCRETE_STAIRS) - .add(NSE_Blocks.CRACKED_BLUE_CONCRETE_SLAB) - .add(NSE_Blocks.RED_CONCRETE_STAIRS) - .add(NSE_Blocks.RED_CONCRETE_SLAB) - .add(NSE_Blocks.CRACKED_RED_CONCRETE_STAIRS) - .add(NSE_Blocks.CRACKED_RED_CONCRETE_SLAB) - .add(NSE_Blocks.YELLOW_CONCRETE_STAIRS) - .add(NSE_Blocks.YELLOW_CONCRETE_SLAB) - .add(NSE_Blocks.CRACKED_YELLOW_CONCRETE_STAIRS) - .add(NSE_Blocks.CRACKED_YELLOW_CONCRETE_SLAB) - .add(NSE_Blocks.GREEN_CONCRETE_STAIRS) - .add(NSE_Blocks.GREEN_CONCRETE_SLAB) - .add(NSE_Blocks.CRACKED_GREEN_CONCRETE_STAIRS) - .add(NSE_Blocks.CRACKED_GREEN_CONCRETE_SLAB) - .add(NSE_Blocks.NII_FLOOR_STAIRS) - .add(NSE_Blocks.NII_FLOOR_SLAB) - .add(NSE_Blocks.METAL_PLATING_STAIRS) - .add(NSE_Blocks.METAL_PLATING_SLAB) - .add(NSE_Custom.VINTAGE_LAMP) - .add(NSE_Custom.LIGHT_BULB_LAMP); - - // Blocks mined with an axe - getOrCreateTagBuilder(BlockTags.AXE_MINEABLE) - .add(NSE_Blocks.CRATE) - .add(NSE_Blocks.CONCRETE_WALL) - .add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS) - .add(NSE_Blocks.CROSS_ACACIA_PLANKS) - .add(NSE_Blocks.HERRINGBONE_OAK_PLANKS) - .add(NSE_Blocks.CROSS_OAK_PLANKS) - .add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS) - .add(NSE_Blocks.CROSS_BIRCH_PLANKS) - .add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS) - .add(NSE_Blocks.CROSS_CRIMSON_PLANKS) - .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS) - .add(NSE_Blocks.CROSS_DARK_OAK_PLANKS) - .add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS) - .add(NSE_Blocks.CROSS_JUNGLE_PLANKS) - .add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS) - .add(NSE_Blocks.CROSS_MANGROVE_PLANKS) - .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS) - .add(NSE_Blocks.CROSS_SPRUCE_PLANKS) - .add(NSE_Blocks.HERRINGBONE_PARQUET) - .add(NSE_Blocks.STRAIGHT_PARQUET) - .add(NSE_Blocks.SEPARATED_PARQUET) - .add(NSE_Blocks.GREEN_LINOLEUM) - .add(NSE_Blocks.BLUE_LINOLEUM) - .add(NSE_Blocks.RED_LINOLEUM) - .add(NSE_Blocks.GRAY_LINOLEUM) - .add(NSE_Blocks.ORANGE_LINOLEUM) - .add(NSE_Blocks.BROWN_LINOLEUM) - .add(NSE_Blocks.CYAN_LINOLEUM) - .add(NSE_Blocks.CROSS_ORANGE_LINOLEUM) - .add(NSE_Blocks.CROSS_BROWN_LINOLEUM) - .add(NSE_Blocks.CHISELED_BIRCH_DOOR) - .add(NSE_Blocks.CHISELED_MANGROVE_DOOR) - .add(NSE_Blocks.CHISELED_OAK_DOOR) - .add(NSE_Blocks.CHISELED_SPRUCE_DOOR) - .add(NSE_Blocks.GREEN_WALLPAPER) - .add(NSE_Blocks.BROWN_WALLPAPER) - .add(NSE_Blocks.BEIGE_WALLPAPER) - .add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_ACACIA_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_ACACIA_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_OAK_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_OAK_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_OAK_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_OAK_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_BIRCH_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_BIRCH_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_CRIMSON_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_CRIMSON_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_DARK_OAK_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_DARK_OAK_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_JUNGLE_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_JUNGLE_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_MANGROVE_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_MANGROVE_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_PARQUET_STAIRS) - .add(NSE_Blocks.HERRINGBONE_PARQUET_SLAB) - .add(NSE_Blocks.STRAIGHT_PARQUET_STAIRS) - .add(NSE_Blocks.STRAIGHT_PARQUET_SLAB) - .add(NSE_Blocks.SEPARATED_PARQUET_STAIRS) - .add(NSE_Blocks.SEPARATED_PARQUET_SLAB) - .add(NSE_Blocks.GREEN_LINOLEUM_STAIRS) - .add(NSE_Blocks.GREEN_LINOLEUM_SLAB) - .add(NSE_Blocks.BLUE_LINOLEUM_STAIRS) - .add(NSE_Blocks.BLUE_LINOLEUM_SLAB) - .add(NSE_Blocks.RED_LINOLEUM_STAIRS) - .add(NSE_Blocks.RED_LINOLEUM_SLAB) - .add(NSE_Blocks.GRAY_LINOLEUM_STAIRS) - .add(NSE_Blocks.GRAY_LINOLEUM_SLAB) - .add(NSE_Blocks.ORANGE_LINOLEUM_STAIRS) - .add(NSE_Blocks.ORANGE_LINOLEUM_SLAB) - .add(NSE_Blocks.BROWN_LINOLEUM_STAIRS) - .add(NSE_Blocks.BROWN_LINOLEUM_SLAB) - .add(NSE_Blocks.CYAN_LINOLEUM_STAIRS) - .add(NSE_Blocks.CYAN_LINOLEUM_SLAB) - .add(NSE_Custom.TABLE_LAMP); - - getOrCreateTagBuilder(NSE_Tags.Blocks.RAKE_MINEABLE) - .add(NSE_Blocks.MEAT) - .add(NSE_Blocks.MEAT_EYE) - .add(NSE_Blocks.MEAT_TEETH) - .add(NSE_Blocks.PURPLE_GOO); - - getOrCreateTagBuilder(NSE_Tags.Blocks.TV) - .add(NSE_Custom.TV) - .add(NSE_Custom.RED_TV) - .add(NSE_Custom.BROWN_TV); - - getOrCreateTagBuilder(NSE_Tags.Blocks.POST_LAMPS) - .add(NSE_Custom.CAGED_POST_LAMP) - .add(NSE_Custom.VINTAGE_POST_LAMP) - .add(NSE_Custom.MODERN_POST_LAMP) - .add(NSE_Custom.BIG_POST_LAMP); - - getOrCreateTagBuilder(BlockTags.DOORS) - .add(NSE_Blocks.CHISELED_BIRCH_DOOR) - .add(NSE_Blocks.CHISELED_OAK_DOOR) - .add(NSE_Blocks.CHISELED_MANGROVE_DOOR) - .add(NSE_Blocks.CHISELED_SPRUCE_DOOR); - - getOrCreateTagBuilder(BlockTags.WOODEN_DOORS) - .add(NSE_Blocks.CHISELED_BIRCH_DOOR) - .add(NSE_Blocks.CHISELED_OAK_DOOR) - .add(NSE_Blocks.CHISELED_MANGROVE_DOOR) - .add(NSE_Blocks.CHISELED_SPRUCE_DOOR); - - getOrCreateTagBuilder(BlockTags.WALLS).add(NSE_Blocks.CONCRETE_WALL); - - getOrCreateTagBuilder(BlockTags.PLANKS) - .add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS) - .add(NSE_Blocks.CROSS_ACACIA_PLANKS) - .add(NSE_Blocks.HERRINGBONE_OAK_PLANKS) - .add(NSE_Blocks.CROSS_OAK_PLANKS) - .add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS) - .add(NSE_Blocks.CROSS_BIRCH_PLANKS) - .add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS) - .add(NSE_Blocks.CROSS_CRIMSON_PLANKS) - .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS) - .add(NSE_Blocks.CROSS_DARK_OAK_PLANKS) - .add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS) - .add(NSE_Blocks.CROSS_JUNGLE_PLANKS) - .add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS) - .add(NSE_Blocks.CROSS_MANGROVE_PLANKS) - .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS) - .add(NSE_Blocks.CROSS_SPRUCE_PLANKS); - - getOrCreateTagBuilder(BlockTags.STAIRS) - .add(NSE_Blocks.SAND_TILES_STAIRS) - .add(NSE_Blocks.CRACKED_SAND_TILES_STAIRS) - .add(NSE_Blocks.MOSSY_SAND_TILES_STAIRS) - .add(NSE_Blocks.HERRINGBONE_SAND_TILES_STAIRS) - .add(NSE_Blocks.CROSS_SAND_TILES_STAIRS) - .add(NSE_Blocks.SAND_BRICKS_STAIRS) - .add(NSE_Blocks.CRACKED_SAND_BRICKS_STAIRS) - .add(NSE_Blocks.MOSSY_SAND_BRICKS_STAIRS) - .add(NSE_Blocks.BIG_SAND_BRICKS_STAIRS) - .add(NSE_Blocks.BRICK_TILES_STAIRS) - .add(NSE_Blocks.CRACKED_BRICK_TILES_STAIRS) - .add(NSE_Blocks.MOSSY_BRICK_TILES_STAIRS) - .add(NSE_Blocks.DIRTY_BRICK_TILES_STAIRS) - .add(NSE_Blocks.DARK_BRICK_TILES_STAIRS) - .add(NSE_Blocks.CRACKED_DARK_BRICK_TILES_STAIRS) - .add(NSE_Blocks.MOSSY_DARK_BRICK_TILES_STAIRS) - .add(NSE_Blocks.DIRTY_DARK_BRICK_TILES_STAIRS) - .add(NSE_Blocks.RED_BRICKS_STAIRS) - .add(NSE_Blocks.CRACKED_RED_BRICKS_STAIRS) - .add(NSE_Blocks.MOSSY_RED_BRICKS_STAIRS) - .add(NSE_Blocks.TEAL_TILES_STAIRS) - .add(NSE_Blocks.CRACKED_TEAL_TILES_STAIRS) - .add(NSE_Blocks.MOSSY_TEAL_TILES_STAIRS) - .add(NSE_Blocks.VARIATED_TEAL_TILES_STAIRS) - .add(NSE_Blocks.GREEN_BRICKS_STAIRS) - .add(NSE_Blocks.CRACKED_GREEN_BRICKS_STAIRS) - .add(NSE_Blocks.MOSSY_GREEN_BRICKS_STAIRS) - .add(NSE_Blocks.GREEN_BRICKS_2_STAIRS) - .add(NSE_Blocks.CRACKED_GREEN_BRICKS_2_STAIRS) - .add(NSE_Blocks.MOSSY_GREEN_BRICKS_2_STAIRS) - .add(NSE_Blocks.AQUAMARINE_TILES_STAIRS) - .add(NSE_Blocks.CRACKED_AQUAMARINE_TILES_STAIRS) - .add(NSE_Blocks.MOSSY_AQUAMARINE_TILES_STAIRS) - .add(NSE_Blocks.DIRTY_AQUAMARINE_TILES_STAIRS) - .add(NSE_Blocks.DIORITE_BRICKS_STAIRS) - .add(NSE_Blocks.CRACKED_DIORITE_BRICKS_STAIRS) - .add(NSE_Blocks.MOSSY_DIORITE_BRICKS_STAIRS) - .add(NSE_Blocks.CALCITE_TILES_STAIRS) - .add(NSE_Blocks.CRACKED_CALCITE_TILES_STAIRS) - .add(NSE_Blocks.MOSSY_CALCITE_TILES_STAIRS) - .add(NSE_Blocks.DRIPSTONE_TILES_STAIRS) - .add(NSE_Blocks.CRACKED_DRIPSTONE_TILES_STAIRS) - .add(NSE_Blocks.MOSSY_DRIPSTONE_TILES_STAIRS) - .add(NSE_Blocks.DEEPSLATE_TILES_STAIRS) - .add(NSE_Blocks.CRACKED_DEEPSLATE_TILES_STAIRS) - .add(NSE_Blocks.MOSSY_DEEPSLATE_TILES_STAIRS) - .add(NSE_Blocks.LIGHT_BLUE_TILES_STAIRS) - .add(NSE_Blocks.CRACKED_LIGHT_BLUE_TILES_STAIRS) - .add(NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_STAIRS) - .add(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES_STAIRS) - .add(NSE_Blocks.LIGHT_BLUE_BRICKS_STAIRS) - .add(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS_STAIRS) - .add(NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_STAIRS) - .add(NSE_Blocks.GREEN_WHITE_TILES_STAIRS) - .add(NSE_Blocks.CRACKED_GREEN_WHITE_TILES_STAIRS) - .add(NSE_Blocks.MOSSY_GREEN_WHITE_TILES_STAIRS) - .add(NSE_Blocks.TUFF_TILES_STAIRS) - .add(NSE_Blocks.CRACKED_TUFF_TILES_STAIRS) - .add(NSE_Blocks.MOSSY_TUFF_TILES_STAIRS) - .add(NSE_Blocks.TUFF_BRICKS_STAIRS) - .add(NSE_Blocks.CRACKED_TUFF_BRICKS_STAIRS) - .add(NSE_Blocks.MOSSY_TUFF_BRICKS_STAIRS) - .add(NSE_Blocks.WHITE_CONCRETE_STAIRS) - .add(NSE_Blocks.CRACKED_WHITE_CONCRETE_STAIRS) - .add(NSE_Blocks.BEIGE_CONCRETE_STAIRS) - .add(NSE_Blocks.CRACKED_BEIGE_CONCRETE_STAIRS) - .add(NSE_Blocks.BLUE_CONCRETE_STAIRS) - .add(NSE_Blocks.CRACKED_BLUE_CONCRETE_STAIRS) - .add(NSE_Blocks.RED_CONCRETE_STAIRS) - .add(NSE_Blocks.CRACKED_RED_CONCRETE_STAIRS) - .add(NSE_Blocks.YELLOW_CONCRETE_STAIRS) - .add(NSE_Blocks.CRACKED_YELLOW_CONCRETE_STAIRS) - .add(NSE_Blocks.GREEN_CONCRETE_STAIRS) - .add(NSE_Blocks.CRACKED_GREEN_CONCRETE_STAIRS) - .add(NSE_Blocks.NII_FLOOR_STAIRS) - .add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_ACACIA_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_OAK_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_OAK_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_BIRCH_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_CRIMSON_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_DARK_OAK_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_JUNGLE_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_MANGROVE_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_PARQUET_STAIRS) - .add(NSE_Blocks.STRAIGHT_PARQUET_STAIRS) - .add(NSE_Blocks.SEPARATED_PARQUET_STAIRS) - .add(NSE_Blocks.GREEN_LINOLEUM_STAIRS) - .add(NSE_Blocks.BLUE_LINOLEUM_STAIRS) - .add(NSE_Blocks.RED_LINOLEUM_STAIRS) - .add(NSE_Blocks.GRAY_LINOLEUM_STAIRS) - .add(NSE_Blocks.ORANGE_LINOLEUM_STAIRS) - .add(NSE_Blocks.BROWN_LINOLEUM_STAIRS) - .add(NSE_Blocks.CYAN_LINOLEUM_STAIRS) - .add(NSE_Blocks.METAL_PLATING_STAIRS); - - getOrCreateTagBuilder(BlockTags.SLABS) - .add(NSE_Blocks.SAND_TILES_SLAB) - .add(NSE_Blocks.CRACKED_SAND_TILES_SLAB) - .add(NSE_Blocks.MOSSY_SAND_TILES_SLAB) - .add(NSE_Blocks.HERRINGBONE_SAND_TILES_SLAB) - .add(NSE_Blocks.CROSS_SAND_TILES_SLAB) - .add(NSE_Blocks.SAND_BRICKS_SLAB) - .add(NSE_Blocks.CRACKED_SAND_BRICKS_SLAB) - .add(NSE_Blocks.MOSSY_SAND_BRICKS_SLAB) - .add(NSE_Blocks.BIG_SAND_BRICKS_SLAB) - .add(NSE_Blocks.BRICK_TILES_SLAB) - .add(NSE_Blocks.CRACKED_BRICK_TILES_SLAB) - .add(NSE_Blocks.MOSSY_BRICK_TILES_SLAB) - .add(NSE_Blocks.DIRTY_BRICK_TILES_SLAB) - .add(NSE_Blocks.DARK_BRICK_TILES_SLAB) - .add(NSE_Blocks.CRACKED_DARK_BRICK_TILES_SLAB) - .add(NSE_Blocks.MOSSY_DARK_BRICK_TILES_SLAB) - .add(NSE_Blocks.DIRTY_DARK_BRICK_TILES_SLAB) - .add(NSE_Blocks.RED_BRICKS_SLAB) - .add(NSE_Blocks.CRACKED_RED_BRICKS_SLAB) - .add(NSE_Blocks.MOSSY_RED_BRICKS_SLAB) - .add(NSE_Blocks.TEAL_TILES_SLAB) - .add(NSE_Blocks.CRACKED_TEAL_TILES_SLAB) - .add(NSE_Blocks.MOSSY_TEAL_TILES_SLAB) - .add(NSE_Blocks.VARIATED_TEAL_TILES_SLAB) - .add(NSE_Blocks.GREEN_BRICKS_SLAB) - .add(NSE_Blocks.CRACKED_GREEN_BRICKS_SLAB) - .add(NSE_Blocks.MOSSY_GREEN_BRICKS_SLAB) - .add(NSE_Blocks.GREEN_BRICKS_2_SLAB) - .add(NSE_Blocks.CRACKED_GREEN_BRICKS_2_SLAB) - .add(NSE_Blocks.MOSSY_GREEN_BRICKS_2_SLAB) - .add(NSE_Blocks.AQUAMARINE_TILES_SLAB) - .add(NSE_Blocks.CRACKED_AQUAMARINE_TILES_SLAB) - .add(NSE_Blocks.MOSSY_AQUAMARINE_TILES_SLAB) - .add(NSE_Blocks.DIRTY_AQUAMARINE_TILES_SLAB) - .add(NSE_Blocks.DIORITE_BRICKS_SLAB) - .add(NSE_Blocks.CRACKED_DIORITE_BRICKS_SLAB) - .add(NSE_Blocks.MOSSY_DIORITE_BRICKS_SLAB) - .add(NSE_Blocks.CALCITE_TILES_SLAB) - .add(NSE_Blocks.CRACKED_CALCITE_TILES_SLAB) - .add(NSE_Blocks.MOSSY_CALCITE_TILES_SLAB) - .add(NSE_Blocks.DRIPSTONE_TILES_SLAB) - .add(NSE_Blocks.CRACKED_DRIPSTONE_TILES_SLAB) - .add(NSE_Blocks.MOSSY_DRIPSTONE_TILES_SLAB) - .add(NSE_Blocks.DEEPSLATE_TILES_SLAB) - .add(NSE_Blocks.CRACKED_DEEPSLATE_TILES_SLAB) - .add(NSE_Blocks.MOSSY_DEEPSLATE_TILES_SLAB) - .add(NSE_Blocks.LIGHT_BLUE_TILES_SLAB) - .add(NSE_Blocks.CRACKED_LIGHT_BLUE_TILES_SLAB) - .add(NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_SLAB) - .add(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES_SLAB) - .add(NSE_Blocks.LIGHT_BLUE_BRICKS_SLAB) - .add(NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS_SLAB) - .add(NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_SLAB) - .add(NSE_Blocks.GREEN_WHITE_TILES_SLAB) - .add(NSE_Blocks.CRACKED_GREEN_WHITE_TILES_SLAB) - .add(NSE_Blocks.MOSSY_GREEN_WHITE_TILES_SLAB) - .add(NSE_Blocks.TUFF_TILES_SLAB) - .add(NSE_Blocks.CRACKED_TUFF_TILES_SLAB) - .add(NSE_Blocks.MOSSY_TUFF_TILES_SLAB) - .add(NSE_Blocks.TUFF_BRICKS_SLAB) - .add(NSE_Blocks.CRACKED_TUFF_BRICKS_SLAB) - .add(NSE_Blocks.MOSSY_TUFF_BRICKS_SLAB) - .add(NSE_Blocks.WHITE_CONCRETE_SLAB) - .add(NSE_Blocks.CRACKED_WHITE_CONCRETE_SLAB) - .add(NSE_Blocks.BEIGE_CONCRETE_SLAB) - .add(NSE_Blocks.CRACKED_BEIGE_CONCRETE_SLAB) - .add(NSE_Blocks.BLUE_CONCRETE_SLAB) - .add(NSE_Blocks.CRACKED_BLUE_CONCRETE_SLAB) - .add(NSE_Blocks.RED_CONCRETE_SLAB) - .add(NSE_Blocks.CRACKED_RED_CONCRETE_SLAB) - .add(NSE_Blocks.YELLOW_CONCRETE_SLAB) - .add(NSE_Blocks.CRACKED_YELLOW_CONCRETE_SLAB) - .add(NSE_Blocks.GREEN_CONCRETE_SLAB) - .add(NSE_Blocks.CRACKED_GREEN_CONCRETE_SLAB) - .add(NSE_Blocks.NII_FLOOR_SLAB) - .add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_ACACIA_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_OAK_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_OAK_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_BIRCH_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_CRIMSON_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_DARK_OAK_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_JUNGLE_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_MANGROVE_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_PARQUET_SLAB) - .add(NSE_Blocks.STRAIGHT_PARQUET_SLAB) - .add(NSE_Blocks.SEPARATED_PARQUET_SLAB) - .add(NSE_Blocks.GREEN_LINOLEUM_SLAB) - .add(NSE_Blocks.BLUE_LINOLEUM_SLAB) - .add(NSE_Blocks.RED_LINOLEUM_SLAB) - .add(NSE_Blocks.GRAY_LINOLEUM_SLAB) - .add(NSE_Blocks.ORANGE_LINOLEUM_SLAB) - .add(NSE_Blocks.BROWN_LINOLEUM_SLAB) - .add(NSE_Blocks.CYAN_LINOLEUM_SLAB) - .add(NSE_Blocks.METAL_PLATING_SLAB); - - getOrCreateTagBuilder(BlockTags.WOODEN_STAIRS) - .add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_ACACIA_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_OAK_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_OAK_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_BIRCH_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_CRIMSON_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_DARK_OAK_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_JUNGLE_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_MANGROVE_PLANKS_STAIRS) - .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_STAIRS) - .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS); - - getOrCreateTagBuilder(BlockTags.WOODEN_SLABS) - .add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_ACACIA_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_OAK_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_OAK_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_BIRCH_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_CRIMSON_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_DARK_OAK_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_JUNGLE_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_MANGROVE_PLANKS_SLAB) - .add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_SLAB) - .add(NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB); - } -} \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/datagen/ItemTagGenerator.java b/src/main/java/su/a71/new_soviet/datagen/ItemTagGenerator.java deleted file mode 100644 index 708b6d8..0000000 --- a/src/main/java/su/a71/new_soviet/datagen/ItemTagGenerator.java +++ /dev/null @@ -1,26 +0,0 @@ -package su.a71.new_soviet.datagen; -// === ABANDON HOPE, YE WHO ENTER HERE === - -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricTagProvider; -import net.minecraft.registry.RegistryWrapper; - -import su.a71.new_soviet.registration.NSE_Items; -import su.a71.new_soviet.registration.NSE_Tags; -import java.util.concurrent.CompletableFuture; - - -public class ItemTagGenerator extends FabricTagProvider.ItemTagProvider { - - public ItemTagGenerator(FabricDataOutput output, CompletableFuture completableFuture) { - super(output, completableFuture); - } - - @Override - protected void configure(RegistryWrapper.WrapperLookup arg) { - getOrCreateTagBuilder(NSE_Tags.Items.DICE) - .add(NSE_Items.DICE_D4) - .add(NSE_Items.DICE_D6) - .add(NSE_Items.DICE_D20); - } -} \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java b/src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java deleted file mode 100644 index 557eaf4..0000000 --- a/src/main/java/su/a71/new_soviet/datagen/ModelGenerator.java +++ /dev/null @@ -1,236 +0,0 @@ -package su.a71.new_soviet.datagen; -// === ABANDON HOPE, YE WHO ENTER HERE === - -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; -import net.minecraft.block.Block; -import net.minecraft.block.SlabBlock; -import net.minecraft.block.StairsBlock; -import net.minecraft.data.client.*; -import net.minecraft.registry.Registries; -import net.minecraft.util.Identifier; -import su.a71.new_soviet.registration.NSE_Blocks; - -public class ModelGenerator extends FabricModelProvider { - public ModelGenerator(FabricDataOutput generator) { - super(generator); - } - - // HELPER METHODS TO ACCOUNT FOR NON-FLAT TEXTURE STRUCTURE ==================== - - public void registerDoor(BlockStateModelGenerator blockStateModelGenerator, Block doorBlock) { - TextureMap textureMap = TextureMap.topBottom( - Registries.BLOCK.getId(doorBlock).withPath((path) -> "block/doors/" + path + "_top"), - Registries.BLOCK.getId(doorBlock).withPath((path) -> "block/doors/" + path + "_bottom")); - TextureMap textureMapItem = TextureMap.layer0(Registries.BLOCK.getId(doorBlock).withPath((path) -> "item/doors/" + path)); - - Identifier identifier = Models.DOOR_BOTTOM_LEFT.upload(doorBlock, textureMap, blockStateModelGenerator.modelCollector); - Identifier identifier2 = Models.DOOR_BOTTOM_LEFT_OPEN.upload(doorBlock, textureMap, blockStateModelGenerator.modelCollector); - Identifier identifier3 = Models.DOOR_BOTTOM_RIGHT.upload(doorBlock, textureMap, blockStateModelGenerator.modelCollector); - Identifier identifier4 = Models.DOOR_BOTTOM_RIGHT_OPEN.upload(doorBlock, textureMap, blockStateModelGenerator.modelCollector); - Identifier identifier5 = Models.DOOR_TOP_LEFT.upload(doorBlock, textureMap, blockStateModelGenerator.modelCollector); - Identifier identifier6 = Models.DOOR_TOP_LEFT_OPEN.upload(doorBlock, textureMap, blockStateModelGenerator.modelCollector); - Identifier identifier7 = Models.DOOR_TOP_RIGHT.upload(doorBlock, textureMap, blockStateModelGenerator.modelCollector); - Identifier identifier8 = Models.DOOR_TOP_RIGHT_OPEN.upload(doorBlock, textureMap, blockStateModelGenerator.modelCollector); - Models.GENERATED.upload(ModelIds.getItemModelId(doorBlock.asItem()), textureMapItem, blockStateModelGenerator.modelCollector); - blockStateModelGenerator.blockStateCollector.accept(BlockStateModelGenerator.createDoorBlockState(doorBlock, identifier, identifier2, identifier3, identifier4, identifier5, identifier6, identifier7, identifier8)); - } - - public void registerCube(BlockStateModelGenerator blockStateModelGenerator, Block block, String texturePath) { - TextureMap textureMap = TextureMap.all(Registries.BLOCK.getId(block).withPath((path) -> "block/" + texturePath + "/" + path)); - Identifier model_id = Models.CUBE_ALL.upload(block, textureMap, blockStateModelGenerator.modelCollector); - blockStateModelGenerator.blockStateCollector.accept(BlockStateModelGenerator.createSingletonBlockState(block, model_id)); - } - - public void registerCubeWithSlabStairs(BlockStateModelGenerator blockStateModelGenerator, Block parent, StairsBlock stairs, SlabBlock slab, String texturePath) { - TextureMap textureMap = TextureMap.all(Registries.BLOCK.getId(parent).withPath((path) -> "block/" + texturePath + "/" + path)); - Identifier cube_model = Models.CUBE_ALL.upload(parent, textureMap, blockStateModelGenerator.modelCollector); - blockStateModelGenerator.blockStateCollector.accept(BlockStateModelGenerator.createSingletonBlockState(parent, cube_model)); - - Identifier slab_model = Models.SLAB.upload(slab, textureMap, blockStateModelGenerator.modelCollector); - Identifier slab_model_top = Models.SLAB_TOP.upload(slab, textureMap, blockStateModelGenerator.modelCollector); - - Identifier stairs_model = Models.STAIRS.upload(stairs, textureMap, blockStateModelGenerator.modelCollector); - Identifier stairs_model_outer = Models.OUTER_STAIRS.upload(stairs, textureMap, blockStateModelGenerator.modelCollector); - Identifier stairs_model_inner = Models.INNER_STAIRS.upload(stairs, textureMap, blockStateModelGenerator.modelCollector); - - blockStateModelGenerator.blockStateCollector.accept(BlockStateModelGenerator.createSlabBlockState(slab, slab_model, slab_model_top, cube_model)); - blockStateModelGenerator.blockStateCollector.accept(BlockStateModelGenerator.createStairsBlockState(stairs, stairs_model_inner, stairs_model, stairs_model_outer)); - } - - @Override - public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGenerator) { - registerDoor(blockStateModelGenerator, NSE_Blocks.CHISELED_BIRCH_DOOR); - registerDoor(blockStateModelGenerator, NSE_Blocks.CHISELED_SPRUCE_DOOR); - registerDoor(blockStateModelGenerator, NSE_Blocks.CHISELED_OAK_DOOR); - registerDoor(blockStateModelGenerator, NSE_Blocks.CHISELED_MANGROVE_DOOR); - - registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.SAND_TILES, NSE_Blocks.SAND_TILES_STAIRS, NSE_Blocks.SAND_TILES_SLAB, "sand"); - registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CRACKED_SAND_TILES, NSE_Blocks.CRACKED_SAND_TILES_STAIRS, NSE_Blocks.CRACKED_SAND_TILES_SLAB, "sand"); - registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.MOSSY_SAND_TILES, NSE_Blocks.MOSSY_SAND_TILES_STAIRS, NSE_Blocks.MOSSY_SAND_TILES_SLAB, "sand"); - registerCube(blockStateModelGenerator, NSE_Blocks.SMALL_SAND_TILES, "sand"); - registerCube(blockStateModelGenerator, NSE_Blocks.SMALL_CRACKED_SAND_TILES, "sand"); - registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_SAND_TILES, NSE_Blocks.HERRINGBONE_SAND_TILES_STAIRS, NSE_Blocks.HERRINGBONE_SAND_TILES_SLAB, "sand"); - registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CROSS_SAND_TILES, NSE_Blocks.CROSS_SAND_TILES_STAIRS, NSE_Blocks.CROSS_SAND_TILES_SLAB, "sand"); - registerCube(blockStateModelGenerator, NSE_Blocks.BIG_SAND_TILES, "sand"); - registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.SAND_BRICKS, NSE_Blocks.SAND_BRICKS_STAIRS, NSE_Blocks.SAND_BRICKS_SLAB, "sand"); - registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.CRACKED_SAND_BRICKS, NSE_Blocks.CRACKED_SAND_BRICKS_STAIRS, NSE_Blocks.CRACKED_SAND_BRICKS_SLAB, "sand"); - registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.MOSSY_SAND_BRICKS, NSE_Blocks.MOSSY_SAND_BRICKS_STAIRS, NSE_Blocks.MOSSY_SAND_BRICKS_SLAB, "sand"); - registerCubeWithSlabStairs(blockStateModelGenerator, NSE_Blocks.BIG_SAND_BRICKS, NSE_Blocks.BIG_SAND_BRICKS_STAIRS, NSE_Blocks.BIG_SAND_BRICKS_SLAB, "sand"); - registerCube(blockStateModelGenerator, NSE_Blocks.BRICK_TILES, "brick"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_BRICK_TILES, "brick"); - registerCube(blockStateModelGenerator, NSE_Blocks.MOSSY_BRICK_TILES, "brick"); - registerCube(blockStateModelGenerator, NSE_Blocks.DIRTY_BRICK_TILES, "brick"); - registerCube(blockStateModelGenerator, NSE_Blocks.DARK_BRICK_TILES, "brick"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_DARK_BRICK_TILES, "brick"); - registerCube(blockStateModelGenerator, NSE_Blocks.MOSSY_DARK_BRICK_TILES, "brick"); - registerCube(blockStateModelGenerator, NSE_Blocks.DIRTY_DARK_BRICK_TILES, "brick"); - registerCube(blockStateModelGenerator, NSE_Blocks.GLAZED_BRICK_TILES, "brick"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_GLAZED_BRICK_TILES, "brick"); - registerCube(blockStateModelGenerator, NSE_Blocks.RED_BRICKS, "red"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_RED_BRICKS, "red"); - registerCube(blockStateModelGenerator, NSE_Blocks.MOSSY_RED_BRICKS, "red"); - registerCube(blockStateModelGenerator, NSE_Blocks.TEAL_TILES, "teal"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_TEAL_TILES, "teal"); - registerCube(blockStateModelGenerator, NSE_Blocks.MOSSY_TEAL_TILES, "teal"); - registerCube(blockStateModelGenerator, NSE_Blocks.SMALL_TEAL_TILES, "teal"); - registerCube(blockStateModelGenerator, NSE_Blocks.SMALL_CRACKED_TEAL_TILES, "teal"); - registerCube(blockStateModelGenerator, NSE_Blocks.GLAZED_TEAL_TILES, "teal"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_GLAZED_TEAL_TILES, "teal"); - registerCube(blockStateModelGenerator, NSE_Blocks.VARIATED_TEAL_TILES, "teal"); - registerCube(blockStateModelGenerator, NSE_Blocks.BIG_GREEN_TILES, "green"); - // Cracked big green tiles are variated! - registerCube(blockStateModelGenerator, NSE_Blocks.GREEN_BRICKS, "green"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_GREEN_BRICKS, "green"); - registerCube(blockStateModelGenerator, NSE_Blocks.MOSSY_GREEN_BRICKS, "green"); - registerCube(blockStateModelGenerator, NSE_Blocks.GREEN_BRICKS_2, "green"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_GREEN_BRICKS_2, "green"); - registerCube(blockStateModelGenerator, NSE_Blocks.MOSSY_GREEN_BRICKS_2, "green"); - registerCube(blockStateModelGenerator, NSE_Blocks.AQUAMARINE_TILES, "aquamarine"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_AQUAMARINE_TILES, "aquamarine"); - registerCube(blockStateModelGenerator, NSE_Blocks.MOSSY_AQUAMARINE_TILES, "aquamarine"); - registerCube(blockStateModelGenerator, NSE_Blocks.DIRTY_AQUAMARINE_TILES, "aquamarine"); - registerCube(blockStateModelGenerator, NSE_Blocks.SMALL_AQUAMARINE_TILES, "aquamarine"); - registerCube(blockStateModelGenerator, NSE_Blocks.SMALL_CRACKED_AQUAMARINE_TILES, "aquamarine"); - registerCube(blockStateModelGenerator, NSE_Blocks.GLAZED_AQUAMARINE_TILES, "aquamarine"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_GLAZED_AQUAMARINE_TILES, "aquamarine"); - registerCube(blockStateModelGenerator, NSE_Blocks.SMALL_DIORITE_TILES, "diorite"); - registerCube(blockStateModelGenerator, NSE_Blocks.SMALL_CRACKED_DIORITE_TILES, "diorite"); - registerCube(blockStateModelGenerator, NSE_Blocks.BIG_DIORITE_TILES, "diorite"); - registerCube(blockStateModelGenerator, NSE_Blocks.DIORITE_BRICKS, "diorite"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_DIORITE_BRICKS, "diorite"); - registerCube(blockStateModelGenerator, NSE_Blocks.MOSSY_DIORITE_BRICKS, "diorite"); - registerCube(blockStateModelGenerator, NSE_Blocks.CALCITE_TILES, "calcite"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_CALCITE_TILES, "calcite"); - registerCube(blockStateModelGenerator, NSE_Blocks.MOSSY_CALCITE_TILES, "calcite"); - registerCube(blockStateModelGenerator, NSE_Blocks.DIAGONAL_CALCITE_TILES, "calcite"); - registerCube(blockStateModelGenerator, NSE_Blocks.NII_WALL_1, "research_institute"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_NII_WALL_1, "research_institute"); - registerCube(blockStateModelGenerator, NSE_Blocks.NII_WALL_2, "research_institute"); - registerCube(blockStateModelGenerator, NSE_Blocks.NII_WALL_3, "research_institute"); - registerCube(blockStateModelGenerator, NSE_Blocks.DRIPSTONE_TILES, "dripstone"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_DRIPSTONE_TILES, "dripstone"); - registerCube(blockStateModelGenerator, NSE_Blocks.MOSSY_DRIPSTONE_TILES, "dripstone"); - registerCube(blockStateModelGenerator, NSE_Blocks.DRIPSTONE_BRICKS, "dripstone"); - registerCube(blockStateModelGenerator, NSE_Blocks.DEEPSLATE_TILES, "deepslate"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_DEEPSLATE_TILES, "deepslate"); - registerCube(blockStateModelGenerator, NSE_Blocks.MOSSY_DEEPSLATE_TILES, "deepslate"); - registerCube(blockStateModelGenerator, NSE_Blocks.SMALL_DEEPSLATE_TILES, "deepslate"); - registerCube(blockStateModelGenerator, NSE_Blocks.SMALL_CRACKED_DEEPSLATE_TILES, "deepslate"); - registerCube(blockStateModelGenerator, NSE_Blocks.DIAGONAL_DEEPSLATE_TILES, "deepslate"); - registerCube(blockStateModelGenerator, NSE_Blocks.LIGHT_BLUE_TILES, "light_blue"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_LIGHT_BLUE_TILES, "light_blue"); - registerCube(blockStateModelGenerator, NSE_Blocks.MOSSY_LIGHT_BLUE_TILES, "light_blue"); - registerCube(blockStateModelGenerator, NSE_Blocks.VARIATED_LIGHT_BLUE_TILES, "light_blue"); - registerCube(blockStateModelGenerator, NSE_Blocks.SMALL_LIGHT_BLUE_TILES, "light_blue"); - registerCube(blockStateModelGenerator, NSE_Blocks.SMALL_CRACKED_LIGHT_BLUE_TILES, "light_blue"); - registerCube(blockStateModelGenerator, NSE_Blocks.GLAZED_LIGHT_BLUE_TILES, "light_blue"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_GLAZED_LIGHT_BLUE_TILES, "light_blue"); - registerCube(blockStateModelGenerator, NSE_Blocks.LIGHT_BLUE_BRICKS, "light_blue"); - // cracked light blue bricks are variated - registerCube(blockStateModelGenerator, NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS, "light_blue"); - registerCube(blockStateModelGenerator, NSE_Blocks.BIG_GRANITE_TILES, "granite"); - registerCube(blockStateModelGenerator, NSE_Blocks.SMALL_GRANITE_TILES, "granite"); - registerCube(blockStateModelGenerator, NSE_Blocks.SMALL_CRACKED_GRANITE_TILES, "granite"); - registerCube(blockStateModelGenerator, NSE_Blocks.GREEN_WHITE_TILES, "green_white"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_GREEN_WHITE_TILES, "green_white"); - registerCube(blockStateModelGenerator, NSE_Blocks.MOSSY_GREEN_WHITE_TILES, "green_white"); - registerCube(blockStateModelGenerator, NSE_Blocks.TUFF_TILES, "tuff"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_TUFF_TILES, "tuff"); - registerCube(blockStateModelGenerator, NSE_Blocks.MOSSY_TUFF_TILES, "tuff"); - registerCube(blockStateModelGenerator, NSE_Blocks.BIG_TUFF_TILES, "tuff"); - registerCube(blockStateModelGenerator, NSE_Blocks.TUFF_BRICKS, "tuff"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_TUFF_BRICKS, "tuff"); - registerCube(blockStateModelGenerator, NSE_Blocks.MOSSY_TUFF_BRICKS, "tuff"); - registerCube(blockStateModelGenerator, NSE_Blocks.SMALL_WHITE_TILES, "white"); - registerCube(blockStateModelGenerator, NSE_Blocks.SMALL_CRACKED_WHITE_TILES, "white"); - registerCube(blockStateModelGenerator, NSE_Blocks.GLAZED_WHITE_TILES, "white"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_GLAZED_WHITE_TILES, "white"); - registerCube(blockStateModelGenerator, NSE_Blocks.SMALL_YELLOW_TILES, "yellow"); - registerCube(blockStateModelGenerator, NSE_Blocks.SMALL_CRACKED_YELLOW_TILES, "yellow"); - registerCube(blockStateModelGenerator, NSE_Blocks.WHITEWASH, "whitewash"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_WHITEWASH, "whitewash"); - registerCube(blockStateModelGenerator, NSE_Blocks.VERY_CRACKED_WHITEWASH, "whitewash"); - registerCube(blockStateModelGenerator, NSE_Blocks.WHITE_CONCRETE, "concrete"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_WHITE_CONCRETE, "concrete"); - registerCube(blockStateModelGenerator, NSE_Blocks.BEIGE_CONCRETE, "concrete"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_BEIGE_CONCRETE, "concrete"); - registerCube(blockStateModelGenerator, NSE_Blocks.BLUE_CONCRETE, "concrete"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_BLUE_CONCRETE, "concrete"); - registerCube(blockStateModelGenerator, NSE_Blocks.RED_CONCRETE, "concrete"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_RED_CONCRETE, "concrete"); - registerCube(blockStateModelGenerator, NSE_Blocks.YELLOW_CONCRETE, "concrete"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_YELLOW_CONCRETE, "concrete"); - registerCube(blockStateModelGenerator, NSE_Blocks.GREEN_CONCRETE, "concrete"); - registerCube(blockStateModelGenerator, NSE_Blocks.CRACKED_GREEN_CONCRETE, "concrete"); - registerCube(blockStateModelGenerator, NSE_Blocks.NII_FLOOR, "research_institute"); - registerCube(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_ACACIA_PLANKS, "floor/planks"); - registerCube(blockStateModelGenerator, NSE_Blocks.CROSS_ACACIA_PLANKS, "floor/planks"); - registerCube(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_OAK_PLANKS, "floor/planks"); - registerCube(blockStateModelGenerator, NSE_Blocks.CROSS_OAK_PLANKS, "floor/planks"); - registerCube(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_BIRCH_PLANKS, "floor/planks"); - registerCube(blockStateModelGenerator, NSE_Blocks.CROSS_BIRCH_PLANKS, "floor/planks"); - registerCube(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS, "floor/planks"); - registerCube(blockStateModelGenerator, NSE_Blocks.CROSS_CRIMSON_PLANKS, "floor/planks"); - registerCube(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS, "floor/planks"); - registerCube(blockStateModelGenerator, NSE_Blocks.CROSS_DARK_OAK_PLANKS, "floor/planks"); - registerCube(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS, "floor/planks"); - registerCube(blockStateModelGenerator, NSE_Blocks.CROSS_JUNGLE_PLANKS, "floor/planks"); - registerCube(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS, "floor/planks"); - registerCube(blockStateModelGenerator, NSE_Blocks.CROSS_MANGROVE_PLANKS, "floor/planks"); - registerCube(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS, "floor/planks"); - registerCube(blockStateModelGenerator, NSE_Blocks.CROSS_SPRUCE_PLANKS, "floor/planks"); - registerCube(blockStateModelGenerator, NSE_Blocks.HERRINGBONE_PARQUET, "floor/planks"); - registerCube(blockStateModelGenerator, NSE_Blocks.STRAIGHT_PARQUET, "floor/planks"); - registerCube(blockStateModelGenerator, NSE_Blocks.SEPARATED_PARQUET, "floor/planks"); - registerCube(blockStateModelGenerator, NSE_Blocks.GREEN_LINOLEUM, "floor/linoleum"); - registerCube(blockStateModelGenerator, NSE_Blocks.BLUE_LINOLEUM, "floor/linoleum"); - registerCube(blockStateModelGenerator, NSE_Blocks.RED_LINOLEUM, "floor/linoleum"); - registerCube(blockStateModelGenerator, NSE_Blocks.GRAY_LINOLEUM, "floor/linoleum"); - registerCube(blockStateModelGenerator, NSE_Blocks.ORANGE_LINOLEUM, "floor/linoleum"); - registerCube(blockStateModelGenerator, NSE_Blocks.BROWN_LINOLEUM, "floor/linoleum"); - registerCube(blockStateModelGenerator, NSE_Blocks.CYAN_LINOLEUM, "floor/linoleum"); - registerCube(blockStateModelGenerator, NSE_Blocks.CROSS_ORANGE_LINOLEUM, "floor/linoleum"); - registerCube(blockStateModelGenerator, NSE_Blocks.CROSS_BROWN_LINOLEUM, "floor/linoleum"); - registerCube(blockStateModelGenerator, NSE_Blocks.INDUSTRIAL_WARNING, "industrial/warning"); - registerCube(blockStateModelGenerator, NSE_Blocks.GRAY_WARNING, "industrial/warning"); - registerCube(blockStateModelGenerator, NSE_Blocks.RED_WARNING, "industrial/warning"); - registerCube(blockStateModelGenerator, NSE_Blocks.ORANGE_WARNING, "industrial/warning"); - registerCube(blockStateModelGenerator, NSE_Blocks.YELLOW_WARNING, "industrial/warning"); - registerCube(blockStateModelGenerator, NSE_Blocks.LIME_WARNING, "industrial/warning"); - registerCube(blockStateModelGenerator, NSE_Blocks.GREEN_WARNING, "industrial/warning"); - registerCube(blockStateModelGenerator, NSE_Blocks.CYAN_WARNING, "industrial/warning"); - registerCube(blockStateModelGenerator, NSE_Blocks.LIGHT_BLUE_WARNING, "industrial/warning"); - registerCube(blockStateModelGenerator, NSE_Blocks.BLUE_WARNING, "industrial/warning"); - registerCube(blockStateModelGenerator, NSE_Blocks.PURPLE_WARNING, "industrial/warning"); - registerCube(blockStateModelGenerator, NSE_Blocks.MAGENTA_WARNING, "industrial/warning"); - registerCube(blockStateModelGenerator, NSE_Blocks.METAL_PLATING, "industrial"); - registerCube(blockStateModelGenerator, NSE_Blocks.GREEN_WALLPAPER, "wallpapers"); - registerCube(blockStateModelGenerator, NSE_Blocks.BROWN_WALLPAPER, "wallpapers"); - registerCube(blockStateModelGenerator, NSE_Blocks.BEIGE_WALLPAPER, "wallpapers"); - } - - @Override - public void generateItemModels(ItemModelGenerator itemModelGenerator) { - } -} diff --git a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java deleted file mode 100644 index 698afb3..0000000 --- a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java +++ /dev/null @@ -1,697 +0,0 @@ -package su.a71.new_soviet.datagen; -// === ABANDON HOPE, YE WHO ENTER HERE === - -import com.google.common.collect.Lists; -import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; -import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; -import net.minecraft.block.Blocks; -import net.minecraft.data.server.recipe.RecipeJsonProvider; -import net.minecraft.data.server.recipe.RecipeProvider; -import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; -import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder; -import net.minecraft.item.ItemConvertible; -import net.minecraft.item.Items; -import net.minecraft.recipe.Ingredient; -import net.minecraft.recipe.book.RecipeCategory; -import net.minecraft.registry.tag.ItemTags; -import net.minecraft.util.Util; -import su.a71.new_soviet.registration.NSE_Blocks; -import su.a71.new_soviet.registration.NSE_Custom; -import su.a71.new_soviet.registration.NSE_Items; - -import java.util.List; -import java.util.function.Consumer; - -public class RecipeGenerator extends FabricRecipeProvider { - public RecipeGenerator(FabricDataOutput generator) { - super(generator); - } - - private void mossRecipe(Consumer exporter, ItemConvertible output, ItemConvertible input) { - var path = convertBetween(output, input); - ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output).input(input).input(Items.VINE).criterion(FabricRecipeProvider.hasItem(output), - FabricRecipeProvider.conditionsFromItem(output)).criterion(FabricRecipeProvider.hasItem(input), - FabricRecipeProvider.conditionsFromItem(output)).criterion(FabricRecipeProvider.hasItem(Items.VINE), - FabricRecipeProvider.conditionsFromItem(output)).offerTo(exporter, path + "_vine"); - - ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output).input(input).input(Items.MOSS_BLOCK).criterion(FabricRecipeProvider.hasItem(output), - FabricRecipeProvider.conditionsFromItem(output)).criterion(FabricRecipeProvider.hasItem(input), - FabricRecipeProvider.conditionsFromItem(output)).criterion(FabricRecipeProvider.hasItem(Items.MOSS_BLOCK), - FabricRecipeProvider.conditionsFromItem(output)).offerTo(exporter, path + "_moss"); - } - - private void dirtyRecipe(Consumer exporter, ItemConvertible output, ItemConvertible input) { - var path = convertBetween(output, input); - ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output).input(input).input(Items.DIRT).criterion(FabricRecipeProvider.hasItem(output), - FabricRecipeProvider.conditionsFromItem(output)).criterion(FabricRecipeProvider.hasItem(input), - FabricRecipeProvider.conditionsFromItem(output)).criterion(FabricRecipeProvider.hasItem(Items.DIRT), - FabricRecipeProvider.conditionsFromItem(output)).offerTo(exporter, path + "_dirt"); - - ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output).input(input).input(Items.GLOW_LICHEN).criterion(FabricRecipeProvider.hasItem(output), - FabricRecipeProvider.conditionsFromItem(output)).criterion(FabricRecipeProvider.hasItem(input), - FabricRecipeProvider.conditionsFromItem(output)).criterion(FabricRecipeProvider.hasItem(Items.GLOW_LICHEN), - FabricRecipeProvider.conditionsFromItem(output)).offerTo(exporter, path + "_lichen"); - } - - private void stoneCuttingCategory(Consumer exporter, List category, RecipeCategory recipe_category) { - for (int i = 0; i < category.size(); i++) { - for (int j = 0; j < category.size(); j++) { - if (i != j) { - offerStonecuttingRecipe(exporter, recipe_category, - category.get(i), category.get(j)); - } - } - } - } - - private void diceRecipe(Consumer exporter, ItemConvertible dice) { - // why can't we use BlockTags.WOODEN_BUTTONS - var buttons = Util.make(Lists.newArrayList(), list -> { - list.add(Blocks.OAK_BUTTON); - list.add(Blocks.BAMBOO_BUTTON); - list.add(Blocks.BIRCH_BUTTON); - list.add(Blocks.CHERRY_BUTTON); - list.add(Blocks.ACACIA_BUTTON); - list.add(Blocks.CRIMSON_BUTTON); - list.add(Blocks.DARK_OAK_BUTTON); - list.add(Blocks.JUNGLE_BUTTON); - list.add(Blocks.MANGROVE_BUTTON); - list.add(Blocks.SPRUCE_BUTTON); - list.add(Blocks.WARPED_BUTTON); - }); - for (Object button : buttons) { - offerStonecuttingRecipe(exporter, RecipeCategory.MISC, dice, (ItemConvertible) button); - } - } - - private void warningStripeRecipe(Consumer exporter, ItemConvertible output, ItemConvertible dye) { - ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output, 4) - .pattern("D#D") - .pattern("#D#") - .pattern("D#D") - .input('D', dye) - .input('#', Items.IRON_INGOT) - .criterion(RecipeProvider.hasItem(Items.IRON_INGOT), - RecipeProvider.conditionsFromItem(Items.IRON_INGOT)) - .criterion(RecipeProvider.hasItem(dye), - RecipeProvider.conditionsFromItem(dye)) - .offerTo(exporter); - } - - private void crissCrossRecipe(Consumer exporter, ItemConvertible output, ItemConvertible input1, ItemConvertible input2) { - ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, output, 4) - .pattern("XY") - .pattern("YX") - .input('X', input1) - .input('Y', input2) - .criterion(RecipeProvider.hasItem(input1), - RecipeProvider.conditionsFromItem(input1)) - .criterion(RecipeProvider.hasItem(input2), - RecipeProvider.conditionsFromItem(input2)) - .offerTo(exporter); - } - - private void tvRecipe(Consumer exporter, ItemConvertible output, ItemConvertible dye) { - ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, output, 1) - .pattern("N N") - .pattern("DGD") - .pattern("DRD") - .input('D', dye) - .input('N', Items.IRON_NUGGET) - .input('R', Items.REDSTONE) - .input('G', Items.GLASS_PANE) - .criterion(RecipeProvider.hasItem(Items.IRON_NUGGET), - RecipeProvider.conditionsFromItem(Items.IRON_NUGGET)) - .criterion(RecipeProvider.hasItem(Items.GLASS_PANE), - RecipeProvider.conditionsFromItem(Items.GLASS_PANE)) - .criterion(RecipeProvider.hasItem(Items.REDSTONE), - RecipeProvider.conditionsFromItem(Items.REDSTONE)) - .criterion(RecipeProvider.hasItem(dye), - RecipeProvider.conditionsFromItem(dye)) - .offerTo(exporter); - } - - private void radioRecipe(Consumer exporter, ItemConvertible output) { - ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, output, 1) - .pattern(" N") - .pattern("MMM") - .pattern("III") - .input('M', Blocks.NOTE_BLOCK) - .input('N', Items.IRON_NUGGET) - .input('I', Items.IRON_INGOT) - .criterion(RecipeProvider.hasItem(Items.IRON_NUGGET), - RecipeProvider.conditionsFromItem(Items.IRON_NUGGET)) - .criterion(RecipeProvider.hasItem(Items.NOTE_BLOCK), - RecipeProvider.conditionsFromItem(Items.NOTE_BLOCK)) - .criterion(RecipeProvider.hasItem(Items.IRON_INGOT), - RecipeProvider.conditionsFromItem(Items.IRON_INGOT)) - .offerTo(exporter); - } - - private void ceilingFanRecipe(Consumer exporter, ItemConvertible output) { - ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, output, 1) - .pattern(" S ") - .pattern("WNW") - .input('S', Items.STICK) - .input('N', Items.IRON_NUGGET) - .input('W', Items.WHITE_WOOL) - .criterion(RecipeProvider.hasItem(Items.IRON_NUGGET), - RecipeProvider.conditionsFromItem(Items.IRON_NUGGET)) - .criterion(RecipeProvider.hasItem(Items.STICK), - RecipeProvider.conditionsFromItem(Items.STICK)) - .criterion(RecipeProvider.hasItem(Items.WHITE_WOOL), - RecipeProvider.conditionsFromItem(Items.WHITE_WOOL)) - .offerTo(exporter); - } - - private void tableLampRecipe(Consumer exporter, ItemConvertible output) { - ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, output, 3) - .pattern("WWW") - .pattern("WTW") - .pattern(" S ") - - .input('S', Items.STICK) - .input('T', Items.TORCH) - .input('W', ItemTags.WOOL) - .criterion(RecipeProvider.hasItem(Items.TORCH), - RecipeProvider.conditionsFromItem(Items.TORCH)) - .criterion(RecipeProvider.hasItem(Items.STICK), - RecipeProvider.conditionsFromItem(Items.STICK)) - .criterion("has_wool", RecipeProvider.conditionsFromTag(ItemTags.WOOL)) - .offerTo(exporter); - } - - private void vintageLampRecipe(Consumer exporter, ItemConvertible output) { - ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, output, 3) - .pattern("NNN") - .pattern("GTG") - .pattern(" N ") - - .input('N', Items.IRON_NUGGET) - .input('T', Items.TORCH) - .input('G', Items.GREEN_STAINED_GLASS) - .criterion(RecipeProvider.hasItem(Items.TORCH), - RecipeProvider.conditionsFromItem(Items.TORCH)) - .criterion(RecipeProvider.hasItem(Items.IRON_NUGGET), - RecipeProvider.conditionsFromItem(Items.IRON_NUGGET)) - .criterion(RecipeProvider.hasItem(Items.GREEN_STAINED_GLASS), - RecipeProvider.conditionsFromItem(Items.GREEN_STAINED_GLASS)) - .offerTo(exporter); - } - - private void sickleRecipe(Consumer exporter, ItemConvertible output) { - ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, output, 1) - .pattern(" I ") - .pattern(" I") - .pattern(" S ") - .input('S', Items.STICK) - .input('I', Items.IRON_INGOT) - .criterion(RecipeProvider.hasItem(Items.STICK), - RecipeProvider.conditionsFromItem(Items.STICK)) - .criterion(RecipeProvider.hasItem(Items.IRON_INGOT), - RecipeProvider.conditionsFromItem(Items.IRON_INGOT)) - .offerTo(exporter); - } - - private void rakeRecipe(Consumer exporter, ItemConvertible output) { - ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, output, 1) - .pattern("III") - .pattern(" N ") - .pattern(" S ") - .input('S', Items.STICK) - .input('I', Items.IRON_INGOT) - .input('N', Items.IRON_NUGGET) - .criterion(RecipeProvider.hasItem(Items.STICK), - RecipeProvider.conditionsFromItem(Items.STICK)) - .criterion(RecipeProvider.hasItem(Items.IRON_INGOT), - RecipeProvider.conditionsFromItem(Items.IRON_INGOT)) - .criterion(RecipeProvider.hasItem(Items.IRON_NUGGET), - RecipeProvider.conditionsFromItem(Items.IRON_NUGGET)) - .offerTo(exporter); - } - - private void offerStairsAndSlab(Consumer exporter, ItemConvertible output_stairs, ItemConvertible output_slab, ItemConvertible input) { - createStairsRecipe(output_stairs, Ingredient.ofItems(input)) - .criterion(hasItem(input), conditionsFromItem(input)).offerTo(exporter); - createSlabRecipe(RecipeCategory.BUILDING_BLOCKS, output_slab, Ingredient.ofItems(input)) - .criterion(hasItem(input), conditionsFromItem(input)).offerTo(exporter); - - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, output_stairs, input); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, output_slab, input); - } - - @Override - public void generate(Consumer exporter) { - crissCrossRecipe(exporter, NSE_Blocks.SAND_TILES, Blocks.SMOOTH_SANDSTONE, Blocks.SMOOTH_RED_SANDSTONE); - crissCrossRecipe(exporter, NSE_Blocks.LIGHT_BLUE_TILES, Blocks.STONE, Items.LIGHT_BLUE_DYE); - crissCrossRecipe(exporter, NSE_Blocks.SMALL_WHITE_TILES, Blocks.STONE, Items.WHITE_DYE); - crissCrossRecipe(exporter, NSE_Blocks.GREEN_WHITE_TILES, Blocks.POLISHED_DIORITE, Items.GREEN_DYE); - - tvRecipe(exporter, NSE_Custom.TV, Items.ORANGE_DYE); - tvRecipe(exporter, NSE_Custom.BROWN_TV, Items.BROWN_DYE); - tvRecipe(exporter, NSE_Custom.RED_TV, Items.RED_DYE); - radioRecipe(exporter, NSE_Custom.RADIO_RECEIVER); - ceilingFanRecipe(exporter, NSE_Custom.CEILING_FAN); - tableLampRecipe(exporter, NSE_Custom.TABLE_LAMP); - vintageLampRecipe(exporter, NSE_Custom.VINTAGE_LAMP); - sickleRecipe(exporter, NSE_Items.SICKLE); - rakeRecipe(exporter, NSE_Items.RAKE); - - // Cracked blocks - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_BRICK_TILES, NSE_Blocks.BRICK_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GLAZED_BRICK_TILES, NSE_Blocks.GLAZED_BRICK_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_DARK_BRICK_TILES, NSE_Blocks.DARK_BRICK_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_NII_WALL_1, NSE_Blocks.NII_WALL_1); - offerCrackingRecipe(exporter, NSE_Blocks.SMALL_CRACKED_YELLOW_TILES, NSE_Blocks.SMALL_YELLOW_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_SAND_TILES, NSE_Blocks.SAND_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.SMALL_CRACKED_SAND_TILES, NSE_Blocks.SMALL_SAND_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_SAND_BRICKS, NSE_Blocks.SAND_BRICKS); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_TEAL_TILES, NSE_Blocks.TEAL_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.SMALL_CRACKED_TEAL_TILES, NSE_Blocks.SMALL_TEAL_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GLAZED_TEAL_TILES, NSE_Blocks.GLAZED_TEAL_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_AQUAMARINE_TILES, NSE_Blocks.AQUAMARINE_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.SMALL_CRACKED_AQUAMARINE_TILES, NSE_Blocks.SMALL_AQUAMARINE_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GLAZED_AQUAMARINE_TILES, NSE_Blocks.GLAZED_AQUAMARINE_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.SMALL_CRACKED_DIORITE_TILES, NSE_Blocks.SMALL_DIORITE_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_DIORITE_BRICKS, NSE_Blocks.DIORITE_BRICKS); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_CALCITE_TILES, NSE_Blocks.CALCITE_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_DRIPSTONE_TILES, NSE_Blocks.DRIPSTONE_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_DEEPSLATE_TILES, NSE_Blocks.DEEPSLATE_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.SMALL_CRACKED_DEEPSLATE_TILES, NSE_Blocks.SMALL_DEEPSLATE_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_LIGHT_BLUE_TILES, NSE_Blocks.LIGHT_BLUE_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.SMALL_CRACKED_LIGHT_BLUE_TILES, NSE_Blocks.SMALL_LIGHT_BLUE_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GLAZED_LIGHT_BLUE_TILES, NSE_Blocks.GLAZED_LIGHT_BLUE_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS, NSE_Blocks.LIGHT_BLUE_BRICKS); - offerCrackingRecipe(exporter, NSE_Blocks.SMALL_CRACKED_GRANITE_TILES, NSE_Blocks.SMALL_GRANITE_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GREEN_WHITE_TILES, NSE_Blocks.GREEN_WHITE_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_TUFF_TILES, NSE_Blocks.TUFF_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_TUFF_BRICKS, NSE_Blocks.TUFF_BRICKS); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_WHITEWASH, NSE_Blocks.WHITEWASH); - offerCrackingRecipe(exporter, NSE_Blocks.VERY_CRACKED_WHITEWASH, NSE_Blocks.CRACKED_WHITEWASH); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_WHITE_CONCRETE, NSE_Blocks.WHITE_CONCRETE); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_BEIGE_CONCRETE, NSE_Blocks.BEIGE_CONCRETE); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_BLUE_CONCRETE, NSE_Blocks.BLUE_CONCRETE); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_RED_CONCRETE, NSE_Blocks.RED_CONCRETE); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_YELLOW_CONCRETE, NSE_Blocks.YELLOW_CONCRETE); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GREEN_CONCRETE, NSE_Blocks.GREEN_CONCRETE); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GREEN_BRICKS, NSE_Blocks.GREEN_BRICKS); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_GREEN_BRICKS_2, NSE_Blocks.GREEN_BRICKS_2); - offerCrackingRecipe(exporter, NSE_Blocks.BIG_GREEN_TILES_CRACKED, NSE_Blocks.BIG_GREEN_TILES); - offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_RED_BRICKS, NSE_Blocks.RED_BRICKS); - - // Mossy variants - mossRecipe(exporter, NSE_Blocks.MOSSY_SAND_TILES, NSE_Blocks.SAND_TILES); - mossRecipe(exporter, NSE_Blocks.MOSSY_SAND_BRICKS, NSE_Blocks.SAND_BRICKS); - mossRecipe(exporter, NSE_Blocks.MOSSY_TEAL_TILES, NSE_Blocks.TEAL_TILES); - mossRecipe(exporter, NSE_Blocks.MOSSY_AQUAMARINE_TILES, NSE_Blocks.AQUAMARINE_TILES); - mossRecipe(exporter, NSE_Blocks.MOSSY_DIORITE_BRICKS, NSE_Blocks.DIORITE_BRICKS); - mossRecipe(exporter, NSE_Blocks.MOSSY_CALCITE_TILES, NSE_Blocks.CALCITE_TILES); - mossRecipe(exporter, NSE_Blocks.MOSSY_DRIPSTONE_TILES, NSE_Blocks.DRIPSTONE_TILES); - mossRecipe(exporter, NSE_Blocks.MOSSY_DEEPSLATE_TILES, NSE_Blocks.DEEPSLATE_TILES); - mossRecipe(exporter, NSE_Blocks.MOSSY_LIGHT_BLUE_TILES, NSE_Blocks.LIGHT_BLUE_TILES); - mossRecipe(exporter, NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS, NSE_Blocks.LIGHT_BLUE_BRICKS); - mossRecipe(exporter, NSE_Blocks.MOSSY_GREEN_WHITE_TILES, NSE_Blocks.GREEN_WHITE_TILES); - mossRecipe(exporter, NSE_Blocks.MOSSY_TUFF_TILES, NSE_Blocks.TUFF_TILES); - mossRecipe(exporter, NSE_Blocks.MOSSY_TUFF_BRICKS, NSE_Blocks.TUFF_BRICKS); - mossRecipe(exporter, NSE_Blocks.MOSSY_GREEN_BRICKS, NSE_Blocks.GREEN_BRICKS); - mossRecipe(exporter, NSE_Blocks.MOSSY_GREEN_BRICKS_2, NSE_Blocks.GREEN_BRICKS_2); - mossRecipe(exporter, NSE_Blocks.MOSSY_RED_BRICKS, NSE_Blocks.RED_BRICKS); - mossRecipe(exporter, NSE_Blocks.MOSSY_BRICK_TILES, NSE_Blocks.BRICK_TILES); - mossRecipe(exporter, NSE_Blocks.MOSSY_DARK_BRICK_TILES, NSE_Blocks.DARK_BRICK_TILES); - mossRecipe(exporter, NSE_Blocks.MOSSY_SAND_TILES_STAIRS, NSE_Blocks.SAND_TILES_STAIRS); - mossRecipe(exporter, NSE_Blocks.MOSSY_SAND_TILES_SLAB, NSE_Blocks.SAND_TILES_SLAB); - mossRecipe(exporter, NSE_Blocks.MOSSY_SAND_BRICKS_STAIRS, NSE_Blocks.SAND_BRICKS_STAIRS); - mossRecipe(exporter, NSE_Blocks.MOSSY_SAND_BRICKS_SLAB, NSE_Blocks.SAND_BRICKS_SLAB); - mossRecipe(exporter, NSE_Blocks.MOSSY_BRICK_TILES_STAIRS, NSE_Blocks.BRICK_TILES_STAIRS); - mossRecipe(exporter, NSE_Blocks.MOSSY_BRICK_TILES_SLAB, NSE_Blocks.BRICK_TILES_SLAB); - mossRecipe(exporter, NSE_Blocks.MOSSY_DARK_BRICK_TILES_STAIRS, NSE_Blocks.DARK_BRICK_TILES_STAIRS); - mossRecipe(exporter, NSE_Blocks.MOSSY_DARK_BRICK_TILES_SLAB, NSE_Blocks.DARK_BRICK_TILES_SLAB); - mossRecipe(exporter, NSE_Blocks.MOSSY_RED_BRICKS_STAIRS, NSE_Blocks.RED_BRICKS_STAIRS); - mossRecipe(exporter, NSE_Blocks.MOSSY_RED_BRICKS_SLAB, NSE_Blocks.RED_BRICKS_SLAB); - mossRecipe(exporter, NSE_Blocks.MOSSY_TEAL_TILES_STAIRS, NSE_Blocks.TEAL_TILES_STAIRS); - mossRecipe(exporter, NSE_Blocks.MOSSY_TEAL_TILES_SLAB, NSE_Blocks.TEAL_TILES_SLAB); - mossRecipe(exporter, NSE_Blocks.MOSSY_GREEN_BRICKS_STAIRS, NSE_Blocks.GREEN_BRICKS_STAIRS); - mossRecipe(exporter, NSE_Blocks.MOSSY_GREEN_BRICKS_SLAB, NSE_Blocks.GREEN_BRICKS_SLAB); - mossRecipe(exporter, NSE_Blocks.MOSSY_GREEN_BRICKS_2_STAIRS, NSE_Blocks.GREEN_BRICKS_2_STAIRS); - mossRecipe(exporter, NSE_Blocks.MOSSY_GREEN_BRICKS_2_SLAB, NSE_Blocks.GREEN_BRICKS_2_SLAB); - mossRecipe(exporter, NSE_Blocks.MOSSY_AQUAMARINE_TILES_STAIRS, NSE_Blocks.AQUAMARINE_TILES_STAIRS); - mossRecipe(exporter, NSE_Blocks.MOSSY_AQUAMARINE_TILES_SLAB, NSE_Blocks.AQUAMARINE_TILES_SLAB); - mossRecipe(exporter, NSE_Blocks.MOSSY_DIORITE_BRICKS_STAIRS, NSE_Blocks.DIORITE_BRICKS_STAIRS); - mossRecipe(exporter, NSE_Blocks.MOSSY_DIORITE_BRICKS_SLAB, NSE_Blocks.DIORITE_BRICKS_SLAB); - mossRecipe(exporter, NSE_Blocks.MOSSY_CALCITE_TILES_STAIRS, NSE_Blocks.CALCITE_TILES_STAIRS); - mossRecipe(exporter, NSE_Blocks.MOSSY_CALCITE_TILES_SLAB, NSE_Blocks.CALCITE_TILES_SLAB); - mossRecipe(exporter, NSE_Blocks.MOSSY_DRIPSTONE_TILES_STAIRS, NSE_Blocks.DRIPSTONE_TILES_STAIRS); - mossRecipe(exporter, NSE_Blocks.MOSSY_DRIPSTONE_TILES_SLAB, NSE_Blocks.DRIPSTONE_TILES_SLAB); - mossRecipe(exporter, NSE_Blocks.MOSSY_DEEPSLATE_TILES_STAIRS, NSE_Blocks.DEEPSLATE_TILES_STAIRS); - mossRecipe(exporter, NSE_Blocks.MOSSY_DEEPSLATE_TILES_SLAB, NSE_Blocks.DEEPSLATE_TILES_SLAB); - mossRecipe(exporter, NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_STAIRS, NSE_Blocks.LIGHT_BLUE_TILES_STAIRS); - mossRecipe(exporter, NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_SLAB, NSE_Blocks.LIGHT_BLUE_TILES_SLAB); - mossRecipe(exporter, NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_STAIRS, NSE_Blocks.LIGHT_BLUE_BRICKS_STAIRS); - mossRecipe(exporter, NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_SLAB, NSE_Blocks.LIGHT_BLUE_BRICKS_SLAB); - mossRecipe(exporter, NSE_Blocks.MOSSY_GREEN_WHITE_TILES_STAIRS, NSE_Blocks.GREEN_WHITE_TILES_STAIRS); - mossRecipe(exporter, NSE_Blocks.MOSSY_GREEN_WHITE_TILES_SLAB, NSE_Blocks.GREEN_WHITE_TILES_SLAB); - mossRecipe(exporter, NSE_Blocks.MOSSY_TUFF_TILES_STAIRS, NSE_Blocks.TUFF_TILES_STAIRS); - mossRecipe(exporter, NSE_Blocks.MOSSY_TUFF_TILES_SLAB, NSE_Blocks.TUFF_TILES_SLAB); - mossRecipe(exporter, NSE_Blocks.MOSSY_TUFF_BRICKS_STAIRS, NSE_Blocks.TUFF_BRICKS_STAIRS); - mossRecipe(exporter, NSE_Blocks.MOSSY_TUFF_BRICKS_SLAB, NSE_Blocks.TUFF_BRICKS_SLAB); - - // Dirty blocks recipe - dirtyRecipe(exporter, NSE_Blocks.DIRTY_AQUAMARINE_TILES, NSE_Blocks.AQUAMARINE_TILES); - dirtyRecipe(exporter, NSE_Blocks.DIRTY_AQUAMARINE_TILES_SLAB, NSE_Blocks.AQUAMARINE_TILES_SLAB); - dirtyRecipe(exporter, NSE_Blocks.DIRTY_AQUAMARINE_TILES_STAIRS, NSE_Blocks.AQUAMARINE_TILES_STAIRS); - dirtyRecipe(exporter, NSE_Blocks.DIRTY_BRICK_TILES, NSE_Blocks.BRICK_TILES); - dirtyRecipe(exporter, NSE_Blocks.DIRTY_BRICK_TILES_SLAB, NSE_Blocks.BRICK_TILES_SLAB); - dirtyRecipe(exporter, NSE_Blocks.DIRTY_BRICK_TILES_STAIRS, NSE_Blocks.BRICK_TILES_STAIRS); - dirtyRecipe(exporter, NSE_Blocks.DIRTY_DARK_BRICK_TILES, NSE_Blocks.DARK_BRICK_TILES); - dirtyRecipe(exporter, NSE_Blocks.DIRTY_DARK_BRICK_TILES_SLAB, NSE_Blocks.DARK_BRICK_TILES_SLAB); - dirtyRecipe(exporter, NSE_Blocks.DIRTY_DARK_BRICK_TILES_STAIRS, NSE_Blocks.DARK_BRICK_TILES_STAIRS); - - // Warning stripes - warningStripeRecipe(exporter, NSE_Blocks.INDUSTRIAL_WARNING, Items.BLACK_DYE); - warningStripeRecipe(exporter, NSE_Blocks.RED_WARNING, Items.RED_DYE); - warningStripeRecipe(exporter, NSE_Blocks.BLUE_WARNING, Items.BLUE_DYE); - warningStripeRecipe(exporter, NSE_Blocks.LIGHT_BLUE_WARNING, Items.LIGHT_BLUE_DYE); - warningStripeRecipe(exporter, NSE_Blocks.CYAN_WARNING, Items.CYAN_DYE); - warningStripeRecipe(exporter, NSE_Blocks.YELLOW_WARNING, Items.YELLOW_DYE); - warningStripeRecipe(exporter, NSE_Blocks.ORANGE_WARNING, Items.ORANGE_DYE); - warningStripeRecipe(exporter, NSE_Blocks.GREEN_WARNING, Items.GREEN_DYE); - warningStripeRecipe(exporter, NSE_Blocks.LIME_WARNING, Items.LIME_DYE); - warningStripeRecipe(exporter, NSE_Blocks.PURPLE_WARNING, Items.PURPLE_DYE); - warningStripeRecipe(exporter, NSE_Blocks.MAGENTA_WARNING, Items.MAGENTA_DYE); - warningStripeRecipe(exporter, NSE_Blocks.GRAY_WARNING, Items.GRAY_DYE); - - stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.SAND_TILES); - list.add(NSE_Blocks.SAND_BRICKS); - list.add(NSE_Blocks.SMALL_SAND_TILES); - list.add(NSE_Blocks.BIG_SAND_TILES); - list.add(NSE_Blocks.BIG_SAND_BRICKS); - list.add(NSE_Blocks.CROSS_SAND_TILES); - list.add(NSE_Blocks.HERRINGBONE_SAND_TILES); - }), RecipeCategory.BUILDING_BLOCKS); - - stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.TEAL_TILES); - list.add(NSE_Blocks.SMALL_TEAL_TILES); - list.add(NSE_Blocks.GLAZED_TEAL_TILES); - list.add(NSE_Blocks.VARIATED_TEAL_TILES); - list.add(Blocks.PRISMARINE_BRICKS); - }), RecipeCategory.BUILDING_BLOCKS); - - stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.AQUAMARINE_TILES); - list.add(NSE_Blocks.GLAZED_AQUAMARINE_TILES); - list.add(NSE_Blocks.SMALL_AQUAMARINE_TILES); - }), RecipeCategory.BUILDING_BLOCKS); - - stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.DIORITE_BRICKS); - list.add(NSE_Blocks.BIG_DIORITE_TILES); - list.add(NSE_Blocks.SMALL_DIORITE_TILES); - list.add(NSE_Blocks.NII_WALL_1); - list.add(Blocks.POLISHED_DIORITE); - }), RecipeCategory.BUILDING_BLOCKS); - - stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.CALCITE_TILES); - list.add(NSE_Blocks.DIAGONAL_CALCITE_TILES); - list.add(Blocks.CALCITE); - }), RecipeCategory.BUILDING_BLOCKS); - - stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.DRIPSTONE_TILES); - list.add(NSE_Blocks.DRIPSTONE_BRICKS); - list.add(Blocks.DRIPSTONE_BLOCK); - }), RecipeCategory.BUILDING_BLOCKS); - - stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.DEEPSLATE_TILES); - list.add(NSE_Blocks.DIAGONAL_DEEPSLATE_TILES); - list.add(NSE_Blocks.SMALL_DEEPSLATE_TILES); - list.add(Blocks.POLISHED_DEEPSLATE); - }), RecipeCategory.BUILDING_BLOCKS); - - stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.LIGHT_BLUE_TILES); - list.add(NSE_Blocks.LIGHT_BLUE_BRICKS); - list.add(NSE_Blocks.VARIATED_LIGHT_BLUE_TILES); - list.add(NSE_Blocks.GLAZED_LIGHT_BLUE_TILES); - list.add(NSE_Blocks.SMALL_LIGHT_BLUE_TILES); - }), RecipeCategory.BUILDING_BLOCKS); - - stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.BIG_GRANITE_TILES); - list.add(NSE_Blocks.SMALL_GRANITE_TILES); - list.add(Blocks.POLISHED_GRANITE); - }), RecipeCategory.BUILDING_BLOCKS); - - stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.TUFF_TILES); - list.add(NSE_Blocks.TUFF_BRICKS); - list.add(NSE_Blocks.BIG_TUFF_TILES); - list.add(Blocks.TUFF); - }), RecipeCategory.BUILDING_BLOCKS); - - stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.SMALL_WHITE_TILES); - list.add(NSE_Blocks.SMALL_CRACKED_WHITE_TILES); - list.add(NSE_Blocks.GLAZED_WHITE_TILES); - list.add(NSE_Blocks.CRACKED_GLAZED_WHITE_TILES); - }), RecipeCategory.BUILDING_BLOCKS); - - stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.CROSS_ACACIA_PLANKS); - list.add(NSE_Blocks.HERRINGBONE_ACACIA_PLANKS); - list.add(Blocks.ACACIA_PLANKS); - }), RecipeCategory.BUILDING_BLOCKS); - stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.CROSS_OAK_PLANKS); - list.add(NSE_Blocks.HERRINGBONE_OAK_PLANKS); - list.add(Blocks.OAK_PLANKS); - }), RecipeCategory.BUILDING_BLOCKS); - stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.CROSS_BIRCH_PLANKS); - list.add(NSE_Blocks.HERRINGBONE_BIRCH_PLANKS); - list.add(Blocks.BIRCH_PLANKS); - }), RecipeCategory.BUILDING_BLOCKS); - stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.CROSS_CRIMSON_PLANKS); - list.add(NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS); - list.add(Blocks.CRIMSON_PLANKS); - }), RecipeCategory.BUILDING_BLOCKS); - stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.CROSS_DARK_OAK_PLANKS); - list.add(NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS); - list.add(Blocks.DARK_OAK_PLANKS); - }), RecipeCategory.BUILDING_BLOCKS); - stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.CROSS_JUNGLE_PLANKS); - list.add(NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS); - list.add(Blocks.JUNGLE_PLANKS); - }), RecipeCategory.BUILDING_BLOCKS); - stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.CROSS_MANGROVE_PLANKS); - list.add(NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS); - list.add(Blocks.MANGROVE_PLANKS); - }), RecipeCategory.BUILDING_BLOCKS); - stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.CROSS_SPRUCE_PLANKS); - list.add(NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS); - list.add(Blocks.SPRUCE_PLANKS); - }), RecipeCategory.BUILDING_BLOCKS); - - stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.BRICK_TILES); - list.add(NSE_Blocks.GLAZED_BRICK_TILES); - list.add(Blocks.BRICKS); - }), RecipeCategory.BUILDING_BLOCKS); - - stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.NII_WALL_3); - list.add(Blocks.STONE); - list.add(Blocks.STONE_BRICKS); - }), RecipeCategory.BUILDING_BLOCKS); - - stoneCuttingCategory(exporter, Util.make(Lists.newArrayList(), list -> { - list.add(NSE_Blocks.NII_WALL_2); - list.add(Blocks.SMOOTH_STONE); - }), RecipeCategory.BUILDING_BLOCKS); - - diceRecipe(exporter, NSE_Items.DICE_D4); - diceRecipe(exporter, NSE_Items.DICE_D6); - diceRecipe(exporter, NSE_Items.DICE_D20); - - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_MANGROVE_DOOR, Blocks.MANGROVE_DOOR); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_OAK_DOOR, Blocks.OAK_DOOR); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_SPRUCE_DOOR, Blocks.SPRUCE_DOOR); - offerStonecuttingRecipe(exporter, RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.CHISELED_BIRCH_DOOR, Blocks.BIRCH_DOOR); - - ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Custom.LIGHT_BULB_LAMP, 1) - .input('X', Items.IRON_INGOT).input('Y', Items.IRON_NUGGET).input('Z', NSE_Items.LIGHT_BULB) - .pattern(" X ").pattern(" Y ").pattern(" Z ") - .criterion(hasItem(NSE_Items.LIGHT_BULB), conditionsFromItem(NSE_Items.LIGHT_BULB)).offerTo(exporter); - - ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.NII_FLOOR, 4) - .input('#', Items.DIORITE).input('G', Items.GRANITE).input('C', Items.COBBLESTONE) - .pattern("#G").pattern("GC") - .criterion(hasItem(Items.GRANITE), conditionsFromItem(Items.GRANITE)) - .criterion(hasItem(Items.DIORITE), conditionsFromItem(Items.DIORITE)) - .criterion(hasItem(Items.COBBLESTONE), conditionsFromItem(Items.COBBLESTONE)) - .offerTo(exporter); - - ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.BIG_GREEN_TILES, 8) - .input('#', NSE_Blocks.BIG_DIORITE_TILES).input('G', Items.GREEN_DYE) - .pattern("###") - .pattern("#G#") - .pattern("###") - .criterion(hasItem(Items.GREEN_DYE), conditionsFromItem(Items.GREEN_DYE)) - .criterion(hasItem(NSE_Blocks.BIG_DIORITE_TILES), conditionsFromItem(NSE_Blocks.BIG_DIORITE_TILES)) - .offerTo(exporter); - - ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.GREEN_BRICKS, 8) - .input('#', Items.BRICKS).input('G', Items.GREEN_DYE) - .pattern("###") - .pattern("#G#") - .pattern("###") - .criterion(hasItem(Items.GREEN_DYE), conditionsFromItem(Items.GREEN_DYE)) - .criterion(hasItem(Items.BRICKS), conditionsFromItem(Items.BRICKS)) - .offerTo(exporter); - - ShapelessRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.GREEN_BRICKS_2, 2) - .input(Items.BRICKS).input(NSE_Blocks.GREEN_BRICKS) - .criterion(hasItem(NSE_Blocks.GREEN_BRICKS), conditionsFromItem(NSE_Blocks.GREEN_BRICKS)) - .criterion(hasItem(Items.BRICKS), conditionsFromItem(Items.BRICKS)) - .offerTo(exporter); - - ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.SMALL_YELLOW_TILES, 8) - .pattern("###") - .pattern("#Y#") - .pattern("###") - .input('#', NSE_Blocks.SMALL_WHITE_TILES).input('Y', Items.YELLOW_DYE) - .criterion(hasItem(NSE_Blocks.SMALL_WHITE_TILES), conditionsFromItem(NSE_Blocks.SMALL_WHITE_TILES)) - .criterion(hasItem(Items.YELLOW_DYE), conditionsFromItem(Items.YELLOW_DYE)) - .offerTo(exporter); - - ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.RED_BRICKS, 8) - .pattern("###") - .pattern("#R#") - .pattern("###") - .input('#', Items.BRICKS).input('R', Items.RED_DYE) - .criterion(hasItem(Items.BRICKS), conditionsFromItem(Items.BRICKS)) - .criterion(hasItem(Items.RED_DYE), conditionsFromItem(Items.RED_DYE)) - .offerTo(exporter); - - ShapedRecipeJsonBuilder.create(RecipeCategory.BUILDING_BLOCKS, NSE_Blocks.DARK_BRICK_TILES, 8) - .pattern("###") - .pattern("#D#") - .pattern("###") - .input('#', NSE_Blocks.BRICK_TILES).input('D', Items.BROWN_DYE) - .criterion(hasItem(NSE_Blocks.BRICK_TILES), conditionsFromItem(NSE_Blocks.BRICK_TILES)) - .criterion(hasItem(Items.BROWN_DYE), conditionsFromItem(Items.BROWN_DYE)) - .offerTo(exporter); - - // Generated stairs and slabs recipes - offerStairsAndSlab(exporter, NSE_Blocks.SAND_TILES_STAIRS, NSE_Blocks.SAND_TILES_SLAB, NSE_Blocks.SAND_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_SAND_TILES_STAIRS, NSE_Blocks.CRACKED_SAND_TILES_SLAB, NSE_Blocks.CRACKED_SAND_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_SAND_TILES_STAIRS, NSE_Blocks.MOSSY_SAND_TILES_SLAB, NSE_Blocks.MOSSY_SAND_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_SAND_TILES_STAIRS, NSE_Blocks.HERRINGBONE_SAND_TILES_SLAB, NSE_Blocks.HERRINGBONE_SAND_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.CROSS_SAND_TILES_STAIRS, NSE_Blocks.CROSS_SAND_TILES_SLAB, NSE_Blocks.CROSS_SAND_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.SAND_BRICKS_STAIRS, NSE_Blocks.SAND_BRICKS_SLAB, NSE_Blocks.SAND_BRICKS); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_SAND_BRICKS_STAIRS, NSE_Blocks.CRACKED_SAND_BRICKS_SLAB, NSE_Blocks.CRACKED_SAND_BRICKS); - offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_SAND_BRICKS_STAIRS, NSE_Blocks.MOSSY_SAND_BRICKS_SLAB, NSE_Blocks.MOSSY_SAND_BRICKS); - offerStairsAndSlab(exporter, NSE_Blocks.BIG_SAND_BRICKS_STAIRS, NSE_Blocks.BIG_SAND_BRICKS_SLAB, NSE_Blocks.BIG_SAND_BRICKS); - offerStairsAndSlab(exporter, NSE_Blocks.BRICK_TILES_STAIRS, NSE_Blocks.BRICK_TILES_SLAB, NSE_Blocks.BRICK_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_BRICK_TILES_STAIRS, NSE_Blocks.CRACKED_BRICK_TILES_SLAB, NSE_Blocks.CRACKED_BRICK_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_BRICK_TILES_STAIRS, NSE_Blocks.MOSSY_BRICK_TILES_SLAB, NSE_Blocks.MOSSY_BRICK_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.DIRTY_BRICK_TILES_STAIRS, NSE_Blocks.DIRTY_BRICK_TILES_SLAB, NSE_Blocks.DIRTY_BRICK_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.DARK_BRICK_TILES_STAIRS, NSE_Blocks.DARK_BRICK_TILES_SLAB, NSE_Blocks.DARK_BRICK_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_DARK_BRICK_TILES_STAIRS, NSE_Blocks.CRACKED_DARK_BRICK_TILES_SLAB, NSE_Blocks.CRACKED_DARK_BRICK_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_DARK_BRICK_TILES_STAIRS, NSE_Blocks.MOSSY_DARK_BRICK_TILES_SLAB, NSE_Blocks.MOSSY_DARK_BRICK_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.DIRTY_DARK_BRICK_TILES_STAIRS, NSE_Blocks.DIRTY_DARK_BRICK_TILES_SLAB, NSE_Blocks.DIRTY_DARK_BRICK_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.RED_BRICKS_STAIRS, NSE_Blocks.RED_BRICKS_SLAB, NSE_Blocks.RED_BRICKS); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_RED_BRICKS_STAIRS, NSE_Blocks.CRACKED_RED_BRICKS_SLAB, NSE_Blocks.CRACKED_RED_BRICKS); - offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_RED_BRICKS_STAIRS, NSE_Blocks.MOSSY_RED_BRICKS_SLAB, NSE_Blocks.MOSSY_RED_BRICKS); - offerStairsAndSlab(exporter, NSE_Blocks.TEAL_TILES_STAIRS, NSE_Blocks.TEAL_TILES_SLAB, NSE_Blocks.TEAL_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_TEAL_TILES_STAIRS, NSE_Blocks.CRACKED_TEAL_TILES_SLAB, NSE_Blocks.CRACKED_TEAL_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_TEAL_TILES_STAIRS, NSE_Blocks.MOSSY_TEAL_TILES_SLAB, NSE_Blocks.MOSSY_TEAL_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.VARIATED_TEAL_TILES_STAIRS, NSE_Blocks.VARIATED_TEAL_TILES_SLAB, NSE_Blocks.VARIATED_TEAL_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.GREEN_BRICKS_STAIRS, NSE_Blocks.GREEN_BRICKS_SLAB, NSE_Blocks.GREEN_BRICKS); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_GREEN_BRICKS_STAIRS, NSE_Blocks.CRACKED_GREEN_BRICKS_SLAB, NSE_Blocks.CRACKED_GREEN_BRICKS); - offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_GREEN_BRICKS_STAIRS, NSE_Blocks.MOSSY_GREEN_BRICKS_SLAB, NSE_Blocks.MOSSY_GREEN_BRICKS); - offerStairsAndSlab(exporter, NSE_Blocks.GREEN_BRICKS_2_STAIRS, NSE_Blocks.GREEN_BRICKS_2_SLAB, NSE_Blocks.GREEN_BRICKS_2); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_GREEN_BRICKS_2_STAIRS, NSE_Blocks.CRACKED_GREEN_BRICKS_2_SLAB, NSE_Blocks.CRACKED_GREEN_BRICKS_2); - offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_GREEN_BRICKS_2_STAIRS, NSE_Blocks.MOSSY_GREEN_BRICKS_2_SLAB, NSE_Blocks.MOSSY_GREEN_BRICKS_2); - offerStairsAndSlab(exporter, NSE_Blocks.AQUAMARINE_TILES_STAIRS, NSE_Blocks.AQUAMARINE_TILES_SLAB, NSE_Blocks.AQUAMARINE_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_AQUAMARINE_TILES_STAIRS, NSE_Blocks.CRACKED_AQUAMARINE_TILES_SLAB, NSE_Blocks.CRACKED_AQUAMARINE_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_AQUAMARINE_TILES_STAIRS, NSE_Blocks.MOSSY_AQUAMARINE_TILES_SLAB, NSE_Blocks.MOSSY_AQUAMARINE_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.DIRTY_AQUAMARINE_TILES_STAIRS, NSE_Blocks.DIRTY_AQUAMARINE_TILES_SLAB, NSE_Blocks.DIRTY_AQUAMARINE_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.DIORITE_BRICKS_STAIRS, NSE_Blocks.DIORITE_BRICKS_SLAB, NSE_Blocks.DIORITE_BRICKS); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_DIORITE_BRICKS_STAIRS, NSE_Blocks.CRACKED_DIORITE_BRICKS_SLAB, NSE_Blocks.CRACKED_DIORITE_BRICKS); - offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_DIORITE_BRICKS_STAIRS, NSE_Blocks.MOSSY_DIORITE_BRICKS_SLAB, NSE_Blocks.MOSSY_DIORITE_BRICKS); - offerStairsAndSlab(exporter, NSE_Blocks.CALCITE_TILES_STAIRS, NSE_Blocks.CALCITE_TILES_SLAB, NSE_Blocks.CALCITE_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_CALCITE_TILES_STAIRS, NSE_Blocks.CRACKED_CALCITE_TILES_SLAB, NSE_Blocks.CRACKED_CALCITE_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_CALCITE_TILES_STAIRS, NSE_Blocks.MOSSY_CALCITE_TILES_SLAB, NSE_Blocks.MOSSY_CALCITE_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.DRIPSTONE_TILES_STAIRS, NSE_Blocks.DRIPSTONE_TILES_SLAB, NSE_Blocks.DRIPSTONE_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_DRIPSTONE_TILES_STAIRS, NSE_Blocks.CRACKED_DRIPSTONE_TILES_SLAB, NSE_Blocks.CRACKED_DRIPSTONE_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_DRIPSTONE_TILES_STAIRS, NSE_Blocks.MOSSY_DRIPSTONE_TILES_SLAB, NSE_Blocks.MOSSY_DRIPSTONE_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.DEEPSLATE_TILES_STAIRS, NSE_Blocks.DEEPSLATE_TILES_SLAB, NSE_Blocks.DEEPSLATE_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_DEEPSLATE_TILES_STAIRS, NSE_Blocks.CRACKED_DEEPSLATE_TILES_SLAB, NSE_Blocks.CRACKED_DEEPSLATE_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_DEEPSLATE_TILES_STAIRS, NSE_Blocks.MOSSY_DEEPSLATE_TILES_SLAB, NSE_Blocks.MOSSY_DEEPSLATE_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.LIGHT_BLUE_TILES_STAIRS, NSE_Blocks.LIGHT_BLUE_TILES_SLAB, NSE_Blocks.LIGHT_BLUE_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_LIGHT_BLUE_TILES_STAIRS, NSE_Blocks.CRACKED_LIGHT_BLUE_TILES_SLAB, NSE_Blocks.CRACKED_LIGHT_BLUE_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_STAIRS, NSE_Blocks.MOSSY_LIGHT_BLUE_TILES_SLAB, NSE_Blocks.MOSSY_LIGHT_BLUE_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.VARIATED_LIGHT_BLUE_TILES_STAIRS, NSE_Blocks.VARIATED_LIGHT_BLUE_TILES_SLAB, NSE_Blocks.VARIATED_LIGHT_BLUE_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.LIGHT_BLUE_BRICKS_STAIRS, NSE_Blocks.LIGHT_BLUE_BRICKS_SLAB, NSE_Blocks.LIGHT_BLUE_BRICKS); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS_STAIRS, NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS_SLAB, NSE_Blocks.CRACKED_LIGHT_BLUE_BRICKS); - offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_STAIRS, NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS_SLAB, NSE_Blocks.MOSSY_LIGHT_BLUE_BRICKS); - offerStairsAndSlab(exporter, NSE_Blocks.GREEN_WHITE_TILES_STAIRS, NSE_Blocks.GREEN_WHITE_TILES_SLAB, NSE_Blocks.GREEN_WHITE_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_GREEN_WHITE_TILES_STAIRS, NSE_Blocks.CRACKED_GREEN_WHITE_TILES_SLAB, NSE_Blocks.CRACKED_GREEN_WHITE_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_GREEN_WHITE_TILES_STAIRS, NSE_Blocks.MOSSY_GREEN_WHITE_TILES_SLAB, NSE_Blocks.MOSSY_GREEN_WHITE_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.TUFF_TILES_STAIRS, NSE_Blocks.TUFF_TILES_SLAB, NSE_Blocks.TUFF_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_TUFF_TILES_STAIRS, NSE_Blocks.CRACKED_TUFF_TILES_SLAB, NSE_Blocks.CRACKED_TUFF_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_TUFF_TILES_STAIRS, NSE_Blocks.MOSSY_TUFF_TILES_SLAB, NSE_Blocks.MOSSY_TUFF_TILES); - offerStairsAndSlab(exporter, NSE_Blocks.TUFF_BRICKS_STAIRS, NSE_Blocks.TUFF_BRICKS_SLAB, NSE_Blocks.TUFF_BRICKS); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_TUFF_BRICKS_STAIRS, NSE_Blocks.CRACKED_TUFF_BRICKS_SLAB, NSE_Blocks.CRACKED_TUFF_BRICKS); - offerStairsAndSlab(exporter, NSE_Blocks.MOSSY_TUFF_BRICKS_STAIRS, NSE_Blocks.MOSSY_TUFF_BRICKS_SLAB, NSE_Blocks.MOSSY_TUFF_BRICKS); - offerStairsAndSlab(exporter, NSE_Blocks.WHITE_CONCRETE_STAIRS, NSE_Blocks.WHITE_CONCRETE_SLAB, NSE_Blocks.WHITE_CONCRETE); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_WHITE_CONCRETE_STAIRS, NSE_Blocks.CRACKED_WHITE_CONCRETE_SLAB, NSE_Blocks.CRACKED_WHITE_CONCRETE); - offerStairsAndSlab(exporter, NSE_Blocks.BEIGE_CONCRETE_STAIRS, NSE_Blocks.BEIGE_CONCRETE_SLAB, NSE_Blocks.BEIGE_CONCRETE); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_BEIGE_CONCRETE_STAIRS, NSE_Blocks.CRACKED_BEIGE_CONCRETE_SLAB, NSE_Blocks.CRACKED_BEIGE_CONCRETE); - offerStairsAndSlab(exporter, NSE_Blocks.BLUE_CONCRETE_STAIRS, NSE_Blocks.BLUE_CONCRETE_SLAB, NSE_Blocks.BLUE_CONCRETE); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_BLUE_CONCRETE_STAIRS, NSE_Blocks.CRACKED_BLUE_CONCRETE_SLAB, NSE_Blocks.CRACKED_BLUE_CONCRETE); - offerStairsAndSlab(exporter, NSE_Blocks.RED_CONCRETE_STAIRS, NSE_Blocks.RED_CONCRETE_SLAB, NSE_Blocks.RED_CONCRETE); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_RED_CONCRETE_STAIRS, NSE_Blocks.CRACKED_RED_CONCRETE_SLAB, NSE_Blocks.CRACKED_RED_CONCRETE); - offerStairsAndSlab(exporter, NSE_Blocks.YELLOW_CONCRETE_STAIRS, NSE_Blocks.YELLOW_CONCRETE_SLAB, NSE_Blocks.YELLOW_CONCRETE); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_YELLOW_CONCRETE_STAIRS, NSE_Blocks.CRACKED_YELLOW_CONCRETE_SLAB, NSE_Blocks.CRACKED_YELLOW_CONCRETE); - offerStairsAndSlab(exporter, NSE_Blocks.GREEN_CONCRETE_STAIRS, NSE_Blocks.GREEN_CONCRETE_SLAB, NSE_Blocks.GREEN_CONCRETE); - offerStairsAndSlab(exporter, NSE_Blocks.CRACKED_GREEN_CONCRETE_STAIRS, NSE_Blocks.CRACKED_GREEN_CONCRETE_SLAB, NSE_Blocks.CRACKED_GREEN_CONCRETE); - offerStairsAndSlab(exporter, NSE_Blocks.NII_FLOOR_STAIRS, NSE_Blocks.NII_FLOOR_SLAB, NSE_Blocks.NII_FLOOR); - offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_ACACIA_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_ACACIA_PLANKS); - offerStairsAndSlab(exporter, NSE_Blocks.CROSS_ACACIA_PLANKS_STAIRS, NSE_Blocks.CROSS_ACACIA_PLANKS_SLAB, NSE_Blocks.CROSS_ACACIA_PLANKS); - offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_OAK_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_OAK_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_OAK_PLANKS); - offerStairsAndSlab(exporter, NSE_Blocks.CROSS_OAK_PLANKS_STAIRS, NSE_Blocks.CROSS_OAK_PLANKS_SLAB, NSE_Blocks.CROSS_OAK_PLANKS); - offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_BIRCH_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_BIRCH_PLANKS); - offerStairsAndSlab(exporter, NSE_Blocks.CROSS_BIRCH_PLANKS_STAIRS, NSE_Blocks.CROSS_BIRCH_PLANKS_SLAB, NSE_Blocks.CROSS_BIRCH_PLANKS); - offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_CRIMSON_PLANKS); - offerStairsAndSlab(exporter, NSE_Blocks.CROSS_CRIMSON_PLANKS_STAIRS, NSE_Blocks.CROSS_CRIMSON_PLANKS_SLAB, NSE_Blocks.CROSS_CRIMSON_PLANKS); - offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_DARK_OAK_PLANKS); - offerStairsAndSlab(exporter, NSE_Blocks.CROSS_DARK_OAK_PLANKS_STAIRS, NSE_Blocks.CROSS_DARK_OAK_PLANKS_SLAB, NSE_Blocks.CROSS_DARK_OAK_PLANKS); - offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_JUNGLE_PLANKS); - offerStairsAndSlab(exporter, NSE_Blocks.CROSS_JUNGLE_PLANKS_STAIRS, NSE_Blocks.CROSS_JUNGLE_PLANKS_SLAB, NSE_Blocks.CROSS_JUNGLE_PLANKS); - offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_MANGROVE_PLANKS); - offerStairsAndSlab(exporter, NSE_Blocks.CROSS_MANGROVE_PLANKS_STAIRS, NSE_Blocks.CROSS_MANGROVE_PLANKS_SLAB, NSE_Blocks.CROSS_MANGROVE_PLANKS); - offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_STAIRS, NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS_SLAB, NSE_Blocks.HERRINGBONE_SPRUCE_PLANKS); - offerStairsAndSlab(exporter, NSE_Blocks.CROSS_SPRUCE_PLANKS_STAIRS, NSE_Blocks.CROSS_SPRUCE_PLANKS_SLAB, NSE_Blocks.CROSS_SPRUCE_PLANKS); - offerStairsAndSlab(exporter, NSE_Blocks.HERRINGBONE_PARQUET_STAIRS, NSE_Blocks.HERRINGBONE_PARQUET_SLAB, NSE_Blocks.HERRINGBONE_PARQUET); - offerStairsAndSlab(exporter, NSE_Blocks.STRAIGHT_PARQUET_STAIRS, NSE_Blocks.STRAIGHT_PARQUET_SLAB, NSE_Blocks.STRAIGHT_PARQUET); - offerStairsAndSlab(exporter, NSE_Blocks.SEPARATED_PARQUET_STAIRS, NSE_Blocks.SEPARATED_PARQUET_SLAB, NSE_Blocks.SEPARATED_PARQUET); - offerStairsAndSlab(exporter, NSE_Blocks.GREEN_LINOLEUM_STAIRS, NSE_Blocks.GREEN_LINOLEUM_SLAB, NSE_Blocks.GREEN_LINOLEUM); - offerStairsAndSlab(exporter, NSE_Blocks.BLUE_LINOLEUM_STAIRS, NSE_Blocks.BLUE_LINOLEUM_SLAB, NSE_Blocks.BLUE_LINOLEUM); - offerStairsAndSlab(exporter, NSE_Blocks.RED_LINOLEUM_STAIRS, NSE_Blocks.RED_LINOLEUM_SLAB, NSE_Blocks.RED_LINOLEUM); - offerStairsAndSlab(exporter, NSE_Blocks.GRAY_LINOLEUM_STAIRS, NSE_Blocks.GRAY_LINOLEUM_SLAB, NSE_Blocks.GRAY_LINOLEUM); - offerStairsAndSlab(exporter, NSE_Blocks.ORANGE_LINOLEUM_STAIRS, NSE_Blocks.ORANGE_LINOLEUM_SLAB, NSE_Blocks.ORANGE_LINOLEUM); - offerStairsAndSlab(exporter, NSE_Blocks.BROWN_LINOLEUM_STAIRS, NSE_Blocks.BROWN_LINOLEUM_SLAB, NSE_Blocks.BROWN_LINOLEUM); - offerStairsAndSlab(exporter, NSE_Blocks.CYAN_LINOLEUM_STAIRS, NSE_Blocks.CYAN_LINOLEUM_SLAB, NSE_Blocks.CYAN_LINOLEUM); - offerStairsAndSlab(exporter, NSE_Blocks.METAL_PLATING_STAIRS, NSE_Blocks.METAL_PLATING_SLAB, NSE_Blocks.METAL_PLATING); - } -} \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/entities/TVBlockEntity.java b/src/main/java/su/a71/new_soviet/entity/TVBlockEntity.java similarity index 98% rename from src/main/java/su/a71/new_soviet/entities/TVBlockEntity.java rename to src/main/java/su/a71/new_soviet/entity/TVBlockEntity.java index ff3b164..4cc51e9 100644 --- a/src/main/java/su/a71/new_soviet/entities/TVBlockEntity.java +++ b/src/main/java/su/a71/new_soviet/entity/TVBlockEntity.java @@ -1,4 +1,4 @@ -package su.a71.new_soviet.entities; +package su.a71.new_soviet.entity; import net.minecraft.block.BlockState; import net.minecraft.block.entity.BlockEntity; diff --git a/src/main/java/su/a71/new_soviet/items/CigaretteItem.java b/src/main/java/su/a71/new_soviet/items/CigaretteItem.java index 8b01af2..3d19a1c 100644 --- a/src/main/java/su/a71/new_soviet/items/CigaretteItem.java +++ b/src/main/java/su/a71/new_soviet/items/CigaretteItem.java @@ -19,9 +19,11 @@ import net.minecraft.util.Hand; import net.minecraft.util.TypedActionResult; import org.jetbrains.annotations.Nullable; import su.a71.new_soviet.NewSoviet; +import su.a71.new_soviet.registration.NSE_Items; import su.a71.new_soviet.registration.NSE_Sounds; import java.util.List; +import java.util.Objects; // FIXME: 26.08.2023 This whole class is making my head hurt, fix!!! public class CigaretteItem extends Item { diff --git a/src/main/java/su/a71/new_soviet/items/DiceItem.java b/src/main/java/su/a71/new_soviet/items/DiceItem.java index 60fa342..85d4760 100644 --- a/src/main/java/su/a71/new_soviet/items/DiceItem.java +++ b/src/main/java/su/a71/new_soviet/items/DiceItem.java @@ -17,16 +17,15 @@ import java.util.List; import su.a71.new_soviet.Config; import su.a71.new_soviet.NewSoviet; import su.a71.new_soviet.registration.NSE_Sounds; -import su.a71.new_soviet.registration.NSE_Stats; public class DiceItem extends Item { private final int sides; - private final String local_tooltip; + private final String loacl_tooltip; public DiceItem(int sides, String localTooltip, Settings settings) { super(settings); this.sides = sides; - this.local_tooltip = localTooltip; + this.loacl_tooltip = localTooltip; } public TypedActionResult use(World world, PlayerEntity user, Hand hand) { @@ -35,15 +34,13 @@ public class DiceItem extends Item { if (!world.isClient) { StringBuilder output = new StringBuilder(); for (var i = 0; i < itemStack.getCount(); i++) { - int result = NewSoviet.RANDOM.nextBetween(1, this.getSides()); - if (result == this.getSides()) { - user.incrementStat(NSE_Stats.ROLL_PERFECT_DICE); - } - world.playSound(null, user.getX(), user.getY(), user.getZ(), NSE_Sounds.DICE_SOUND, SoundCategory.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F)); - output.append(result).append(", "); + world.playSound((PlayerEntity)null, user.getX(), user.getY(), user.getZ(), NSE_Sounds.DICE_SOUND, SoundCategory.NEUTRAL, 0.5F, 0.4F / (world.getRandom().nextFloat() * 0.4F + 0.8F)); + output.append(NewSoviet.RANDOM.nextBetween(1, this.getSides())).append(", "); } if (Config.INSTANCE.shouldAnnounceDice()) { - world.getPlayers().forEach(player -> player.sendMessage(Text.translatable(itemStack.getCount() == 1 ? "item.new_soviet.dice.thrown_announce" : "item.new_soviet.dice.thrown_multiple_announce", user.getDisplayName()).append(" " + output.subSequence(0, output.length() - 2)), false)); + world.getPlayers().forEach(player -> { + player.sendMessage(Text.translatable(itemStack.getCount() == 1 ? "item.new_soviet.dice.thrown_announce" : "item.new_soviet.dice.thrown_multiple_announce", user.getDisplayName()).append(" " + output.subSequence(0, output.length() - 2)), false); + }); } else { user.sendMessage(Text.translatable(itemStack.getCount() == 1 ? "item.new_soviet.dice.thrown" : "item.new_soviet.dice.thrown_multiple").append(" " + output.subSequence(0, output.length() - 2)), true); } @@ -59,7 +56,7 @@ public class DiceItem extends Item { @Override public void appendTooltip(ItemStack stack, @Nullable World world, List tooltip, TooltipContext context) { - tooltip.add(Text.translatable(local_tooltip)); + tooltip.add(Text.translatable(loacl_tooltip)); super.appendTooltip(stack, world, tooltip, context); } } diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_BaseRegistration.java b/src/main/java/su/a71/new_soviet/registration/NSE_BaseRegistration.java index 20031b7..d27224f 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_BaseRegistration.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_BaseRegistration.java @@ -19,7 +19,6 @@ import net.minecraft.util.Identifier; import java.util.Optional; import java.util.function.Supplier; - import su.a71.new_soviet.NewSoviet; public class NSE_BaseRegistration { @@ -29,7 +28,9 @@ public class NSE_BaseRegistration { if (tab == null) return; // Sanity check for hidden items Optional> key = Registries.ITEM_GROUP.getKey(tab); - key.ifPresent(itemGroupRegistryKey -> ItemGroupEvents.modifyEntriesEvent(itemGroupRegistryKey).register(content -> content.add(supplier.get()))); + key.ifPresent(itemGroupRegistryKey -> ItemGroupEvents.modifyEntriesEvent(itemGroupRegistryKey).register(content -> { + content.add(supplier.get()); + })); } public static void registerBlock(String name, Supplier supplier, ItemGroup tab) { @@ -43,8 +44,6 @@ public class NSE_BaseRegistration { return Registry.register(Registries.SOUND_EVENT, id, SoundEvent.of(id)); } - - @SuppressWarnings({"unchecked", "rawtypes"}) public static T registerBlockEntity(String name, FabricBlockEntityTypeBuilder.Factory factory, net.minecraft.block.Block... blocks) { return (T) Registry.register( Registries.BLOCK_ENTITY_TYPE, @@ -52,13 +51,9 @@ public class NSE_BaseRegistration { FabricBlockEntityTypeBuilder.create(factory, blocks).build()); } - public static TagKey createBlockTag(String name) { + public static TagKey createTag(String name) { return TagKey.of(RegistryKeys.BLOCK, new Identifier(NewSoviet.MOD_ID, name)); } - public static TagKey createItemTag(String name) { - return TagKey.of(RegistryKeys.ITEM, new Identifier(NewSoviet.MOD_ID, name)); - } - public static void init() {} } diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java b/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java index 2f4ba3b..7814a20 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java @@ -25,7 +25,7 @@ import su.a71.new_soviet.blocks.lamps.TableLampBlock; import su.a71.new_soviet.blocks.lamps.VintageLampBlock; import su.a71.new_soviet.blocks.lamps.lamp_post.LampPostBaseBlock; import su.a71.new_soviet.blocks.lamps.lamp_post.LampPostLampBlock; -import su.a71.new_soviet.entities.TVBlockEntity; +import su.a71.new_soviet.entity.TVBlockEntity; import su.a71.new_soviet.util.Shapes; import java.util.List; @@ -46,22 +46,22 @@ public class NSE_Custom extends NSE_BaseRegistration { public static final LampPostBaseBlock LAMP_POST_BASE = new LampPostBaseBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).strength(1f, 1.5f).mapColor(MapColor.IRON_GRAY)); public static final LampPostLampBlock CAGED_POST_LAMP = new LampPostLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).strength(1f, 1.5f).mapColor(MapColor.IRON_GRAY), - new Shapes.HorizontalShapeLegacy(List.of(List.of(6.5, 0.0, 6.5, 9.5, 2.0, 9.5), + new Shapes.HorizontalShape(List.of(List.of(6.5, 0.0, 6.5, 9.5, 2.0, 9.5), List.of(7.0, 2.0, 7.0, 9.0, 7.0, 9.0), List.of(6.5, 7.0, 6.5, 9.5, 9.0, 9.5), List.of(7.0, 9.0, 7.0, 9.0, 12.0, 9.0)))); public static final LampPostLampBlock MODERN_POST_LAMP = new LampPostLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).strength(1f, 1.5f).mapColor(MapColor.IRON_GRAY), - new Shapes.HorizontalShapeLegacy(List.of(List.of(6.5, 0.0, 6.5, 9.5, 2.0, 9.5), + new Shapes.HorizontalShape(List.of(List.of(6.5, 0.0, 6.5, 9.5, 2.0, 9.5), List.of(7.0, 2.0, 7.0, 9.0, 7.0, 9.0), List.of(6.5, 7.0, 6.5, 9.5, 9.0, 9.5), List.of(7.0, 9.0, 7.0, 9.0, 12.0, 9.0)))); public static final LampPostLampBlock BIG_POST_LAMP = new LampPostLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).strength(1f, 1.5f).mapColor(MapColor.IRON_GRAY), - new Shapes.HorizontalShapeLegacy(List.of(List.of(6.5, 0.0, 6.5, 9.5, 2.0, 9.5), + new Shapes.HorizontalShape(List.of(List.of(6.5, 0.0, 6.5, 9.5, 2.0, 9.5), List.of(7.0, 2.0, 7.0, 9.0, 7.0, 9.0), List.of(6.5, 7.0, 6.5, 9.5, 9.0, 9.5), List.of(7.0, 9.0, 7.0, 9.0, 12.0, 9.0)))); public static final LampPostLampBlock VINTAGE_POST_LAMP = new LampPostLampBlock(FabricBlockSettings.create().sounds(BlockSoundGroup.METAL).strength(1f, 1.5f).mapColor(MapColor.IRON_GRAY), - new Shapes.HorizontalShapeLegacy(List.of(List.of(6.5, 0.0, 6.5, 9.5, 2.0, 9.5), + new Shapes.HorizontalShape(List.of(List.of(6.5, 0.0, 6.5, 9.5, 2.0, 9.5), List.of(7.0, 2.0, 7.0, 9.0, 7.0, 9.0), List.of(6.5, 7.0, 6.5, 9.5, 9.0, 9.5), List.of(7.0, 9.0, 7.0, 9.0, 12.0, 9.0)))); diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Items.java b/src/main/java/su/a71/new_soviet/registration/NSE_Items.java index e2c0b74..7e22dcf 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Items.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_Items.java @@ -10,6 +10,7 @@ import net.minecraft.text.Text; import net.minecraft.util.Identifier; import net.minecraft.util.Rarity; +import su.a71.new_soviet.Materials.NSE_ToolMaterials; import su.a71.new_soviet.items.CigaretteItem; import su.a71.new_soviet.items.DiceItem; import su.a71.new_soviet.items.RakeItem; diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Stats.java b/src/main/java/su/a71/new_soviet/registration/NSE_Stats.java deleted file mode 100644 index 446958b..0000000 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Stats.java +++ /dev/null @@ -1,17 +0,0 @@ -package su.a71.new_soviet.registration; - -import net.minecraft.registry.Registries; -import net.minecraft.registry.Registry; -import net.minecraft.stat.StatFormatter; -import net.minecraft.stat.Stats; -import net.minecraft.util.Identifier; -import su.a71.new_soviet.NewSoviet; - -public class NSE_Stats extends NSE_BaseRegistration { - public static final Identifier ROLL_PERFECT_DICE = new Identifier(NewSoviet.MOD_ID, "roll_perfect_dice"); - - public static void init() { - Registry.register(Registries.CUSTOM_STAT, "roll_perfect_dice", ROLL_PERFECT_DICE); - Stats.CUSTOM.getOrCreateStat(ROLL_PERFECT_DICE, StatFormatter.DEFAULT); - } -} \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Tags.java b/src/main/java/su/a71/new_soviet/registration/NSE_Tags.java index c31f200..2155253 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Tags.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_Tags.java @@ -1,18 +1,17 @@ package su.a71.new_soviet.registration; import net.minecraft.block.Block; -import net.minecraft.item.Item; +import net.minecraft.registry.RegistryKeys; import net.minecraft.registry.tag.TagKey; +import net.minecraft.util.Identifier; +import su.a71.new_soviet.NewSoviet; public class NSE_Tags extends NSE_BaseRegistration{ public static class Blocks { - public static final TagKey RAKE_MINEABLE = createBlockTag("rake"); + public static final TagKey RAKE_MINEABLE = createTag("rake"); - public static final TagKey TV = createBlockTag("tv"); - public static final TagKey POST_LAMPS = createBlockTag("post_lamps"); - } + public static final TagKey TV = createTag("tv"); + public static final TagKey POST_LAMPS = createTag("post_lamps"); - public static class Items { - public static final TagKey DICE = createItemTag("dice"); } } diff --git a/src/main/java/su/a71/new_soviet/util/Shapes.java b/src/main/java/su/a71/new_soviet/util/Shapes.java index c1ec08a..f589d62 100644 --- a/src/main/java/su/a71/new_soviet/util/Shapes.java +++ b/src/main/java/su/a71/new_soviet/util/Shapes.java @@ -8,13 +8,25 @@ import java.util.ArrayList; import java.util.List; public class Shapes { - public static class NHShapeLegacy { - private final VoxelShape NORTH; - private final VoxelShape WEST; - private final VoxelShape SOUTH; - private final VoxelShape EAST; + public static class NHShape{ + private VoxelShape NORTH; + private VoxelShape WEST; + private VoxelShape SOUTH; + private VoxelShape EAST; + private double minX; + private double minY; + private double minZ; + private double maxX; + private double maxY; + private double maxZ; - public NHShapeLegacy(double minX, double minY, double minZ, double maxX, double maxY, double maxZ) { + public NHShape(double minX, double minY, double minZ, double maxX, double maxY, double maxZ) { + this.minX = minX; + this.minY = minY; + this.minZ = minZ; + this.maxX = maxX; + this.maxY = maxY; + this.maxZ = maxZ; this.NORTH = Block.createCuboidShape(minX, minY, minZ, maxX, maxY, maxZ); this.WEST = Block.createCuboidShape(minZ, minY, minX, maxZ, maxY, maxX); this.SOUTH = Block.createCuboidShape(minX, minY, (16 - maxZ), maxX, maxY, (16 - minZ)); @@ -38,13 +50,25 @@ public class Shapes { } } - public static class NHShape { - private final VoxelShape NORTH; - private final VoxelShape WEST; - private final VoxelShape SOUTH; - private final VoxelShape EAST; + public static class NHShape2{ + private VoxelShape NORTH; + private VoxelShape WEST; + private VoxelShape SOUTH; + private VoxelShape EAST; + private double minX; + private double minY; + private double minZ; + private double maxX; + private double maxY; + private double maxZ; - public NHShape(double minX, double minY, double minZ, double maxX, double maxY, double maxZ) { + public NHShape2(double minX, double minY, double minZ, double maxX, double maxY, double maxZ) { + this.minX = minX; + this.minY = minY; + this.minZ = minZ; + this.maxX = maxX; + this.maxY = maxY; + this.maxZ = maxZ; this.NORTH = Block.createCuboidShape((16 - maxX), minY, minZ, (16 - minX), maxY, maxZ); this.WEST = Block.createCuboidShape(minZ, minY, minX, maxZ, maxY, maxX); this.SOUTH = Block.createCuboidShape(minX, minY, (16 - maxZ), maxX, maxY, (16 - minZ)); @@ -68,63 +92,11 @@ public class Shapes { } } - public static class HorizontalShapeLegacy { - private final List ShapesListN; - private final List ShapesListS; - private final List ShapesListW; - private final List ShapesListE; - public HorizontalShapeLegacy(List> list) { - this.ShapesListN = new ArrayList<>(); - this.ShapesListS = new ArrayList<>(); - this.ShapesListW = new ArrayList<>(); - this.ShapesListE = new ArrayList<>(); - for (List i : list) { - NHShapeLegacy shape = new NHShapeLegacy(i.get(0), i.get(1), i.get(2), i.get(3), i.get(4), i.get(5)); - ShapesListN.add(shape.north()); - ShapesListS.add(shape.south()); - ShapesListW.add(shape.west()); - ShapesListE.add(shape.east()); - } - } - - public VoxelShape north() { - VoxelShape shape = Block.createCuboidShape(0, 0,0,0,0,0); - for (VoxelShape o : ShapesListN) { - shape = VoxelShapes.union(shape, o); - } - return shape; - } - - public VoxelShape west() { - VoxelShape shape = Block.createCuboidShape(0, 0,0,0,0,0); - for (VoxelShape o : ShapesListW) { - shape = VoxelShapes.union(shape, o); - } - return shape; - } - - public VoxelShape south() { - VoxelShape shape = Block.createCuboidShape(0, 0,0,0,0,0); - for (VoxelShape shapesList : ShapesListS) { - shape = VoxelShapes.union(shape, shapesList); - } - return shape; - } - - public VoxelShape east() { - VoxelShape shape = Block.createCuboidShape(0, 0,0,0,0,0); - for (VoxelShape o : ShapesListE) { - shape = VoxelShapes.union(shape, o); - } - return shape; - } - } - - public static class HorizontalShape { - private final List ShapesListN; - private final List ShapesListS; - private final List ShapesListW; - private final List ShapesListE; + public static class HorizontalShape{ + private List ShapesListN; + private List ShapesListS; + private List ShapesListW; + private List ShapesListE; public HorizontalShape(List> list) { this.ShapesListN = new ArrayList<>(); this.ShapesListS = new ArrayList<>(); @@ -141,32 +113,84 @@ public class Shapes { public VoxelShape north() { VoxelShape shape = Block.createCuboidShape(0, 0,0,0,0,0); - for (VoxelShape o : ShapesListN) { - shape = VoxelShapes.union(shape, o); + for (int i=0;i> list) { + this.ShapesListN = new ArrayList<>(); + this.ShapesListS = new ArrayList<>(); + this.ShapesListW = new ArrayList<>(); + this.ShapesListE = new ArrayList<>(); + for (List i : list) { + NHShape2 shape = new NHShape2(i.get(0), i.get(1), i.get(2), i.get(3), i.get(4), i.get(5)); + ShapesListN.add(shape.north()); + ShapesListS.add(shape.south()); + ShapesListW.add(shape.west()); + ShapesListE.add(shape.east()); + } + } + + public VoxelShape north() { VoxelShape shape = Block.createCuboidShape(0, 0,0,0,0,0); - for (VoxelShape o : ShapesListE) { - shape = VoxelShapes.union(shape, o); + for (int i=0;i