From c98ff140a2e77128fbbaf1c1b382844fa537a084 Mon Sep 17 00:00:00 2001 From: DrMangoTea Date: Sat, 2 Sep 2023 22:30:52 +0200 Subject: [PATCH] worldgen and stone palettes --- .../9047e4e94996e73e9dfde3738763637fb609e07e | 4 +- .../ad795fb8576279849034d802e60366ec43bb396a | 201 ++++++++++++- .../assets/tfmg/blockstates/bauxite.json | 18 ++ .../tfmg/blockstates/bauxite_pillar.json | 16 ++ .../assets/tfmg/blockstates/cut_bauxite.json | 7 + .../blockstates/cut_bauxite_brick_slab.json | 13 + .../blockstates/cut_bauxite_brick_stairs.json | 209 ++++++++++++++ .../blockstates/cut_bauxite_brick_wall.json | 90 ++++++ .../tfmg/blockstates/cut_bauxite_bricks.json | 7 + .../tfmg/blockstates/cut_bauxite_slab.json | 13 + .../tfmg/blockstates/cut_bauxite_stairs.json | 209 ++++++++++++++ .../tfmg/blockstates/cut_bauxite_wall.json | 90 ++++++ .../assets/tfmg/blockstates/fossilstone.json | 7 + .../tfmg/blockstates/layered_bauxite.json | 7 + .../assets/tfmg/blockstates/oil_deposit.json | 7 + .../blockstates/polished_cut_bauxite.json | 7 + .../polished_cut_bauxite_slab.json | 13 + .../polished_cut_bauxite_stairs.json | 209 ++++++++++++++ .../polished_cut_bauxite_wall.json | 90 ++++++ .../blockstates/small_bauxite_brick_slab.json | 13 + .../small_bauxite_brick_stairs.json | 209 ++++++++++++++ .../blockstates/small_bauxite_brick_wall.json | 90 ++++++ .../blockstates/small_bauxite_bricks.json | 7 + .../resources/assets/tfmg/lang/en_ud.json | 21 ++ .../resources/assets/tfmg/lang/en_us.json | 21 ++ .../tfmg/models/block/bauxite_natural_0.json | 6 + .../tfmg/models/block/bauxite_natural_1.json | 6 + .../tfmg/models/block/bauxite_natural_2.json | 6 + .../tfmg/models/block/bauxite_natural_3.json | 6 + .../tfmg/models/block/bauxite_pillar.json | 7 + .../block/bauxite_pillar_horizontal.json | 7 + .../assets/tfmg/models/block/cut_bauxite.json | 6 + .../models/block/cut_bauxite_brick_slab.json | 8 + .../block/cut_bauxite_brick_slab_top.json | 8 + .../block/cut_bauxite_brick_stairs.json | 8 + .../block/cut_bauxite_brick_stairs_inner.json | 8 + .../block/cut_bauxite_brick_stairs_outer.json | 8 + .../tfmg/models/block/cut_bauxite_bricks.json | 6 + .../block/cut_bauxite_bricks_wall_post.json | 6 + .../block/cut_bauxite_bricks_wall_side.json | 6 + .../cut_bauxite_bricks_wall_side_tall.json | 6 + .../tfmg/models/block/cut_bauxite_slab.json | 8 + .../models/block/cut_bauxite_slab_top.json | 8 + .../tfmg/models/block/cut_bauxite_stairs.json | 8 + .../block/cut_bauxite_stairs_inner.json | 8 + .../block/cut_bauxite_stairs_outer.json | 8 + .../models/block/cut_bauxite_wall_post.json | 6 + .../models/block/cut_bauxite_wall_side.json | 6 + .../block/cut_bauxite_wall_side_tall.json | 6 + .../assets/tfmg/models/block/fossilstone.json | 6 + .../tfmg/models/block/layered_bauxite.json | 7 + .../assets/tfmg/models/block/oil_deposit.json | 6 + .../models/block/polished_cut_bauxite.json | 6 + .../block/polished_cut_bauxite_slab.json | 8 + .../polished_cut_bauxite_slab_double.json | 7 + .../block/polished_cut_bauxite_slab_top.json | 8 + .../block/polished_cut_bauxite_stairs.json | 8 + .../polished_cut_bauxite_stairs_inner.json | 8 + .../polished_cut_bauxite_stairs_outer.json | 8 + .../block/polished_cut_bauxite_wall_post.json | 6 + .../block/polished_cut_bauxite_wall_side.json | 6 + .../polished_cut_bauxite_wall_side_tall.json | 6 + .../block/small_bauxite_brick_slab.json | 8 + .../block/small_bauxite_brick_slab_top.json | 8 + .../block/small_bauxite_brick_stairs.json | 8 + .../small_bauxite_brick_stairs_inner.json | 8 + .../small_bauxite_brick_stairs_outer.json | 8 + .../models/block/small_bauxite_bricks.json | 6 + .../block/small_bauxite_bricks_wall_post.json | 6 + .../block/small_bauxite_bricks_wall_side.json | 6 + .../small_bauxite_bricks_wall_side_tall.json | 6 + .../assets/tfmg/models/item/bauxite.json | 6 + .../tfmg/models/item/bauxite_pillar.json | 3 + .../assets/tfmg/models/item/cut_bauxite.json | 3 + .../models/item/cut_bauxite_brick_slab.json | 3 + .../models/item/cut_bauxite_brick_stairs.json | 3 + .../models/item/cut_bauxite_brick_wall.json | 6 + .../tfmg/models/item/cut_bauxite_bricks.json | 3 + .../tfmg/models/item/cut_bauxite_slab.json | 3 + .../tfmg/models/item/cut_bauxite_stairs.json | 3 + .../tfmg/models/item/cut_bauxite_wall.json | 6 + .../assets/tfmg/models/item/fossilstone.json | 3 + .../tfmg/models/item/layered_bauxite.json | 3 + .../assets/tfmg/models/item/oil_deposit.json | 3 + .../models/item/polished_cut_bauxite.json | 3 + .../item/polished_cut_bauxite_slab.json | 3 + .../item/polished_cut_bauxite_stairs.json | 3 + .../item/polished_cut_bauxite_wall.json | 6 + .../models/item/small_bauxite_brick_slab.json | 3 + .../item/small_bauxite_brick_stairs.json | 3 + .../models/item/small_bauxite_brick_wall.json | 6 + .../models/item/small_bauxite_bricks.json | 3 + .../tags/blocks/azalea_root_replaceable.json | 5 + .../blocks/dripstone_replaceable_blocks.json | 5 + .../tags/blocks/lush_ground_replaceable.json | 5 + .../tags/blocks/mineable/pickaxe.json | 23 +- .../tags/blocks/moss_replaceable.json | 5 + .../tags/blocks/needs_iron_tool.json | 3 +- .../tags/blocks/needs_stone_tool.json | 5 + .../data/minecraft/tags/blocks/slabs.json | 8 + .../data/minecraft/tags/blocks/stairs.json | 8 + .../data/minecraft/tags/blocks/walls.json | 8 + .../data/minecraft/tags/items/slabs.json | 8 + .../data/minecraft/tags/items/stairs.json | 8 + .../data/minecraft/tags/items/walls.json | 8 + ...from_stone_types_bauxite_stonecutting.json | 32 +++ ...from_stone_types_bauxite_stonecutting.json | 32 +++ .../tfmg.base/cut_bauxite_brick_slab.json | 34 +++ ...from_stone_types_bauxite_stonecutting.json | 32 +++ .../cut_bauxite_brick_slab_recycling.json | 34 +++ .../tfmg.base/cut_bauxite_brick_stairs.json | 34 +++ ...from_stone_types_bauxite_stonecutting.json | 32 +++ .../tfmg.base/cut_bauxite_brick_wall.json | 34 +++ ...from_stone_types_bauxite_stonecutting.json | 32 +++ ...from_stone_types_bauxite_stonecutting.json | 32 +++ ...from_stone_types_bauxite_stonecutting.json | 32 +++ .../recipes/tfmg.base/cut_bauxite_slab.json | 34 +++ ...from_stone_types_bauxite_stonecutting.json | 32 +++ .../tfmg.base/cut_bauxite_slab_recycling.json | 34 +++ .../recipes/tfmg.base/cut_bauxite_stairs.json | 34 +++ ...from_stone_types_bauxite_stonecutting.json | 32 +++ .../recipes/tfmg.base/cut_bauxite_wall.json | 34 +++ ...from_stone_types_bauxite_stonecutting.json | 32 +++ ...from_stone_types_bauxite_stonecutting.json | 32 +++ ...from_stone_types_bauxite_stonecutting.json | 32 +++ .../tfmg.base/polished_cut_bauxite_slab.json | 34 +++ ...from_stone_types_bauxite_stonecutting.json | 32 +++ .../polished_cut_bauxite_slab_recycling.json | 34 +++ .../polished_cut_bauxite_stairs.json | 34 +++ ...from_stone_types_bauxite_stonecutting.json | 32 +++ .../tfmg.base/polished_cut_bauxite_wall.json | 34 +++ ...from_stone_types_bauxite_stonecutting.json | 32 +++ .../tfmg.base/small_bauxite_brick_slab.json | 34 +++ ...from_stone_types_bauxite_stonecutting.json | 32 +++ .../small_bauxite_brick_slab_recycling.json | 34 +++ .../tfmg.base/small_bauxite_brick_stairs.json | 34 +++ ...from_stone_types_bauxite_stonecutting.json | 32 +++ .../tfmg.base/small_bauxite_brick_wall.json | 34 +++ ...from_stone_types_bauxite_stonecutting.json | 32 +++ ...from_stone_types_bauxite_stonecutting.json | 32 +++ .../data/tfmg/loot_tables/blocks/bauxite.json | 20 ++ .../loot_tables/blocks/bauxite_pillar.json | 20 ++ .../tfmg/loot_tables/blocks/cut_bauxite.json | 20 ++ .../blocks/cut_bauxite_brick_slab.json | 34 +++ .../blocks/cut_bauxite_brick_stairs.json | 20 ++ .../blocks/cut_bauxite_brick_wall.json | 20 ++ .../blocks/cut_bauxite_bricks.json | 20 ++ .../loot_tables/blocks/cut_bauxite_slab.json | 34 +++ .../blocks/cut_bauxite_stairs.json | 20 ++ .../loot_tables/blocks/cut_bauxite_wall.json | 20 ++ .../tfmg/loot_tables/blocks/fossilstone.json | 20 ++ .../loot_tables/blocks/layered_bauxite.json | 20 ++ .../tfmg/loot_tables/blocks/oil_deposit.json | 20 ++ .../blocks/polished_cut_bauxite.json | 20 ++ .../blocks/polished_cut_bauxite_slab.json | 34 +++ .../blocks/polished_cut_bauxite_stairs.json | 20 ++ .../blocks/polished_cut_bauxite_wall.json | 20 ++ .../blocks/small_bauxite_brick_slab.json | 34 +++ .../blocks/small_bauxite_brick_stairs.json | 20 ++ .../blocks/small_bauxite_brick_wall.json | 20 ++ .../blocks/small_bauxite_bricks.json | 20 ++ ...from_stone_types_bauxite_stonecutting.json | 8 + ...from_stone_types_bauxite_stonecutting.json | 8 + .../tfmg/recipes/cut_bauxite_brick_slab.json | 16 ++ ...from_stone_types_bauxite_stonecutting.json | 8 + .../cut_bauxite_brick_slab_recycling.json | 14 + .../recipes/cut_bauxite_brick_stairs.json | 18 ++ ...from_stone_types_bauxite_stonecutting.json | 8 + .../tfmg/recipes/cut_bauxite_brick_wall.json | 16 ++ ...from_stone_types_bauxite_stonecutting.json | 8 + ...from_stone_types_bauxite_stonecutting.json | 8 + ...from_stone_types_bauxite_stonecutting.json | 8 + .../data/tfmg/recipes/cut_bauxite_slab.json | 16 ++ ...from_stone_types_bauxite_stonecutting.json | 8 + .../recipes/cut_bauxite_slab_recycling.json | 14 + .../data/tfmg/recipes/cut_bauxite_stairs.json | 18 ++ ...from_stone_types_bauxite_stonecutting.json | 8 + .../data/tfmg/recipes/cut_bauxite_wall.json | 16 ++ ...from_stone_types_bauxite_stonecutting.json | 8 + ...from_stone_types_bauxite_stonecutting.json | 8 + ...from_stone_types_bauxite_stonecutting.json | 8 + .../recipes/polished_cut_bauxite_slab.json | 16 ++ ...from_stone_types_bauxite_stonecutting.json | 8 + .../polished_cut_bauxite_slab_recycling.json | 14 + .../recipes/polished_cut_bauxite_stairs.json | 18 ++ ...from_stone_types_bauxite_stonecutting.json | 8 + .../recipes/polished_cut_bauxite_wall.json | 16 ++ ...from_stone_types_bauxite_stonecutting.json | 8 + .../recipes/small_bauxite_brick_slab.json | 16 ++ ...from_stone_types_bauxite_stonecutting.json | 8 + .../small_bauxite_brick_slab_recycling.json | 14 + .../recipes/small_bauxite_brick_stairs.json | 18 ++ ...from_stone_types_bauxite_stonecutting.json | 8 + .../recipes/small_bauxite_brick_wall.json | 16 ++ ...from_stone_types_bauxite_stonecutting.json | 8 + ...from_stone_types_bauxite_stonecutting.json | 8 + .../tfmg/tags/items/stone_types/bauxite.json | 19 ++ .../java/com/drmangotea/tfmg/CreateTFMG.java | 28 +- .../palettes/TFMGPaletteBlockPartial.java | 269 +++++++++++++++++ .../palettes/TFMGPaletteBlockPattern.java | 270 ++++++++++++++++++ .../palettes/TFMGPalettesVariantEntry.java | 84 ++++++ .../content/deposits/FluidDepositBlock.java | 25 ++ .../deposits/FluidDepositTileEntity.java | 54 ++++ .../tfmg/content/fluids/BurnableFluid.java | 88 ++++++ .../tfmg/content/items/TFMGFuelItem.java | 32 +++ .../AllOreFeatureConfigEntriesMixin.java | 127 ++++++++ .../tfmg/registry/TFMGBlockEntities.java | 5 + .../drmangotea/tfmg/registry/TFMGBlocks.java | 30 +- .../drmangotea/tfmg/registry/TFMGFluids.java | 53 +--- .../tfmg/registry/TFMGPaletteBlocks.java | 39 +++ .../tfmg/registry/TFMGPaletteStoneTypes.java | 64 +++++ .../drmangotea/tfmg/worldgen/OilFeature.java | 170 +++++++++++ .../tfmg/worldgen/TFMGConfiguredFeatures.java | 69 +++++ .../tfmg/worldgen/TFMGFeatures.java | 34 +++ .../tfmg/worldgen/TFMGLayeredPatterns.java | 93 ++++++ .../alternatives/bauxite_cut_basketweave.png | Bin 0 -> 240 bytes .../alternatives/bauxite_cut_bond.png | Bin 0 -> 246 bytes .../alternatives/bauxite_cut_herring.png | Bin 0 -> 243 bytes .../alternatives/bauxite_cut_indented.png | Bin 0 -> 230 bytes .../stone_types/brick/bauxite_cut_brick.png | Bin 0 -> 224 bytes .../stone_types/cap/bauxite_cut_cap.png | Bin 0 -> 230 bytes .../cap/bauxite_cut_cap_connected.png | Bin 0 -> 1336 bytes .../palettes/stone_types/cut/bauxite_cut.png | Bin 0 -> 206 bytes .../layered/bauxite_cut_layered.png | Bin 0 -> 223 bytes .../layered/bauxite_cut_layered_connected.png | Bin 0 -> 346 bytes .../stone_types/natural/bauxite_0.png | Bin 0 -> 195 bytes .../stone_types/natural/bauxite_1.png | Bin 0 -> 182 bytes .../stone_types/natural/bauxite_2.png | Bin 0 -> 177 bytes .../stone_types/natural/bauxite_3.png | Bin 0 -> 197 bytes .../stone_types/pillar/bauxite_cut_pillar.png | Bin 0 -> 202 bytes .../pillar/bauxite_cut_pillar_connected.png | Bin 0 -> 908 bytes .../polished/bauxite_cut_polished.png | Bin 0 -> 219 bytes .../stone_types/slab/bauxite_cut_slab.png | Bin 0 -> 224 bytes .../small_brick/bauxite_cut_small_brick.png | Bin 0 -> 240 bytes .../tfmg/forge/biome_modifier/yeehaw.json | 6 + .../tfmg/forge/biome_modifier/yeehaw2.json | 6 + src/main/resources/tfmg.mixins.json | 3 +- src/main/resources/tfmg_changelog.txt | 16 ++ 238 files changed, 5630 insertions(+), 65 deletions(-) create mode 100644 src/generated/resources/assets/tfmg/blockstates/bauxite.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/bauxite_pillar.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/cut_bauxite.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/cut_bauxite_brick_slab.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/cut_bauxite_brick_stairs.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/cut_bauxite_brick_wall.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/cut_bauxite_bricks.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/cut_bauxite_slab.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/cut_bauxite_stairs.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/cut_bauxite_wall.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/fossilstone.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/layered_bauxite.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/oil_deposit.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/polished_cut_bauxite.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/polished_cut_bauxite_slab.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/polished_cut_bauxite_stairs.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/polished_cut_bauxite_wall.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/small_bauxite_brick_slab.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/small_bauxite_brick_stairs.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/small_bauxite_brick_wall.json create mode 100644 src/generated/resources/assets/tfmg/blockstates/small_bauxite_bricks.json create mode 100644 src/generated/resources/assets/tfmg/models/block/bauxite_natural_0.json create mode 100644 src/generated/resources/assets/tfmg/models/block/bauxite_natural_1.json create mode 100644 src/generated/resources/assets/tfmg/models/block/bauxite_natural_2.json create mode 100644 src/generated/resources/assets/tfmg/models/block/bauxite_natural_3.json create mode 100644 src/generated/resources/assets/tfmg/models/block/bauxite_pillar.json create mode 100644 src/generated/resources/assets/tfmg/models/block/bauxite_pillar_horizontal.json create mode 100644 src/generated/resources/assets/tfmg/models/block/cut_bauxite.json create mode 100644 src/generated/resources/assets/tfmg/models/block/cut_bauxite_brick_slab.json create mode 100644 src/generated/resources/assets/tfmg/models/block/cut_bauxite_brick_slab_top.json create mode 100644 src/generated/resources/assets/tfmg/models/block/cut_bauxite_brick_stairs.json create mode 100644 src/generated/resources/assets/tfmg/models/block/cut_bauxite_brick_stairs_inner.json create mode 100644 src/generated/resources/assets/tfmg/models/block/cut_bauxite_brick_stairs_outer.json create mode 100644 src/generated/resources/assets/tfmg/models/block/cut_bauxite_bricks.json create mode 100644 src/generated/resources/assets/tfmg/models/block/cut_bauxite_bricks_wall_post.json create mode 100644 src/generated/resources/assets/tfmg/models/block/cut_bauxite_bricks_wall_side.json create mode 100644 src/generated/resources/assets/tfmg/models/block/cut_bauxite_bricks_wall_side_tall.json create mode 100644 src/generated/resources/assets/tfmg/models/block/cut_bauxite_slab.json create mode 100644 src/generated/resources/assets/tfmg/models/block/cut_bauxite_slab_top.json create mode 100644 src/generated/resources/assets/tfmg/models/block/cut_bauxite_stairs.json create mode 100644 src/generated/resources/assets/tfmg/models/block/cut_bauxite_stairs_inner.json create mode 100644 src/generated/resources/assets/tfmg/models/block/cut_bauxite_stairs_outer.json create mode 100644 src/generated/resources/assets/tfmg/models/block/cut_bauxite_wall_post.json create mode 100644 src/generated/resources/assets/tfmg/models/block/cut_bauxite_wall_side.json create mode 100644 src/generated/resources/assets/tfmg/models/block/cut_bauxite_wall_side_tall.json create mode 100644 src/generated/resources/assets/tfmg/models/block/fossilstone.json create mode 100644 src/generated/resources/assets/tfmg/models/block/layered_bauxite.json create mode 100644 src/generated/resources/assets/tfmg/models/block/oil_deposit.json create mode 100644 src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite.json create mode 100644 src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_slab.json create mode 100644 src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_slab_double.json create mode 100644 src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_slab_top.json create mode 100644 src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_stairs.json create mode 100644 src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_stairs_inner.json create mode 100644 src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_stairs_outer.json create mode 100644 src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_wall_post.json create mode 100644 src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_wall_side.json create mode 100644 src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_wall_side_tall.json create mode 100644 src/generated/resources/assets/tfmg/models/block/small_bauxite_brick_slab.json create mode 100644 src/generated/resources/assets/tfmg/models/block/small_bauxite_brick_slab_top.json create mode 100644 src/generated/resources/assets/tfmg/models/block/small_bauxite_brick_stairs.json create mode 100644 src/generated/resources/assets/tfmg/models/block/small_bauxite_brick_stairs_inner.json create mode 100644 src/generated/resources/assets/tfmg/models/block/small_bauxite_brick_stairs_outer.json create mode 100644 src/generated/resources/assets/tfmg/models/block/small_bauxite_bricks.json create mode 100644 src/generated/resources/assets/tfmg/models/block/small_bauxite_bricks_wall_post.json create mode 100644 src/generated/resources/assets/tfmg/models/block/small_bauxite_bricks_wall_side.json create mode 100644 src/generated/resources/assets/tfmg/models/block/small_bauxite_bricks_wall_side_tall.json create mode 100644 src/generated/resources/assets/tfmg/models/item/bauxite.json create mode 100644 src/generated/resources/assets/tfmg/models/item/bauxite_pillar.json create mode 100644 src/generated/resources/assets/tfmg/models/item/cut_bauxite.json create mode 100644 src/generated/resources/assets/tfmg/models/item/cut_bauxite_brick_slab.json create mode 100644 src/generated/resources/assets/tfmg/models/item/cut_bauxite_brick_stairs.json create mode 100644 src/generated/resources/assets/tfmg/models/item/cut_bauxite_brick_wall.json create mode 100644 src/generated/resources/assets/tfmg/models/item/cut_bauxite_bricks.json create mode 100644 src/generated/resources/assets/tfmg/models/item/cut_bauxite_slab.json create mode 100644 src/generated/resources/assets/tfmg/models/item/cut_bauxite_stairs.json create mode 100644 src/generated/resources/assets/tfmg/models/item/cut_bauxite_wall.json create mode 100644 src/generated/resources/assets/tfmg/models/item/fossilstone.json create mode 100644 src/generated/resources/assets/tfmg/models/item/layered_bauxite.json create mode 100644 src/generated/resources/assets/tfmg/models/item/oil_deposit.json create mode 100644 src/generated/resources/assets/tfmg/models/item/polished_cut_bauxite.json create mode 100644 src/generated/resources/assets/tfmg/models/item/polished_cut_bauxite_slab.json create mode 100644 src/generated/resources/assets/tfmg/models/item/polished_cut_bauxite_stairs.json create mode 100644 src/generated/resources/assets/tfmg/models/item/polished_cut_bauxite_wall.json create mode 100644 src/generated/resources/assets/tfmg/models/item/small_bauxite_brick_slab.json create mode 100644 src/generated/resources/assets/tfmg/models/item/small_bauxite_brick_stairs.json create mode 100644 src/generated/resources/assets/tfmg/models/item/small_bauxite_brick_wall.json create mode 100644 src/generated/resources/assets/tfmg/models/item/small_bauxite_bricks.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/azalea_root_replaceable.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/dripstone_replaceable_blocks.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/lush_ground_replaceable.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/moss_replaceable.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/slabs.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/stairs.json create mode 100644 src/generated/resources/data/minecraft/tags/blocks/walls.json create mode 100644 src/generated/resources/data/minecraft/tags/items/slabs.json create mode 100644 src/generated/resources/data/minecraft/tags/items/stairs.json create mode 100644 src/generated/resources/data/minecraft/tags/items/walls.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/bauxite_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/bauxite_pillar_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_slab.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_slab_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_slab_recycling.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_stairs.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_wall.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_wall_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_bricks_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_slab.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_slab_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_slab_recycling.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_stairs.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_stairs_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_wall.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_wall_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/layered_bauxite_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_slab.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_slab_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_slab_recycling.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_stairs.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_stairs_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_wall.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_wall_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_slab.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_slab_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_slab_recycling.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_stairs.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_wall.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_wall_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_bricks_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/bauxite.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/bauxite_pillar.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_brick_slab.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_brick_stairs.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_brick_wall.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_bricks.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_slab.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_stairs.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_wall.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/fossilstone.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/layered_bauxite.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/oil_deposit.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/polished_cut_bauxite.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/polished_cut_bauxite_slab.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/polished_cut_bauxite_stairs.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/polished_cut_bauxite_wall.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/small_bauxite_brick_slab.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/small_bauxite_brick_stairs.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/small_bauxite_brick_wall.json create mode 100644 src/generated/resources/data/tfmg/loot_tables/blocks/small_bauxite_bricks.json create mode 100644 src/generated/resources/data/tfmg/recipes/bauxite_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/bauxite_pillar_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_slab.json create mode 100644 src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_slab_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_slab_recycling.json create mode 100644 src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_stairs.json create mode 100644 src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_wall.json create mode 100644 src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_wall_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/cut_bauxite_bricks_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/cut_bauxite_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/cut_bauxite_slab.json create mode 100644 src/generated/resources/data/tfmg/recipes/cut_bauxite_slab_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/cut_bauxite_slab_recycling.json create mode 100644 src/generated/resources/data/tfmg/recipes/cut_bauxite_stairs.json create mode 100644 src/generated/resources/data/tfmg/recipes/cut_bauxite_stairs_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/cut_bauxite_wall.json create mode 100644 src/generated/resources/data/tfmg/recipes/cut_bauxite_wall_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/layered_bauxite_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_slab.json create mode 100644 src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_slab_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_slab_recycling.json create mode 100644 src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_stairs.json create mode 100644 src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_stairs_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_wall.json create mode 100644 src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_wall_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/small_bauxite_brick_slab.json create mode 100644 src/generated/resources/data/tfmg/recipes/small_bauxite_brick_slab_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/small_bauxite_brick_slab_recycling.json create mode 100644 src/generated/resources/data/tfmg/recipes/small_bauxite_brick_stairs.json create mode 100644 src/generated/resources/data/tfmg/recipes/small_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/small_bauxite_brick_wall.json create mode 100644 src/generated/resources/data/tfmg/recipes/small_bauxite_brick_wall_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/recipes/small_bauxite_bricks_from_stone_types_bauxite_stonecutting.json create mode 100644 src/generated/resources/data/tfmg/tags/items/stone_types/bauxite.json create mode 100644 src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPaletteBlockPartial.java create mode 100644 src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPaletteBlockPattern.java create mode 100644 src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPalettesVariantEntry.java create mode 100644 src/main/java/com/drmangotea/tfmg/content/deposits/FluidDepositBlock.java create mode 100644 src/main/java/com/drmangotea/tfmg/content/deposits/FluidDepositTileEntity.java create mode 100644 src/main/java/com/drmangotea/tfmg/content/fluids/BurnableFluid.java create mode 100644 src/main/java/com/drmangotea/tfmg/content/items/TFMGFuelItem.java create mode 100644 src/main/java/com/drmangotea/tfmg/mixins/AllOreFeatureConfigEntriesMixin.java create mode 100644 src/main/java/com/drmangotea/tfmg/registry/TFMGPaletteBlocks.java create mode 100644 src/main/java/com/drmangotea/tfmg/registry/TFMGPaletteStoneTypes.java create mode 100644 src/main/java/com/drmangotea/tfmg/worldgen/OilFeature.java create mode 100644 src/main/java/com/drmangotea/tfmg/worldgen/TFMGConfiguredFeatures.java create mode 100644 src/main/java/com/drmangotea/tfmg/worldgen/TFMGFeatures.java create mode 100644 src/main/java/com/drmangotea/tfmg/worldgen/TFMGLayeredPatterns.java create mode 100644 src/main/resources/assets/tfmg/textures/block/palettes/stone_types/alternatives/bauxite_cut_basketweave.png create mode 100644 src/main/resources/assets/tfmg/textures/block/palettes/stone_types/alternatives/bauxite_cut_bond.png create mode 100644 src/main/resources/assets/tfmg/textures/block/palettes/stone_types/alternatives/bauxite_cut_herring.png create mode 100644 src/main/resources/assets/tfmg/textures/block/palettes/stone_types/alternatives/bauxite_cut_indented.png create mode 100644 src/main/resources/assets/tfmg/textures/block/palettes/stone_types/brick/bauxite_cut_brick.png create mode 100644 src/main/resources/assets/tfmg/textures/block/palettes/stone_types/cap/bauxite_cut_cap.png create mode 100644 src/main/resources/assets/tfmg/textures/block/palettes/stone_types/cap/bauxite_cut_cap_connected.png create mode 100644 src/main/resources/assets/tfmg/textures/block/palettes/stone_types/cut/bauxite_cut.png create mode 100644 src/main/resources/assets/tfmg/textures/block/palettes/stone_types/layered/bauxite_cut_layered.png create mode 100644 src/main/resources/assets/tfmg/textures/block/palettes/stone_types/layered/bauxite_cut_layered_connected.png create mode 100644 src/main/resources/assets/tfmg/textures/block/palettes/stone_types/natural/bauxite_0.png create mode 100644 src/main/resources/assets/tfmg/textures/block/palettes/stone_types/natural/bauxite_1.png create mode 100644 src/main/resources/assets/tfmg/textures/block/palettes/stone_types/natural/bauxite_2.png create mode 100644 src/main/resources/assets/tfmg/textures/block/palettes/stone_types/natural/bauxite_3.png create mode 100644 src/main/resources/assets/tfmg/textures/block/palettes/stone_types/pillar/bauxite_cut_pillar.png create mode 100644 src/main/resources/assets/tfmg/textures/block/palettes/stone_types/pillar/bauxite_cut_pillar_connected.png create mode 100644 src/main/resources/assets/tfmg/textures/block/palettes/stone_types/polished/bauxite_cut_polished.png create mode 100644 src/main/resources/assets/tfmg/textures/block/palettes/stone_types/slab/bauxite_cut_slab.png create mode 100644 src/main/resources/assets/tfmg/textures/block/palettes/stone_types/small_brick/bauxite_cut_small_brick.png create mode 100644 src/main/resources/data/tfmg/forge/biome_modifier/yeehaw.json create mode 100644 src/main/resources/data/tfmg/forge/biome_modifier/yeehaw2.json create mode 100644 src/main/resources/tfmg_changelog.txt diff --git a/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e b/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e index d6026aea..bea8913c 100644 --- a/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e +++ b/src/generated/resources/.cache/9047e4e94996e73e9dfde3738763637fb609e07e @@ -1,2 +1,2 @@ -// 1.19.2 2023-09-01T14:12:50.8740378 Create: The Factory Must Grow's lang merger -b7a4bcf3d2f21f8f7dd323ed56598d109b7fb064 assets/tfmg/lang/en_us.json +// 1.19.2 2023-09-02T22:17:42.1551506 Create: The Factory Must Grow's lang merger +c0f23942c5605c0ffee88aca7d4850cf429905bd assets/tfmg/lang/en_us.json diff --git a/src/generated/resources/.cache/ad795fb8576279849034d802e60366ec43bb396a b/src/generated/resources/.cache/ad795fb8576279849034d802e60366ec43bb396a index 4ff42089..84e82212 100644 --- a/src/generated/resources/.cache/ad795fb8576279849034d802e60366ec43bb396a +++ b/src/generated/resources/.cache/ad795fb8576279849034d802e60366ec43bb396a @@ -1,61 +1,149 @@ -// 1.19.2 2023-08-31T14:31:49.9051322 Registrate Provider for tfmg [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] +// 1.19.2 2023-09-02T22:17:42.1611507 Registrate Provider for tfmg [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] +933485fa587fccc649b4cbe8f76f15e590cc8bb1 assets/tfmg/blockstates/bauxite.json +2b53ff8e880d35a42388584cb3ca896c55bfaf95 assets/tfmg/blockstates/bauxite_pillar.json 9ca537517fb8baeff3d4e4137c93aebd6b874c81 assets/tfmg/blockstates/cast_iron_block.json c67b91a7fd9f16cd2d7eaa92dd9b945042d58130 assets/tfmg/blockstates/concrete.json dca4728ef33ca9d54fb55d707761c2eeb77c32b1 assets/tfmg/blockstates/cooling_fluid.json fa1fa0509cd94e57da7624b5d094c228d6b92593 assets/tfmg/blockstates/creosote.json a9b81338133077138f447a0d159f094edb61242a assets/tfmg/blockstates/crude_oil_fluid.json +5f57a2dc6fa076ee9d2a22e32d26993490c6debc assets/tfmg/blockstates/cut_bauxite.json +b9c7bedf897df9728ae76d405686054e1f0f3549 assets/tfmg/blockstates/cut_bauxite_bricks.json +72dd4e067c197ef8e198930feb363b7f00104429 assets/tfmg/blockstates/cut_bauxite_brick_slab.json +857d56ad1da100aa6c3a1543b5f8d608242d20a8 assets/tfmg/blockstates/cut_bauxite_brick_stairs.json +e11a6159da224e69f12e11a594c20bb2bd8c0e68 assets/tfmg/blockstates/cut_bauxite_brick_wall.json +2a6fe47413aa549cd531ca1fb1d317da36745093 assets/tfmg/blockstates/cut_bauxite_slab.json +3803629d3a0fe11a30c7dedaf0ae8e396df4c994 assets/tfmg/blockstates/cut_bauxite_stairs.json +700d6569dd98adc6a3167c99295816453bf351b9 assets/tfmg/blockstates/cut_bauxite_wall.json 03983ce3de10310cd75b98f17c9161653b7034cd assets/tfmg/blockstates/diesel.json f16d1cf03e5053455ea485f7aa53a88206f61749 assets/tfmg/blockstates/formwork_block.json +e74acd9562e4b46295cf017d17f2662e20a7f5ea assets/tfmg/blockstates/fossilstone.json b0a3f4da5d9efdd01800c8b9738aee194565c6e7 assets/tfmg/blockstates/gasoline.json c7aa764cc11ee837deeed68c9c2d8567ea078f5c assets/tfmg/blockstates/heavy_machinery_casing.json dea24edfcb504c6c74560174a94bd7d3e5d58e76 assets/tfmg/blockstates/heavy_oil.json 7199cbfa37e83fcedf8e99af48b05b283aef319f assets/tfmg/blockstates/kerosene.json +a8f81ce72c3f074ffef304b238ae805f3b4ea763 assets/tfmg/blockstates/layered_bauxite.json 55cba7d103b52b31f2deb59effcc01cfae6e2c05 assets/tfmg/blockstates/liquid_concrete.json d3ba2682652fd44337d1f82ec382df17611fabe1 assets/tfmg/blockstates/liquid_plastic.json 2dc4b1da2bee0275cbb13ef89003d56f62d4443d assets/tfmg/blockstates/lubrication_oil.json ebd6804b999acea36abbf07c2381ee6dee0d7a16 assets/tfmg/blockstates/napalm.json 0f33dc6b2a736164b17f416ce7d127c87bfb6441 assets/tfmg/blockstates/napalm_bomb.json 89f2902010903aad686571ef37c781b111147456 assets/tfmg/blockstates/naphtha.json +98a003d914c034d7fdc0e7da31c550cbc8d068f1 assets/tfmg/blockstates/oil_deposit.json +de9db40aec6d8dfe1afc222cd136df66a5ea0ff4 assets/tfmg/blockstates/polished_cut_bauxite.json +666a8272c3b88cc95106ff6c517b39d5f405cd15 assets/tfmg/blockstates/polished_cut_bauxite_slab.json +09b0074325813fc7b3cc47d406127abd0cfff21a assets/tfmg/blockstates/polished_cut_bauxite_stairs.json +92ac841c40e42468c4a01f98c61bc7df13eb4b9f assets/tfmg/blockstates/polished_cut_bauxite_wall.json +759968da877221c21f6979f6af6cf201a9a8c1b7 assets/tfmg/blockstates/small_bauxite_bricks.json +bf9dcbeabbd8d9da8dcd1cd9d42c3fce6509e7e6 assets/tfmg/blockstates/small_bauxite_brick_slab.json +e80f4610e3272a4edfb47572aff71f1db3d283d7 assets/tfmg/blockstates/small_bauxite_brick_stairs.json +a2eed7173d7f528d0f068c5fa9ea358f61ef1436 assets/tfmg/blockstates/small_bauxite_brick_wall.json e6983072149d1a9a2f4d39e4e1feac599ff7413e assets/tfmg/blockstates/steel_block.json df44115876045e6f863de2f8be6a9166b336a2f1 assets/tfmg/blockstates/steel_casing.json -b9953b7a05c4747eee192dc2b66943fe7b45db84 assets/tfmg/lang/en_ud.json -13043ade5d18c12e300962f4cc9d06ecc02e7089 assets/tfmg/lang/en_us.json +1abebfd461d9f0d2bcf74a13f2902719a7c09d83 assets/tfmg/lang/en_ud.json +c5943f88c53ebb9a4e5ae247523abf65fb698935 assets/tfmg/lang/en_us.json +5a4c785e8d8394ccd125732c0017459648574c4e assets/tfmg/models/block/bauxite_natural_0.json +4ace0da00498fcbb9ddfdf321767b40b095c8778 assets/tfmg/models/block/bauxite_natural_1.json +3d19a151c9691f26b22050d0556e85420dd07ecd assets/tfmg/models/block/bauxite_natural_2.json +b43711f35915b71b15db638538a83a4ea46480dc assets/tfmg/models/block/bauxite_natural_3.json +920f96d4b648414ce8331e5a81e6b7ddbce7e225 assets/tfmg/models/block/bauxite_pillar.json +cd5ade5f9a0b3b5e28b5d11a685408dd922dbe2d assets/tfmg/models/block/bauxite_pillar_horizontal.json 37789d06ec6cfc0312be7b1b66ac1ec6403d4516 assets/tfmg/models/block/cast_iron_block.json 75c31d328fc5d6d46c8b43e8bde7504f4e51dadc assets/tfmg/models/block/concrete.json 80fb4a90f861992322bfd63f1232593e8cce708e assets/tfmg/models/block/cooling_fluid.json 80fb4a90f861992322bfd63f1232593e8cce708e assets/tfmg/models/block/creosote.json 391762cca00f54de8a43d076b028eb3e3b5cb5cf assets/tfmg/models/block/crude_oil_fluid.json +3435e87769d2b51bed64540531b1bdba928dbaaf assets/tfmg/models/block/cut_bauxite.json +91a8249d66f308cbd58214f26023d1a0491f2019 assets/tfmg/models/block/cut_bauxite_bricks.json +83d583e230a89c177dfb269738b32b0a2aea804a assets/tfmg/models/block/cut_bauxite_bricks_wall_post.json +ac025f4a76aaa35ea3730539c9838c64ca0b7c94 assets/tfmg/models/block/cut_bauxite_bricks_wall_side.json +d1968a903df40cb0eeea9c88a706b10f44226889 assets/tfmg/models/block/cut_bauxite_bricks_wall_side_tall.json +f7ad52199a743fecebd21e53f1b01e367bd9b162 assets/tfmg/models/block/cut_bauxite_brick_slab.json +abd2eb4651d4719726e1ee505607a70aee8c8f90 assets/tfmg/models/block/cut_bauxite_brick_slab_top.json +1d8cdb30bcfcc245e4594205343a60e2f828bae6 assets/tfmg/models/block/cut_bauxite_brick_stairs.json +06412ed41e3240479bd45faba5ce1b1fab78cf56 assets/tfmg/models/block/cut_bauxite_brick_stairs_inner.json +b1ea45c8a8d280088b6c69c239ed3f7fa0cb0252 assets/tfmg/models/block/cut_bauxite_brick_stairs_outer.json +c04f251626a74102d42440b12f85e10091aca823 assets/tfmg/models/block/cut_bauxite_slab.json +6d2cc3010afb7319b88a9b77422416c11ff38a7a assets/tfmg/models/block/cut_bauxite_slab_top.json +c087d9aad64b8d89cfbbe58a3db6a4e8ef6ff3a8 assets/tfmg/models/block/cut_bauxite_stairs.json +046cd7fbb99608e78ebcfa45563dc80b0549a6e0 assets/tfmg/models/block/cut_bauxite_stairs_inner.json +1649695bb19f41e067aae2a69f55961b3ae3eb9e assets/tfmg/models/block/cut_bauxite_stairs_outer.json +c85e3f557de57442a06502abd302f2b0deb4c6bf assets/tfmg/models/block/cut_bauxite_wall_post.json +38e83097489baf251fba2c4229a6fedf6b441528 assets/tfmg/models/block/cut_bauxite_wall_side.json +a98527559bb1385b628e465d629ac429cdfb9f8e assets/tfmg/models/block/cut_bauxite_wall_side_tall.json 997750c71f9ead915c393c5821146a57dcd01bfa assets/tfmg/models/block/diesel.json +b0cb044b77cb3ffaf0628e0a06a8fe12c7462da0 assets/tfmg/models/block/fossilstone.json e0cf42adbfeaa5c781b8239352335985658ae2d3 assets/tfmg/models/block/gasoline.json 717ee09803cb584062c9717f45475fbd15673cde assets/tfmg/models/block/heavy_machinery_casing.json 725ac5c4c5aade982edbcb6c4e6c53626f0e68e4 assets/tfmg/models/block/heavy_oil.json 796f870ee5d3f55ace500798ae389e532c7233b8 assets/tfmg/models/block/kerosene.json +87cc75cb9bc8e65f8e46785b14e21ac5a4356faa assets/tfmg/models/block/layered_bauxite.json eced115e0feb825f719abc480c4f9d7e7cc698c8 assets/tfmg/models/block/liquid_concrete.json 03ace76bbda220374985683aeea1eb4466bd4f13 assets/tfmg/models/block/liquid_plastic.json 6de36688139c9b11ed1ce6ef26ef1b65dfad34f5 assets/tfmg/models/block/lubrication_oil.json 80fb4a90f861992322bfd63f1232593e8cce708e assets/tfmg/models/block/napalm.json b541c0cab9298f1d2578639349755b93f1019621 assets/tfmg/models/block/napalm_bomb.json e8e7bb74d46f9cec768a5443c10870fe1dd2105b assets/tfmg/models/block/naphtha.json +891d9c448d29b31bd28b3bf86395aabe9d645b87 assets/tfmg/models/block/oil_deposit.json +713266e9f0f9ad53bfebee09059f4ac443d4e5a6 assets/tfmg/models/block/polished_cut_bauxite.json +5f847a2787b932b7c0984c78ec7abe0c80f4632b assets/tfmg/models/block/polished_cut_bauxite_slab.json +02a179eed2dc456e2e590255d1e41c894cf126ce assets/tfmg/models/block/polished_cut_bauxite_slab_double.json +a6f230eb9f5d0955c772a19fd6b04b9aca2b2731 assets/tfmg/models/block/polished_cut_bauxite_slab_top.json +ee9baa8139938cbe79941be08369a18878d6ae6b assets/tfmg/models/block/polished_cut_bauxite_stairs.json +3136a081ffadc8981d2adce28fc0b396e59993ce assets/tfmg/models/block/polished_cut_bauxite_stairs_inner.json +f92bda412c3057000812a86a702b1f7d94d696a8 assets/tfmg/models/block/polished_cut_bauxite_stairs_outer.json +931053f2b5c646d80f1a74820733fe072b11a83f assets/tfmg/models/block/polished_cut_bauxite_wall_post.json +ad9fe70859fbb4152c183c33f159e88f1f1e532b assets/tfmg/models/block/polished_cut_bauxite_wall_side.json +dfaec7706609f1df7535203fbc653e53907f6885 assets/tfmg/models/block/polished_cut_bauxite_wall_side_tall.json +0527561f96904dabea20a824baf8828ff1bbfc32 assets/tfmg/models/block/small_bauxite_bricks.json +35349e72beddafb42b477c100ba16e41eb0bc473 assets/tfmg/models/block/small_bauxite_bricks_wall_post.json +86658ab1a36973071032dd844664d817e0628adb assets/tfmg/models/block/small_bauxite_bricks_wall_side.json +85202ffe20243ab1343014c0d52e504016bc054f assets/tfmg/models/block/small_bauxite_bricks_wall_side_tall.json +a0aea27e8b671d7370b10f7ae269c5049ce291b3 assets/tfmg/models/block/small_bauxite_brick_slab.json +ad150fc0e40e5ee2b112cb2d774e691373ff45aa assets/tfmg/models/block/small_bauxite_brick_slab_top.json +d29800a63ca2717e056798cf8bb29bf55d29a07c assets/tfmg/models/block/small_bauxite_brick_stairs.json +7f4bdf3f4059dc1cda60557d59f5440addd26547 assets/tfmg/models/block/small_bauxite_brick_stairs_inner.json +a07354a238bd4d5aadee6e60e1d61fcffde43f5b assets/tfmg/models/block/small_bauxite_brick_stairs_outer.json 0ceb30eaff16a495c9a165ca16c925cbff836755 assets/tfmg/models/block/steel_block.json 465b1fed10d06090e5e8d19457f9fa48fe890bb4 assets/tfmg/models/block/steel_casing.json +4ace0da00498fcbb9ddfdf321767b40b095c8778 assets/tfmg/models/item/bauxite.json +41091873d85bac787e4752d0ff81189432f1e28e assets/tfmg/models/item/bauxite_pillar.json ec38882fb9010884823d6d6afa604f8a6512d279 assets/tfmg/models/item/cast_iron_block.json 4a843d55647a606fa97bc2daf745a7603406767d assets/tfmg/models/item/concrete.json e8c4e68647a6ced815cfca649c679e709fcc7751 assets/tfmg/models/item/cooling_fluid_bucket.json df4e7fa8f3f60908f58794528a8db60dce7d0135 assets/tfmg/models/item/copper_grenade.json 0abf2b2d61995c4fd3e3c88656e740ffe0a2f083 assets/tfmg/models/item/creosote_bucket.json e857cfbd6dfd0fe4b38e48f432f7a92e82dc5e22 assets/tfmg/models/item/crude_oil_fluid_bucket.json +ad53ebb7bbb4567ba0bc948b6594c079d1050fb9 assets/tfmg/models/item/cut_bauxite.json +eb80646f49d4c682fd21fb8054ed5b8427d9b554 assets/tfmg/models/item/cut_bauxite_bricks.json +7112aa744d3215a868decd72aa42adb62c4f0b66 assets/tfmg/models/item/cut_bauxite_brick_slab.json +cb56b95b0aad65f7d51e707eb7c4e5fa406bb741 assets/tfmg/models/item/cut_bauxite_brick_stairs.json +0cb0ad817e92d97aba1130219e9a93fd5da9a417 assets/tfmg/models/item/cut_bauxite_brick_wall.json +65fc6c720b7fcd2609ee20215971e84e0d0c0cd3 assets/tfmg/models/item/cut_bauxite_slab.json +e6bf52c7a969b26d65cc36353a6a3e2a91752e42 assets/tfmg/models/item/cut_bauxite_stairs.json +0cef1f82baa51acdbe768b60f54ba126f9f6eb60 assets/tfmg/models/item/cut_bauxite_wall.json 3497bcbaee50b2f766de659043bf3c36823b570d assets/tfmg/models/item/diesel_bucket.json a11a0b5a9887ba342d80b574a7f2c3dc5cdd7372 assets/tfmg/models/item/formwork_block.json +7e4a58a6d05b19dc8c5fff73434c2d7cefa75343 assets/tfmg/models/item/fossilstone.json ed2830b2988403aebaca633b2e315878b41f7503 assets/tfmg/models/item/gasoline_bucket.json 3fdff9e88db39939ee31968358eb51c060006766 assets/tfmg/models/item/heavy_machinery_casing.json f3bea42a905b7df9395bda18f751e2ee0c023e65 assets/tfmg/models/item/heavy_oil_bucket.json 8996fe57623ded9433d6766e80a39e41a2aba1ca assets/tfmg/models/item/kerosene_bucket.json +c0f668fca568bc4c35aba97d9ac93986720e501f assets/tfmg/models/item/layered_bauxite.json 46bda405310f45b8faff7d29f3e2b76b6e6d512f assets/tfmg/models/item/liquid_concrete_bucket.json 630e09bfe78ed89d966b0e78599e818ef69f56a6 assets/tfmg/models/item/liquid_plastic_bucket.json c86a836bfcf884dc13094fd908a561dd1d8f7ad8 assets/tfmg/models/item/lubrication_oil_bucket.json afac1fce0904a0df4e68d731b897ff1be6c68766 assets/tfmg/models/item/napalm_bomb.json b41853a4ae8b890f924058e57d274e956e6f4e37 assets/tfmg/models/item/napalm_bucket.json aa94f1afebb7c458e85849d8ddff76c27efefb80 assets/tfmg/models/item/naphtha_bucket.json +9907695c674afea00d3affefdc2ede9e68aa5667 assets/tfmg/models/item/oil_deposit.json +b652ff21ebb628809b8756d7d62644e0d2a5adfb assets/tfmg/models/item/polished_cut_bauxite.json +489528130097d6163d032483048ac41fa9da0dff assets/tfmg/models/item/polished_cut_bauxite_slab.json +ac7c8f2f308145f0ae8108648cfb9fd0513987c6 assets/tfmg/models/item/polished_cut_bauxite_stairs.json +1dd75a9ca8cda0bb0237dee6b477d76823c15b8a assets/tfmg/models/item/polished_cut_bauxite_wall.json +c00f7c5c7d05936bbe6a3069116c5adba5c60acf assets/tfmg/models/item/small_bauxite_bricks.json +f1fffad853ccb4173ba63efaf89ce0bf112915a8 assets/tfmg/models/item/small_bauxite_brick_slab.json +a1149d3ee5596f2c1038b225b0086ae1601da82c assets/tfmg/models/item/small_bauxite_brick_stairs.json +0f3f7918e41afa95cc14bc6641a7beaf36c27621 assets/tfmg/models/item/small_bauxite_brick_wall.json 57bf86df814741f846feb8be4a10afe633f51721 assets/tfmg/models/item/steel_block.json d34ca92f5288cbb5cecee06f046a072763b2926c assets/tfmg/models/item/steel_casing.json 72da5f91f1992b502e90c8fc84d654e075163eb7 assets/tfmg/models/item/thermite_grenade.json @@ -76,14 +164,117 @@ f0989952061266a02499103c1dcd9f2d7da131f5 data/forge/tags/items/concrete.json c98956ac34e02a8c1c801122486771ef89fb640b data/forge/tags/items/storage_blocks.json 7c5615c56bb169570a061f052ebb1f5115760c16 data/forge/tags/items/storage_blocks/cast_iron.json 37b1c9c3ae722d8110db48015993ede3e194c0a0 data/forge/tags/items/storage_blocks/steel.json +63c4a8d8e713db70730e766f1a10f8dd9072f98f data/minecraft/tags/blocks/azalea_root_replaceable.json c98956ac34e02a8c1c801122486771ef89fb640b data/minecraft/tags/blocks/beacon_base_blocks.json +63c4a8d8e713db70730e766f1a10f8dd9072f98f data/minecraft/tags/blocks/dripstone_replaceable_blocks.json +63c4a8d8e713db70730e766f1a10f8dd9072f98f data/minecraft/tags/blocks/lush_ground_replaceable.json ecfc3593fe0f3f0b5eff61fb1a2a445b16cda216 data/minecraft/tags/blocks/mineable/axe.json -b64e309f3dfd304a74fc9c4e1a97b2ea3c2c02e8 data/minecraft/tags/blocks/mineable/pickaxe.json -7f922e1459e98ee497c359655ee2b408bf84e4f4 data/minecraft/tags/blocks/needs_iron_tool.json +40d4978927d5867ada19df5e974c7ef5c063e449 data/minecraft/tags/blocks/mineable/pickaxe.json +63c4a8d8e713db70730e766f1a10f8dd9072f98f data/minecraft/tags/blocks/moss_replaceable.json +c98956ac34e02a8c1c801122486771ef89fb640b data/minecraft/tags/blocks/needs_iron_tool.json +f0989952061266a02499103c1dcd9f2d7da131f5 data/minecraft/tags/blocks/needs_stone_tool.json +193c8b45d804216ca5fe2035fa8dfc4567303500 data/minecraft/tags/blocks/slabs.json +e02820ff93a8835947837b6b7e4f75b90a365ffb data/minecraft/tags/blocks/stairs.json +0472af44cb3c69aa62ace428304592aacc443045 data/minecraft/tags/blocks/walls.json +193c8b45d804216ca5fe2035fa8dfc4567303500 data/minecraft/tags/items/slabs.json +e02820ff93a8835947837b6b7e4f75b90a365ffb data/minecraft/tags/items/stairs.json +0472af44cb3c69aa62ace428304592aacc443045 data/minecraft/tags/items/walls.json +7796b85e86a28b753b90089a522eca12c5722e5e data/tfmg/advancements/recipes/tfmg.base/bauxite_from_stone_types_bauxite_stonecutting.json +179e5950865e8114ff5cbe443dedf44e6c1d5342 data/tfmg/advancements/recipes/tfmg.base/bauxite_pillar_from_stone_types_bauxite_stonecutting.json +6d51fd8ca8e92f799cd57f23c50a140765f03a33 data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_bricks_from_stone_types_bauxite_stonecutting.json +d7a2186dcfe901015dfb864d6bc2a1e593cb6fb8 data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_slab.json +407deff7ee16144a9a6efcb86ca77cdcf055ba7f data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_slab_from_stone_types_bauxite_stonecutting.json +09436f20d637af36818da23f08da3ed751283061 data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_slab_recycling.json +9e95159b33c3f367812b110fc3b41d7639a06b94 data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_stairs.json +cb1dbc9f7ae0dec43c2b99ed5de3441e0fbf1cae data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting.json +4d2340e9dd2b4396beb08679fb7dbff731351054 data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_wall.json +333e4bcb2fb6ec03619cb50b802414769febb83e data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_wall_from_stone_types_bauxite_stonecutting.json +191eb9e001f210e9066770c14f85a59fa21c5b44 data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_from_stone_types_bauxite_stonecutting.json +8d5142bcfcaf8c9f2f07438dd570afca7d869fc2 data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_slab.json +a9d1b5e1f94d8a183a130b652941a30d20686b20 data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_slab_from_stone_types_bauxite_stonecutting.json +3496a79f08b1917101e2ae0761b30bb8881ef1d6 data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_slab_recycling.json +0d298e3f45dfa490498f758934c4e46d0c4dc7ea data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_stairs.json +f24b22b48cefdb0364b2a5ebc36ebac2f50b697c data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_stairs_from_stone_types_bauxite_stonecutting.json +8fa8a9d0a53569e1375916460af9eeb8a418accb data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_wall.json +a39c72241284d1371e2e568371f8386130e40e8e data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_wall_from_stone_types_bauxite_stonecutting.json +d23b6f341bccb7b615b1e03516bd9962bc3712b7 data/tfmg/advancements/recipes/tfmg.base/layered_bauxite_from_stone_types_bauxite_stonecutting.json +5dfa5d101106038d8ff4bdb938c08f797863b658 data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_from_stone_types_bauxite_stonecutting.json +52e2f67c22fff610ce15e5287fe34e9723e895c5 data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_slab.json +eb598b8313ceb5a00cfc1a555438bb97fb146c20 data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_slab_from_stone_types_bauxite_stonecutting.json +8e18803dba6ef54e37d03d12c59dff29bd47a23f data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_slab_recycling.json +4b77e80711025164c9313111807733525c91c278 data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_stairs.json +424fe2c775d273e44706ed5d3171a8d30b6db223 data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_stairs_from_stone_types_bauxite_stonecutting.json +59c471db3e8a0f7851d37364797b87f5a88bd601 data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_wall.json +5103d9c1ac6cdfc302e5e518a319e04165e09e6e data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_wall_from_stone_types_bauxite_stonecutting.json +0db112e82ea94e03bcfa3543a624214a51bb830a data/tfmg/advancements/recipes/tfmg.base/small_bauxite_bricks_from_stone_types_bauxite_stonecutting.json +a3cf7dc55ab1c4d12d91d870ff2f577153f6c79f data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_slab.json +9377c2a47ae900f4a2ad2aab8a90d520a428f9ed data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_slab_from_stone_types_bauxite_stonecutting.json +601255a5d63714de1ef674bca2181d5da9582730 data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_slab_recycling.json +60791a6cf32cec93bd180902ef8511d6481e5176 data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_stairs.json +d152c8826235944ea57ff042dcd0bd19e13a7c29 data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting.json +5fdcb4254dd2c1e8cd2651777746354e71dfc0a8 data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_wall.json +57365f0ab8f3026cc2d5ea959bab5fc2af0d0838 data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_wall_from_stone_types_bauxite_stonecutting.json +56d114d40ea3160b5c06cf9cfaa2e5107543c460 data/tfmg/loot_tables/blocks/bauxite.json +473b0effd9a768189aa232855cd09e7b380c3adc data/tfmg/loot_tables/blocks/bauxite_pillar.json 60857d034446187e758de87644a80a7bc4d6b150 data/tfmg/loot_tables/blocks/cast_iron_block.json d32a75f20ca3f2da6ba69b0a91e295c63f65de92 data/tfmg/loot_tables/blocks/concrete.json +6874888d31bcadadb4a850b75c1bc780af9de9a2 data/tfmg/loot_tables/blocks/cut_bauxite.json +4761a001dd2728c95f4c7fd34ad4842f8dc3a4d3 data/tfmg/loot_tables/blocks/cut_bauxite_bricks.json +4b13082c2a2a904970581d4887cc139cf2bb99af data/tfmg/loot_tables/blocks/cut_bauxite_brick_slab.json +2baf1848301b5ab91c38c3bd76644715f258105c data/tfmg/loot_tables/blocks/cut_bauxite_brick_stairs.json +0e3bc1e6ebf48804c732cd224def289c47be8533 data/tfmg/loot_tables/blocks/cut_bauxite_brick_wall.json +ce0c785984e63fa57a0cc8a9d5af0ce997285554 data/tfmg/loot_tables/blocks/cut_bauxite_slab.json +efba82fdf0c26dd90aacf5f604e613e29513b60e data/tfmg/loot_tables/blocks/cut_bauxite_stairs.json +ce47c0f03819dab221e70b3d4197ac82963b47d6 data/tfmg/loot_tables/blocks/cut_bauxite_wall.json 51818c7cf522c10c409c8737fdc30a58d7560f71 data/tfmg/loot_tables/blocks/formwork_block.json +fd7674b996fd961339614656498a1ff54f092bb8 data/tfmg/loot_tables/blocks/fossilstone.json 661cc61f9c13ddf8c6bf06470defa93170e8ee7f data/tfmg/loot_tables/blocks/heavy_machinery_casing.json +1633b0609c1f7b71d0ccda03bdb95bf873692b18 data/tfmg/loot_tables/blocks/layered_bauxite.json 7da9b20012e584104331da961756d6c1d02682b5 data/tfmg/loot_tables/blocks/napalm_bomb.json +04ed0121924425d89886398da07c98277cb26100 data/tfmg/loot_tables/blocks/oil_deposit.json +c8658b25761345012c9861389a95a4605380f868 data/tfmg/loot_tables/blocks/polished_cut_bauxite.json +df7e518e9def864a4fad6b6bfbb605ae5bd4e57b data/tfmg/loot_tables/blocks/polished_cut_bauxite_slab.json +699d56aed6ceeeecb9ba94634130a05167ca041c data/tfmg/loot_tables/blocks/polished_cut_bauxite_stairs.json +4490dd2dd5e3d851c4dac4b37374094d6e90478b data/tfmg/loot_tables/blocks/polished_cut_bauxite_wall.json +8392e6fbbaeb3a1f1316b3f12ecaf8927042a7ea data/tfmg/loot_tables/blocks/small_bauxite_bricks.json +211d6ba8f5576975698ad91ebdf5feb36f618ac7 data/tfmg/loot_tables/blocks/small_bauxite_brick_slab.json +b43d1fa7a2ac0534ab2867dec787d97f205f4a8d data/tfmg/loot_tables/blocks/small_bauxite_brick_stairs.json +47af1defc5e03a0806d8afd5f119fab420aa1da8 data/tfmg/loot_tables/blocks/small_bauxite_brick_wall.json 01298989d0fe79936cdfa1e6cc07fd05f143ae09 data/tfmg/loot_tables/blocks/steel_block.json 62cd229b00eb2c95187d1b7b8e968aa26e54c412 data/tfmg/loot_tables/blocks/steel_casing.json +fe8fbd529304f28f4aeb1017956f288f6e6bbe1c data/tfmg/recipes/bauxite_from_stone_types_bauxite_stonecutting.json +9bddb0ff48b335428001ae0526e41ab6d09da1c3 data/tfmg/recipes/bauxite_pillar_from_stone_types_bauxite_stonecutting.json +c1d723c26e4e2eeeb46ef03e16df946309ff2650 data/tfmg/recipes/cut_bauxite_bricks_from_stone_types_bauxite_stonecutting.json +9948fc7ed1744ff026fc21d1e78d0643d26b0ac0 data/tfmg/recipes/cut_bauxite_brick_slab.json +c898f0e467706b0bd03d4aee4090ac162b35a865 data/tfmg/recipes/cut_bauxite_brick_slab_from_stone_types_bauxite_stonecutting.json +24280f03ec873dd24c76c71484a3470427c8502b data/tfmg/recipes/cut_bauxite_brick_slab_recycling.json +8b3abc62e620b76acd674b7e786d4b98a455af4f data/tfmg/recipes/cut_bauxite_brick_stairs.json +b9623b53e9ec33949f039ae3f3e93c5a93eb8548 data/tfmg/recipes/cut_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting.json +9d032b600219fbc3a3f4f41dd1e33fcef45aeca4 data/tfmg/recipes/cut_bauxite_brick_wall.json +b3d9fdbad888f91cbf96ee4879fb6a3a74bfacc2 data/tfmg/recipes/cut_bauxite_brick_wall_from_stone_types_bauxite_stonecutting.json +2b575eb502f4e9419573a07bc64f1d2eda15c37b data/tfmg/recipes/cut_bauxite_from_stone_types_bauxite_stonecutting.json +f916728c62d205193fd62fa364af8cda9af4f369 data/tfmg/recipes/cut_bauxite_slab.json +82654aa24e35bac9297ebbea5fe40aec3ca32104 data/tfmg/recipes/cut_bauxite_slab_from_stone_types_bauxite_stonecutting.json +6e4078dd27e7af00ac161284db53c3b3ddb02f25 data/tfmg/recipes/cut_bauxite_slab_recycling.json +abe4b9839cc27f1b4052dcd69b5cfa830495d3d8 data/tfmg/recipes/cut_bauxite_stairs.json +10888a46fbcb39a14655b84d4fa1784990543e3c data/tfmg/recipes/cut_bauxite_stairs_from_stone_types_bauxite_stonecutting.json +bf474994e18b3e0f3118a17a50f8dd8b7ea86391 data/tfmg/recipes/cut_bauxite_wall.json +144df8762db145367d7cba7144d5ee586c9b352f data/tfmg/recipes/cut_bauxite_wall_from_stone_types_bauxite_stonecutting.json +397f73e53d9d76b9520291388bb28976c7f3dc07 data/tfmg/recipes/layered_bauxite_from_stone_types_bauxite_stonecutting.json +266e1e7e7937a713f1bf485dbb61662e5f4a79ec data/tfmg/recipes/polished_cut_bauxite_from_stone_types_bauxite_stonecutting.json +c251af0aac45291d463127d80648043a49a5bb4c data/tfmg/recipes/polished_cut_bauxite_slab.json +a929ae544a9a4492e1106caf17a8b44023deb772 data/tfmg/recipes/polished_cut_bauxite_slab_from_stone_types_bauxite_stonecutting.json +864bc194ffe104bed82ded3e1ad98eafe2b37404 data/tfmg/recipes/polished_cut_bauxite_slab_recycling.json +32931b3a4c44a29ff706408992652ea7f2a2d9bb data/tfmg/recipes/polished_cut_bauxite_stairs.json +2808df1d62163578b263dac4bef65560e99b2669 data/tfmg/recipes/polished_cut_bauxite_stairs_from_stone_types_bauxite_stonecutting.json +fe29195b7a25d02945a2c1fd37571f330b34baa6 data/tfmg/recipes/polished_cut_bauxite_wall.json +202b2f1b15b766e2a67d68dc73546a965bb6328f data/tfmg/recipes/polished_cut_bauxite_wall_from_stone_types_bauxite_stonecutting.json +60282633cc41437f4402dc871f2c4cf4b822014c data/tfmg/recipes/small_bauxite_bricks_from_stone_types_bauxite_stonecutting.json +262bcf02099e57c2f5f79f013f5cc84cebc767a9 data/tfmg/recipes/small_bauxite_brick_slab.json +374fea644a078415a5be568eb94ab53cdc8eee12 data/tfmg/recipes/small_bauxite_brick_slab_from_stone_types_bauxite_stonecutting.json +73d5fe21732f1efbf16a4deffd07b96786d0fda0 data/tfmg/recipes/small_bauxite_brick_slab_recycling.json +1b53fe3920909e51e4fcec2ab42eaad375b2610a data/tfmg/recipes/small_bauxite_brick_stairs.json +968863d8afacbdea430384bb8fb0e38fbd6577f4 data/tfmg/recipes/small_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting.json +109f06446bf190cd5e4f65a1e48381d589a73c22 data/tfmg/recipes/small_bauxite_brick_wall.json +0a6421d9c9bdeb2faa18c6658097c681191aa760 data/tfmg/recipes/small_bauxite_brick_wall_from_stone_types_bauxite_stonecutting.json +1b01f27da52b48305c3efbba7d07ecd82d90d2f1 data/tfmg/tags/items/stone_types/bauxite.json diff --git a/src/generated/resources/assets/tfmg/blockstates/bauxite.json b/src/generated/resources/assets/tfmg/blockstates/bauxite.json new file mode 100644 index 00000000..8ec2740c --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/bauxite.json @@ -0,0 +1,18 @@ +{ + "variants": { + "": [ + { + "model": "tfmg:block/bauxite_natural_0" + }, + { + "model": "tfmg:block/bauxite_natural_1" + }, + { + "model": "tfmg:block/bauxite_natural_2" + }, + { + "model": "tfmg:block/bauxite_natural_3" + } + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/bauxite_pillar.json b/src/generated/resources/assets/tfmg/blockstates/bauxite_pillar.json new file mode 100644 index 00000000..814e1a90 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/bauxite_pillar.json @@ -0,0 +1,16 @@ +{ + "variants": { + "axis=x": { + "model": "tfmg:block/bauxite_pillar_horizontal", + "x": 90, + "y": 90 + }, + "axis=y": { + "model": "tfmg:block/bauxite_pillar" + }, + "axis=z": { + "model": "tfmg:block/bauxite_pillar_horizontal", + "x": 90 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/cut_bauxite.json b/src/generated/resources/assets/tfmg/blockstates/cut_bauxite.json new file mode 100644 index 00000000..7a692a11 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/cut_bauxite.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/cut_bauxite" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/cut_bauxite_brick_slab.json b/src/generated/resources/assets/tfmg/blockstates/cut_bauxite_brick_slab.json new file mode 100644 index 00000000..975f9e25 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/cut_bauxite_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "tfmg:block/cut_bauxite_brick_slab" + }, + "type=double": { + "model": "tfmg:block/cut_bauxite_bricks" + }, + "type=top": { + "model": "tfmg:block/cut_bauxite_brick_slab_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/cut_bauxite_brick_stairs.json b/src/generated/resources/assets/tfmg/blockstates/cut_bauxite_brick_stairs.json new file mode 100644 index 00000000..b2effb80 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/cut_bauxite_brick_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "tfmg:block/cut_bauxite_brick_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "tfmg:block/cut_bauxite_brick_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "tfmg:block/cut_bauxite_brick_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "tfmg:block/cut_bauxite_brick_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "tfmg:block/cut_bauxite_brick_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "tfmg:block/cut_bauxite_brick_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "tfmg:block/cut_bauxite_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "tfmg:block/cut_bauxite_brick_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "tfmg:block/cut_bauxite_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "tfmg:block/cut_bauxite_brick_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "tfmg:block/cut_bauxite_brick_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "tfmg:block/cut_bauxite_brick_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "tfmg:block/cut_bauxite_brick_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "tfmg:block/cut_bauxite_brick_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "tfmg:block/cut_bauxite_brick_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "tfmg:block/cut_bauxite_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "tfmg:block/cut_bauxite_brick_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "tfmg:block/cut_bauxite_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "tfmg:block/cut_bauxite_brick_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "tfmg:block/cut_bauxite_brick_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "tfmg:block/cut_bauxite_brick_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "tfmg:block/cut_bauxite_brick_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "tfmg:block/cut_bauxite_brick_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "tfmg:block/cut_bauxite_brick_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "tfmg:block/cut_bauxite_brick_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "tfmg:block/cut_bauxite_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "tfmg:block/cut_bauxite_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "tfmg:block/cut_bauxite_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "tfmg:block/cut_bauxite_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "tfmg:block/cut_bauxite_brick_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "tfmg:block/cut_bauxite_brick_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "tfmg:block/cut_bauxite_brick_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "tfmg:block/cut_bauxite_brick_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "tfmg:block/cut_bauxite_brick_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "tfmg:block/cut_bauxite_brick_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "tfmg:block/cut_bauxite_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "tfmg:block/cut_bauxite_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "tfmg:block/cut_bauxite_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "tfmg:block/cut_bauxite_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "tfmg:block/cut_bauxite_brick_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/cut_bauxite_brick_wall.json b/src/generated/resources/assets/tfmg/blockstates/cut_bauxite_brick_wall.json new file mode 100644 index 00000000..540359de --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/cut_bauxite_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/cut_bauxite_bricks_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "tfmg:block/cut_bauxite_bricks_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "tfmg:block/cut_bauxite_bricks_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/cut_bauxite_bricks_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "tfmg:block/cut_bauxite_bricks_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/cut_bauxite_bricks_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "tfmg:block/cut_bauxite_bricks_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/cut_bauxite_bricks_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "tfmg:block/cut_bauxite_bricks_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/cut_bauxite_bricks.json b/src/generated/resources/assets/tfmg/blockstates/cut_bauxite_bricks.json new file mode 100644 index 00000000..10db8921 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/cut_bauxite_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/cut_bauxite_bricks" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/cut_bauxite_slab.json b/src/generated/resources/assets/tfmg/blockstates/cut_bauxite_slab.json new file mode 100644 index 00000000..27a66133 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/cut_bauxite_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "tfmg:block/cut_bauxite_slab" + }, + "type=double": { + "model": "tfmg:block/cut_bauxite" + }, + "type=top": { + "model": "tfmg:block/cut_bauxite_slab_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/cut_bauxite_stairs.json b/src/generated/resources/assets/tfmg/blockstates/cut_bauxite_stairs.json new file mode 100644 index 00000000..2a0e96a4 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/cut_bauxite_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "tfmg:block/cut_bauxite_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "tfmg:block/cut_bauxite_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "tfmg:block/cut_bauxite_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "tfmg:block/cut_bauxite_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "tfmg:block/cut_bauxite_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "tfmg:block/cut_bauxite_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "tfmg:block/cut_bauxite_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "tfmg:block/cut_bauxite_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "tfmg:block/cut_bauxite_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "tfmg:block/cut_bauxite_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "tfmg:block/cut_bauxite_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "tfmg:block/cut_bauxite_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "tfmg:block/cut_bauxite_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "tfmg:block/cut_bauxite_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "tfmg:block/cut_bauxite_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "tfmg:block/cut_bauxite_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "tfmg:block/cut_bauxite_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "tfmg:block/cut_bauxite_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "tfmg:block/cut_bauxite_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "tfmg:block/cut_bauxite_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "tfmg:block/cut_bauxite_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "tfmg:block/cut_bauxite_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "tfmg:block/cut_bauxite_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "tfmg:block/cut_bauxite_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "tfmg:block/cut_bauxite_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "tfmg:block/cut_bauxite_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "tfmg:block/cut_bauxite_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "tfmg:block/cut_bauxite_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "tfmg:block/cut_bauxite_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "tfmg:block/cut_bauxite_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "tfmg:block/cut_bauxite_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "tfmg:block/cut_bauxite_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "tfmg:block/cut_bauxite_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "tfmg:block/cut_bauxite_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "tfmg:block/cut_bauxite_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "tfmg:block/cut_bauxite_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "tfmg:block/cut_bauxite_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "tfmg:block/cut_bauxite_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "tfmg:block/cut_bauxite_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "tfmg:block/cut_bauxite_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/cut_bauxite_wall.json b/src/generated/resources/assets/tfmg/blockstates/cut_bauxite_wall.json new file mode 100644 index 00000000..667e3bd1 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/cut_bauxite_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/cut_bauxite_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "tfmg:block/cut_bauxite_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "tfmg:block/cut_bauxite_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/cut_bauxite_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "tfmg:block/cut_bauxite_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/cut_bauxite_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "tfmg:block/cut_bauxite_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/cut_bauxite_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "tfmg:block/cut_bauxite_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/fossilstone.json b/src/generated/resources/assets/tfmg/blockstates/fossilstone.json new file mode 100644 index 00000000..421af0dc --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/fossilstone.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/fossilstone" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/layered_bauxite.json b/src/generated/resources/assets/tfmg/blockstates/layered_bauxite.json new file mode 100644 index 00000000..a3d0c781 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/layered_bauxite.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/layered_bauxite" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/oil_deposit.json b/src/generated/resources/assets/tfmg/blockstates/oil_deposit.json new file mode 100644 index 00000000..060f4782 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/oil_deposit.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/oil_deposit" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/polished_cut_bauxite.json b/src/generated/resources/assets/tfmg/blockstates/polished_cut_bauxite.json new file mode 100644 index 00000000..e6370079 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/polished_cut_bauxite.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/polished_cut_bauxite" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/polished_cut_bauxite_slab.json b/src/generated/resources/assets/tfmg/blockstates/polished_cut_bauxite_slab.json new file mode 100644 index 00000000..7bbf0535 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/polished_cut_bauxite_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "tfmg:block/polished_cut_bauxite_slab" + }, + "type=double": { + "model": "tfmg:block/polished_cut_bauxite_slab_double" + }, + "type=top": { + "model": "tfmg:block/polished_cut_bauxite_slab_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/polished_cut_bauxite_stairs.json b/src/generated/resources/assets/tfmg/blockstates/polished_cut_bauxite_stairs.json new file mode 100644 index 00000000..4a6153b3 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/polished_cut_bauxite_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "tfmg:block/polished_cut_bauxite_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "tfmg:block/polished_cut_bauxite_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "tfmg:block/polished_cut_bauxite_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "tfmg:block/polished_cut_bauxite_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "tfmg:block/polished_cut_bauxite_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "tfmg:block/polished_cut_bauxite_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "tfmg:block/polished_cut_bauxite_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "tfmg:block/polished_cut_bauxite_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "tfmg:block/polished_cut_bauxite_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "tfmg:block/polished_cut_bauxite_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "tfmg:block/polished_cut_bauxite_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "tfmg:block/polished_cut_bauxite_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "tfmg:block/polished_cut_bauxite_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "tfmg:block/polished_cut_bauxite_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "tfmg:block/polished_cut_bauxite_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "tfmg:block/polished_cut_bauxite_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "tfmg:block/polished_cut_bauxite_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "tfmg:block/polished_cut_bauxite_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "tfmg:block/polished_cut_bauxite_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "tfmg:block/polished_cut_bauxite_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "tfmg:block/polished_cut_bauxite_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "tfmg:block/polished_cut_bauxite_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "tfmg:block/polished_cut_bauxite_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "tfmg:block/polished_cut_bauxite_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "tfmg:block/polished_cut_bauxite_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "tfmg:block/polished_cut_bauxite_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "tfmg:block/polished_cut_bauxite_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "tfmg:block/polished_cut_bauxite_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "tfmg:block/polished_cut_bauxite_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "tfmg:block/polished_cut_bauxite_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "tfmg:block/polished_cut_bauxite_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "tfmg:block/polished_cut_bauxite_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "tfmg:block/polished_cut_bauxite_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "tfmg:block/polished_cut_bauxite_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "tfmg:block/polished_cut_bauxite_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "tfmg:block/polished_cut_bauxite_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "tfmg:block/polished_cut_bauxite_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "tfmg:block/polished_cut_bauxite_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "tfmg:block/polished_cut_bauxite_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "tfmg:block/polished_cut_bauxite_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/polished_cut_bauxite_wall.json b/src/generated/resources/assets/tfmg/blockstates/polished_cut_bauxite_wall.json new file mode 100644 index 00000000..1640ec6f --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/polished_cut_bauxite_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/polished_cut_bauxite_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "tfmg:block/polished_cut_bauxite_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "tfmg:block/polished_cut_bauxite_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/polished_cut_bauxite_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "tfmg:block/polished_cut_bauxite_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/polished_cut_bauxite_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "tfmg:block/polished_cut_bauxite_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/polished_cut_bauxite_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "tfmg:block/polished_cut_bauxite_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/small_bauxite_brick_slab.json b/src/generated/resources/assets/tfmg/blockstates/small_bauxite_brick_slab.json new file mode 100644 index 00000000..250f23f5 --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/small_bauxite_brick_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "tfmg:block/small_bauxite_brick_slab" + }, + "type=double": { + "model": "tfmg:block/small_bauxite_bricks" + }, + "type=top": { + "model": "tfmg:block/small_bauxite_brick_slab_top" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/small_bauxite_brick_stairs.json b/src/generated/resources/assets/tfmg/blockstates/small_bauxite_brick_stairs.json new file mode 100644 index 00000000..2ff06c6d --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/small_bauxite_brick_stairs.json @@ -0,0 +1,209 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "tfmg:block/small_bauxite_brick_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "tfmg:block/small_bauxite_brick_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "tfmg:block/small_bauxite_brick_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "tfmg:block/small_bauxite_brick_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "tfmg:block/small_bauxite_brick_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "tfmg:block/small_bauxite_brick_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "tfmg:block/small_bauxite_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "tfmg:block/small_bauxite_brick_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "tfmg:block/small_bauxite_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "tfmg:block/small_bauxite_brick_stairs", + "uvlock": true, + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "tfmg:block/small_bauxite_brick_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "tfmg:block/small_bauxite_brick_stairs_inner", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "tfmg:block/small_bauxite_brick_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "tfmg:block/small_bauxite_brick_stairs_outer", + "uvlock": true, + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "tfmg:block/small_bauxite_brick_stairs", + "uvlock": true, + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "tfmg:block/small_bauxite_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "tfmg:block/small_bauxite_brick_stairs_inner", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "tfmg:block/small_bauxite_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "tfmg:block/small_bauxite_brick_stairs_outer", + "uvlock": true, + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "tfmg:block/small_bauxite_brick_stairs", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "tfmg:block/small_bauxite_brick_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "tfmg:block/small_bauxite_brick_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "tfmg:block/small_bauxite_brick_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "tfmg:block/small_bauxite_brick_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "tfmg:block/small_bauxite_brick_stairs", + "uvlock": true, + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "tfmg:block/small_bauxite_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "tfmg:block/small_bauxite_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "tfmg:block/small_bauxite_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "tfmg:block/small_bauxite_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "tfmg:block/small_bauxite_brick_stairs", + "uvlock": true, + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "tfmg:block/small_bauxite_brick_stairs_inner", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "tfmg:block/small_bauxite_brick_stairs_inner", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "tfmg:block/small_bauxite_brick_stairs_outer", + "uvlock": true, + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "tfmg:block/small_bauxite_brick_stairs_outer", + "uvlock": true, + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "tfmg:block/small_bauxite_brick_stairs", + "uvlock": true, + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "tfmg:block/small_bauxite_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "tfmg:block/small_bauxite_brick_stairs_inner", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "tfmg:block/small_bauxite_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "tfmg:block/small_bauxite_brick_stairs_outer", + "uvlock": true, + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "tfmg:block/small_bauxite_brick_stairs", + "uvlock": true, + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/small_bauxite_brick_wall.json b/src/generated/resources/assets/tfmg/blockstates/small_bauxite_brick_wall.json new file mode 100644 index 00000000..4848439f --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/small_bauxite_brick_wall.json @@ -0,0 +1,90 @@ +{ + "multipart": [ + { + "apply": { + "model": "tfmg:block/small_bauxite_bricks_wall_post" + }, + "when": { + "up": "true" + } + }, + { + "apply": { + "model": "tfmg:block/small_bauxite_bricks_wall_side", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "low" + } + }, + { + "apply": { + "model": "tfmg:block/small_bauxite_bricks_wall_side_tall", + "uvlock": true, + "y": 90 + }, + "when": { + "east": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/small_bauxite_bricks_wall_side", + "uvlock": true + }, + "when": { + "north": "low" + } + }, + { + "apply": { + "model": "tfmg:block/small_bauxite_bricks_wall_side_tall", + "uvlock": true + }, + "when": { + "north": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/small_bauxite_bricks_wall_side", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "low" + } + }, + { + "apply": { + "model": "tfmg:block/small_bauxite_bricks_wall_side_tall", + "uvlock": true, + "y": 180 + }, + "when": { + "south": "tall" + } + }, + { + "apply": { + "model": "tfmg:block/small_bauxite_bricks_wall_side", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "low" + } + }, + { + "apply": { + "model": "tfmg:block/small_bauxite_bricks_wall_side_tall", + "uvlock": true, + "y": 270 + }, + "when": { + "west": "tall" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/blockstates/small_bauxite_bricks.json b/src/generated/resources/assets/tfmg/blockstates/small_bauxite_bricks.json new file mode 100644 index 00000000..6cb0ff2c --- /dev/null +++ b/src/generated/resources/assets/tfmg/blockstates/small_bauxite_bricks.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfmg:block/small_bauxite_bricks" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/lang/en_ud.json b/src/generated/resources/assets/tfmg/lang/en_ud.json index 5bbbfe03..dd1ad73b 100644 --- a/src/generated/resources/assets/tfmg/lang/en_ud.json +++ b/src/generated/resources/assets/tfmg/lang/en_ud.json @@ -1,21 +1,42 @@ { + "block.tfmg.bauxite": "ǝʇıxnɐᗺ", + "block.tfmg.bauxite_pillar": "ɹɐןןıԀ ǝʇıxnɐᗺ", "block.tfmg.cast_iron_block": "uoɹI ʇsɐƆ ɟo ʞɔoןᗺ", "block.tfmg.concrete": "ǝʇǝɹɔuoƆ", "block.tfmg.cooling_fluid": "pınןℲ buıןooƆ", "block.tfmg.creosote": "ǝʇosoǝɹƆ", "block.tfmg.crude_oil_fluid": "pınןℲ ןıO ǝpnɹƆ", + "block.tfmg.cut_bauxite": "ǝʇıxnɐᗺ ʇnƆ", + "block.tfmg.cut_bauxite_brick_slab": "qɐןS ʞɔıɹᗺ ǝʇıxnɐᗺ ʇnƆ", + "block.tfmg.cut_bauxite_brick_stairs": "sɹıɐʇS ʞɔıɹᗺ ǝʇıxnɐᗺ ʇnƆ", + "block.tfmg.cut_bauxite_brick_wall": "ןןɐM ʞɔıɹᗺ ǝʇıxnɐᗺ ʇnƆ", + "block.tfmg.cut_bauxite_bricks": "sʞɔıɹᗺ ǝʇıxnɐᗺ ʇnƆ", + "block.tfmg.cut_bauxite_slab": "qɐןS ǝʇıxnɐᗺ ʇnƆ", + "block.tfmg.cut_bauxite_stairs": "sɹıɐʇS ǝʇıxnɐᗺ ʇnƆ", + "block.tfmg.cut_bauxite_wall": "ןןɐM ǝʇıxnɐᗺ ʇnƆ", "block.tfmg.diesel": "ןǝsǝıᗡ", "block.tfmg.formwork_block": "ʞɔoןᗺ ʞɹoʍɯɹoℲ", + "block.tfmg.fossilstone": "ǝuoʇsןıssoℲ", "block.tfmg.gasoline": "ǝuıןosɐ⅁", "block.tfmg.heavy_machinery_casing": "buısɐƆ ʎɹǝuıɥɔɐW ʎʌɐǝH", "block.tfmg.heavy_oil": "ןıO ʎʌɐǝH", "block.tfmg.kerosene": "ǝuǝsoɹǝʞ", + "block.tfmg.layered_bauxite": "ǝʇıxnɐᗺ pǝɹǝʎɐꞀ", "block.tfmg.liquid_concrete": "ǝʇǝɹɔuoƆ pınbıꞀ", "block.tfmg.liquid_plastic": "ɔıʇsɐןԀ pınbıꞀ", "block.tfmg.lubrication_oil": "ןıO uoıʇɐɔıɹqnꞀ", "block.tfmg.napalm": "ɯןɐdɐN", "block.tfmg.napalm_bomb": "qɯoᗺ ɯןɐdɐN", "block.tfmg.naphtha": "ɐɥʇɥdɐN", + "block.tfmg.oil_deposit": "ʇısodǝᗡ ןıO", + "block.tfmg.polished_cut_bauxite": "ǝʇıxnɐᗺ ʇnƆ pǝɥsıןoԀ", + "block.tfmg.polished_cut_bauxite_slab": "qɐןS ǝʇıxnɐᗺ ʇnƆ pǝɥsıןoԀ", + "block.tfmg.polished_cut_bauxite_stairs": "sɹıɐʇS ǝʇıxnɐᗺ ʇnƆ pǝɥsıןoԀ", + "block.tfmg.polished_cut_bauxite_wall": "ןןɐM ǝʇıxnɐᗺ ʇnƆ pǝɥsıןoԀ", + "block.tfmg.small_bauxite_brick_slab": "qɐןS ʞɔıɹᗺ ǝʇıxnɐᗺ ןןɐɯS", + "block.tfmg.small_bauxite_brick_stairs": "sɹıɐʇS ʞɔıɹᗺ ǝʇıxnɐᗺ ןןɐɯS", + "block.tfmg.small_bauxite_brick_wall": "ןןɐM ʞɔıɹᗺ ǝʇıxnɐᗺ ןןɐɯS", + "block.tfmg.small_bauxite_bricks": "sʞɔıɹᗺ ǝʇıxnɐᗺ ןןɐɯS", "block.tfmg.steel_block": "ןǝǝʇS ɟo ʞɔoןᗺ", "block.tfmg.steel_casing": "buısɐƆ ןǝǝʇS", "entity.tfmg.blue_spark": "ʞɹɐdS ǝnןᗺ", diff --git a/src/generated/resources/assets/tfmg/lang/en_us.json b/src/generated/resources/assets/tfmg/lang/en_us.json index 64e2e83a..7c590b96 100644 --- a/src/generated/resources/assets/tfmg/lang/en_us.json +++ b/src/generated/resources/assets/tfmg/lang/en_us.json @@ -2,23 +2,44 @@ "_": "->------------------------] Game Elements [------------------------<-", + "block.tfmg.bauxite": "Bauxite", + "block.tfmg.bauxite_pillar": "Bauxite Pillar", "block.tfmg.cast_iron_block": "Block of Cast Iron", "block.tfmg.concrete": "Concrete", "block.tfmg.cooling_fluid": "Cooling Fluid", "block.tfmg.creosote": "Creosote", "block.tfmg.crude_oil_fluid": "Crude Oil Fluid", + "block.tfmg.cut_bauxite": "Cut Bauxite", + "block.tfmg.cut_bauxite_brick_slab": "Cut Bauxite Brick Slab", + "block.tfmg.cut_bauxite_brick_stairs": "Cut Bauxite Brick Stairs", + "block.tfmg.cut_bauxite_brick_wall": "Cut Bauxite Brick Wall", + "block.tfmg.cut_bauxite_bricks": "Cut Bauxite Bricks", + "block.tfmg.cut_bauxite_slab": "Cut Bauxite Slab", + "block.tfmg.cut_bauxite_stairs": "Cut Bauxite Stairs", + "block.tfmg.cut_bauxite_wall": "Cut Bauxite Wall", "block.tfmg.diesel": "Diesel", "block.tfmg.formwork_block": "Formwork Block", + "block.tfmg.fossilstone": "Fossilstone", "block.tfmg.gasoline": "Gasoline", "block.tfmg.heavy_machinery_casing": "Heavy Machinery Casing", "block.tfmg.heavy_oil": "Heavy Oil", "block.tfmg.kerosene": "Kerosene", + "block.tfmg.layered_bauxite": "Layered Bauxite", "block.tfmg.liquid_concrete": "Liquid Concrete", "block.tfmg.liquid_plastic": "Liquid Plastic", "block.tfmg.lubrication_oil": "Lubrication Oil", "block.tfmg.napalm": "Napalm", "block.tfmg.napalm_bomb": "Napalm Bomb", "block.tfmg.naphtha": "Naphtha", + "block.tfmg.oil_deposit": "Oil Deposit", + "block.tfmg.polished_cut_bauxite": "Polished Cut Bauxite", + "block.tfmg.polished_cut_bauxite_slab": "Polished Cut Bauxite Slab", + "block.tfmg.polished_cut_bauxite_stairs": "Polished Cut Bauxite Stairs", + "block.tfmg.polished_cut_bauxite_wall": "Polished Cut Bauxite Wall", + "block.tfmg.small_bauxite_brick_slab": "Small Bauxite Brick Slab", + "block.tfmg.small_bauxite_brick_stairs": "Small Bauxite Brick Stairs", + "block.tfmg.small_bauxite_brick_wall": "Small Bauxite Brick Wall", + "block.tfmg.small_bauxite_bricks": "Small Bauxite Bricks", "block.tfmg.steel_block": "Block of Steel", "block.tfmg.steel_casing": "Steel Casing", diff --git a/src/generated/resources/assets/tfmg/models/block/bauxite_natural_0.json b/src/generated/resources/assets/tfmg/models/block/bauxite_natural_0.json new file mode 100644 index 00000000..0240f3ba --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/bauxite_natural_0.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/palettes/stone_types/natural/bauxite_0" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/bauxite_natural_1.json b/src/generated/resources/assets/tfmg/models/block/bauxite_natural_1.json new file mode 100644 index 00000000..07fd63cc --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/bauxite_natural_1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/palettes/stone_types/natural/bauxite_1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/bauxite_natural_2.json b/src/generated/resources/assets/tfmg/models/block/bauxite_natural_2.json new file mode 100644 index 00000000..76fcd3bc --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/bauxite_natural_2.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/palettes/stone_types/natural/bauxite_2" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/bauxite_natural_3.json b/src/generated/resources/assets/tfmg/models/block/bauxite_natural_3.json new file mode 100644 index 00000000..71e2953a --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/bauxite_natural_3.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/palettes/stone_types/natural/bauxite_3" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/bauxite_pillar.json b/src/generated/resources/assets/tfmg/models/block/bauxite_pillar.json new file mode 100644 index 00000000..603ce302 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/bauxite_pillar.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "tfmg:block/palettes/stone_types/cap/bauxite_cut_cap", + "side": "tfmg:block/palettes/stone_types/pillar/bauxite_cut_pillar" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/bauxite_pillar_horizontal.json b/src/generated/resources/assets/tfmg/models/block/bauxite_pillar_horizontal.json new file mode 100644 index 00000000..3f474d7e --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/bauxite_pillar_horizontal.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column_horizontal", + "textures": { + "end": "tfmg:block/palettes/stone_types/cap/bauxite_cut_cap", + "side": "tfmg:block/palettes/stone_types/pillar/bauxite_cut_pillar" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cut_bauxite.json b/src/generated/resources/assets/tfmg/models/block/cut_bauxite.json new file mode 100644 index 00000000..f57341a8 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cut_bauxite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/palettes/stone_types/cut/bauxite_cut" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cut_bauxite_brick_slab.json b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_brick_slab.json new file mode 100644 index 00000000..9e899211 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "tfmg:block/palettes/stone_types/brick/bauxite_cut_brick", + "side": "tfmg:block/palettes/stone_types/brick/bauxite_cut_brick", + "top": "tfmg:block/palettes/stone_types/brick/bauxite_cut_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cut_bauxite_brick_slab_top.json b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_brick_slab_top.json new file mode 100644 index 00000000..b07a336b --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "tfmg:block/palettes/stone_types/brick/bauxite_cut_brick", + "side": "tfmg:block/palettes/stone_types/brick/bauxite_cut_brick", + "top": "tfmg:block/palettes/stone_types/brick/bauxite_cut_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cut_bauxite_brick_stairs.json b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_brick_stairs.json new file mode 100644 index 00000000..aed95726 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "tfmg:block/palettes/stone_types/brick/bauxite_cut_brick", + "side": "tfmg:block/palettes/stone_types/brick/bauxite_cut_brick", + "top": "tfmg:block/palettes/stone_types/brick/bauxite_cut_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cut_bauxite_brick_stairs_inner.json b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_brick_stairs_inner.json new file mode 100644 index 00000000..6d0ee11a --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_brick_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "tfmg:block/palettes/stone_types/brick/bauxite_cut_brick", + "side": "tfmg:block/palettes/stone_types/brick/bauxite_cut_brick", + "top": "tfmg:block/palettes/stone_types/brick/bauxite_cut_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cut_bauxite_brick_stairs_outer.json b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_brick_stairs_outer.json new file mode 100644 index 00000000..f35429d2 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_brick_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "tfmg:block/palettes/stone_types/brick/bauxite_cut_brick", + "side": "tfmg:block/palettes/stone_types/brick/bauxite_cut_brick", + "top": "tfmg:block/palettes/stone_types/brick/bauxite_cut_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cut_bauxite_bricks.json b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_bricks.json new file mode 100644 index 00000000..7ec021b7 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/palettes/stone_types/brick/bauxite_cut_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cut_bauxite_bricks_wall_post.json b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_bricks_wall_post.json new file mode 100644 index 00000000..0f3c728c --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_bricks_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "tfmg:block/palettes/stone_types/brick/bauxite_cut_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cut_bauxite_bricks_wall_side.json b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_bricks_wall_side.json new file mode 100644 index 00000000..edfbf19b --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_bricks_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "tfmg:block/palettes/stone_types/brick/bauxite_cut_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cut_bauxite_bricks_wall_side_tall.json b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_bricks_wall_side_tall.json new file mode 100644 index 00000000..65e6a7b4 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_bricks_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "tfmg:block/palettes/stone_types/brick/bauxite_cut_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cut_bauxite_slab.json b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_slab.json new file mode 100644 index 00000000..9f0aa9e4 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "tfmg:block/palettes/stone_types/cut/bauxite_cut", + "side": "tfmg:block/palettes/stone_types/cut/bauxite_cut", + "top": "tfmg:block/palettes/stone_types/cut/bauxite_cut" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cut_bauxite_slab_top.json b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_slab_top.json new file mode 100644 index 00000000..bdec8d43 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "tfmg:block/palettes/stone_types/cut/bauxite_cut", + "side": "tfmg:block/palettes/stone_types/cut/bauxite_cut", + "top": "tfmg:block/palettes/stone_types/cut/bauxite_cut" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cut_bauxite_stairs.json b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_stairs.json new file mode 100644 index 00000000..210c56cf --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "tfmg:block/palettes/stone_types/cut/bauxite_cut", + "side": "tfmg:block/palettes/stone_types/cut/bauxite_cut", + "top": "tfmg:block/palettes/stone_types/cut/bauxite_cut" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cut_bauxite_stairs_inner.json b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_stairs_inner.json new file mode 100644 index 00000000..d4c24e75 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "tfmg:block/palettes/stone_types/cut/bauxite_cut", + "side": "tfmg:block/palettes/stone_types/cut/bauxite_cut", + "top": "tfmg:block/palettes/stone_types/cut/bauxite_cut" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cut_bauxite_stairs_outer.json b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_stairs_outer.json new file mode 100644 index 00000000..43de1c7d --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "tfmg:block/palettes/stone_types/cut/bauxite_cut", + "side": "tfmg:block/palettes/stone_types/cut/bauxite_cut", + "top": "tfmg:block/palettes/stone_types/cut/bauxite_cut" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cut_bauxite_wall_post.json b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_wall_post.json new file mode 100644 index 00000000..f868ea51 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "tfmg:block/palettes/stone_types/cut/bauxite_cut" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cut_bauxite_wall_side.json b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_wall_side.json new file mode 100644 index 00000000..052ae943 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "tfmg:block/palettes/stone_types/cut/bauxite_cut" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/cut_bauxite_wall_side_tall.json b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_wall_side_tall.json new file mode 100644 index 00000000..5ffb4a8b --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/cut_bauxite_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "tfmg:block/palettes/stone_types/cut/bauxite_cut" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/fossilstone.json b/src/generated/resources/assets/tfmg/models/block/fossilstone.json new file mode 100644 index 00000000..2beeaf59 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/fossilstone.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/fossilstone" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/layered_bauxite.json b/src/generated/resources/assets/tfmg/models/block/layered_bauxite.json new file mode 100644 index 00000000..576c1a4a --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/layered_bauxite.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "tfmg:block/palettes/stone_types/cap/bauxite_cut_cap", + "side": "tfmg:block/palettes/stone_types/layered/bauxite_cut_layered" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/oil_deposit.json b/src/generated/resources/assets/tfmg/models/block/oil_deposit.json new file mode 100644 index 00000000..445d908e --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/oil_deposit.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/oil_deposit" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite.json b/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite.json new file mode 100644 index 00000000..6675530e --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/palettes/stone_types/polished/bauxite_cut_polished" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_slab.json b/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_slab.json new file mode 100644 index 00000000..f4a54ec1 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "tfmg:block/palettes/stone_types/polished/bauxite_cut_polished", + "side": "tfmg:block/palettes/stone_types/slab/bauxite_cut_slab", + "top": "tfmg:block/palettes/stone_types/polished/bauxite_cut_polished" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_slab_double.json b/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_slab_double.json new file mode 100644 index 00000000..698f6e07 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_slab_double.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "tfmg:block/palettes/stone_types/polished/bauxite_cut_polished", + "side": "tfmg:block/palettes/stone_types/slab/bauxite_cut_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_slab_top.json b/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_slab_top.json new file mode 100644 index 00000000..c89b7b16 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "tfmg:block/palettes/stone_types/polished/bauxite_cut_polished", + "side": "tfmg:block/palettes/stone_types/slab/bauxite_cut_slab", + "top": "tfmg:block/palettes/stone_types/polished/bauxite_cut_polished" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_stairs.json b/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_stairs.json new file mode 100644 index 00000000..617300f9 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "tfmg:block/palettes/stone_types/polished/bauxite_cut_polished", + "side": "tfmg:block/palettes/stone_types/polished/bauxite_cut_polished", + "top": "tfmg:block/palettes/stone_types/polished/bauxite_cut_polished" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_stairs_inner.json b/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_stairs_inner.json new file mode 100644 index 00000000..2da04e85 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "tfmg:block/palettes/stone_types/polished/bauxite_cut_polished", + "side": "tfmg:block/palettes/stone_types/polished/bauxite_cut_polished", + "top": "tfmg:block/palettes/stone_types/polished/bauxite_cut_polished" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_stairs_outer.json b/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_stairs_outer.json new file mode 100644 index 00000000..6f505abb --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "tfmg:block/palettes/stone_types/polished/bauxite_cut_polished", + "side": "tfmg:block/palettes/stone_types/polished/bauxite_cut_polished", + "top": "tfmg:block/palettes/stone_types/polished/bauxite_cut_polished" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_wall_post.json b/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_wall_post.json new file mode 100644 index 00000000..51e5183b --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "tfmg:block/palettes/stone_types/polished/bauxite_cut_polished" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_wall_side.json b/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_wall_side.json new file mode 100644 index 00000000..5d78f343 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "tfmg:block/palettes/stone_types/polished/bauxite_cut_polished" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_wall_side_tall.json b/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_wall_side_tall.json new file mode 100644 index 00000000..aa55e40f --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/polished_cut_bauxite_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "tfmg:block/palettes/stone_types/polished/bauxite_cut_polished" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/small_bauxite_brick_slab.json b/src/generated/resources/assets/tfmg/models/block/small_bauxite_brick_slab.json new file mode 100644 index 00000000..ac603c5d --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/small_bauxite_brick_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "tfmg:block/palettes/stone_types/small_brick/bauxite_cut_small_brick", + "side": "tfmg:block/palettes/stone_types/small_brick/bauxite_cut_small_brick", + "top": "tfmg:block/palettes/stone_types/small_brick/bauxite_cut_small_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/small_bauxite_brick_slab_top.json b/src/generated/resources/assets/tfmg/models/block/small_bauxite_brick_slab_top.json new file mode 100644 index 00000000..269db9d9 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/small_bauxite_brick_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "tfmg:block/palettes/stone_types/small_brick/bauxite_cut_small_brick", + "side": "tfmg:block/palettes/stone_types/small_brick/bauxite_cut_small_brick", + "top": "tfmg:block/palettes/stone_types/small_brick/bauxite_cut_small_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/small_bauxite_brick_stairs.json b/src/generated/resources/assets/tfmg/models/block/small_bauxite_brick_stairs.json new file mode 100644 index 00000000..bfe55e74 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/small_bauxite_brick_stairs.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/stairs", + "textures": { + "bottom": "tfmg:block/palettes/stone_types/small_brick/bauxite_cut_small_brick", + "side": "tfmg:block/palettes/stone_types/small_brick/bauxite_cut_small_brick", + "top": "tfmg:block/palettes/stone_types/small_brick/bauxite_cut_small_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/small_bauxite_brick_stairs_inner.json b/src/generated/resources/assets/tfmg/models/block/small_bauxite_brick_stairs_inner.json new file mode 100644 index 00000000..60244142 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/small_bauxite_brick_stairs_inner.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/inner_stairs", + "textures": { + "bottom": "tfmg:block/palettes/stone_types/small_brick/bauxite_cut_small_brick", + "side": "tfmg:block/palettes/stone_types/small_brick/bauxite_cut_small_brick", + "top": "tfmg:block/palettes/stone_types/small_brick/bauxite_cut_small_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/small_bauxite_brick_stairs_outer.json b/src/generated/resources/assets/tfmg/models/block/small_bauxite_brick_stairs_outer.json new file mode 100644 index 00000000..a89d760b --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/small_bauxite_brick_stairs_outer.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/outer_stairs", + "textures": { + "bottom": "tfmg:block/palettes/stone_types/small_brick/bauxite_cut_small_brick", + "side": "tfmg:block/palettes/stone_types/small_brick/bauxite_cut_small_brick", + "top": "tfmg:block/palettes/stone_types/small_brick/bauxite_cut_small_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/small_bauxite_bricks.json b/src/generated/resources/assets/tfmg/models/block/small_bauxite_bricks.json new file mode 100644 index 00000000..be636731 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/small_bauxite_bricks.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/palettes/stone_types/small_brick/bauxite_cut_small_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/small_bauxite_bricks_wall_post.json b/src/generated/resources/assets/tfmg/models/block/small_bauxite_bricks_wall_post.json new file mode 100644 index 00000000..d75c0667 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/small_bauxite_bricks_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "tfmg:block/palettes/stone_types/small_brick/bauxite_cut_small_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/small_bauxite_bricks_wall_side.json b/src/generated/resources/assets/tfmg/models/block/small_bauxite_bricks_wall_side.json new file mode 100644 index 00000000..6f3b6edf --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/small_bauxite_bricks_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "tfmg:block/palettes/stone_types/small_brick/bauxite_cut_small_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/block/small_bauxite_bricks_wall_side_tall.json b/src/generated/resources/assets/tfmg/models/block/small_bauxite_bricks_wall_side_tall.json new file mode 100644 index 00000000..936f1958 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/block/small_bauxite_bricks_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "tfmg:block/palettes/stone_types/small_brick/bauxite_cut_small_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/bauxite.json b/src/generated/resources/assets/tfmg/models/item/bauxite.json new file mode 100644 index 00000000..07fd63cc --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/bauxite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfmg:block/palettes/stone_types/natural/bauxite_1" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/bauxite_pillar.json b/src/generated/resources/assets/tfmg/models/item/bauxite_pillar.json new file mode 100644 index 00000000..a22119c1 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/bauxite_pillar.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/bauxite_pillar" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/cut_bauxite.json b/src/generated/resources/assets/tfmg/models/item/cut_bauxite.json new file mode 100644 index 00000000..09e97da0 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/cut_bauxite.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/cut_bauxite" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/cut_bauxite_brick_slab.json b/src/generated/resources/assets/tfmg/models/item/cut_bauxite_brick_slab.json new file mode 100644 index 00000000..ecf67152 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/cut_bauxite_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/cut_bauxite_brick_slab" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/cut_bauxite_brick_stairs.json b/src/generated/resources/assets/tfmg/models/item/cut_bauxite_brick_stairs.json new file mode 100644 index 00000000..6fa4217e --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/cut_bauxite_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/cut_bauxite_brick_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/cut_bauxite_brick_wall.json b/src/generated/resources/assets/tfmg/models/item/cut_bauxite_brick_wall.json new file mode 100644 index 00000000..2093a9b7 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/cut_bauxite_brick_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "tfmg:block/palettes/stone_types/brick/bauxite_cut_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/cut_bauxite_bricks.json b/src/generated/resources/assets/tfmg/models/item/cut_bauxite_bricks.json new file mode 100644 index 00000000..c30da0af --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/cut_bauxite_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/cut_bauxite_bricks" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/cut_bauxite_slab.json b/src/generated/resources/assets/tfmg/models/item/cut_bauxite_slab.json new file mode 100644 index 00000000..5656c3dc --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/cut_bauxite_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/cut_bauxite_slab" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/cut_bauxite_stairs.json b/src/generated/resources/assets/tfmg/models/item/cut_bauxite_stairs.json new file mode 100644 index 00000000..4834a131 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/cut_bauxite_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/cut_bauxite_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/cut_bauxite_wall.json b/src/generated/resources/assets/tfmg/models/item/cut_bauxite_wall.json new file mode 100644 index 00000000..c38ccdae --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/cut_bauxite_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "tfmg:block/palettes/stone_types/cut/bauxite_cut" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/fossilstone.json b/src/generated/resources/assets/tfmg/models/item/fossilstone.json new file mode 100644 index 00000000..a18c2ef6 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/fossilstone.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/fossilstone" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/layered_bauxite.json b/src/generated/resources/assets/tfmg/models/item/layered_bauxite.json new file mode 100644 index 00000000..f318b5d9 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/layered_bauxite.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/layered_bauxite" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/oil_deposit.json b/src/generated/resources/assets/tfmg/models/item/oil_deposit.json new file mode 100644 index 00000000..6acea743 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/oil_deposit.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/oil_deposit" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/polished_cut_bauxite.json b/src/generated/resources/assets/tfmg/models/item/polished_cut_bauxite.json new file mode 100644 index 00000000..1e2a976f --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/polished_cut_bauxite.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/polished_cut_bauxite" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/polished_cut_bauxite_slab.json b/src/generated/resources/assets/tfmg/models/item/polished_cut_bauxite_slab.json new file mode 100644 index 00000000..875b5d3c --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/polished_cut_bauxite_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/polished_cut_bauxite_slab" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/polished_cut_bauxite_stairs.json b/src/generated/resources/assets/tfmg/models/item/polished_cut_bauxite_stairs.json new file mode 100644 index 00000000..94807f1f --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/polished_cut_bauxite_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/polished_cut_bauxite_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/polished_cut_bauxite_wall.json b/src/generated/resources/assets/tfmg/models/item/polished_cut_bauxite_wall.json new file mode 100644 index 00000000..627b6752 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/polished_cut_bauxite_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "tfmg:block/palettes/stone_types/polished/bauxite_cut_polished" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/small_bauxite_brick_slab.json b/src/generated/resources/assets/tfmg/models/item/small_bauxite_brick_slab.json new file mode 100644 index 00000000..53e0492a --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/small_bauxite_brick_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/small_bauxite_brick_slab" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/small_bauxite_brick_stairs.json b/src/generated/resources/assets/tfmg/models/item/small_bauxite_brick_stairs.json new file mode 100644 index 00000000..b01f7981 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/small_bauxite_brick_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/small_bauxite_brick_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/small_bauxite_brick_wall.json b/src/generated/resources/assets/tfmg/models/item/small_bauxite_brick_wall.json new file mode 100644 index 00000000..28241ead --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/small_bauxite_brick_wall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "tfmg:block/palettes/stone_types/small_brick/bauxite_cut_small_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/tfmg/models/item/small_bauxite_bricks.json b/src/generated/resources/assets/tfmg/models/item/small_bauxite_bricks.json new file mode 100644 index 00000000..04d4b668 --- /dev/null +++ b/src/generated/resources/assets/tfmg/models/item/small_bauxite_bricks.json @@ -0,0 +1,3 @@ +{ + "parent": "tfmg:block/small_bauxite_bricks" +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/azalea_root_replaceable.json b/src/generated/resources/data/minecraft/tags/blocks/azalea_root_replaceable.json new file mode 100644 index 00000000..0644f0d5 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/azalea_root_replaceable.json @@ -0,0 +1,5 @@ +{ + "values": [ + "tfmg:bauxite" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/dripstone_replaceable_blocks.json b/src/generated/resources/data/minecraft/tags/blocks/dripstone_replaceable_blocks.json new file mode 100644 index 00000000..0644f0d5 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/dripstone_replaceable_blocks.json @@ -0,0 +1,5 @@ +{ + "values": [ + "tfmg:bauxite" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/lush_ground_replaceable.json b/src/generated/resources/data/minecraft/tags/blocks/lush_ground_replaceable.json new file mode 100644 index 00000000..0644f0d5 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/lush_ground_replaceable.json @@ -0,0 +1,5 @@ +{ + "values": [ + "tfmg:bauxite" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index e6483217..285cdfcd 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -1,10 +1,31 @@ { "values": [ "tfmg:napalm_bomb", + "tfmg:fossilstone", + "tfmg:oil_deposit", "tfmg:steel_casing", "tfmg:heavy_machinery_casing", "tfmg:steel_block", "tfmg:cast_iron_block", - "tfmg:concrete" + "tfmg:concrete", + "tfmg:bauxite", + "tfmg:cut_bauxite", + "tfmg:cut_bauxite_stairs", + "tfmg:cut_bauxite_slab", + "tfmg:cut_bauxite_wall", + "tfmg:polished_cut_bauxite", + "tfmg:polished_cut_bauxite_stairs", + "tfmg:polished_cut_bauxite_slab", + "tfmg:polished_cut_bauxite_wall", + "tfmg:cut_bauxite_bricks", + "tfmg:cut_bauxite_brick_stairs", + "tfmg:cut_bauxite_brick_slab", + "tfmg:cut_bauxite_brick_wall", + "tfmg:small_bauxite_bricks", + "tfmg:small_bauxite_brick_stairs", + "tfmg:small_bauxite_brick_slab", + "tfmg:small_bauxite_brick_wall", + "tfmg:layered_bauxite", + "tfmg:bauxite_pillar" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/moss_replaceable.json b/src/generated/resources/data/minecraft/tags/blocks/moss_replaceable.json new file mode 100644 index 00000000..0644f0d5 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/moss_replaceable.json @@ -0,0 +1,5 @@ +{ + "values": [ + "tfmg:bauxite" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json index b4eced41..45444180 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json +++ b/src/generated/resources/data/minecraft/tags/blocks/needs_iron_tool.json @@ -1,7 +1,6 @@ { "values": [ "tfmg:steel_block", - "tfmg:cast_iron_block", - "tfmg:concrete" + "tfmg:cast_iron_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json b/src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json new file mode 100644 index 00000000..b10436bf --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json @@ -0,0 +1,5 @@ +{ + "values": [ + "tfmg:concrete" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/slabs.json b/src/generated/resources/data/minecraft/tags/blocks/slabs.json new file mode 100644 index 00000000..abfbdcea --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/slabs.json @@ -0,0 +1,8 @@ +{ + "values": [ + "tfmg:cut_bauxite_slab", + "tfmg:polished_cut_bauxite_slab", + "tfmg:cut_bauxite_brick_slab", + "tfmg:small_bauxite_brick_slab" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/stairs.json b/src/generated/resources/data/minecraft/tags/blocks/stairs.json new file mode 100644 index 00000000..fafd6261 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/stairs.json @@ -0,0 +1,8 @@ +{ + "values": [ + "tfmg:cut_bauxite_stairs", + "tfmg:polished_cut_bauxite_stairs", + "tfmg:cut_bauxite_brick_stairs", + "tfmg:small_bauxite_brick_stairs" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/blocks/walls.json b/src/generated/resources/data/minecraft/tags/blocks/walls.json new file mode 100644 index 00000000..00c29213 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/blocks/walls.json @@ -0,0 +1,8 @@ +{ + "values": [ + "tfmg:cut_bauxite_wall", + "tfmg:polished_cut_bauxite_wall", + "tfmg:cut_bauxite_brick_wall", + "tfmg:small_bauxite_brick_wall" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/slabs.json b/src/generated/resources/data/minecraft/tags/items/slabs.json new file mode 100644 index 00000000..abfbdcea --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/slabs.json @@ -0,0 +1,8 @@ +{ + "values": [ + "tfmg:cut_bauxite_slab", + "tfmg:polished_cut_bauxite_slab", + "tfmg:cut_bauxite_brick_slab", + "tfmg:small_bauxite_brick_slab" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/stairs.json b/src/generated/resources/data/minecraft/tags/items/stairs.json new file mode 100644 index 00000000..fafd6261 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/stairs.json @@ -0,0 +1,8 @@ +{ + "values": [ + "tfmg:cut_bauxite_stairs", + "tfmg:polished_cut_bauxite_stairs", + "tfmg:cut_bauxite_brick_stairs", + "tfmg:small_bauxite_brick_stairs" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/items/walls.json b/src/generated/resources/data/minecraft/tags/items/walls.json new file mode 100644 index 00000000..00c29213 --- /dev/null +++ b/src/generated/resources/data/minecraft/tags/items/walls.json @@ -0,0 +1,8 @@ +{ + "values": [ + "tfmg:cut_bauxite_wall", + "tfmg:polished_cut_bauxite_wall", + "tfmg:cut_bauxite_brick_wall", + "tfmg:small_bauxite_brick_wall" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/bauxite_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/bauxite_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..a28c7c12 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/bauxite_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone_types_bauxite": { + "conditions": { + "items": [ + { + "tag": "tfmg:stone_types/bauxite" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:bauxite_from_stone_types_bauxite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone_types_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:bauxite_from_stone_types_bauxite_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/bauxite_pillar_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/bauxite_pillar_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..f2ee222c --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/bauxite_pillar_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone_types_bauxite": { + "conditions": { + "items": [ + { + "tag": "tfmg:stone_types/bauxite" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:bauxite_pillar_from_stone_types_bauxite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone_types_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:bauxite_pillar_from_stone_types_bauxite_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_slab.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_slab.json new file mode 100644 index 00000000..275333b9 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cut_bauxite_bricks": { + "conditions": { + "items": [ + { + "items": [ + "tfmg:cut_bauxite_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:cut_bauxite_brick_slab" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cut_bauxite_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:cut_bauxite_brick_slab" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_slab_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_slab_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..9dc2608d --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_slab_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone_types_bauxite": { + "conditions": { + "items": [ + { + "tag": "tfmg:stone_types/bauxite" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:cut_bauxite_brick_slab_from_stone_types_bauxite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone_types_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:cut_bauxite_brick_slab_from_stone_types_bauxite_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_slab_recycling.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_slab_recycling.json new file mode 100644 index 00000000..8518ff70 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_slab_recycling.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cut_bauxite_brick_slab": { + "conditions": { + "items": [ + { + "items": [ + "tfmg:cut_bauxite_brick_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:cut_bauxite_brick_slab_recycling" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cut_bauxite_brick_slab", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:cut_bauxite_brick_slab_recycling" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_stairs.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_stairs.json new file mode 100644 index 00000000..31f70820 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cut_bauxite_bricks": { + "conditions": { + "items": [ + { + "items": [ + "tfmg:cut_bauxite_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:cut_bauxite_brick_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cut_bauxite_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:cut_bauxite_brick_stairs" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..f8803e1d --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone_types_bauxite": { + "conditions": { + "items": [ + { + "tag": "tfmg:stone_types/bauxite" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:cut_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone_types_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:cut_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_wall.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_wall.json new file mode 100644 index 00000000..3e025199 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_wall.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cut_bauxite_bricks": { + "conditions": { + "items": [ + { + "items": [ + "tfmg:cut_bauxite_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:cut_bauxite_brick_wall" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cut_bauxite_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:cut_bauxite_brick_wall" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_wall_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_wall_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..ed6f7dc0 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_brick_wall_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone_types_bauxite": { + "conditions": { + "items": [ + { + "tag": "tfmg:stone_types/bauxite" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:cut_bauxite_brick_wall_from_stone_types_bauxite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone_types_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:cut_bauxite_brick_wall_from_stone_types_bauxite_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_bricks_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_bricks_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..db5727fc --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_bricks_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone_types_bauxite": { + "conditions": { + "items": [ + { + "tag": "tfmg:stone_types/bauxite" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:cut_bauxite_bricks_from_stone_types_bauxite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone_types_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:cut_bauxite_bricks_from_stone_types_bauxite_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..f42c698e --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone_types_bauxite": { + "conditions": { + "items": [ + { + "tag": "tfmg:stone_types/bauxite" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:cut_bauxite_from_stone_types_bauxite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone_types_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:cut_bauxite_from_stone_types_bauxite_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_slab.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_slab.json new file mode 100644 index 00000000..f60bb0b3 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cut_bauxite": { + "conditions": { + "items": [ + { + "items": [ + "tfmg:cut_bauxite" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:cut_bauxite_slab" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cut_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:cut_bauxite_slab" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_slab_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_slab_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..71b0cda1 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_slab_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone_types_bauxite": { + "conditions": { + "items": [ + { + "tag": "tfmg:stone_types/bauxite" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:cut_bauxite_slab_from_stone_types_bauxite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone_types_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:cut_bauxite_slab_from_stone_types_bauxite_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_slab_recycling.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_slab_recycling.json new file mode 100644 index 00000000..2eda28d0 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_slab_recycling.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cut_bauxite_slab": { + "conditions": { + "items": [ + { + "items": [ + "tfmg:cut_bauxite_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:cut_bauxite_slab_recycling" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cut_bauxite_slab", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:cut_bauxite_slab_recycling" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_stairs.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_stairs.json new file mode 100644 index 00000000..1aa224f6 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cut_bauxite": { + "conditions": { + "items": [ + { + "items": [ + "tfmg:cut_bauxite" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:cut_bauxite_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cut_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:cut_bauxite_stairs" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_stairs_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_stairs_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..00b7fc7e --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_stairs_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone_types_bauxite": { + "conditions": { + "items": [ + { + "tag": "tfmg:stone_types/bauxite" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:cut_bauxite_stairs_from_stone_types_bauxite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone_types_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:cut_bauxite_stairs_from_stone_types_bauxite_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_wall.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_wall.json new file mode 100644 index 00000000..8fe1fd40 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_wall.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_cut_bauxite": { + "conditions": { + "items": [ + { + "items": [ + "tfmg:cut_bauxite" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:cut_bauxite_wall" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_cut_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:cut_bauxite_wall" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_wall_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_wall_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..332de182 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/cut_bauxite_wall_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone_types_bauxite": { + "conditions": { + "items": [ + { + "tag": "tfmg:stone_types/bauxite" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:cut_bauxite_wall_from_stone_types_bauxite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone_types_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:cut_bauxite_wall_from_stone_types_bauxite_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/layered_bauxite_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/layered_bauxite_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..30bff70e --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/layered_bauxite_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone_types_bauxite": { + "conditions": { + "items": [ + { + "tag": "tfmg:stone_types/bauxite" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:layered_bauxite_from_stone_types_bauxite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone_types_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:layered_bauxite_from_stone_types_bauxite_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..418f07d3 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone_types_bauxite": { + "conditions": { + "items": [ + { + "tag": "tfmg:stone_types/bauxite" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:polished_cut_bauxite_from_stone_types_bauxite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone_types_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:polished_cut_bauxite_from_stone_types_bauxite_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_slab.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_slab.json new file mode 100644 index 00000000..74124e71 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_polished_cut_bauxite": { + "conditions": { + "items": [ + { + "items": [ + "tfmg:polished_cut_bauxite" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:polished_cut_bauxite_slab" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_polished_cut_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:polished_cut_bauxite_slab" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_slab_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_slab_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..4f7d5b50 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_slab_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone_types_bauxite": { + "conditions": { + "items": [ + { + "tag": "tfmg:stone_types/bauxite" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:polished_cut_bauxite_slab_from_stone_types_bauxite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone_types_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:polished_cut_bauxite_slab_from_stone_types_bauxite_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_slab_recycling.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_slab_recycling.json new file mode 100644 index 00000000..871664c5 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_slab_recycling.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_polished_cut_bauxite_slab": { + "conditions": { + "items": [ + { + "items": [ + "tfmg:polished_cut_bauxite_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:polished_cut_bauxite_slab_recycling" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_polished_cut_bauxite_slab", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:polished_cut_bauxite_slab_recycling" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_stairs.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_stairs.json new file mode 100644 index 00000000..57051b4e --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_polished_cut_bauxite": { + "conditions": { + "items": [ + { + "items": [ + "tfmg:polished_cut_bauxite" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:polished_cut_bauxite_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_polished_cut_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:polished_cut_bauxite_stairs" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_stairs_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_stairs_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..aebf7764 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_stairs_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone_types_bauxite": { + "conditions": { + "items": [ + { + "tag": "tfmg:stone_types/bauxite" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:polished_cut_bauxite_stairs_from_stone_types_bauxite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone_types_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:polished_cut_bauxite_stairs_from_stone_types_bauxite_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_wall.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_wall.json new file mode 100644 index 00000000..7ffa5a71 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_wall.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_polished_cut_bauxite": { + "conditions": { + "items": [ + { + "items": [ + "tfmg:polished_cut_bauxite" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:polished_cut_bauxite_wall" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_polished_cut_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:polished_cut_bauxite_wall" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_wall_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_wall_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..81997830 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/polished_cut_bauxite_wall_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone_types_bauxite": { + "conditions": { + "items": [ + { + "tag": "tfmg:stone_types/bauxite" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:polished_cut_bauxite_wall_from_stone_types_bauxite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone_types_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:polished_cut_bauxite_wall_from_stone_types_bauxite_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_slab.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_slab.json new file mode 100644 index 00000000..ce6fe4bf --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_slab.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_small_bauxite_bricks": { + "conditions": { + "items": [ + { + "items": [ + "tfmg:small_bauxite_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:small_bauxite_brick_slab" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_small_bauxite_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:small_bauxite_brick_slab" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_slab_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_slab_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..5c53c866 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_slab_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone_types_bauxite": { + "conditions": { + "items": [ + { + "tag": "tfmg:stone_types/bauxite" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:small_bauxite_brick_slab_from_stone_types_bauxite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone_types_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:small_bauxite_brick_slab_from_stone_types_bauxite_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_slab_recycling.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_slab_recycling.json new file mode 100644 index 00000000..feeba735 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_slab_recycling.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_small_bauxite_brick_slab": { + "conditions": { + "items": [ + { + "items": [ + "tfmg:small_bauxite_brick_slab" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:small_bauxite_brick_slab_recycling" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_small_bauxite_brick_slab", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:small_bauxite_brick_slab_recycling" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_stairs.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_stairs.json new file mode 100644 index 00000000..a2aadbfd --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_stairs.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_small_bauxite_bricks": { + "conditions": { + "items": [ + { + "items": [ + "tfmg:small_bauxite_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:small_bauxite_brick_stairs" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_small_bauxite_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:small_bauxite_brick_stairs" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..a14dfba8 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone_types_bauxite": { + "conditions": { + "items": [ + { + "tag": "tfmg:stone_types/bauxite" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:small_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone_types_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:small_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_wall.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_wall.json new file mode 100644 index 00000000..c108ae6b --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_wall.json @@ -0,0 +1,34 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_small_bauxite_bricks": { + "conditions": { + "items": [ + { + "items": [ + "tfmg:small_bauxite_bricks" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:small_bauxite_brick_wall" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_small_bauxite_bricks", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:small_bauxite_brick_wall" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_wall_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_wall_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..4de06674 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_brick_wall_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone_types_bauxite": { + "conditions": { + "items": [ + { + "tag": "tfmg:stone_types/bauxite" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:small_bauxite_brick_wall_from_stone_types_bauxite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone_types_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:small_bauxite_brick_wall_from_stone_types_bauxite_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_bricks_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_bricks_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..9ced51c1 --- /dev/null +++ b/src/generated/resources/data/tfmg/advancements/recipes/tfmg.base/small_bauxite_bricks_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,32 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_stone_types_bauxite": { + "conditions": { + "items": [ + { + "tag": "tfmg:stone_types/bauxite" + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "tfmg:small_bauxite_bricks_from_stone_types_bauxite_stonecutting" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_stone_types_bauxite", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "tfmg:small_bauxite_bricks_from_stone_types_bauxite_stonecutting" + ] + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/bauxite.json b/src/generated/resources/data/tfmg/loot_tables/blocks/bauxite.json new file mode 100644 index 00000000..9798e50e --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/bauxite.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:bauxite" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/bauxite_pillar.json b/src/generated/resources/data/tfmg/loot_tables/blocks/bauxite_pillar.json new file mode 100644 index 00000000..dceb77ff --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/bauxite_pillar.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:bauxite_pillar" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite.json b/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite.json new file mode 100644 index 00000000..1ad53edc --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:cut_bauxite" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_brick_slab.json b/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_brick_slab.json new file mode 100644 index 00000000..b0038c40 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_brick_slab.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "tfmg:cut_bauxite_brick_slab", + "condition": "minecraft:block_state_property", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "tfmg:cut_bauxite_brick_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_brick_stairs.json b/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_brick_stairs.json new file mode 100644 index 00000000..7d0979ab --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_brick_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:cut_bauxite_brick_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_brick_wall.json b/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_brick_wall.json new file mode 100644 index 00000000..7e067b98 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_brick_wall.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:cut_bauxite_brick_wall" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_bricks.json b/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_bricks.json new file mode 100644 index 00000000..f55bc564 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_bricks.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:cut_bauxite_bricks" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_slab.json b/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_slab.json new file mode 100644 index 00000000..a8f58ba9 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_slab.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "tfmg:cut_bauxite_slab", + "condition": "minecraft:block_state_property", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "tfmg:cut_bauxite_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_stairs.json b/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_stairs.json new file mode 100644 index 00000000..101fbf8d --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:cut_bauxite_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_wall.json b/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_wall.json new file mode 100644 index 00000000..806dd6cb --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/cut_bauxite_wall.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:cut_bauxite_wall" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/fossilstone.json b/src/generated/resources/data/tfmg/loot_tables/blocks/fossilstone.json new file mode 100644 index 00000000..5f8a9dc1 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/fossilstone.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:fossilstone" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/layered_bauxite.json b/src/generated/resources/data/tfmg/loot_tables/blocks/layered_bauxite.json new file mode 100644 index 00000000..0d30702c --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/layered_bauxite.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:layered_bauxite" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/oil_deposit.json b/src/generated/resources/data/tfmg/loot_tables/blocks/oil_deposit.json new file mode 100644 index 00000000..4e1e8f60 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/oil_deposit.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:oil_deposit" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/polished_cut_bauxite.json b/src/generated/resources/data/tfmg/loot_tables/blocks/polished_cut_bauxite.json new file mode 100644 index 00000000..2da97c75 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/polished_cut_bauxite.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:polished_cut_bauxite" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/polished_cut_bauxite_slab.json b/src/generated/resources/data/tfmg/loot_tables/blocks/polished_cut_bauxite_slab.json new file mode 100644 index 00000000..2114a2a4 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/polished_cut_bauxite_slab.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "tfmg:polished_cut_bauxite_slab", + "condition": "minecraft:block_state_property", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "tfmg:polished_cut_bauxite_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/polished_cut_bauxite_stairs.json b/src/generated/resources/data/tfmg/loot_tables/blocks/polished_cut_bauxite_stairs.json new file mode 100644 index 00000000..15c819c3 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/polished_cut_bauxite_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:polished_cut_bauxite_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/polished_cut_bauxite_wall.json b/src/generated/resources/data/tfmg/loot_tables/blocks/polished_cut_bauxite_wall.json new file mode 100644 index 00000000..8dcd05c7 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/polished_cut_bauxite_wall.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:polished_cut_bauxite_wall" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/small_bauxite_brick_slab.json b/src/generated/resources/data/tfmg/loot_tables/blocks/small_bauxite_brick_slab.json new file mode 100644 index 00000000..3923376c --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/small_bauxite_brick_slab.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "conditions": [ + { + "block": "tfmg:small_bauxite_brick_slab", + "condition": "minecraft:block_state_property", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "tfmg:small_bauxite_brick_slab" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/small_bauxite_brick_stairs.json b/src/generated/resources/data/tfmg/loot_tables/blocks/small_bauxite_brick_stairs.json new file mode 100644 index 00000000..becefb00 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/small_bauxite_brick_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:small_bauxite_brick_stairs" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/small_bauxite_brick_wall.json b/src/generated/resources/data/tfmg/loot_tables/blocks/small_bauxite_brick_wall.json new file mode 100644 index 00000000..79c0bdec --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/small_bauxite_brick_wall.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:small_bauxite_brick_wall" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/loot_tables/blocks/small_bauxite_bricks.json b/src/generated/resources/data/tfmg/loot_tables/blocks/small_bauxite_bricks.json new file mode 100644 index 00000000..81691538 --- /dev/null +++ b/src/generated/resources/data/tfmg/loot_tables/blocks/small_bauxite_bricks.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "tfmg:small_bauxite_bricks" + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/bauxite_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/recipes/bauxite_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..d7408f0f --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/bauxite_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "tfmg:stone_types/bauxite" + }, + "result": "tfmg:bauxite" +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/bauxite_pillar_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/recipes/bauxite_pillar_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..dbab2729 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/bauxite_pillar_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "tfmg:stone_types/bauxite" + }, + "result": "tfmg:bauxite_pillar" +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_slab.json b/src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_slab.json new file mode 100644 index 00000000..7e9b6110 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "cut_bauxite_brick_slab", + "key": { + "X": { + "item": "tfmg:cut_bauxite_bricks" + } + }, + "pattern": [ + "XXX" + ], + "result": { + "count": 6, + "item": "tfmg:cut_bauxite_brick_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_slab_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_slab_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..82519606 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_slab_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "tag": "tfmg:stone_types/bauxite" + }, + "result": "tfmg:cut_bauxite_brick_slab" +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_slab_recycling.json b/src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_slab_recycling.json new file mode 100644 index 00000000..443965fb --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_slab_recycling.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "tfmg:cut_bauxite_brick_slab" + }, + { + "item": "tfmg:cut_bauxite_brick_slab" + } + ], + "result": { + "item": "tfmg:cut_bauxite_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_stairs.json b/src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_stairs.json new file mode 100644 index 00000000..c8cd57be --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "cut_bauxite_brick_stairs", + "key": { + "X": { + "item": "tfmg:cut_bauxite_bricks" + } + }, + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "result": { + "count": 4, + "item": "tfmg:cut_bauxite_brick_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..fd25aaa1 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "tfmg:stone_types/bauxite" + }, + "result": "tfmg:cut_bauxite_brick_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_wall.json b/src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_wall.json new file mode 100644 index 00000000..4ee119a7 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_wall.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "key": { + "X": { + "item": "tfmg:cut_bauxite_bricks" + } + }, + "pattern": [ + "XXX", + "XXX" + ], + "result": { + "count": 6, + "item": "tfmg:cut_bauxite_brick_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_wall_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_wall_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..cbbba670 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/cut_bauxite_brick_wall_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "tfmg:stone_types/bauxite" + }, + "result": "tfmg:cut_bauxite_brick_wall" +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/cut_bauxite_bricks_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/recipes/cut_bauxite_bricks_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..2b915ab5 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/cut_bauxite_bricks_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "tfmg:stone_types/bauxite" + }, + "result": "tfmg:cut_bauxite_bricks" +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/cut_bauxite_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/recipes/cut_bauxite_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..8fc25b0f --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/cut_bauxite_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "tfmg:stone_types/bauxite" + }, + "result": "tfmg:cut_bauxite" +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/cut_bauxite_slab.json b/src/generated/resources/data/tfmg/recipes/cut_bauxite_slab.json new file mode 100644 index 00000000..4ce5bebc --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/cut_bauxite_slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "cut_bauxite_slab", + "key": { + "X": { + "item": "tfmg:cut_bauxite" + } + }, + "pattern": [ + "XXX" + ], + "result": { + "count": 6, + "item": "tfmg:cut_bauxite_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/cut_bauxite_slab_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/recipes/cut_bauxite_slab_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..f7319fa1 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/cut_bauxite_slab_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "tag": "tfmg:stone_types/bauxite" + }, + "result": "tfmg:cut_bauxite_slab" +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/cut_bauxite_slab_recycling.json b/src/generated/resources/data/tfmg/recipes/cut_bauxite_slab_recycling.json new file mode 100644 index 00000000..2aa94ac8 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/cut_bauxite_slab_recycling.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "tfmg:cut_bauxite_slab" + }, + { + "item": "tfmg:cut_bauxite_slab" + } + ], + "result": { + "item": "tfmg:cut_bauxite" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/cut_bauxite_stairs.json b/src/generated/resources/data/tfmg/recipes/cut_bauxite_stairs.json new file mode 100644 index 00000000..022fd22e --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/cut_bauxite_stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "cut_bauxite_stairs", + "key": { + "X": { + "item": "tfmg:cut_bauxite" + } + }, + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "result": { + "count": 4, + "item": "tfmg:cut_bauxite_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/cut_bauxite_stairs_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/recipes/cut_bauxite_stairs_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..7eba9d75 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/cut_bauxite_stairs_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "tfmg:stone_types/bauxite" + }, + "result": "tfmg:cut_bauxite_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/cut_bauxite_wall.json b/src/generated/resources/data/tfmg/recipes/cut_bauxite_wall.json new file mode 100644 index 00000000..703f941c --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/cut_bauxite_wall.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "key": { + "X": { + "item": "tfmg:cut_bauxite" + } + }, + "pattern": [ + "XXX", + "XXX" + ], + "result": { + "count": 6, + "item": "tfmg:cut_bauxite_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/cut_bauxite_wall_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/recipes/cut_bauxite_wall_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..cb930e93 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/cut_bauxite_wall_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "tfmg:stone_types/bauxite" + }, + "result": "tfmg:cut_bauxite_wall" +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/layered_bauxite_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/recipes/layered_bauxite_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..4a325a71 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/layered_bauxite_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "tfmg:stone_types/bauxite" + }, + "result": "tfmg:layered_bauxite" +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..0a7ee73b --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "tfmg:stone_types/bauxite" + }, + "result": "tfmg:polished_cut_bauxite" +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_slab.json b/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_slab.json new file mode 100644 index 00000000..b8ef9836 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "polished_cut_bauxite_slab", + "key": { + "X": { + "item": "tfmg:polished_cut_bauxite" + } + }, + "pattern": [ + "XXX" + ], + "result": { + "count": 6, + "item": "tfmg:polished_cut_bauxite_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_slab_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_slab_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..c9d0e8aa --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_slab_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "tag": "tfmg:stone_types/bauxite" + }, + "result": "tfmg:polished_cut_bauxite_slab" +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_slab_recycling.json b/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_slab_recycling.json new file mode 100644 index 00000000..70ec8875 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_slab_recycling.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "tfmg:polished_cut_bauxite_slab" + }, + { + "item": "tfmg:polished_cut_bauxite_slab" + } + ], + "result": { + "item": "tfmg:polished_cut_bauxite" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_stairs.json b/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_stairs.json new file mode 100644 index 00000000..d3e11707 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "polished_cut_bauxite_stairs", + "key": { + "X": { + "item": "tfmg:polished_cut_bauxite" + } + }, + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "result": { + "count": 4, + "item": "tfmg:polished_cut_bauxite_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_stairs_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_stairs_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..1f960e94 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_stairs_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "tfmg:stone_types/bauxite" + }, + "result": "tfmg:polished_cut_bauxite_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_wall.json b/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_wall.json new file mode 100644 index 00000000..f69491a3 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_wall.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "key": { + "X": { + "item": "tfmg:polished_cut_bauxite" + } + }, + "pattern": [ + "XXX", + "XXX" + ], + "result": { + "count": 6, + "item": "tfmg:polished_cut_bauxite_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_wall_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_wall_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..9615f1e0 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/polished_cut_bauxite_wall_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "tfmg:stone_types/bauxite" + }, + "result": "tfmg:polished_cut_bauxite_wall" +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/small_bauxite_brick_slab.json b/src/generated/resources/data/tfmg/recipes/small_bauxite_brick_slab.json new file mode 100644 index 00000000..ebd34d9a --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/small_bauxite_brick_slab.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "small_bauxite_brick_slab", + "key": { + "X": { + "item": "tfmg:small_bauxite_bricks" + } + }, + "pattern": [ + "XXX" + ], + "result": { + "count": 6, + "item": "tfmg:small_bauxite_brick_slab" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/small_bauxite_brick_slab_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/recipes/small_bauxite_brick_slab_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..71c122e2 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/small_bauxite_brick_slab_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 2, + "ingredient": { + "tag": "tfmg:stone_types/bauxite" + }, + "result": "tfmg:small_bauxite_brick_slab" +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/small_bauxite_brick_slab_recycling.json b/src/generated/resources/data/tfmg/recipes/small_bauxite_brick_slab_recycling.json new file mode 100644 index 00000000..62266244 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/small_bauxite_brick_slab_recycling.json @@ -0,0 +1,14 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "tfmg:small_bauxite_brick_slab" + }, + { + "item": "tfmg:small_bauxite_brick_slab" + } + ], + "result": { + "item": "tfmg:small_bauxite_bricks" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/small_bauxite_brick_stairs.json b/src/generated/resources/data/tfmg/recipes/small_bauxite_brick_stairs.json new file mode 100644 index 00000000..7295b4df --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/small_bauxite_brick_stairs.json @@ -0,0 +1,18 @@ +{ + "type": "minecraft:crafting_shaped", + "group": "small_bauxite_brick_stairs", + "key": { + "X": { + "item": "tfmg:small_bauxite_bricks" + } + }, + "pattern": [ + "X ", + "XX ", + "XXX" + ], + "result": { + "count": 4, + "item": "tfmg:small_bauxite_brick_stairs" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/small_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/recipes/small_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..ce303468 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/small_bauxite_brick_stairs_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "tfmg:stone_types/bauxite" + }, + "result": "tfmg:small_bauxite_brick_stairs" +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/small_bauxite_brick_wall.json b/src/generated/resources/data/tfmg/recipes/small_bauxite_brick_wall.json new file mode 100644 index 00000000..f87a2789 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/small_bauxite_brick_wall.json @@ -0,0 +1,16 @@ +{ + "type": "minecraft:crafting_shaped", + "key": { + "X": { + "item": "tfmg:small_bauxite_bricks" + } + }, + "pattern": [ + "XXX", + "XXX" + ], + "result": { + "count": 6, + "item": "tfmg:small_bauxite_brick_wall" + } +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/small_bauxite_brick_wall_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/recipes/small_bauxite_brick_wall_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..7d1f84b6 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/small_bauxite_brick_wall_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "tfmg:stone_types/bauxite" + }, + "result": "tfmg:small_bauxite_brick_wall" +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/recipes/small_bauxite_bricks_from_stone_types_bauxite_stonecutting.json b/src/generated/resources/data/tfmg/recipes/small_bauxite_bricks_from_stone_types_bauxite_stonecutting.json new file mode 100644 index 00000000..9c614555 --- /dev/null +++ b/src/generated/resources/data/tfmg/recipes/small_bauxite_bricks_from_stone_types_bauxite_stonecutting.json @@ -0,0 +1,8 @@ +{ + "type": "minecraft:stonecutting", + "count": 1, + "ingredient": { + "tag": "tfmg:stone_types/bauxite" + }, + "result": "tfmg:small_bauxite_bricks" +} \ No newline at end of file diff --git a/src/generated/resources/data/tfmg/tags/items/stone_types/bauxite.json b/src/generated/resources/data/tfmg/tags/items/stone_types/bauxite.json new file mode 100644 index 00000000..349b1b27 --- /dev/null +++ b/src/generated/resources/data/tfmg/tags/items/stone_types/bauxite.json @@ -0,0 +1,19 @@ +{ + "values": [ + "tfmg:cut_bauxite", + "tfmg:cut_bauxite_stairs", + "tfmg:cut_bauxite_wall", + "tfmg:polished_cut_bauxite", + "tfmg:polished_cut_bauxite_stairs", + "tfmg:polished_cut_bauxite_wall", + "tfmg:cut_bauxite_bricks", + "tfmg:cut_bauxite_brick_stairs", + "tfmg:cut_bauxite_brick_wall", + "tfmg:small_bauxite_bricks", + "tfmg:small_bauxite_brick_stairs", + "tfmg:small_bauxite_brick_wall", + "tfmg:layered_bauxite", + "tfmg:bauxite_pillar", + "tfmg:bauxite" + ] +} \ No newline at end of file diff --git a/src/main/java/com/drmangotea/tfmg/CreateTFMG.java b/src/main/java/com/drmangotea/tfmg/CreateTFMG.java index 135763fc..e06ac23c 100644 --- a/src/main/java/com/drmangotea/tfmg/CreateTFMG.java +++ b/src/main/java/com/drmangotea/tfmg/CreateTFMG.java @@ -3,24 +3,17 @@ package com.drmangotea.tfmg; import com.drmangotea.tfmg.base.TFMGLangPartials; import com.drmangotea.tfmg.content.gadgets.explosives.thermite_grenades.fire.TFMGColoredFires; import com.drmangotea.tfmg.registry.*; +import com.drmangotea.tfmg.worldgen.TFMGConfiguredFeatures; +import com.drmangotea.tfmg.worldgen.TFMGFeatures; import com.mojang.logging.LogUtils; -import com.simibubi.create.AllSoundEvents; -import com.simibubi.create.Create; -import com.simibubi.create.foundation.advancement.AllAdvancements; -import com.simibubi.create.foundation.data.AllLangPartials; import com.simibubi.create.foundation.data.CreateRegistrate; import com.simibubi.create.foundation.data.LangMerger; -import com.simibubi.create.foundation.data.TagGen; -import com.simibubi.create.foundation.data.recipe.MechanicalCraftingRecipeGen; -import com.simibubi.create.foundation.data.recipe.ProcessingRecipeGen; -import com.simibubi.create.foundation.data.recipe.SequencedAssemblyRecipeGen; -import com.simibubi.create.foundation.data.recipe.StandardRecipeGen; -import com.simibubi.create.foundation.ponder.PonderLocalization; -import com.tterrag.registrate.providers.ProviderType; import net.minecraft.client.renderer.ItemBlockRenderTypes; import net.minecraft.client.renderer.RenderType; +import net.minecraft.core.Holder; import net.minecraft.data.DataGenerator; import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.levelgen.placement.PlacedFeature; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.data.event.GatherDataEvent; @@ -31,6 +24,7 @@ import net.minecraftforge.fml.DistExecutor; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.event.server.ServerStartingEvent; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; +import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import org.slf4j.Logger; @@ -49,6 +43,8 @@ public class CreateTFMG IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); REGISTRATE.registerEventListeners(FMLJavaModLoadingContext.get().getModEventBus()); + + FMLJavaModLoadingContext.get().getModEventBus().addListener(this::commonSetup); // TFMGBlocks.register(); @@ -57,7 +53,10 @@ public class CreateTFMG TFMGEntityTypes.register(); TFMGCreativeModeTabs.init(); TFMGFluids.register(); + TFMGPaletteBlocks.register(); TFMGColoredFires.register(modEventBus); + TFMGFeatures.register(modEventBus); + // modEventBus.addListener(EventPriority.LOWEST, CreateTFMG::gatherData); DistExecutor.safeRunWhenOn(Dist.CLIENT, () -> CreateTFMGClient::new); @@ -72,6 +71,13 @@ public class CreateTFMG ItemBlockRenderTypes.setRenderLayer(TFMGColoredFires.GREEN_FIRE.get(), RenderType.cutout()); ItemBlockRenderTypes.setRenderLayer(TFMGColoredFires.BLUE_FIRE.get(), RenderType.cutout()); } + private void commonSetup(final FMLCommonSetupEvent event) { + event.enqueueWork(() -> { + final Holder initializeOil = TFMGConfiguredFeatures.OIL_PLACED; + final Holder initializeSimulatedOil = TFMGConfiguredFeatures.SIMULATED_OIL_PLACED; + + }); + } @SubscribeEvent public void onServerStarting(ServerStartingEvent event) { diff --git a/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPaletteBlockPartial.java b/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPaletteBlockPartial.java new file mode 100644 index 00000000..d0de527a --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPaletteBlockPartial.java @@ -0,0 +1,269 @@ +package com.drmangotea.tfmg.base.palettes; + +import static com.drmangotea.tfmg.CreateTFMG.REGISTRATE; +import static com.simibubi.create.foundation.data.TagGen.pickaxeOnly; + +import java.util.Arrays; +import java.util.function.Supplier; + +import com.drmangotea.tfmg.CreateTFMG; +import com.drmangotea.tfmg.registry.TFMGPaletteStoneTypes; +import com.simibubi.create.foundation.data.CreateRegistrate; +import com.simibubi.create.foundation.utility.Lang; +import com.tterrag.registrate.builders.BlockBuilder; +import com.tterrag.registrate.builders.ItemBuilder; +import com.tterrag.registrate.providers.DataGenContext; +import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import com.tterrag.registrate.providers.RegistrateRecipeProvider; +import com.tterrag.registrate.providers.loot.RegistrateBlockLootTables; +import com.tterrag.registrate.util.DataIngredient; +import com.tterrag.registrate.util.entry.BlockEntry; +import com.tterrag.registrate.util.nullness.NonnullType; + +import net.minecraft.data.recipes.ShapedRecipeBuilder; +import net.minecraft.data.recipes.ShapelessRecipeBuilder; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.SlabBlock; +import net.minecraft.world.level.block.StairBlock; +import net.minecraft.world.level.block.WallBlock; +import net.minecraft.world.level.block.state.BlockBehaviour.Properties; +import net.minecraftforge.client.model.generators.ModelFile; + +public abstract class TFMGPaletteBlockPartial { + + public static final TFMGPaletteBlockPartial STAIR = new TFMGPaletteBlockPartial.Stairs(); + public static final TFMGPaletteBlockPartial SLAB = new TFMGPaletteBlockPartial.Slab(false); + public static final TFMGPaletteBlockPartial UNIQUE_SLAB = new TFMGPaletteBlockPartial.Slab(true); + public static final TFMGPaletteBlockPartial WALL = new TFMGPaletteBlockPartial.Wall(); + + public static final TFMGPaletteBlockPartial[] ALL_PARTIALS = { STAIR, SLAB, WALL }; + public static final TFMGPaletteBlockPartial[] FOR_POLISHED = { STAIR, UNIQUE_SLAB, WALL }; + + private String name; + + private TFMGPaletteBlockPartial(String name) { + this.name = name; + } + + public @NonnullType BlockBuilder create(String variantName, TFMGPaletteBlockPattern pattern, + BlockEntry block, TFMGPaletteStoneTypes variant) { + String patternName = Lang.nonPluralId(pattern.createName(variantName)); + String blockName = patternName + "_" + this.name; + + BlockBuilder blockBuilder = REGISTRATE + .block(blockName, p -> createBlock(block)) + .blockstate((c, p) -> generateBlockState(c, p, variantName, pattern, block)) + .recipe((c, p) -> createRecipes(variant, block, c, p)) + .transform(b -> transformBlock(b, variantName, pattern)); + + ItemBuilder> itemBuilder = blockBuilder.item() + .transform(b -> transformItem(b, variantName, pattern)); + + if (canRecycle()) + itemBuilder.tag(variant.materialTag); + + return itemBuilder.build(); + } + + protected ResourceLocation getTexture(String variantName, TFMGPaletteBlockPattern pattern, int index) { + return TFMGPaletteBlockPattern.toLocation(variantName, pattern.getTexture(index)); + } + + protected BlockBuilder transformBlock(BlockBuilder builder, + String variantName, TFMGPaletteBlockPattern pattern) { + getBlockTags().forEach(builder::tag); + return builder.transform(pickaxeOnly()); + } + + protected ItemBuilder> transformItem( + ItemBuilder> builder, String variantName, + TFMGPaletteBlockPattern pattern) { + getItemTags().forEach(builder::tag); + return builder; + } + + protected boolean canRecycle() { + return true; + } + + protected abstract Iterable> getBlockTags(); + + protected abstract Iterable> getItemTags(); + + protected abstract B createBlock(Supplier block); + + protected abstract void createRecipes(TFMGPaletteStoneTypes type, BlockEntry patternBlock, + DataGenContext c, RegistrateRecipeProvider p); + + protected abstract void generateBlockState(DataGenContext ctx, RegistrateBlockstateProvider prov, + String variantName, TFMGPaletteBlockPattern pattern, Supplier block); + + private static class Stairs extends TFMGPaletteBlockPartial { + + public Stairs() { + super("stairs"); + } + + @Override + protected StairBlock createBlock(Supplier block) { + return new StairBlock(() -> block.get() + .defaultBlockState(), Properties.copy(block.get())); + } + + @Override + protected void generateBlockState(DataGenContext ctx, RegistrateBlockstateProvider prov, + String variantName, TFMGPaletteBlockPattern pattern, Supplier block) { + prov.stairsBlock(ctx.get(), getTexture(variantName, pattern, 0)); + } + + @Override + protected Iterable> getBlockTags() { + return Arrays.asList(BlockTags.STAIRS); + } + + @Override + protected Iterable> getItemTags() { + return Arrays.asList(ItemTags.STAIRS); + } + + @Override + protected void createRecipes(TFMGPaletteStoneTypes type, BlockEntry patternBlock, + DataGenContext c, RegistrateRecipeProvider p) { + p.stairs(DataIngredient.items(patternBlock), c::get, c.getName(), false); + p.stonecutting(DataIngredient.tag(type.materialTag), c::get, 1); + } + + } + + private static class Slab extends TFMGPaletteBlockPartial { + + private boolean customSide; + + public Slab(boolean customSide) { + super("slab"); + this.customSide = customSide; + } + + @Override + protected SlabBlock createBlock(Supplier block) { + return new SlabBlock(Properties.copy(block.get())); + } + + @Override + protected boolean canRecycle() { + return false; + } + + @Override + protected void generateBlockState(DataGenContext ctx, RegistrateBlockstateProvider prov, + String variantName, TFMGPaletteBlockPattern pattern, Supplier block) { + String name = ctx.getName(); + ResourceLocation mainTexture = getTexture(variantName, pattern, 0); + ResourceLocation sideTexture = customSide ? getTexture(variantName, pattern, 1) : mainTexture; + + ModelFile bottom = prov.models() + .slab(name, sideTexture, mainTexture, mainTexture); + ModelFile top = prov.models() + .slabTop(name + "_top", sideTexture, mainTexture, mainTexture); + ModelFile doubleSlab; + + if (customSide) { + doubleSlab = prov.models() + .cubeColumn(name + "_double", sideTexture, mainTexture); + } else { + doubleSlab = prov.models() + .getExistingFile(prov.modLoc(pattern.createName(variantName))); + } + + prov.slabBlock(ctx.get(), bottom, top, doubleSlab); + } + + @Override + protected Iterable> getBlockTags() { + return Arrays.asList(BlockTags.SLABS); + } + + @Override + protected Iterable> getItemTags() { + return Arrays.asList(ItemTags.SLABS); + } + + @Override + protected void createRecipes(TFMGPaletteStoneTypes type, BlockEntry patternBlock, + DataGenContext c, RegistrateRecipeProvider p) { + p.slab(DataIngredient.items(patternBlock), c::get, c.getName(), false); + p.stonecutting(DataIngredient.tag(type.materialTag), c::get, 2); + DataIngredient ingredient = DataIngredient.items(c.get()); + ShapelessRecipeBuilder.shapeless(patternBlock.get()) + .requires(ingredient) + .requires(ingredient) + .unlockedBy("has_" + c.getName(), ingredient.getCritereon(p)) + .save(p, CreateTFMG.MOD_ID + ":" + c.getName() + "_recycling"); + } + + @Override + protected BlockBuilder transformBlock( + BlockBuilder builder, String variantName, TFMGPaletteBlockPattern pattern) { + builder.loot((lt, block) -> lt.add(block, RegistrateBlockLootTables.createSlabItemTable(block))); + return super.transformBlock(builder, variantName, pattern); + } + + } + + private static class Wall extends TFMGPaletteBlockPartial { + + public Wall() { + super("wall"); + } + + @Override + protected WallBlock createBlock(Supplier block) { + return new WallBlock(Properties.copy(block.get())); + } + + @Override + protected ItemBuilder> transformItem( + ItemBuilder> builder, String variantName, + TFMGPaletteBlockPattern pattern) { + builder.model((c, p) -> p.wallInventory(c.getName(), getTexture(variantName, pattern, 0))); + return super.transformItem(builder, variantName, pattern); + } + + @Override + protected void generateBlockState(DataGenContext ctx, RegistrateBlockstateProvider prov, + String variantName, TFMGPaletteBlockPattern pattern, Supplier block) { + prov.wallBlock(ctx.get(), pattern.createName(variantName), getTexture(variantName, pattern, 0)); + } + + @Override + protected Iterable> getBlockTags() { + return Arrays.asList(BlockTags.WALLS); + } + + @Override + protected Iterable> getItemTags() { + return Arrays.asList(ItemTags.WALLS); + } + + @Override + protected void createRecipes(TFMGPaletteStoneTypes type, BlockEntry patternBlock, + DataGenContext c, RegistrateRecipeProvider p) { + p.stonecutting(DataIngredient.tag(type.materialTag), c::get, 1); + DataIngredient ingredient = DataIngredient.items(patternBlock); + ShapedRecipeBuilder.shaped(c.get(), 6) + .pattern("XXX") + .pattern("XXX") + .define('X', ingredient) + .unlockedBy("has_" + p.safeName(ingredient), ingredient.getCritereon(p)) + .save(p, p.safeId(c.get())); + } + + } + +} \ No newline at end of file diff --git a/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPaletteBlockPattern.java b/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPaletteBlockPattern.java new file mode 100644 index 00000000..65c1513f --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPaletteBlockPattern.java @@ -0,0 +1,270 @@ +package com.drmangotea.tfmg.base.palettes; + + +import com.drmangotea.tfmg.CreateTFMG; +import com.simibubi.create.content.decoration.palettes.ConnectedPillarBlock; +import com.simibubi.create.foundation.block.connected.*; +import com.tterrag.registrate.providers.DataGenContext; +import com.tterrag.registrate.providers.RegistrateBlockstateProvider; +import com.tterrag.registrate.providers.RegistrateRecipeProvider; +import com.tterrag.registrate.util.nullness.NonNullBiConsumer; +import com.tterrag.registrate.util.nullness.NonNullFunction; +import com.tterrag.registrate.util.nullness.NonNullSupplier; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.core.Direction; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; +import net.minecraftforge.client.model.generators.ConfiguredModel; + +import java.util.Optional; +import java.util.function.Function; +import java.util.function.Supplier; + +import static com.drmangotea.tfmg.base.palettes.TFMGPaletteBlockPartial.ALL_PARTIALS; +import static com.drmangotea.tfmg.base.palettes.TFMGPaletteBlockPartial.FOR_POLISHED; +import static com.drmangotea.tfmg.base.palettes.TFMGPaletteBlockPattern.PatternNameType.*; + + +public class TFMGPaletteBlockPattern { + + public static final TFMGPaletteBlockPattern + + CUT = + create("cut", PREFIX, ALL_PARTIALS), + + BRICKS = create("cut_bricks", WRAP, ALL_PARTIALS).textures("brick"), + + SMALL_BRICKS = create("small_bricks", WRAP, ALL_PARTIALS).textures("small_brick"), + + POLISHED = create("polished_cut", PREFIX, FOR_POLISHED).textures("polished", "slab"), + + LAYERED = create("layered", PREFIX).blockStateFactory(p -> p::cubeColumn) + .textures("layered", "cap") + .connectedTextures(v -> new HorizontalCTBehaviour(ct(v, TFMGPaletteBlockPattern.CTs.LAYERED), ct(v, TFMGPaletteBlockPattern.CTs.CAP))), + + PILLAR = create("pillar", SUFFIX).blockStateFactory(p -> p::pillar) + .block(ConnectedPillarBlock::new) + .textures("pillar", "cap") + .connectedTextures(v -> new RotatedPillarCTBehaviour(ct(v, TFMGPaletteBlockPattern.CTs.PILLAR), ct(v, TFMGPaletteBlockPattern.CTs.CAP))) + + ; + + public static final TFMGPaletteBlockPattern[] VANILLA_RANGE = { CUT, POLISHED, BRICKS, SMALL_BRICKS, LAYERED, PILLAR }; + + public static final TFMGPaletteBlockPattern[] STANDARD_RANGE = { CUT, POLISHED, BRICKS, SMALL_BRICKS, LAYERED, PILLAR }; + + static final String TEXTURE_LOCATION = "block/palettes/stone_types/%s/%s"; + + private TFMGPaletteBlockPattern.PatternNameType nameType; + private String[] textures; + private String id; + private boolean isTranslucent; + private TagKey[] blockTags; + private TagKey[] itemTags; + private Optional> ctFactory; + + private TFMGPaletteBlockPattern.IPatternBlockStateGenerator blockStateGenerator; + private NonNullFunction blockFactory; + private NonNullFunction, NonNullBiConsumer, RegistrateRecipeProvider>> additionalRecipes; + private TFMGPaletteBlockPartial[] partials; + + @OnlyIn(Dist.CLIENT) + private RenderType renderType; + + private static TFMGPaletteBlockPattern create(String name, TFMGPaletteBlockPattern.PatternNameType nameType, + TFMGPaletteBlockPartial... partials) { + TFMGPaletteBlockPattern pattern = new TFMGPaletteBlockPattern(); + pattern.id = name; + pattern.ctFactory = Optional.empty(); + pattern.nameType = nameType; + pattern.partials = partials; + pattern.additionalRecipes = $ -> NonNullBiConsumer.noop(); + pattern.isTranslucent = false; + pattern.blockFactory = Block::new; + pattern.textures = new String[] { name }; + pattern.blockStateGenerator = p -> p::cubeAll; + return pattern; + } + + public TFMGPaletteBlockPattern.IPatternBlockStateGenerator getBlockStateGenerator() { + return blockStateGenerator; + } + + public boolean isTranslucent() { + return isTranslucent; + } + + public TagKey[] getBlockTags() { + return blockTags; + } + + public TagKey[] getItemTags() { + return itemTags; + } + + public NonNullFunction getBlockFactory() { + return blockFactory; + } + + public TFMGPaletteBlockPartial[] getPartials() { + return partials; + } + + public String getTexture(int index) { + return textures[index]; + } + + public void addRecipes(NonNullSupplier baseBlock, DataGenContext c, + RegistrateRecipeProvider p) { + additionalRecipes.apply(baseBlock) + .accept(c, p); + } + + public Optional> createCTBehaviour(String variant) { + return ctFactory.map(d -> () -> d.apply(variant)); + } + + // Builder + + private TFMGPaletteBlockPattern blockStateFactory(TFMGPaletteBlockPattern.IPatternBlockStateGenerator factory) { + blockStateGenerator = factory; + return this; + } + + private TFMGPaletteBlockPattern textures(String... textures) { + this.textures = textures; + return this; + } + + private TFMGPaletteBlockPattern block(NonNullFunction blockFactory) { + this.blockFactory = blockFactory; + return this; + } + + private TFMGPaletteBlockPattern connectedTextures(Function factory) { + this.ctFactory = Optional.of(factory); + return this; + } + + // Model generators + + public TFMGPaletteBlockPattern.IBlockStateProvider cubeAll(String variant) { + ResourceLocation all = toLocation(variant, textures[0]); + return (ctx, prov) -> prov.simpleBlock(ctx.get(), prov.models() + .cubeAll(createName(variant), all)); + } + + public TFMGPaletteBlockPattern.IBlockStateProvider cubeBottomTop(String variant) { + ResourceLocation side = toLocation(variant, textures[0]); + ResourceLocation bottom = toLocation(variant, textures[1]); + ResourceLocation top = toLocation(variant, textures[2]); + return (ctx, prov) -> prov.simpleBlock(ctx.get(), prov.models() + .cubeBottomTop(createName(variant), side, bottom, top)); + } + + public TFMGPaletteBlockPattern.IBlockStateProvider pillar(String variant) { + ResourceLocation side = toLocation(variant, textures[0]); + ResourceLocation end = toLocation(variant, textures[1]); + + return (ctx, prov) -> prov.getVariantBuilder(ctx.getEntry()) + .forAllStatesExcept(state -> { + Direction.Axis axis = state.getValue(BlockStateProperties.AXIS); + if (axis == Direction.Axis.Y) + return ConfiguredModel.builder() + .modelFile(prov.models() + .cubeColumn(createName(variant), side, end)) + .uvLock(false) + .build(); + return ConfiguredModel.builder() + .modelFile(prov.models() + .cubeColumnHorizontal(createName(variant) + "_horizontal", side, end)) + .uvLock(false) + .rotationX(90) + .rotationY(axis == Direction.Axis.X ? 90 : 0) + .build(); + }, BlockStateProperties.WATERLOGGED, ConnectedPillarBlock.NORTH, ConnectedPillarBlock.SOUTH, + ConnectedPillarBlock.EAST, ConnectedPillarBlock.WEST); + } + + public TFMGPaletteBlockPattern.IBlockStateProvider cubeColumn(String variant) { + ResourceLocation side = toLocation(variant, textures[0]); + ResourceLocation end = toLocation(variant, textures[1]); + return (ctx, prov) -> prov.simpleBlock(ctx.get(), prov.models() + .cubeColumn(createName(variant), side, end)); + } + + // Utility + + protected String createName(String variant) { + if (nameType == WRAP) { + String[] split = id.split("_"); + if (split.length == 2) { + String formatString = "%s_%s_%s"; + return String.format(formatString, split[0], variant, split[1]); + } + } + String formatString = "%s_%s"; + return nameType == SUFFIX ? String.format(formatString, variant, id) : String.format(formatString, id, variant); + } + + protected static ResourceLocation toLocation(String variant, String texture) { + return CreateTFMG.asResource( + String.format(TEXTURE_LOCATION, texture, variant + (texture.equals("cut") ? "_" : "_cut_") + texture)); + } + + protected static CTSpriteShiftEntry ct(String variant, TFMGPaletteBlockPattern.CTs texture) { + ResourceLocation resLoc = texture.srcFactory.apply(variant); + ResourceLocation resLocTarget = texture.targetFactory.apply(variant); + return CTSpriteShifter.getCT(texture.type, resLoc, + new ResourceLocation(resLocTarget.getNamespace(), resLocTarget.getPath() + "_connected")); + } + + @FunctionalInterface + static interface IPatternBlockStateGenerator + extends Function> { + } + + @FunctionalInterface + static interface IBlockStateProvider + extends NonNullBiConsumer, RegistrateBlockstateProvider> { + } + + enum PatternNameType { + PREFIX, SUFFIX, WRAP + } + + // Textures with connectability, used by Spriteshifter + + public enum CTs { + + PILLAR(AllCTTypes.RECTANGLE, s -> toLocation(s, "pillar")), + CAP(AllCTTypes.OMNIDIRECTIONAL, s -> toLocation(s, "cap")), + LAYERED(AllCTTypes.HORIZONTAL_KRYPPERS, s -> toLocation(s, "layered")) + + ; + + public CTType type; + private Function srcFactory; + private Function targetFactory; + + private CTs(CTType type, Function factory) { + this(type, factory, factory); + } + + private CTs(CTType type, Function srcFactory, + Function targetFactory) { + this.type = type; + this.srcFactory = srcFactory; + this.targetFactory = targetFactory; + } + + } + +} + diff --git a/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPalettesVariantEntry.java b/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPalettesVariantEntry.java new file mode 100644 index 00000000..842abedd --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/base/palettes/TFMGPalettesVariantEntry.java @@ -0,0 +1,84 @@ +package com.drmangotea.tfmg.base.palettes; + +import com.drmangotea.tfmg.registry.TFMGPaletteStoneTypes; +import com.google.common.collect.ImmutableList; +import com.simibubi.create.foundation.data.CreateRegistrate; +import com.tterrag.registrate.builders.BlockBuilder; +import com.tterrag.registrate.builders.ItemBuilder; +import com.tterrag.registrate.providers.ProviderType; +import com.tterrag.registrate.util.DataIngredient; +import com.tterrag.registrate.util.entry.BlockEntry; +import com.tterrag.registrate.util.nullness.NonNullSupplier; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; + + +import static com.drmangotea.tfmg.CreateTFMG.REGISTRATE; +import static com.simibubi.create.foundation.data.CreateRegistrate.connectedTextures; +import static com.simibubi.create.foundation.data.TagGen.pickaxeOnly; + +@SuppressWarnings("'onRegister(com.tterrag.registrate.util.nullness.NonNullConsumer>)' in 'com.tterrag.registrate.builders.Builder' cannot be applied to '(com.tterrag.registrate.util.nullness.NonNullConsumer>>)'") +public class TFMGPalettesVariantEntry { + + public final ImmutableList> registeredBlocks; + public final ImmutableList> registeredPartials; + + public TFMGPalettesVariantEntry(String name, TFMGPaletteStoneTypes paletteStoneVariants) { + ImmutableList.Builder> registeredBlocks = ImmutableList.builder(); + ImmutableList.Builder> registeredPartials = ImmutableList.builder(); + NonNullSupplier baseBlock = paletteStoneVariants.baseBlock; + + for (TFMGPaletteBlockPattern pattern : paletteStoneVariants.variantTypes) { + BlockBuilder builder = + REGISTRATE.block(pattern.createName(name), pattern.getBlockFactory()) + .initialProperties(baseBlock) + .transform(pickaxeOnly()) + .blockstate(pattern.getBlockStateGenerator() + .apply(pattern) + .apply(name)::accept); + + ItemBuilder> itemBuilder = + builder.item(); + + TagKey[] blockTags = pattern.getBlockTags(); + if (blockTags != null) + builder.tag(blockTags); + TagKey[] itemTags = pattern.getItemTags(); + if (itemTags != null) + itemBuilder.tag(itemTags); + + itemBuilder.tag(paletteStoneVariants.materialTag); + + if (pattern.isTranslucent()) + builder.addLayer(() -> RenderType::translucent); + pattern.createCTBehaviour(name) + .ifPresent(b -> builder.onRegister(connectedTextures(b))); + + builder.recipe((c, p) -> { + p.stonecutting(DataIngredient.tag(paletteStoneVariants.materialTag), c); + pattern.addRecipes(baseBlock, c, p); + }); + + itemBuilder.register(); + BlockEntry block = builder.register(); + registeredBlocks.add(block); + + for (TFMGPaletteBlockPartial partialBlock : pattern.getPartials()) + registeredPartials.add(partialBlock.create(name, pattern, block, paletteStoneVariants) + .register()); + } + + REGISTRATE.addDataGenerator(ProviderType.RECIPE, + p -> p.stonecutting(DataIngredient.tag(paletteStoneVariants.materialTag), baseBlock)); + REGISTRATE.addDataGenerator(ProviderType.ITEM_TAGS, p -> p.tag(paletteStoneVariants.materialTag) + .add(baseBlock.get() + .asItem())); + + this.registeredBlocks = registeredBlocks.build(); + this.registeredPartials = registeredPartials.build(); + } + +} diff --git a/src/main/java/com/drmangotea/tfmg/content/deposits/FluidDepositBlock.java b/src/main/java/com/drmangotea/tfmg/content/deposits/FluidDepositBlock.java new file mode 100644 index 00000000..892c16a7 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/content/deposits/FluidDepositBlock.java @@ -0,0 +1,25 @@ +package com.drmangotea.tfmg.content.deposits; + + + +import com.drmangotea.tfmg.registry.TFMGBlockEntities; +import com.simibubi.create.foundation.block.IBE; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.entity.BlockEntityType; + +public class FluidDepositBlock extends Block implements IBE { + + public FluidDepositBlock(Properties p_49795_) { + super(p_49795_); + } + + @Override + public Class getBlockEntityClass() { + return FluidDepositTileEntity.class; + } + + @Override + public BlockEntityType getBlockEntityType() { + return TFMGBlockEntities.OIL_DEPOSIT.get(); + } +} diff --git a/src/main/java/com/drmangotea/tfmg/content/deposits/FluidDepositTileEntity.java b/src/main/java/com/drmangotea/tfmg/content/deposits/FluidDepositTileEntity.java new file mode 100644 index 00000000..c5e9922e --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/content/deposits/FluidDepositTileEntity.java @@ -0,0 +1,54 @@ +package com.drmangotea.tfmg.content.deposits; + + + +import com.drmangotea.tfmg.CreateTFMG; +import com.drmangotea.tfmg.registry.TFMGFluids; +import com.simibubi.create.Create; +import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; +import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; +import net.minecraft.core.BlockPos; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.level.block.entity.BlockEntityType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.material.Fluid; + +import java.util.List; + +public class FluidDepositTileEntity extends SmartBlockEntity { + + public final int baseFluidAmount= Create.RANDOM.nextInt(300000000); + public final int fluidAmountToBuckets =baseFluidAmount/1000; + public int fluidAmount= fluidAmountToBuckets; + + public FluidDepositTileEntity(BlockEntityType type, BlockPos pos, BlockState state) { + super(type, pos, state); + CreateTFMG.LOGGER.debug("Created Oil Deposit with "+baseFluidAmount+" buckets of Crude Oil"); + } + + @Override + public void addBehaviours(List behaviours) { + + } + + @Override + public void write(CompoundTag compound, boolean clientPacket) { + + compound.putInt("FluidAmount", baseFluidAmount); + + super.write(compound, clientPacket); + + } + @Override + protected void read(CompoundTag compound, boolean clientPacket) { + super.read(compound, clientPacket); + + + fluidAmount = compound.getInt("FluidAmount"); + + } + public Fluid getDepositFluid(){ + return TFMGFluids.CRUDE_OIL.getSource(); + } + +} diff --git a/src/main/java/com/drmangotea/tfmg/content/fluids/BurnableFluid.java b/src/main/java/com/drmangotea/tfmg/content/fluids/BurnableFluid.java new file mode 100644 index 00000000..cb4dcd42 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/content/fluids/BurnableFluid.java @@ -0,0 +1,88 @@ +package com.drmangotea.tfmg.content.fluids; + +import net.minecraft.core.BlockPos; +import net.minecraft.util.RandomSource; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.StateDefinition; +import net.minecraft.world.level.material.Fluid; +import net.minecraft.world.level.material.FluidState; +import net.minecraftforge.fluids.ForgeFlowingFluid; + +public class BurnableFluid extends ForgeFlowingFluid { + + + protected BurnableFluid(Properties properties) { + super(properties); + } + + @Override + public boolean isSource(FluidState p_76140_) { + return true; + } + + @Override + public int getAmount(FluidState p_164509_) { + return 8; + } + + @Override + public void randomTick(Level level, BlockPos pos, FluidState p_230574_, RandomSource randomSource) { + //level.setBlock(pos,Blocks.FIRE.defaultBlockState(),3); + // if (!level.isClientSide) { + + // Direction checkedDirection=Direction.NORTH; + // for(int i = 0; i < 4; i++) { + + // checkedDirection=checkedDirection.getClockWise(); + + // BlockPos checkedPos = pos.relative(checkedDirection); + + // if(level.getBlockEntity(checkedPos).getBlockState().is(Blocks.FIRE)) { + // level.explode(null, pos.getX(), pos.getY(), pos.getZ(), 2.0F, Explosion.BlockInteraction.NONE); + // level.setBlock(pos,Blocks.FIRE.defaultBlockState(),3); + + // } + // } + // } + } + + protected boolean isRandomlyTicking() { + return true; + } + + + // + public static class Flowing extends BurnableFluid { + public Flowing(Properties properties) { + super(properties); + } + + protected void createFluidStateDefinition(StateDefinition.Builder p_76260_) { + super.createFluidStateDefinition(p_76260_); + p_76260_.add(LEVEL); + } + + public int getAmount(FluidState p_76264_) { + return p_76264_.getValue(LEVEL); + } + + public boolean isSource(FluidState p_76262_) { + return false; + } + } + + public static class Source extends BurnableFluid { + public Source(Properties properties) { + super(properties); + } + + public int getAmount(FluidState p_76269_) { + return 8; + } + + public boolean isSource(FluidState p_76267_) { + return true; + } + } +} diff --git a/src/main/java/com/drmangotea/tfmg/content/items/TFMGFuelItem.java b/src/main/java/com/drmangotea/tfmg/content/items/TFMGFuelItem.java new file mode 100644 index 00000000..62a92de4 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/content/items/TFMGFuelItem.java @@ -0,0 +1,32 @@ +package com.drmangotea.tfmg.content.items; + +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.crafting.RecipeType; +import net.minecraft.world.level.block.Block; +import org.jetbrains.annotations.Nullable; + +public class TFMGFuelItem extends BlockItem { + + private final int burnTicks; + + + public static TFMGFuelItem fossilstone(Block block,Properties properties) { + return new TFMGFuelItem(block,properties, 4000); + } + public static TFMGFuelItem coal_coke(Block block,Properties properties){ + return new TFMGFuelItem(block,properties,3200); + } + public TFMGFuelItem(Block p_40565_, Properties p_40566_,int burnTime) { + super(p_40565_, p_40566_); + this.burnTicks = burnTime; + } + + + + @Override + public int getBurnTime(ItemStack itemStack, @Nullable RecipeType recipeType) { + return burnTicks; + } +} diff --git a/src/main/java/com/drmangotea/tfmg/mixins/AllOreFeatureConfigEntriesMixin.java b/src/main/java/com/drmangotea/tfmg/mixins/AllOreFeatureConfigEntriesMixin.java new file mode 100644 index 00000000..c353b802 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/mixins/AllOreFeatureConfigEntriesMixin.java @@ -0,0 +1,127 @@ +package com.drmangotea.tfmg.mixins; + + +import com.drmangotea.tfmg.worldgen.TFMGLayeredPatterns; +import com.simibubi.create.Create; +import com.simibubi.create.foundation.data.DynamicDataProvider; +import com.simibubi.create.infrastructure.worldgen.AllLayerPatterns; +import com.simibubi.create.infrastructure.worldgen.AllOreFeatureConfigEntries; +import com.simibubi.create.infrastructure.worldgen.OreFeatureConfigEntry; +import net.minecraft.core.Registry; +import net.minecraft.core.RegistryAccess; +import net.minecraft.data.DataGenerator; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BiomeTags; +import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; +import net.minecraft.world.level.levelgen.placement.PlacedFeature; +import net.minecraftforge.common.ForgeConfigSpec; +import net.minecraftforge.common.world.BiomeModifier; +import net.minecraftforge.data.event.GatherDataEvent; +import net.minecraftforge.registries.ForgeRegistries; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; + +import java.util.HashMap; +import java.util.Map; + +@Mixin(AllOreFeatureConfigEntries.class) +public class AllOreFeatureConfigEntriesMixin { + + @Shadow + public static final OreFeatureConfigEntry STRIATED_ORES_OVERWORLD = + create("striated_ores_overworld", 32, 1 / 18f, -30, 70) + .layeredDatagenExt() + .withLayerPattern(TFMGLayeredPatterns.BAUXITE) + .withLayerPattern(TFMGLayeredPatterns.LIGNITE) + .withLayerPattern(TFMGLayeredPatterns.GALENA) + .withLayerPattern(AllLayerPatterns.SCORIA) + .withLayerPattern(AllLayerPatterns.CINNABAR) + .withLayerPattern(AllLayerPatterns.MAGNETITE) + .withLayerPattern(AllLayerPatterns.MALACHITE) + .withLayerPattern(AllLayerPatterns.LIMESTONE) + .withLayerPattern(AllLayerPatterns.OCHRESTONE) + .biomeTag(BiomeTags.IS_OVERWORLD) + .parent(); + @Shadow + public static final OreFeatureConfigEntry STRIATED_ORES_NETHER = + create("striated_ores_nether", 32, 1 / 18f, 40, 90) + .layeredDatagenExt() + .withLayerPattern(TFMGLayeredPatterns.SULFUR) + .withLayerPattern(AllLayerPatterns.SCORIA_NETHER) + .withLayerPattern(AllLayerPatterns.SCORCHIA_NETHER) + .biomeTag(BiomeTags.IS_NETHER) + .parent(); + + // + + private static OreFeatureConfigEntry create(String name, int clusterSize, float frequency, + int minHeight, int maxHeight) { + ResourceLocation id = Create.asResource(name); + OreFeatureConfigEntry configDrivenFeatureEntry = new OreFeatureConfigEntry(id, clusterSize, frequency, minHeight, maxHeight); + return configDrivenFeatureEntry; + } + @Shadow + public static void fillConfig(ForgeConfigSpec.Builder builder, String namespace) { + OreFeatureConfigEntry.ALL + .forEach((id, entry) -> { + if (id.getNamespace().equals(namespace)) { + builder.push(entry.getName()); + entry.addToConfig(builder); + builder.pop(); + } + }); + } + @Shadow + public static void init() {} + @Shadow + public static void gatherData(GatherDataEvent event) { + DataGenerator generator = event.getGenerator(); + RegistryAccess registryAccess = RegistryAccess.BUILTIN.get(); + + // + + Map> configuredFeatures = new HashMap<>(); + for (Map.Entry entry : OreFeatureConfigEntry.ALL.entrySet()) { + OreFeatureConfigEntry.DatagenExtension datagenExt = entry.getValue().datagenExt(); + if (datagenExt != null) { + configuredFeatures.put(entry.getKey(), datagenExt.createConfiguredFeature(registryAccess)); + } + } + + DynamicDataProvider> configuredFeatureProvider = DynamicDataProvider.create(generator, "Create's Configured Features", registryAccess, Registry.CONFIGURED_FEATURE_REGISTRY, configuredFeatures); + if (configuredFeatureProvider != null) { + generator.addProvider(true, configuredFeatureProvider); + } + + // + + Map placedFeatures = new HashMap<>(); + for (Map.Entry entry : OreFeatureConfigEntry.ALL.entrySet()) { + OreFeatureConfigEntry.DatagenExtension datagenExt = entry.getValue().datagenExt(); + if (datagenExt != null) { + placedFeatures.put(entry.getKey(), datagenExt.createPlacedFeature(registryAccess)); + } + } + + DynamicDataProvider placedFeatureProvider = DynamicDataProvider.create(generator, "Create's Placed Features", registryAccess, Registry.PLACED_FEATURE_REGISTRY, placedFeatures); + if (placedFeatureProvider != null) { + generator.addProvider(true, placedFeatureProvider); + } + + // + + Map biomeModifiers = new HashMap<>(); + for (Map.Entry entry : OreFeatureConfigEntry.ALL.entrySet()) { + OreFeatureConfigEntry.DatagenExtension datagenExt = entry.getValue().datagenExt(); + if (datagenExt != null) { + biomeModifiers.put(entry.getKey(), datagenExt.createBiomeModifier(registryAccess)); + } + } + + DynamicDataProvider biomeModifierProvider = DynamicDataProvider.create(generator, "Create's Biome Modifiers", registryAccess, ForgeRegistries.Keys.BIOME_MODIFIERS, biomeModifiers); + if (biomeModifierProvider != null) { + generator.addProvider(true, biomeModifierProvider); + } + } +} + diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java index d0b99d57..11a5d46c 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlockEntities.java @@ -3,6 +3,7 @@ package com.drmangotea.tfmg.registry; import com.drmangotea.tfmg.CreateTFMG; import com.drmangotea.tfmg.content.concrete.formwork.FormWorkBlockEntity; import com.drmangotea.tfmg.content.concrete.formwork.FormWorkRenderer; +import com.drmangotea.tfmg.content.deposits.FluidDepositTileEntity; import com.simibubi.create.content.fluids.pipes.FluidPipeBlockEntity; import com.simibubi.create.content.fluids.pipes.StraightPipeBlockEntity; import com.simibubi.create.content.fluids.pipes.TransparentStraightPipeRenderer; @@ -28,6 +29,10 @@ public class TFMGBlockEntities { .renderer(() -> FormWorkRenderer::new) .validBlocks(TFMGBlocks.FORMWORK_BLOCK) .register(); + public static final BlockEntityEntry OIL_DEPOSIT = REGISTRATE + .blockEntity("oil_deposit", FluidDepositTileEntity::new) + // .validBlocks(TFMGBlocks.OIL_DEPOSIT) + .register(); diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java index b6304601..f9ead1cc 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGBlocks.java @@ -4,7 +4,10 @@ import com.drmangotea.tfmg.base.TFMGBuilderTransformers; import com.drmangotea.tfmg.base.TFMGSpriteShifts; import com.drmangotea.tfmg.content.concrete.formwork.FormWorkBlock; import com.drmangotea.tfmg.content.concrete.formwork.FormWorkGenerator; +import com.drmangotea.tfmg.content.deposits.FluidDepositBlock; import com.drmangotea.tfmg.content.gadgets.explosives.napalm.NapalmBombBlock; +import com.drmangotea.tfmg.content.gadgets.explosives.thermite_grenades.ThermiteGrenadeItem; +import com.drmangotea.tfmg.content.items.TFMGFuelItem; import com.simibubi.create.content.decoration.encasing.CasingBlock; import com.simibubi.create.content.decoration.encasing.EncasedCTBehaviour; import com.simibubi.create.content.logistics.chute.ChuteGenerator; @@ -24,6 +27,7 @@ import static com.drmangotea.tfmg.CreateTFMG.REGISTRATE; import static com.simibubi.create.foundation.data.BlockStateGen.simpleCubeAll; import static com.simibubi.create.foundation.data.CreateRegistrate.casingConnectivity; import static com.simibubi.create.foundation.data.CreateRegistrate.connectedTextures; +import static com.simibubi.create.foundation.data.ModelGen.customItemModel; import static com.simibubi.create.foundation.data.TagGen.*; @@ -44,6 +48,30 @@ public class TFMGBlocks { .build() .lang("Napalm Bomb") .register(); + public static final BlockEntry FOSSILSTONE = REGISTRATE.block("fossilstone", Block::new) + .initialProperties(() -> Blocks.OBSIDIAN) + .properties(p -> p.strength(100f,1200f)) + .properties(p -> p.color(MaterialColor.COLOR_BLACK)) + .properties(p -> p.requiresCorrectToolForDrops()) + .transform(pickaxeOnly()) + .blockstate(simpleCubeAll("fossilstone")) + .item(TFMGFuelItem::fossilstone) + .build() + .lang("Fossilstone") + .register(); + + public static final BlockEntry OIL_DEPOSIT = REGISTRATE.block("oil_deposit", FluidDepositBlock::new) + .initialProperties(() -> Blocks.BEDROCK) + .properties(p -> p.color(MaterialColor.COLOR_GRAY)) + .properties(p -> p.strength(69696969)) + .properties(p -> p.requiresCorrectToolForDrops()) + .transform(pickaxeOnly()) + .blockstate(simpleCubeAll("oil_deposit")) + .item() + .build() + .lang("Oil Deposit") + .register(); + public static final BlockEntry STEEL_CASING = REGISTRATE.block("steel_casing", CasingBlock::new) .properties(p -> p.color(MaterialColor.TERRACOTTA_LIGHT_GRAY)) .transform(BuilderTransformers.casing(() -> TFMGSpriteShifts.STEEL_CASING)) @@ -123,7 +151,7 @@ public class TFMGBlocks { .properties(p -> p.requiresCorrectToolForDrops()) .transform(pickaxeOnly()) .blockstate(simpleCubeAll("concrete")) - .tag(BlockTags.NEEDS_IRON_TOOL) + .tag(BlockTags.NEEDS_STONE_TOOL) .transform(tagBlockAndItem("concrete")) .build() .lang("Concrete") diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGFluids.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGFluids.java index 9d19eabd..c43bb717 100644 --- a/src/main/java/com/drmangotea/tfmg/registry/TFMGFluids.java +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGFluids.java @@ -3,47 +3,16 @@ package com.drmangotea.tfmg.registry; -import java.util.function.Consumer; -import java.util.function.Supplier; - -import javax.annotation.Nullable; - import com.drmangotea.tfmg.CreateTFMG; import com.drmangotea.tfmg.content.concrete.ConcreteFluid; import com.drmangotea.tfmg.content.concrete.ConcreteFluidType; -import com.simibubi.create.AllFluids; +import com.drmangotea.tfmg.content.fluids.BurnableFluid; import com.simibubi.create.AllTags; -import org.jetbrains.annotations.NotNull; -import com.mojang.blaze3d.shaders.FogShape; -import com.mojang.blaze3d.systems.RenderSystem; -import com.mojang.math.Vector3f; -import com.simibubi.create.AllTags.AllFluidTags; -import com.simibubi.create.content.decoration.palettes.AllPaletteStoneTypes; import com.simibubi.create.content.fluids.VirtualFluid; -import com.simibubi.create.content.fluids.potion.PotionFluid; -import com.simibubi.create.content.fluids.potion.PotionFluid.PotionFluidType; -import com.simibubi.create.foundation.utility.Color; -import com.simibubi.create.infrastructure.config.AllConfigs; -import com.tterrag.registrate.builders.FluidBuilder.FluidTypeFactory; import com.tterrag.registrate.util.entry.FluidEntry; -import net.minecraft.client.Camera; -import net.minecraft.client.multiplayer.ClientLevel; -import net.minecraft.client.renderer.FogRenderer.FogMode; -import net.minecraft.core.BlockPos; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.BlockAndTintGetter; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.state.BlockState; -import net.minecraft.world.level.material.Fluid; -import net.minecraft.world.level.material.FluidState; -import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions; -import net.minecraftforge.common.ForgeMod; -import net.minecraftforge.fluids.FluidInteractionRegistry; -import net.minecraftforge.fluids.FluidInteractionRegistry.InteractionInformation; -import net.minecraftforge.fluids.FluidStack; -import net.minecraftforge.fluids.FluidType; import net.minecraftforge.fluids.ForgeFlowingFluid; import static com.drmangotea.tfmg.CreateTFMG.REGISTRATE; @@ -121,7 +90,7 @@ public class TFMGFluids { - public static final FluidEntry CRUDE_OIL_FLUID = + public static final FluidEntry CRUDE_OIL = REGISTRATE.fluid("crude_oil_fluid",CRUDE_OIL_STILL_RL,CRUDE_OIL_FLOW_RL) .lang("Crude Oil") .properties(b -> b.viscosity(1000) @@ -131,7 +100,7 @@ public class TFMGFluids { .slopeFindDistance(5) .explosionResistance(100f)) - .source(ForgeFlowingFluid.Source::new) + .source(BurnableFluid.Source::new) .bucket() .tag(AllTags.forgeItemTag("buckets/gasoline")) .build() @@ -167,7 +136,7 @@ public class TFMGFluids { .slopeFindDistance(5) .explosionResistance(100f)) - .source(ForgeFlowingFluid.Source::new) + .source(BurnableFluid.Source::new) .bucket() .tag(AllTags.forgeItemTag("buckets/gasoline")) .build() @@ -185,7 +154,7 @@ public class TFMGFluids { .slopeFindDistance(5) .explosionResistance(100f)) - .source(ForgeFlowingFluid.Source::new) + .source(BurnableFluid.Source::new) .bucket() .tag(AllTags.forgeItemTag("buckets/diesel")) .build() @@ -201,7 +170,7 @@ public class TFMGFluids { .slopeFindDistance(5) .explosionResistance(100f)) - .source(ForgeFlowingFluid.Source::new) + .source(BurnableFluid.Source::new) .bucket() .tag(AllTags.forgeItemTag("buckets/kerosene")) .build() @@ -217,7 +186,7 @@ public class TFMGFluids { .slopeFindDistance(5) .explosionResistance(100f)) - .source(ForgeFlowingFluid.Source::new) + .source(BurnableFluid.Source::new) .bucket() .tag(AllTags.forgeItemTag("buckets/naphtha")) .build() @@ -233,7 +202,7 @@ public class TFMGFluids { .slopeFindDistance(5) .explosionResistance(100f)) - .source(ForgeFlowingFluid.Source::new) + .source(BurnableFluid.Source::new) .bucket() .build() .register(); @@ -248,7 +217,7 @@ public class TFMGFluids { .slopeFindDistance(5) .explosionResistance(100f)) - .source(ForgeFlowingFluid.Source::new) + .source(BurnableFluid.Source::new) .bucket() .build() .register(); @@ -262,7 +231,7 @@ public class TFMGFluids { .slopeFindDistance(5) .explosionResistance(100f)) - .source(ForgeFlowingFluid.Source::new) + .source(BurnableFluid.Source::new) .bucket() .tag(AllTags.forgeItemTag("buckets/napalm")) .build() @@ -292,7 +261,7 @@ public class TFMGFluids { .slopeFindDistance(5) .explosionResistance(100f)) - .source(ForgeFlowingFluid.Source::new) + .source(BurnableFluid.Source::new) .bucket() //.tag(AllTags.forgeItemTag("buckets/napalm")) .build() diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGPaletteBlocks.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGPaletteBlocks.java new file mode 100644 index 00000000..74dc2182 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGPaletteBlocks.java @@ -0,0 +1,39 @@ +package com.drmangotea.tfmg.registry; + +import com.simibubi.create.AllCreativeModeTabs; +import com.simibubi.create.AllSpriteShifts; +import com.simibubi.create.Create; +import com.simibubi.create.content.decoration.palettes.*; +import com.simibubi.create.foundation.block.connected.HorizontalCTBehaviour; +import com.simibubi.create.foundation.block.connected.SimpleCTBehaviour; +import com.simibubi.create.foundation.data.BlockStateGen; +import com.simibubi.create.foundation.data.WindowGen; +import com.tterrag.registrate.util.DataIngredient; +import com.tterrag.registrate.util.entry.BlockEntry; +import net.minecraft.client.renderer.RenderType; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.tags.BlockTags; +import net.minecraft.world.item.Items; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.GlassBlock; +import net.minecraft.world.level.block.state.properties.WoodType; +import net.minecraft.world.level.material.MaterialColor; +import net.minecraftforge.common.Tags; + +import static com.drmangotea.tfmg.CreateTFMG.REGISTRATE; +import static com.simibubi.create.foundation.data.WindowGen.*; + +public class TFMGPaletteBlocks { + + static { + REGISTRATE.creativeModeTab(() -> TFMGCreativeModeTabs.TFMG_BASE); + } + + + static { + TFMGPaletteStoneTypes.register(REGISTRATE); + } + + public static void register() {} + +} \ No newline at end of file diff --git a/src/main/java/com/drmangotea/tfmg/registry/TFMGPaletteStoneTypes.java b/src/main/java/com/drmangotea/tfmg/registry/TFMGPaletteStoneTypes.java new file mode 100644 index 00000000..875bef81 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/registry/TFMGPaletteStoneTypes.java @@ -0,0 +1,64 @@ +package com.drmangotea.tfmg.registry; + +import com.drmangotea.tfmg.CreateTFMG; +import com.drmangotea.tfmg.base.palettes.TFMGPaletteBlockPattern; +import com.drmangotea.tfmg.base.palettes.TFMGPalettesVariantEntry; +import com.simibubi.create.AllTags; + +import com.simibubi.create.foundation.data.CreateRegistrate; +import com.simibubi.create.foundation.utility.Lang; +import com.tterrag.registrate.util.nullness.NonNullSupplier; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.material.MaterialColor; +import net.minecraftforge.registries.ForgeRegistries; + +import java.util.function.Function; + +import static com.drmangotea.tfmg.base.palettes.TFMGPaletteBlockPattern.STANDARD_RANGE; + +public enum TFMGPaletteStoneTypes { + + + BAUXITE(STANDARD_RANGE, r -> r.paletteStoneBlock("bauxite", () -> Blocks.DEEPSLATE, true, true) + .properties(p -> p.destroyTime(1.25f) + .color(MaterialColor.COLOR_BLUE)) + .register()), + + ; + + private Function> factory; + private TFMGPalettesVariantEntry variants; + + public NonNullSupplier baseBlock; + public TFMGPaletteBlockPattern[] variantTypes; + public TagKey materialTag; + + private TFMGPaletteStoneTypes(TFMGPaletteBlockPattern[] variantTypes, + Function> factory) { + this.factory = factory; + this.variantTypes = variantTypes; + } + + public NonNullSupplier getBaseBlock() { + return baseBlock; + } + + public TFMGPalettesVariantEntry getVariants() { + return variants; + } + + public static void register(CreateRegistrate registrate) { + for (TFMGPaletteStoneTypes paletteStoneVariants : values()) { + NonNullSupplier baseBlock = paletteStoneVariants.factory.apply(registrate); + paletteStoneVariants.baseBlock = baseBlock; + String id = Lang.asId(paletteStoneVariants.name()); + paletteStoneVariants.materialTag = + AllTags.optionalTag(ForgeRegistries.ITEMS, CreateTFMG.asResource("stone_types/" + id)); + paletteStoneVariants.variants = new TFMGPalettesVariantEntry(id, paletteStoneVariants); + } + } + +} diff --git a/src/main/java/com/drmangotea/tfmg/worldgen/OilFeature.java b/src/main/java/com/drmangotea/tfmg/worldgen/OilFeature.java new file mode 100644 index 00000000..22224fbd --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/worldgen/OilFeature.java @@ -0,0 +1,170 @@ +package com.drmangotea.tfmg.worldgen; + + +import com.google.common.collect.Lists; +import com.mojang.datafixers.util.Pair; +import com.mojang.serialization.Codec; +import net.minecraft.Util; +import net.minecraft.core.BlockPos; +import net.minecraft.core.Direction; +import net.minecraft.tags.BlockTags; +import net.minecraft.util.Mth; +import net.minecraft.util.RandomSource; +import net.minecraft.world.level.WorldGenLevel; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.BuddingAmethystBlock; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.BlockStateProperties; +import net.minecraft.world.level.levelgen.*; +import net.minecraft.world.level.levelgen.feature.Feature; +import net.minecraft.world.level.levelgen.feature.FeaturePlaceContext; +import net.minecraft.world.level.levelgen.feature.configurations.GeodeConfiguration; +import net.minecraft.world.level.levelgen.synth.NormalNoise; +import net.minecraft.world.level.material.FluidState; + +import java.util.List; +import java.util.function.Predicate; + +public class OilFeature extends Feature { + private static final Direction[] DIRECTIONS = Direction.values(); + + public OilFeature(Codec p_159834_) { + super(p_159834_); + } + + public boolean place(FeaturePlaceContext p_159836_) { + GeodeConfiguration geodeconfiguration = p_159836_.config(); + RandomSource random = p_159836_.random(); + BlockPos blockpos = p_159836_.origin(); + WorldGenLevel worldgenlevel = p_159836_.level(); + int i = geodeconfiguration.minGenOffset; + int j = geodeconfiguration.maxGenOffset; + List> list = Lists.newLinkedList(); + int k = 10; + WorldgenRandom worldgenrandom = new WorldgenRandom(new LegacyRandomSource(worldgenlevel.getSeed())); + NormalNoise normalnoise = NormalNoise.create(worldgenrandom, -4, 0.5D); + List list1 = Lists.newLinkedList(); + double d0 = (double)k / (double)geodeconfiguration.outerWallDistance.getMaxValue(); + GeodeLayerSettings geodelayersettings = geodeconfiguration.geodeLayerSettings; + GeodeBlockSettings geodeblocksettings = geodeconfiguration.geodeBlockSettings; + GeodeCrackSettings geodecracksettings = geodeconfiguration.geodeCrackSettings; + double d1 = 1.0D / Math.sqrt(geodelayersettings.filling-1); + double d2 = 1.0D / Math.sqrt(geodelayersettings.innerLayer + d0-5); + double d3 = 1.0D / Math.sqrt(geodelayersettings.middleLayer + d0-5); + double d4 = 1.0D / Math.sqrt(geodelayersettings.outerLayer + d0-4.7); + double d5 = 1.0D / Math.sqrt(geodecracksettings.baseCrackSize + random.nextDouble() / 2.0D + (k > 3 ? d0 : 0.0D)); + boolean flag = false; + int l = 0; + + for(int i1 = 0; i1 < k; ++i1) { + int j1 = geodeconfiguration.outerWallDistance.sample(random); + int k1 = geodeconfiguration.outerWallDistance.sample(random); + int l1 = geodeconfiguration.outerWallDistance.sample(random); + BlockPos blockpos1 = blockpos.offset(j1, k1, l1); + BlockState blockstate = worldgenlevel.getBlockState(blockpos1); + if (blockstate.isAir() || blockstate.is(BlockTags.GEODE_INVALID_BLOCKS)) { + ++l; + if (l > geodeconfiguration.invalidBlocksThreshold) { + return false; + } + } + + list.add(Pair.of(blockpos1, geodeconfiguration.pointOffset.sample(random))); + } + + if (flag) { + int i2 = random.nextInt(4); + int j2 = k * 2 + 1; + if (i2 == 0) { + list1.add(blockpos.offset(j2, 7, 0)); + list1.add(blockpos.offset(j2, 5, 0)); + list1.add(blockpos.offset(j2, 1, 0)); + } else if (i2 == 1) { + list1.add(blockpos.offset(0, 7, j2)); + list1.add(blockpos.offset(0, 5, j2)); + list1.add(blockpos.offset(0, 1, j2)); + } else if (i2 == 2) { + list1.add(blockpos.offset(j2, 7, j2)); + list1.add(blockpos.offset(j2, 5, j2)); + list1.add(blockpos.offset(j2, 1, j2)); + } else { + list1.add(blockpos.offset(0, 7, 0)); + list1.add(blockpos.offset(0, 5, 0)); + list1.add(blockpos.offset(0, 1, 0)); + } + } + + List list2 = Lists.newArrayList(); + Predicate predicate = isReplaceable(geodeconfiguration.geodeBlockSettings.cannotReplace); + + for(BlockPos blockpos3 : BlockPos.betweenClosed(blockpos.offset(i, i, i), blockpos.offset(j, j, j))) { + double d8 = normalnoise.getValue((double)blockpos3.getX(), (double)blockpos3.getY(), (double)blockpos3.getZ()) * geodeconfiguration.noiseMultiplier; + double d6 = 0.0D; + double d7 = 0.0D; + + for(Pair pair : list) { + d6 += Mth.fastInvSqrt(blockpos3.distSqr(pair.getFirst()) + (double)pair.getSecond().intValue()) + d8; + } + + for(BlockPos blockpos6 : list1) { + d7 += Mth.fastInvSqrt(blockpos3.distSqr(blockpos6) + (double)geodecracksettings.crackPointOffset) + d8; + } + + if (!(d6 < d4)) { + if (flag && d7 >= d5 && d6 < d1) { + this.safeSetBlock(worldgenlevel, blockpos3, Blocks.AIR.defaultBlockState(), predicate); + + for(Direction direction1 : DIRECTIONS) { + BlockPos blockpos2 = blockpos3.relative(direction1); + FluidState fluidstate = worldgenlevel.getFluidState(blockpos2); + if (!fluidstate.isEmpty()) { + worldgenlevel.scheduleTick(blockpos2, fluidstate.getType(), 0); + } + } + } else if (d6 >= d1) { + this.safeSetBlock(worldgenlevel, blockpos3, geodeblocksettings.fillingProvider.getState(random, blockpos3), predicate); + } else if (d6 >= d2) { + boolean flag1 = (double)random.nextFloat() < geodeconfiguration.useAlternateLayer0Chance; + if (flag1) { + this.safeSetBlock(worldgenlevel, blockpos3, geodeblocksettings.alternateInnerLayerProvider.getState(random, blockpos3), predicate); + } else { + this.safeSetBlock(worldgenlevel, blockpos3, geodeblocksettings.innerLayerProvider.getState(random, blockpos3), predicate); + } + + if ((!geodeconfiguration.placementsRequireLayer0Alternate || flag1) && (double)random.nextFloat() < geodeconfiguration.usePotentialPlacementsChance) { + list2.add(blockpos3.immutable()); + } + } else if (d6 >= d3) { + this.safeSetBlock(worldgenlevel, blockpos3, geodeblocksettings.middleLayerProvider.getState(random, blockpos3), predicate); + } else if (d6 >= d4) { + this.safeSetBlock(worldgenlevel, blockpos3, geodeblocksettings.outerLayerProvider.getState(random, blockpos3), predicate); + } + } + } + + List list3 = geodeblocksettings.innerPlacements; + + for(BlockPos blockpos4 : list2) { + BlockState blockstate1 = Util.getRandom(list3, random); + + for(Direction direction : DIRECTIONS) { + if (blockstate1.hasProperty(BlockStateProperties.FACING)) { + blockstate1 = blockstate1.setValue(BlockStateProperties.FACING, direction); + } + + BlockPos blockpos5 = blockpos4.relative(direction); + BlockState blockstate2 = worldgenlevel.getBlockState(blockpos5); + if (blockstate1.hasProperty(BlockStateProperties.WATERLOGGED)) { + blockstate1 = blockstate1.setValue(BlockStateProperties.WATERLOGGED, Boolean.valueOf(blockstate2.getFluidState().isSource())); + } + + if (BuddingAmethystBlock.canClusterGrowAtState(blockstate2)) { + this.safeSetBlock(worldgenlevel, blockpos5, blockstate1, predicate); + break; + } + } + } + + return true; + } +} \ No newline at end of file diff --git a/src/main/java/com/drmangotea/tfmg/worldgen/TFMGConfiguredFeatures.java b/src/main/java/com/drmangotea/tfmg/worldgen/TFMGConfiguredFeatures.java new file mode 100644 index 00000000..77eacf8c --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/worldgen/TFMGConfiguredFeatures.java @@ -0,0 +1,69 @@ +package com.drmangotea.tfmg.worldgen; + + + +import com.drmangotea.tfmg.registry.TFMGBlocks; +import com.drmangotea.tfmg.registry.TFMGFluids; +import net.minecraft.core.Holder; +import net.minecraft.data.worldgen.features.FeatureUtils; +import net.minecraft.data.worldgen.placement.PlacementUtils; +import net.minecraft.tags.BlockTags; +import net.minecraft.util.valueproviders.UniformInt; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.levelgen.GeodeBlockSettings; +import net.minecraft.world.level.levelgen.GeodeCrackSettings; +import net.minecraft.world.level.levelgen.GeodeLayerSettings; +import net.minecraft.world.level.levelgen.VerticalAnchor; +import net.minecraft.world.level.levelgen.feature.ConfiguredFeature; +import net.minecraft.world.level.levelgen.feature.configurations.GeodeConfiguration; +import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; +import net.minecraft.world.level.levelgen.feature.stateproviders.BlockStateProvider; +import net.minecraft.world.level.levelgen.placement.*; +import net.minecraft.world.level.levelgen.structure.templatesystem.BlockMatchTest; +import net.minecraft.world.level.levelgen.structure.templatesystem.RuleTest; + +import java.util.List; + + +public class TFMGConfiguredFeatures { + + // public static final DeferredRegister PLACED_FEATURES = + // DeferredRegister.create(Registry.PLACED_FEATURE_REGISTRY, CreateIndustry.MOD_ID); + + + public static final RuleTest BEDROCK = new BlockMatchTest(Blocks.BEDROCK); + //-------------------------------------------------------------------------------------------------// + + +public static final Holder> OIL_CONFIGURED = + FeatureUtils.register("tfmg:oil", TFMGFeatures.OIL.get(), + new GeodeConfiguration(new GeodeBlockSettings(BlockStateProvider.simple(TFMGFluids.CRUDE_OIL.get().getSource().defaultFluidState().createLegacyBlock()), BlockStateProvider.simple(Blocks.AIR), BlockStateProvider.simple(Blocks.AIR), BlockStateProvider.simple(Blocks.AIR), BlockStateProvider.simple(TFMGBlocks.FOSSILSTONE.get()), List.of(Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState(), Blocks.AIR.defaultBlockState()), BlockTags.FEATURES_CANNOT_REPLACE, BlockTags.GEODE_INVALID_BLOCKS), new GeodeLayerSettings(1.7D, 2.2D, 3.2D, 4.2D), new GeodeCrackSettings(0.95D, 2.0D, 2), 0.35D, 0.083D, true, UniformInt.of(4, 6), UniformInt.of(3, 4), UniformInt.of(1, 2), -16, 16, 0.05D, 1)); + + +public static final Holder> SIMULATED_OIL_CONFIGURED = + FeatureUtils.register("tfmg:simulated_oil", TFMGFeatures.SIMULATED_OIL.get(), + new OreConfiguration(BEDROCK, TFMGBlocks.OIL_DEPOSIT.get().defaultBlockState(), 35)); + + + + //-------------------------------------------------------------------------------------------------// + + +public static final Holder OIL_PLACED = PlacementUtils.register("tfmg:oil", + OIL_CONFIGURED, RarityFilter.onAverageOnceEvery(120), + InSquarePlacement.spread(), + HeightRangePlacement.uniform(VerticalAnchor.absolute(-50), + VerticalAnchor.absolute(-10)), BiomeFilter.biome()); + +public static final Holder SIMULATED_OIL_PLACED = PlacementUtils.register("tfmg:simulated_oil", + SIMULATED_OIL_CONFIGURED, RarityFilter.onAverageOnceEvery(75)); + + + + + // public static void register(IEventBus eventBus) { + // PLACED_FEATURES.register(eventBus); + //} + + +} diff --git a/src/main/java/com/drmangotea/tfmg/worldgen/TFMGFeatures.java b/src/main/java/com/drmangotea/tfmg/worldgen/TFMGFeatures.java new file mode 100644 index 00000000..bf430228 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/worldgen/TFMGFeatures.java @@ -0,0 +1,34 @@ +package com.drmangotea.tfmg.worldgen; + + + +import com.drmangotea.tfmg.CreateTFMG; +import net.minecraft.world.level.levelgen.feature.Feature; +import net.minecraft.world.level.levelgen.feature.OreFeature; +import net.minecraft.world.level.levelgen.feature.configurations.GeodeConfiguration; +import net.minecraft.world.level.levelgen.feature.configurations.OreConfiguration; +import net.minecraftforge.eventbus.api.IEventBus; +import net.minecraftforge.registries.DeferredRegister; +import net.minecraftforge.registries.ForgeRegistries; +import net.minecraftforge.registries.RegistryObject; + +public class TFMGFeatures { + + public static final DeferredRegister> FEATURES = DeferredRegister.create(ForgeRegistries.FEATURES, CreateTFMG.MOD_ID); + + //-------------------------------------------------------------------------------------------------// + + public static final RegistryObject> OIL = FEATURES.register("oil", () -> + new OilFeature(GeodeConfiguration.CODEC)); + + + + public static final RegistryObject> SIMULATED_OIL = FEATURES.register("simulated_oil", () -> + new OreFeature(OreConfiguration.CODEC)); + + + //-------------------------------------------------------------------------------------------------// + public static void register(IEventBus eventBus) { + FEATURES.register(eventBus); + } +} diff --git a/src/main/java/com/drmangotea/tfmg/worldgen/TFMGLayeredPatterns.java b/src/main/java/com/drmangotea/tfmg/worldgen/TFMGLayeredPatterns.java new file mode 100644 index 00000000..891a8985 --- /dev/null +++ b/src/main/java/com/drmangotea/tfmg/worldgen/TFMGLayeredPatterns.java @@ -0,0 +1,93 @@ +package com.drmangotea.tfmg.worldgen; + + +import com.drmangotea.tfmg.registry.TFMGBlocks; +import com.simibubi.create.content.decoration.palettes.AllPaletteStoneTypes; +import com.simibubi.create.infrastructure.worldgen.LayerPattern; +import com.tterrag.registrate.util.nullness.NonNullSupplier; +import net.minecraft.world.level.block.Blocks; + +public class TFMGLayeredPatterns { + + public static final NonNullSupplier + + BAUXITE = () -> LayerPattern.builder() + .layer(l -> l.weight(1) + .passiveBlock()) + .layer(l -> l.weight(2) + .block(TFMGBlocks.CONCRETE.get()) + .size(1, 3)) + .layer(l -> l.weight(1) + .block(Blocks.SMOOTH_BASALT) + .block(Blocks.GRANITE) + .size(2, 2)) + .layer(l -> l.weight(1) + .blocks(Blocks.GRANITE, Blocks.SMOOTH_BASALT)) + .layer(l -> l.weight(1) + .block(AllPaletteStoneTypes.ANDESITE.getBaseBlock())) + .build(); + + public static final NonNullSupplier + + GALENA = () -> LayerPattern.builder() + .layer(l -> l.weight(1) + .passiveBlock()) + .layer(l -> l.weight(2) + .block(TFMGBlocks.CONCRETE.get()) + .size(1, 3)) + .layer(l -> l.weight(1) + .block(Blocks.SMOOTH_BASALT) + .block(Blocks.GRANITE) + .size(2, 2)) + .layer(l -> l.weight(1) + .blocks(Blocks.GRANITE, Blocks.SMOOTH_BASALT)) + .layer(l -> l.weight(1) + .block(AllPaletteStoneTypes.ANDESITE.getBaseBlock())) + .build(); + + public static final NonNullSupplier + + LIGNITE = () -> LayerPattern.builder() + .layer(l -> l.weight(1) + .passiveBlock()) + .layer(l -> l.weight(2) + .block(TFMGBlocks.CONCRETE.get()) + .size(1, 3)) + .layer(l -> l.weight(1) + .block(Blocks.TUFF) + .block(Blocks.DEEPSLATE) + .size(2, 2)) + .layer(l -> l.weight(1) + .blocks(Blocks.DEEPSLATE, Blocks.TUFF)) + .layer(l -> l.weight(1) + .block(AllPaletteStoneTypes.SCORIA.getBaseBlock())) + .build(); + + + public static final NonNullSupplier + + SULFUR = () -> LayerPattern.builder() + .inNether() + .layer(l -> l.weight(2) + .passiveBlock()) + .layer(l -> l.weight(2) + .block(TFMGBlocks.CONCRETE.get()) + .size(1, 2)) + .layer(l -> l.weight(3) + .block(AllPaletteStoneTypes.SCORCHIA.getBaseBlock()) + .block(Blocks.BLACKSTONE) + .size(1, 3)) + .layer(l -> l.weight(1) + .block(Blocks.MAGMA_BLOCK)) + .layer(l -> l.weight(2) + .block(Blocks.BASALT) + .block(Blocks.SMOOTH_BASALT)) + .build(); + + + + + + + +} diff --git a/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/alternatives/bauxite_cut_basketweave.png b/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/alternatives/bauxite_cut_basketweave.png new file mode 100644 index 0000000000000000000000000000000000000000..d3270bfde2498bc258514921d0b8a1c82b36718c GIT binary patch literal 240 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnYZQgUWXw8Y-`MWbGtxav6 zA5%IZD6QEeyv*J!)50mvz%uCX4=q-p;x11Y$B+s}(SsLxn+ycl9>h0uXB^rc=rGSz zmoMSgkE|<34IYsW>xC<}H<~*wH>s2V_OzzhTE1$=K8bseSb1~flxq3j3vr2fcp2XP@0~z~`vYdK>5}22WQ%mvv4FO#pXETaN$$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/alternatives/bauxite_cut_bond.png b/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/alternatives/bauxite_cut_bond.png new file mode 100644 index 0000000000000000000000000000000000000000..36184986ccf34ae524057d0079833debc03ea102 GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnYZQgUWXw8Y-`MWbGtxav6 zA5%IZD6QEeyv*J!)50mvz%uCX4=q-p;t8HEjv*C{tOpH+4h9IYJ*dBaDWz?@|M3|D z;s%QrcrToO$W_MqrCyeKz)RuB4EMYzHc3X_cmH`;f7;Qt_h-M=n7<@g-Y%9AndlDlk|`0rYal*&>_~~;Auiq`%bx)Ch+LaAeInRzvbPZ^ES6RH% r(eU+mi5!=gUmsLuVGPIY};g@!x%hW{an^LB{Ts5R0(8@ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/alternatives/bauxite_cut_indented.png b/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/alternatives/bauxite_cut_indented.png new file mode 100644 index 0000000000000000000000000000000000000000..8bd7d91edfe6c9fbf2c1b2f4cff6ab661e5116f9 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnYZQgUWXw8Y-`MWbGtxav6 zA5%IZD6QEeyv*J!)50mvz%uCX4=q-p;s#F_$B+s})`JIm4;k>VUdTTk<1JI@znCw8 zQ-$pX&zb`zXAW^KnKMyJo%zTf_wD6px_#9nKh^bCy}J~aA#u#7k%Q0U5qshktph*g z&$2FhuDNzFpu;NA=f$S8 c0Sq7cr`Q|3e)YiaGSDpyp00i_>zopr08;Q;y8r+H literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/brick/bauxite_cut_brick.png b/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/brick/bauxite_cut_brick.png new file mode 100644 index 0000000000000000000000000000000000000000..a1961a191293138203cb2ca110cb84797a97b5d6 GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnYZQgUWXw8Y-`MWbGtxav6 zA5%IZD6QEeyv*J!)50mvz%uCX4=q-p;wn!U$B+s})`Ql3ha7lV4}90TthUXP;Z|>u z@KhsRRy9=LZ1-Y+ zcx*{{n!e1g+Czro!34`Ym~ W(xb&^6M&9jVDNPHb6Mw<&;$U+FjkHL literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/cap/bauxite_cut_cap.png b/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/cap/bauxite_cut_cap.png new file mode 100644 index 0000000000000000000000000000000000000000..8bd7d91edfe6c9fbf2c1b2f4cff6ab661e5116f9 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnYZQgUWXw8Y-`MWbGtxav6 zA5%IZD6QEeyv*J!)50mvz%uCX4=q-p;s#F_$B+s})`JIm4;k>VUdTTk<1JI@znCw8 zQ-$pX&zb`zXAW^KnKMyJo%zTf_wD6px_#9nKh^bCy}J~aA#u#7k%Q0U5qshktph*g z&$2FhuDNzFpu;NA=f$S8 c0Sq7cr`Q|3e)YiaGSDpyp00i_>zopr08;Q;y8r+H literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/cap/bauxite_cut_cap_connected.png b/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/cap/bauxite_cut_cap_connected.png new file mode 100644 index 0000000000000000000000000000000000000000..08b0157562d5bc5e2c76ed5e850bcfe67581e9de GIT binary patch literal 1336 zcmV-81;_e{P)oh&gfpAC+%ai6# z$h&SC>tevJxByhBci|7gwe76j!LuEF)bEIF!b8=k+b|th$YKIp7O)8h?%E0jJDj z!24!}VldGGkC?@P&#*>u1v=m*vl#I1`u^L8kEoe{p}u04{{z`6AyG5e3htQYfEMZ& zP&2!_oiexh6`+}SoqlE0HS>FBF<`EZd9k18&dvhx-aL601HQWcAG-d>8jeS;_bcls z0mAiPxc(>l!fN)@c7p3axc+B!;3omn^Tnsgd);O+pE?f}#I6U*#RN8g{63hCnr)fi2i0V_E%W=Jfo5Cg_rcEb;FYusn1SCav1uR7 zm~;n(XW(lToA$wsNq0an*|!v%_JQ(ryMW0)F}n}?mzUl%-UoqiOt)zt4BQ^ju_hXW zZYOA>)$u++;rbtGB5B$Q#PBYF>p8go$C{|f_wS^`eP9jg`k!cb53KLsNr(G@{ybCv zV@(9rD6C0ak`DKQ?K$lM%UCl-z;GYfo+AP=)ge8@ePDb3zYO=mzjn;%wqY2Gfp58X zfp&*V2@C>^m@{-Ur*sz5_GreQ>~j7tA@_2amo(y$>9Vs29L|57Y}_ya(z9Fx~_80vPXs zcma&}K)nFwdw>rp^F6=^l=&Xu1fbkyS1Il<0 z@BwAG2i_OLJ@CE|?t%A(a1XpM#Cw1T;0L_hK3uX09)KV4exI-i9)KV4zD-yJ55Nz2 ze@$2f55Nz2w|%%|5qduK{$dYy-2-|)^nTeFwD-rNFKF+V_JE!by}#IlyY2z~mfqVv zxa%JH-mm+@%NK-iKfU*coAm{FYkc(HaI?N3+zmJH3-J4r-WTBi9ngC3So;4!S!wuR zpsY0fFHlw*{ud}K4gU+2m4^QX%1Xok0%fJKeNSWip2qe)jqQ6H?ti}f^uE$?|MT6a u_m$@KfZw6_6$D@4zku{Ti1>o^J(Gq4yUjx+?db&7KFC?!4xa+>bWP4(teA>a;H^tz$t?isg!cFV_?UQ?IiW|M%V8;x1Q}*LQYhMy=~& z5x?V~DlWURR-Jpa&_Vt%o9K?)A8OAvt(|MN|1-aSsKU%2J7ebqEobm_^>bP0l+XkK DUx!XW literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/layered/bauxite_cut_layered.png b/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/layered/bauxite_cut_layered.png new file mode 100644 index 0000000000000000000000000000000000000000..2b553e1289e071b03cfe5abec1c7140b9f4bea0e GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv3GfMVU3~UI^Pa0kYfj|O-<>&W zZEEZMn9>PBY0VztW%gc~7EW;nmO(WR)3Si-%RF5iLn;_q4<6(_WFWwDz&88meYd83 zo-GcXFB`-%%!Nb~E<2nHaL_Z33EQn#Yrj!(OH@onUF|zB<5{zNYmLqw6`tnkaI0z( zTl1se2|bIB@EnVC`!zeqd1q;3DASTd-&Wgp{jV%8_Ib&2%z>#UY%;?IR)zzNjU8Gi U^ei|3K$x7#O~;t5`c)$-!(KsK#*=7!a{B& z0vphf^vBJ(dbrSR?n@O2PjoHj ziIIf?K$=KzyZgh(@#XN^e9sS!kD4F*_}J!$;AMoEt8RO$JKQKPv7kyO0u({gA%K!iX07*qoM6N<$f)qNLQ2+n{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/natural/bauxite_0.png b/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/natural/bauxite_0.png new file mode 100644 index 0000000000000000000000000000000000000000..324d13dbd128860173ad29e411277b74e5aa41a5 GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VWoqgeX{jMw7Gq%K6P4$hd zv2jZ&`1XJWD4XNy;uunKi`9XV_lN?I%_laynT>s+j@1$i)-opiTdO1CZgPsPXwm!~ zvQw^I{l{-p_3WPXnEu26XU r@RYg0-1P-wSBgycc4nV1IrfJkOIPYJ-z?P#puG&9u6{1-oD!M1Med&ZXds;RzlH8yT3 zr-UkY1ErEYT^vIyZm~Kr3LY`wIK8*YNz@@Lfsr}>S^Q^tJK)3(^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/natural/bauxite_2.png b/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/natural/bauxite_2.png new file mode 100644 index 0000000000000000000000000000000000000000..0dd7cddfa09d93a2f25d6631d86f09eace76449e GIT binary patch literal 177 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPHV5AX?b&7QF(wR1^))l}cO8XLEi zcA>S7K&eACGX_)Np7jRZ%|-z%JAGh^Kzc)B~>lD_ck^idy)L$`j-?(wci>NH@{xU$X)S9 Z-sGF4`fY{JwLps)JYD@<);T3K0RXrOLVN%K literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/natural/bauxite_3.png b/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/natural/bauxite_3.png new file mode 100644 index 0000000000000000000000000000000000000000..01ed0a00ee6cb4d1e1f0b8b745ee700e396b9125 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPE^3h)VW&7QF(wR1^))l}cO8XLD1 zBkRz#&~L^-**s4d$B>F!q9-m29x~uzxj4I#$tIw2Zh(WzPR1px4?O=Dt$3#H?P2w` zD$0kd4cs5t&T21ppEAAIY{S&8m$|dmm(MB4n)`i$STk2*-TwlPT_-jicj=2Lm%i5g tL?rI4x1#f|vUztpd~O=IF4hy%t@losV=~P0p9Zv4o-U3d6^yJ0Hwqpy5O6*C-QTODW;s^?=ME0Wk4w`Tzf))=ULj%;4$j=d#Wzp$Py2XiEnG literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/pillar/bauxite_cut_pillar_connected.png b/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/pillar/bauxite_cut_pillar_connected.png new file mode 100644 index 0000000000000000000000000000000000000000..c624745766e57cfa5110b37266a2a51cda17821b GIT binary patch literal 908 zcmV;719SX|P)}ISN?d{#lES-wCQ65 zJ7v4fLqBZR^)T&B_t~KL#LmmR!_K}vJxn{;kh1N|hscW`Zf_r&=|C!z$=;QE_WS?; z%O8IF{HM?V_J4o>==+a<{P>&Ce*EmGPrm=+n=hVy_Wehz*6hm6gE5|--mv5iduq&l zWfg!!_e6=h>IMt7W7v{1x+*AO9n1hTO~N#d!;)^|ILNeV>I|kbiz+FY^Y8l;Oos&> zKp3Sn(_z9w8+NKQl}(#utB%StO_--9nDdqm7L{F+*q~*r(!F7!zyK(u3|O2P=(jwN zrU!v#`ZSn98Pmbl6D+DGW}we$YUn2B%)$hbfs#qk#$#My2*uv%U1qLPMLlK_`{96k zI)R!lV$ZPvGempRIHm|@wMwP5ZKsT6ha(EBVtU#RJuOTR35^BB!IYkiiE}_K;p8f5 zvI`nACS^4(Wz>lF)~SJ2l=mNPl3`bsYul9s%bfOzVS>|d{g|*E6i8I*LuGqRqAWxU zkjx0w3}orUz{DK8F(8KJY6R0Gg&F2wuC4!!(E3GqqydXeCorH*10$?dxsC{<;&!_d zyTB63928Fn;;9?I_$mSPfAzs{(FecoL&mTAkeRTS-ASy(Vqc2 zcPcgeY*cSjrlss{=`l1g4P%;Vj?2u~MRGl->+KIYAY=FC?woP<{Ns*uOatgWXS>{r z)Ot}lFgGWa>*KI@Dzz@JF0Y<_dULxzdH(A1DDeaO^!e;(=>*Xx5t{jWaw?fQW1A{xS^tRJM48+dEJF!NhWsMOIG}8?4Nqk=Ut=V0>_uD znk3p1C(Zw#%%i|O50PSK_hCVsiG zHXEF8YumnAU-Z4>m&KQYU7raIE_$h-Edy-$gj}SQ_U-CrDpw?U= Q8R!58Pgg&ebxsLQ0F8!Ks{jB1 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/slab/bauxite_cut_slab.png b/src/main/resources/assets/tfmg/textures/block/palettes/stone_types/slab/bauxite_cut_slab.png new file mode 100644 index 0000000000000000000000000000000000000000..ee55f8e683c9f4111763b33f5c0295466c0fa6be GIT binary patch literal 224 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPFv4DbnYZQgUWXw8Y-`MWbGtxav6 zA5%IZD6QEeyv*J!)50mvz%uCX4=q-p;wn!U$B+s})`JHHn;ZmK4$NHrRNMM>yhY8A z>stSpC9tvOOqFzCkr6mB_ijy%a{Tt-bwdoRc&P;anA W@q5R0pCv$7FnGH9xvXh0uXB^rc=rGSz zmoMSgkE|<34IYsW>xC<}H<~*wH>s2V_OzzhTE1$=K8bseSb1~flxq3j3vr2fcp2XP@0~z~`vYdK>5}22WQ%mvv4FO#pXETaN$$ literal 0 HcmV?d00001 diff --git a/src/main/resources/data/tfmg/forge/biome_modifier/yeehaw.json b/src/main/resources/data/tfmg/forge/biome_modifier/yeehaw.json new file mode 100644 index 00000000..0608dcf3 --- /dev/null +++ b/src/main/resources/data/tfmg/forge/biome_modifier/yeehaw.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "biomes": "#minecraft:is_overworld", + "features": "tfmg:simulated_oil", + "step": "underground_ores" +} \ No newline at end of file diff --git a/src/main/resources/data/tfmg/forge/biome_modifier/yeehaw2.json b/src/main/resources/data/tfmg/forge/biome_modifier/yeehaw2.json new file mode 100644 index 00000000..864d4519 --- /dev/null +++ b/src/main/resources/data/tfmg/forge/biome_modifier/yeehaw2.json @@ -0,0 +1,6 @@ +{ + "type": "forge:add_features", + "biomes": "#minecraft:is_overworld", + "features": "tfmg:oil", + "step": "underground_ores" +} \ No newline at end of file diff --git a/src/main/resources/tfmg.mixins.json b/src/main/resources/tfmg.mixins.json index fc003fd1..2ea852a1 100644 --- a/src/main/resources/tfmg.mixins.json +++ b/src/main/resources/tfmg.mixins.json @@ -6,7 +6,8 @@ "compatibilityLevel": "JAVA_8", "refmap": "tfmg.refmap.json", "mixins": [ - + "AllOreFeatureConfigEntriesMixin" + // "FluidPropagatorMixin" ], "injectors": { diff --git a/src/main/resources/tfmg_changelog.txt b/src/main/resources/tfmg_changelog.txt new file mode 100644 index 00000000..b991884e --- /dev/null +++ b/src/main/resources/tfmg_changelog.txt @@ -0,0 +1,16 @@ +Version 0.6.0 + + +-liquid concrete changed from a block to actuall fluid +-liquid concrete bucket works with smart pipes +-changed strength of oil deposits from 696969 to 69696969 +-added formwork +-added cooling liquid +-added creosote +-added connected texture to cast iron block +-added blue and green fire +-added copper and zinc grenades +-sparks from thermite grenades now set mobs on fire on impact +-changed id of the mod from "createindustry" to "tfmg" +-increased burning time of fossilstone and coal coke +-oil deposits spawn in larger but rarer groups \ No newline at end of file