diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index fdff3abe..6c9ba5d6 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -57,6 +57,7 @@ f328a4d05911500b191e6a6ff9b2bfbc29d10407 assets/ultramarine/blockstates/green_ro 8de3cca147378b510321f584ec9125c410a5ab8d assets/ultramarine/blockstates/green_roof_tiles.json 45da0f1f4b66c32ff585018bcbe02a725d4d5076 assets/ultramarine/blockstates/green_silk_fabric_roll.json bed6b9037d6d74c2eb98a44c9a081d8948c74afe assets/ultramarine/blockstates/gunny_sack.json +9012e0ba6aa9fdd3a7ca6fa8ec5de7706f04813b assets/ultramarine/blockstates/hematite_ore.json a00161538dcc0866b0c270ed457a563ac7a0a1a7 assets/ultramarine/blockstates/jade_candlestick.json 7e326522b0c3f658207164f978fd9afcc98c9ab7 assets/ultramarine/blockstates/jade_ore.json 7336e15faf1322ca39cb9b563e155694a524b74c assets/ultramarine/blockstates/light_cyan_floor_tile.json @@ -194,6 +195,7 @@ a5a47d5cf92ca8c98d96413a6ec22d9c89385830 assets/ultramarine/models/block/green_g e19112fdff0472e96ddd08ffb8ded0d72e316b97 assets/ultramarine/models/block/green_roof_tile_stairs_shifted.json a9358896a739475c625971915699ef6d1d7145a5 assets/ultramarine/models/block/green_roof_tiles.json f9e216a4643c2b10f1f8284b60395d78c8c5ae7f assets/ultramarine/models/block/green_roof_tiles_shifted.json +7e3203c1159163dc4f11b8e95aa687c460c6a0e5 assets/ultramarine/models/block/hematite_ore.json 8c0af41bc29f6f8162143a7e06c6da9b8bcd2586 assets/ultramarine/models/block/jade_ore.json ee9ae841cf710b5ef3927fabc5f9ad04ae4829be assets/ultramarine/models/block/light_cyan_floor_tile.json a15fa192e997264a3144e905d5a39e58b595fc08 assets/ultramarine/models/block/light_cyan_floor_tile_slab.json @@ -252,7 +254,9 @@ ed0276a0b61b913dcc2045381e882ae92eb8976e assets/ultramarine/models/block/yellow_ 14ca05afad34dfa2a6cc6357b532d18cb3418423 assets/ultramarine/models/item/bamboo_mat.json 04487ff78832e964a7ec353b8644dcc98129480b assets/ultramarine/models/item/bamboo_mat_slab.json 435225e6fea4c6fd2a5d3bdc8726978dc34f0447 assets/ultramarine/models/item/bamboo_mat_stairs.json +1766a0228391d7d219aacdd8def2d10a919b1bf5 assets/ultramarine/models/item/baozi.json f1e52b2b2c293fca60b91ff1ee3fc3008f7bfe0d assets/ultramarine/models/item/big_blue_and_white_porcelain_vase.json +99ebf4f8978914eba256a4bebc72eed51f04cc73 assets/ultramarine/models/item/black_brick.json 1edcf7d64ef76d8e9a3bfab1d39a2d8a5c53dcec assets/ultramarine/models/item/black_brick_slab.json aef72f1bdef4ab3de9e81be2362fde22e00cc56c assets/ultramarine/models/item/black_brick_stairs.json f3dffc71e818e9390ccdda73a3cd646b84d0403f assets/ultramarine/models/item/black_brick_wall.json @@ -303,10 +307,12 @@ b7caf86408bad0448c1fe860cc51530b4176f26a assets/ultramarine/models/item/eggplant f6cdcc92d69719b02e745c8bac6ab46ab618e98b assets/ultramarine/models/item/engraved_dark_oak_beam_edge.json 3c4fc9ad38273e2b781eb092bc95c80bf25893e1 assets/ultramarine/models/item/food_hamper.json a63ed4466f84de3112cd44e1673f727bab7e6f9b assets/ultramarine/models/item/fruit_box.json +51d418bea86e0bcd596ffb49500e5ec18f61e8f6 assets/ultramarine/models/item/fur.json d0fdffba72af310069e2f432e91fecb5cf73280f assets/ultramarine/models/item/gray_roof_tile.json 44be99cca90a2c7703fd6aafb22ae3eeb99a4059 assets/ultramarine/models/item/gray_roof_tile_edge.json e9d78819fdebb8e887bf64e97d0774d64b1a6df3 assets/ultramarine/models/item/gray_roof_tile_stairs.json c97a2b7f8c6bf1e727e455a47fdc81582e85e2d7 assets/ultramarine/models/item/gray_roof_tiles.json +76c1c136df61b750f42e7f187fe04f78d9b23cba assets/ultramarine/models/item/grease.json 799f5cb07aed457e87b5bf45316197fe5ffb65fc assets/ultramarine/models/item/green_glazed_tile_slab.json 5dfebac1fc20dceae139b3e44726b128be65f986 assets/ultramarine/models/item/green_glazed_tile_stairs.json ba61e2f716fc7e61e4389102afdddf2274960e60 assets/ultramarine/models/item/green_glazed_tiles.json @@ -316,6 +322,7 @@ b742da2e66864a68570851786a81090e16b62f6c assets/ultramarine/models/item/green_ro 882476b69c8fe583cd3f7d202d9457b4c71fcd47 assets/ultramarine/models/item/green_roof_tiles.json 67e616530930fbef8fe40791ed3599f5dce2b340 assets/ultramarine/models/item/green_silk_fabric_roll.json ded4a7d882a9853ba5e250e847fd58534dfec6d4 assets/ultramarine/models/item/gunny_sack.json +0443d7397f3f94e6ad3f3b58c6bdb716d7918f00 assets/ultramarine/models/item/hematite_ore.json 009af157e173017052b78d75376001ebb5100598 assets/ultramarine/models/item/incense.json 5ba540d35a0196878af1cc18987cb591d84e66e6 assets/ultramarine/models/item/jade.json b0788a544233b026352fc99233b098e046b6b94c assets/ultramarine/models/item/jade_candlestick.json @@ -354,6 +361,7 @@ a323eb1abcddad7ec806631d7f6daff21cc8e454 assets/ultramarine/models/item/polished 2f60183a983c1895a0e7fc33b82d3a74f073d26b assets/ultramarine/models/item/polished_weathered_stone_stairs.json 8866b1423756eb2a1622c6bcd3003d68fd57a53f assets/ultramarine/models/item/polished_weathered_stone_wall.json 64b5790afbcd88324078b458ffe7a5d4aec89541 assets/ultramarine/models/item/purple_silk_fabric_roll.json +415209c7c9397d06d8d12a0e4a826c781044a114 assets/ultramarine/models/item/raw_hematite.json 51fbb31d768c48a41c32578d81d6cd41495de2a6 assets/ultramarine/models/item/raw_meat.json ed22025e4422c9f8fb4c6d576a7981e518fd242d assets/ultramarine/models/item/red_candle.json 13ed70a252184a6d185f372f2104b240718c1413 assets/ultramarine/models/item/red_silk_fabric_roll.json @@ -363,6 +371,7 @@ c323cd54911101dd83e1fb6bf73448363f6adb9b assets/ultramarine/models/item/rosewood 735c5becae8922d2b7546097630f075b2e17586f assets/ultramarine/models/item/rosewood_slab.json 3d739b54dc148752eea76c738cd5474416f5098e assets/ultramarine/models/item/rosewood_stairs.json b40304a1367371fb496994dfe4500526ba0242ba assets/ultramarine/models/item/royal_censer.json +87a6f7822c60de40c97bb8781b6e5e35c4f9cd07 assets/ultramarine/models/item/silk.json 913ab5176acae2a8610f45e0006e55e2f2a758e3 assets/ultramarine/models/item/small_red_lantern.json 3be3b3d1953ed40db057816485e1d58cde6e50b7 assets/ultramarine/models/item/small_standing_lamp.json ba1fbd7fea608d55edbe393de167b1ed5b0d3412 assets/ultramarine/models/item/square_palace_lantern.json @@ -382,6 +391,7 @@ ba8736149c1499636d5f167a65b662e22f63f1fa assets/ultramarine/models/item/white_sk 381b8c6302057a40aec373e7c6e912a09ca6abb3 assets/ultramarine/models/item/wooden_frame.json 4b59b8ee2366195f218810e9afb6f79d936f392d assets/ultramarine/models/item/wooden_hammer.json c0c75429dadb07b01f6f00c445ce46057f1cd292 assets/ultramarine/models/item/woodworking_workbench.json +f14c830e4cf389c400a973ae3ea933e21f9ed58e assets/ultramarine/models/item/xuan_paper.json f6f148933bfad1ad653c93bca8f11d6b23d8a51f assets/ultramarine/models/item/yellow_roof_tile.json c588e4513180fb10c783be9248a21dd91c9a010e assets/ultramarine/models/item/yellow_roof_tile_edge.json e7487305493a472b16b5ee41e95f93f669961d88 assets/ultramarine/models/item/yellow_roof_tile_stairs.json @@ -390,9 +400,9 @@ e48e56ce7a08d5506893c975360626e425e808ea assets/ultramarine/models/item/yellow_s bb3cff8ef2b03825fc5bbeffb336436d70edcaa4 data/minecraft/tags/blocks/fences.json 334ccd185cdb5074aae932ae6873ff7f3d875d5f data/minecraft/tags/blocks/mineable/axe.json b7a988c65ec5c840c5d6608ce6d6cd14ab9511bc data/minecraft/tags/blocks/mineable/hoe.json -f11f2fad6223213d9be58185e06c876e82f52df1 data/minecraft/tags/blocks/mineable/pickaxe.json +4cf9da3732ee88addd2d992b4ad91a819bb9cfa7 data/minecraft/tags/blocks/mineable/pickaxe.json 17545dd0c9613eb0477c89b2b64307a497bc1d58 data/minecraft/tags/blocks/needs_iron_tool.json -5ee642239c31fa75df8bbfa4eb586d13242190d2 data/minecraft/tags/blocks/needs_stone_tool.json +9a78734519a787b16bc1a768f35bcbf3e480d116 data/minecraft/tags/blocks/needs_stone_tool.json 3186ba1b362c329daa8cf80a8536319b79fa838a data/minecraft/tags/blocks/planks.json 935ab08c0a4973e35fcf4452f1cce76780e9a627 data/minecraft/tags/blocks/walls.json 3186ba1b362c329daa8cf80a8536319b79fa838a data/minecraft/tags/items/planks.json @@ -529,6 +539,7 @@ fd3cc4b7b0a4ba5b49d779e2a6ab48d5ddef9dfa data/ultramarine/loot_tables/blocks/gre 68ebf4998bf0c0b4a481b5cec8aa93cc94d5dd37 data/ultramarine/loot_tables/blocks/green_roof_tiles.json 521d41f282181792383a6817f74bab4e6affc135 data/ultramarine/loot_tables/blocks/green_silk_fabric_roll.json 642b8eab201ca2784a84d8ba8e8dfe5a1eee098a data/ultramarine/loot_tables/blocks/gunny_sack.json +38f7471ae5cb27305e88eeb9b3f2c1d9b47b86c7 data/ultramarine/loot_tables/blocks/hematite_ore.json b125ca67bffd0a1ea5fe9ee0a355b6939e84f4da data/ultramarine/loot_tables/blocks/jade_candlestick.json ea07703bd0102fc176121fac7082579cb162e73b data/ultramarine/loot_tables/blocks/jade_ore.json 035705d74870c14045739ade8b98f98eabc07175 data/ultramarine/loot_tables/blocks/light_cyan_floor_tile.json diff --git a/src/generated/resources/assets/ultramarine/blockstates/hematite_ore.json b/src/generated/resources/assets/ultramarine/blockstates/hematite_ore.json new file mode 100644 index 00000000..3b79e66a --- /dev/null +++ b/src/generated/resources/assets/ultramarine/blockstates/hematite_ore.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "ultramarine:block/hematite_ore" + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/block/hematite_ore.json b/src/generated/resources/assets/ultramarine/models/block/hematite_ore.json new file mode 100644 index 00000000..78623ab0 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/block/hematite_ore.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "ultramarine:block/hematite_ore" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/baozi.json b/src/generated/resources/assets/ultramarine/models/item/baozi.json new file mode 100644 index 00000000..29d456e3 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/baozi.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ultramarine:item/baozi" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/black_brick.json b/src/generated/resources/assets/ultramarine/models/item/black_brick.json new file mode 100644 index 00000000..7e981b87 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/black_brick.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ultramarine:item/black_brick" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/fur.json b/src/generated/resources/assets/ultramarine/models/item/fur.json new file mode 100644 index 00000000..9c7b153a --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/fur.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ultramarine:item/fur" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/grease.json b/src/generated/resources/assets/ultramarine/models/item/grease.json new file mode 100644 index 00000000..96334475 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/grease.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ultramarine:item/grease" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/hematite_ore.json b/src/generated/resources/assets/ultramarine/models/item/hematite_ore.json new file mode 100644 index 00000000..a0b48dc3 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/hematite_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "ultramarine:block/hematite_ore" +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/raw_hematite.json b/src/generated/resources/assets/ultramarine/models/item/raw_hematite.json new file mode 100644 index 00000000..e116ae87 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/raw_hematite.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ultramarine:item/raw_hematite" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/silk.json b/src/generated/resources/assets/ultramarine/models/item/silk.json new file mode 100644 index 00000000..79f58389 --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/silk.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ultramarine:item/silk" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/ultramarine/models/item/xuan_paper.json b/src/generated/resources/assets/ultramarine/models/item/xuan_paper.json new file mode 100644 index 00000000..05be65fb --- /dev/null +++ b/src/generated/resources/assets/ultramarine/models/item/xuan_paper.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "ultramarine:item/xuan_paper" + } +} \ 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 07ff49a5..eb8d0f1d 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -71,6 +71,7 @@ "ultramarine:black_roof_tile_stairs", "ultramarine:black_roof_tile_edge", "ultramarine:jade_ore", - "ultramarine:magnesite_ore" + "ultramarine:magnesite_ore", + "ultramarine:hematite_ore" ] } \ 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 index 2c12b8ac..524afeba 100644 --- a/src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json +++ b/src/generated/resources/data/minecraft/tags/blocks/needs_stone_tool.json @@ -1,6 +1,7 @@ { "replace": false, "values": [ - "ultramarine:magnesite_ore" + "ultramarine:magnesite_ore", + "ultramarine:hematite_ore" ] } \ No newline at end of file diff --git a/src/generated/resources/data/ultramarine/loot_tables/blocks/hematite_ore.json b/src/generated/resources/data/ultramarine/loot_tables/blocks/hematite_ore.json new file mode 100644 index 00000000..1b89e87b --- /dev/null +++ b/src/generated/resources/data/ultramarine/loot_tables/blocks/hematite_ore.json @@ -0,0 +1,50 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "name": "hematite_ore", + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "ultramarine:hematite_ore" + }, + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:apply_bonus", + "enchantment": "minecraft:fortune", + "formula": "minecraft:ore_drops" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "ultramarine:raw_hematite" + } + ] + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/java/com/voxelutopia/ultramarine/data/ModFoods.java b/src/main/java/com/voxelutopia/ultramarine/data/ModFoods.java index ba1811ce..3e0eff2e 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/ModFoods.java +++ b/src/main/java/com/voxelutopia/ultramarine/data/ModFoods.java @@ -12,6 +12,7 @@ public class ModFoods { .effect(() -> new MobEffectInstance(MobEffects.HUNGER, 300, 0), 0.8F) .build(); public static final FoodProperties COOKED_MEAT = (new FoodProperties.Builder()).nutrition(4).saturationMod(0.5F).build(); + public static final FoodProperties BAOZI = (new FoodProperties.Builder()).nutrition(2).saturationMod(1.0F).build(); public static final FoodProperties FISH = (new FoodProperties.Builder()).nutrition(2).saturationMod(0.2F) .effect(() -> new MobEffectInstance(MobEffects.HUNGER, 300, 0), 0.6F) .effect(() -> new MobEffectInstance(MobEffects.POISON, 200, 0), 0.4F) diff --git a/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java b/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java index edae1820..01fd1995 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java +++ b/src/main/java/com/voxelutopia/ultramarine/data/registry/BlockRegistry.java @@ -171,6 +171,7 @@ public class BlockRegistry { public static final RegistryObject JADE_ORE = BLOCKS.register("jade_ore", () -> new BaseOreBlock(2, 5)); public static final RegistryObject MAGNESITE_ORE = BLOCKS.register("magnesite_ore", () -> new BaseOreBlock(2, 5)); + public static final RegistryObject HEMATITE_ORE = BLOCKS.register("hematite_ore", () -> new BaseOreBlock(1, 3)); public static final RegistryObject WOODWORKING_WORKBENCH = BLOCKS.register("woodworking_workbench", WoodworkingWorkBench::new); diff --git a/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java b/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java index 3b02bf6c..93d67eb3 100644 --- a/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java +++ b/src/main/java/com/voxelutopia/ultramarine/data/registry/ItemRegistry.java @@ -133,6 +133,7 @@ public class ItemRegistry { public static final RegistryObject EBONY_CHAIR = fromBlock(BlockRegistry.EBONY_CHAIR, CreativeTabs.FURNITURE); public static final RegistryObject CYAN_BRICK = simpleItem("cyan_brick", CreativeTabs.MATERIALS); + public static final RegistryObject BLACK_BRICK = simpleItem("black_brick", CreativeTabs.MATERIALS); public static final RegistryObject GRAY_ROOF_TILE = simpleItem("gray_roof_tile", CreativeTabs.MATERIALS); public static final RegistryObject YELLOW_ROOF_TILE = simpleItem("yellow_roof_tile", CreativeTabs.MATERIALS); public static final RegistryObject GREEN_ROOF_TILE = simpleItem("green_roof_tile", CreativeTabs.MATERIALS); @@ -158,10 +159,17 @@ public class ItemRegistry { public static final RegistryObject JADE = simpleItem("jade", CreativeTabs.MATERIALS); public static final RegistryObject MAGNESITE_ORE = fromBlock(BlockRegistry.MAGNESITE_ORE, CreativeTabs.MATERIALS); public static final RegistryObject MAGNESITE = simpleItem("magnesite", CreativeTabs.MATERIALS); + public static final RegistryObject HEMATITE_ORE = fromBlock(BlockRegistry.HEMATITE_ORE, CreativeTabs.MATERIALS); + public static final RegistryObject RAW_HEMATITE = simpleItem("raw_hematite", CreativeTabs.MATERIALS); public static final RegistryObject MOONCAKE = ITEMS.register("mooncake", () -> new BaseFood(ModFoods.MOONCAKE)); public static final RegistryObject MUNG_BEAN_CAKE = ITEMS.register("mung_bean_cake", () -> new BaseFood(ModFoods.MUNG_BEAN_CAKE)); public static final RegistryObject RAW_MEAT = ITEMS.register("raw_meat", () -> new BaseFood(ModFoods.RAW_MEAT)); public static final RegistryObject COOKED_MEAT = ITEMS.register("cooked_meat", () -> new BaseFood(ModFoods.COOKED_MEAT)); + public static final RegistryObject BAOZI = ITEMS.register("baozi", () -> new BaseFood(ModFoods.BAOZI)); + public static final RegistryObject FUR = simpleItem("fur", CreativeTabs.MATERIALS); + public static final RegistryObject GREASE = simpleItem("grease", CreativeTabs.MATERIALS); + public static final RegistryObject SILK = simpleItem("silk", CreativeTabs.MATERIALS); + public static final RegistryObject XUAN_PAPER = simpleItem("xuan_paper", CreativeTabs.MATERIALS); public static final RegistryObject COPPER_CASH_COIN = simpleItem("copper_cash_coin", CreativeTabs.MATERIALS); diff --git a/src/main/java/com/voxelutopia/ultramarine/datagen/ModBlockModelProvider.java b/src/main/java/com/voxelutopia/ultramarine/datagen/ModBlockModelProvider.java index 18673508..de20cba4 100644 --- a/src/main/java/com/voxelutopia/ultramarine/datagen/ModBlockModelProvider.java +++ b/src/main/java/com/voxelutopia/ultramarine/datagen/ModBlockModelProvider.java @@ -124,6 +124,7 @@ protected void registerStatesAndModels() { horizontalBlock(BlockRegistry.WOODWORKING_WORKBENCH.get(), models().getExistingFile(blockLoc(BlockRegistry.WOODWORKING_WORKBENCH.get()))); simpleBlock(BlockRegistry.JADE_ORE.get()); simpleBlock(BlockRegistry.MAGNESITE_ORE.get()); + simpleBlock(BlockRegistry.HEMATITE_ORE.get()); } private ResourceLocation blockLoc(Block block){ diff --git a/src/main/java/com/voxelutopia/ultramarine/datagen/ModBlockTagProvider.java b/src/main/java/com/voxelutopia/ultramarine/datagen/ModBlockTagProvider.java index d8fee749..fd83a662 100644 --- a/src/main/java/com/voxelutopia/ultramarine/datagen/ModBlockTagProvider.java +++ b/src/main/java/com/voxelutopia/ultramarine/datagen/ModBlockTagProvider.java @@ -27,9 +27,11 @@ protected void addTags() { .forEach(blockRegistryObject -> tag(BlockTags.MINEABLE_WITH_PICKAXE).add(blockRegistryObject.get())); tag(BlockTags.MINEABLE_WITH_PICKAXE) .add(BlockRegistry.JADE_ORE.get()) - .add(BlockRegistry.MAGNESITE_ORE.get()); + .add(BlockRegistry.MAGNESITE_ORE.get()) + .add(BlockRegistry.HEMATITE_ORE.get()); tag(BlockTags.NEEDS_STONE_TOOL) - .add(BlockRegistry.MAGNESITE_ORE.get()); + .add(BlockRegistry.MAGNESITE_ORE.get()) + .add(BlockRegistry.HEMATITE_ORE.get()); tag(BlockTags.NEEDS_IRON_TOOL) .add(BlockRegistry.JADE_ORE.get()); tag(BlockTags.MINEABLE_WITH_AXE) diff --git a/src/main/java/com/voxelutopia/ultramarine/datagen/ModLootTableProvider.java b/src/main/java/com/voxelutopia/ultramarine/datagen/ModLootTableProvider.java index f6bda804..73ea0461 100644 --- a/src/main/java/com/voxelutopia/ultramarine/datagen/ModLootTableProvider.java +++ b/src/main/java/com/voxelutopia/ultramarine/datagen/ModLootTableProvider.java @@ -51,6 +51,7 @@ protected void addTables() { .filter(blockRegistryObject -> !NON_SIMPLE_BLOCKS.contains(blockRegistryObject)) .forEach(this::simple); ore(BlockRegistry.JADE_ORE, ItemRegistry.JADE); + ore(BlockRegistry.HEMATITE_ORE, ItemRegistry.RAW_HEMATITE); abundantOre(BlockRegistry.MAGNESITE_ORE, ItemRegistry.MAGNESITE); porcelain(BlockRegistry.BLUE_AND_WHITE_PORCELAIN_VASE, ItemRegistry.BLUE_AND_WHITE_PORCELAIN_PIECE, ItemRegistry.BLUE_AND_WHITE_PORCELAIN_SHARDS); diff --git a/src/main/resources/assets/ultramarine/textures/block/hematite_ore.png b/src/main/resources/assets/ultramarine/textures/block/hematite_ore.png new file mode 100644 index 00000000..222a4ab3 Binary files /dev/null and b/src/main/resources/assets/ultramarine/textures/block/hematite_ore.png differ diff --git a/src/main/resources/assets/ultramarine/textures/item/baozi.png b/src/main/resources/assets/ultramarine/textures/item/baozi.png new file mode 100644 index 00000000..a82dff6c Binary files /dev/null and b/src/main/resources/assets/ultramarine/textures/item/baozi.png differ diff --git a/src/main/resources/assets/ultramarine/textures/item/black_brick.png b/src/main/resources/assets/ultramarine/textures/item/black_brick.png new file mode 100644 index 00000000..0ae9c956 Binary files /dev/null and b/src/main/resources/assets/ultramarine/textures/item/black_brick.png differ diff --git a/src/main/resources/assets/ultramarine/textures/item/fur.png b/src/main/resources/assets/ultramarine/textures/item/fur.png new file mode 100644 index 00000000..529e6aea Binary files /dev/null and b/src/main/resources/assets/ultramarine/textures/item/fur.png differ diff --git a/src/main/resources/assets/ultramarine/textures/item/grease.png b/src/main/resources/assets/ultramarine/textures/item/grease.png new file mode 100644 index 00000000..27c8c4b8 Binary files /dev/null and b/src/main/resources/assets/ultramarine/textures/item/grease.png differ diff --git a/src/main/resources/assets/ultramarine/textures/item/silk.png b/src/main/resources/assets/ultramarine/textures/item/silk.png new file mode 100644 index 00000000..60d1fda5 Binary files /dev/null and b/src/main/resources/assets/ultramarine/textures/item/silk.png differ diff --git a/src/main/resources/assets/ultramarine/textures/item/xuan_paper.png b/src/main/resources/assets/ultramarine/textures/item/xuan_paper.png new file mode 100644 index 00000000..1f09cdee Binary files /dev/null and b/src/main/resources/assets/ultramarine/textures/item/xuan_paper.png differ