From a0d866d838a151da4eacb9617320d75505341883 Mon Sep 17 00:00:00 2001 From: Steven Tracey Date: Wed, 3 Aug 2022 09:33:14 -0400 Subject: [PATCH] merge conflict 2 --- .../nevets/vplus/blocks/LavaSpongeBlock.java | 75 ++++++++++++++++++ .../blocks/SaturatedLavaSpongeBlock.java | 58 ++++++++++++++ .../tech/nevets/vplus/blocks/VPBlocks.java | 4 +- .../tech/nevets/vplus/items/VPMaterials.java | 19 ++--- .../vplus/items/tools/LongSwordBase.java | 10 +++ ...tinum_layer_1.png => sapphire_layer_1.png} | Bin ...tinum_layer_2.png => sapphire_layer_2.png} | Bin .../vplus/blockstates/green_wall_torch.json | 19 ----- .../assets/vplus/blockstates/greentorch.json | 7 -- .../vplus/blockstates/platinum_block.json | 5 -- .../vplus/blockstates/platinum_ore.json | 5 -- .../vplus/blockstates/sapphire_block.json | 5 ++ .../vplus/blockstates/sapphire_ore.json | 5 ++ .../resources/assets/vplus/lang/en_us.json | 71 ++++------------- .../vplus/models/block/green_wall_torch.json | 6 -- .../assets/vplus/models/block/greentorch.json | 6 -- ...latinum_block.json => sapphire_block.json} | 2 +- .../{platinum_ore.json => sapphire_ore.json} | 2 +- .../models/item/enchanted_platinum_apple.json | 6 -- .../models/item/enchanted_sapphire_apple.json | 6 ++ .../assets/vplus/models/item/greentorch.json | 6 -- .../vplus/models/item/platinum_block.json | 3 - .../vplus/models/item/platinum_leggings.json | 6 -- .../vplus/models/item/platinum_nugget.json | 6 -- .../vplus/models/item/platinum_ore.json | 3 - .../{platinum_apple.json => sapphire.json} | 2 +- ...latinum_boots.json => sapphire_apple.json} | 2 +- .../{platinum_hoe.json => sapphire_axe.json} | 2 +- .../vplus/models/item/sapphire_block.json | 3 + ...latinum_ingot.json => sapphire_boots.json} | 2 +- ...estplate.json => sapphire_chestplate.json} | 2 +- ...tinum_helmet.json => sapphire_helmet.json} | 2 +- .../{platinum_axe.json => sapphire_hoe.json} | 2 +- .../vplus/models/item/sapphire_leggings.json | 6 ++ .../vplus/models/item/sapphire_ore.json | 3 + ...num_pickaxe.json => sapphire_pickaxe.json} | 2 +- ...tinum_shovel.json => sapphire_shovel.json} | 2 +- ...latinum_sword.json => sapphire_sword.json} | 2 +- .../vplus/textures/block/greentorch.png | Bin 138 -> 0 bytes ...{platinum_block.png => sapphire_block.png} | Bin .../{platinum_ore.png => sapphire_ore.png} | Bin ...apple.png => enchanted_sapphire_apple.png} | Bin .../vplus/textures/item/platinum_nugget.png | Bin 1565 -> 0 bytes .../item/{platinum_ingot.png => sapphire.png} | Bin ...{platinum_apple.png => sapphire_apple.png} | Bin .../{platinum_axe.png => sapphire_axe.png} | Bin ...{platinum_boots.png => sapphire_boots.png} | Bin ...chestplate.png => sapphire_chestplate.png} | Bin ...latinum_helmet.png => sapphire_helmet.png} | Bin .../{platinum_hoe.png => sapphire_hoe.png} | Bin ...num_leggings.png => sapphire_leggings.png} | Bin ...tinum_pickaxe.png => sapphire_pickaxe.png} | Bin ...latinum_shovel.png => sapphire_shovel.png} | Bin ...{platinum_sword.png => sapphire_sword.png} | Bin .../tags/blocks/beacon_base_blocks.json | 5 +- .../tags/items/beacon_payment_items.json | 5 +- ...latinum_block.json => sapphire_block.json} | 2 +- .../{platinum_ore.json => sapphire_ore.json} | 8 +- ...ple.json => enchanted_sapphire_apple.json} | 4 +- .../vplus/recipes/platinum_axe_smithing.json | 12 --- .../recipes/platinum_boots_smithing.json | 12 --- .../recipes/platinum_chestplate_smithing.json | 12 --- .../recipes/platinum_helmet_smithing.json | 12 --- .../vplus/recipes/platinum_hoe_smithing.json | 12 --- .../recipes/platinum_ingot_from_nuggets.json | 17 ---- .../recipes/platinum_leggings_smithing.json | 12 --- .../recipes/platinum_nugget_from_ingot.json | 15 ---- .../recipes/platinum_pickaxe_smithing.json | 12 --- .../recipes/platinum_shovel_smithing.json | 12 --- .../recipes/platinum_sword_smithing.json | 12 --- .../data/vplus/recipes/ruby_axe_smithing.json | 12 --- .../vplus/recipes/ruby_boots_smithing.json | 12 --- .../{platinum_ingot.json => sapphire.json} | 4 +- ...latinum_apple.json => sapphire_apple.json} | 4 +- .../{platinum_axe.json => sapphire_axe.json} | 4 +- ...latinum_block.json => sapphire_block.json} | 4 +- ...latinum_boots.json => sapphire_boots.json} | 4 +- ...estplate.json => sapphire_chestplate.json} | 4 +- ...sting.json => sapphire_from_blasting.json} | 4 +- ...om_block.json => sapphire_from_block.json} | 4 +- ...tinum_helmet.json => sapphire_helmet.json} | 4 +- .../{platinum_hoe.json => sapphire_hoe.json} | 4 +- ...m_leggings.json => sapphire_leggings.json} | 4 +- ...num_pickaxe.json => sapphire_pickaxe.json} | 4 +- ...tinum_shovel.json => sapphire_shovel.json} | 4 +- ...latinum_sword.json => sapphire_sword.json} | 4 +- .../blockmodels}/vertical_acacia_slab.json | 0 .../blockmodels}/vertical_andesite_slab.json | 0 .../blockmodels}/vertical_birch_slab.json | 0 .../vertical_blackstone_slab.json | 0 .../blockmodels}/vertical_brick_slab.json | 0 .../vertical_cobblestone_slab.json | 0 .../blockmodels}/vertical_crimson_slab.json | 0 .../vertical_cut_red_sandstone_slab.json | 0 .../vertical_cut_sandstone_slab.json | 0 .../blockmodels}/vertical_dark_oak_slab.json | 0 .../vertical_dark_prismarine_slab.json | 0 .../blockmodels}/vertical_diorite_slab.json | 0 .../vertical_end_stone_brick_slab.json | 0 .../blockmodels}/vertical_granite_slab.json | 0 .../blockmodels}/vertical_jungle_slab.json | 0 .../vertical_mossy_cobblestone_slab.json | 0 .../vertical_mossy_stone_brick_slab.json | 0 .../vertical_nether_brick_slab.json | 0 .../blockmodels}/vertical_oak_slab.json | 0 .../vertical_petrified_oak_slab.json | 0 .../vertical_polished_andesite_slab.json | 0 ...rtical_polished_blackstone_brick_slab.json | 0 .../vertical_polished_blackstone_slab.json | 0 .../vertical_polished_diorite_slab.json | 0 .../vertical_polished_granite_slab.json | 0 .../vertical_prismarine_brick_slab.json | 0 .../vertical_prismarine_slab.json | 0 .../blockmodels}/vertical_purpur_slab.json | 0 .../blockmodels}/vertical_quartz_slab.json | 0 .../vertical_red_nether_brick_slab.json | 0 .../vertical_red_sandstone_slab.json | 0 .../blockmodels}/vertical_sandstone_slab.json | 0 .../blockmodels}/vertical_slab.json | 0 .../vertical_smooth_quartz_slab.json | 0 .../vertical_smooth_red_sandstone_slab.json | 0 .../vertical_smooth_sandstone_slab.json | 0 .../vertical_smooth_stone_slab.json | 0 .../blockmodels}/vertical_spruce_slab.json | 0 .../vertical_stone_brick_slab.json | 0 .../blockmodels}/vertical_stone_slab.json | 0 .../blockmodels}/vertical_warped_slab.json | 0 .../blockstates/vertical_acacia_slab.json | 0 .../blockstates/vertical_andesite_slab.json | 0 .../blockstates/vertical_birch_slab.json | 0 .../blockstates/vertical_blackstone_slab.json | 0 .../blockstates/vertical_brick_slab.json | 0 .../vertical_cobblestone_slab.json | 0 .../blockstates/vertical_crimson_slab.json | 0 .../vertical_cut_red_sandstone_slab.json | 0 .../vertical_cut_sandstone_slab.json | 0 .../blockstates/vertical_dark_oak_slab.json | 0 .../vertical_dark_prismarine_slab.json | 0 .../blockstates/vertical_diorite_slab.json | 0 .../vertical_end_stone_brick_slab.json | 0 .../blockstates/vertical_granite_slab.json | 0 .../blockstates/vertical_jungle_slab.json | 0 .../vertical_mossy_cobblestone_slab.json | 0 .../vertical_mossy_stone_brick_slab.json | 0 .../vertical_nether_brick_slab.json | 0 .../blockstates/vertical_oak_slab.json | 0 .../vertical_polished_andesite_slab.json | 0 ...rtical_polished_blackstone_brick_slab.json | 0 .../vertical_polished_blackstone_slab.json | 0 .../vertical_polished_diorite_slab.json | 0 .../vertical_polished_granite_slab.json | 0 .../vertical_prismarine_brick_slab.json | 0 .../blockstates/vertical_prismarine_slab.json | 0 .../blockstates/vertical_purpur_slab.json | 0 .../blockstates/vertical_quartz_slab.json | 0 .../vertical_red_nether_brick_slab.json | 0 .../vertical_red_sandstone_slab.json | 0 .../blockstates/vertical_sandstone_slab.json | 0 .../vertical_smooth_quartz_slab.json | 0 .../vertical_smooth_red_sandstone_slab.json | 0 .../vertical_smooth_sandstone_slab.json | 0 .../vertical_smooth_stone_slab.json | 0 .../blockstates/vertical_spruce_slab.json | 0 .../vertical_stone_brick_slab.json | 0 .../blockstates/vertical_stone_slab.json | 0 .../blockstates/vertical_warped_slab.json | 0 .../itemmodels}/vertical_acacia_slab.json | 0 .../itemmodels}/vertical_andesite_slab.json | 0 .../itemmodels}/vertical_birch_slab.json | 0 .../itemmodels}/vertical_blackstone_slab.json | 0 .../itemmodels}/vertical_brick_slab.json | 0 .../vertical_cobblestone_slab.json | 0 .../itemmodels}/vertical_crimson_slab.json | 0 .../vertical_cut_red_sandstone_slab.json | 0 .../vertical_cut_sandstone_slab.json | 0 .../itemmodels}/vertical_dark_oak_slab.json | 0 .../vertical_dark_prismarine_slab.json | 0 .../itemmodels}/vertical_diorite_slab.json | 0 .../vertical_end_stone_brick_slab.json | 0 .../itemmodels}/vertical_granite_slab.json | 0 .../itemmodels}/vertical_jungle_slab.json | 0 .../vertical_mossy_cobblestone_slab.json | 0 .../vertical_mossy_stone_brick_slab.json | 0 .../vertical_nether_brick_slab.json | 0 .../itemmodels}/vertical_oak_slab.json | 0 .../vertical_polished_andesite_slab.json | 0 ...rtical_polished_blackstone_brick_slab.json | 0 .../vertical_polished_blackstone_slab.json | 0 .../vertical_polished_diorite_slab.json | 0 .../vertical_polished_granite_slab.json | 0 .../vertical_prismarine_brick_slab.json | 0 .../itemmodels}/vertical_prismarine_slab.json | 0 .../itemmodels}/vertical_purpur_slab.json | 0 .../itemmodels}/vertical_quartz_slab.json | 0 .../vertical_red_nether_brick_slab.json | 0 .../vertical_red_sandstone_slab.json | 0 .../itemmodels}/vertical_sandstone_slab.json | 0 .../vertical_smooth_quartz_slab.json | 0 .../vertical_smooth_red_sandstone_slab.json | 0 .../vertical_smooth_sandstone_slab.json | 0 .../vertical_smooth_stone_slab.json | 0 .../itemmodels}/vertical_spruce_slab.json | 0 .../vertical_stone_brick_slab.json | 0 .../itemmodels}/vertical_stone_slab.json | 0 .../itemmodels}/vertical_warped_slab.json | 0 temp/lang.json | 41 ++++++++++ .../tags/blocks/vertical_slabs.json | 0 .../vertloottables}/vertical_acacia_slab.json | 0 .../vertical_andesite_slab.json | 0 .../vertloottables}/vertical_birch_slab.json | 0 .../vertical_blackstone_slab.json | 0 .../vertloottables}/vertical_brick_slab.json | 0 .../vertical_cobblestone_slab.json | 0 .../vertical_crimson_slab.json | 0 .../vertical_cut_red_sandstone_slab.json | 0 .../vertical_cut_sandstone_slab.json | 0 .../vertical_dark_oak_slab.json | 0 .../vertical_dark_prismarine_slab.json | 0 .../vertical_diorite_slab.json | 0 .../vertical_end_stone_brick_slab.json | 0 .../vertical_granite_slab.json | 0 .../vertloottables}/vertical_jungle_slab.json | 0 .../vertical_mossy_cobblestone_slab.json | 0 .../vertical_mossy_stone_brick_slab.json | 0 .../vertical_nether_brick_slab.json | 0 .../vertloottables}/vertical_oak_slab.json | 0 .../vertical_polished_andesite_slab.json | 0 ...rtical_polished_blackstone_brick_slab.json | 0 .../vertical_polished_blackstone_slab.json | 0 .../vertical_polished_diorite_slab.json | 0 .../vertical_polished_granite_slab.json | 0 .../vertical_prismarine_brick_slab.json | 0 .../vertical_prismarine_slab.json | 0 .../vertloottables}/vertical_purpur_slab.json | 0 .../vertloottables}/vertical_quartz_slab.json | 0 .../vertical_red_nether_brick_slab.json | 0 .../vertical_red_sandstone_slab.json | 0 .../vertical_sandstone_slab.json | 0 .../vertical_smooth_quartz_slab.json | 0 .../vertical_smooth_red_sandstone_slab.json | 0 .../vertical_smooth_sandstone_slab.json | 0 .../vertical_smooth_stone_slab.json | 0 .../vertloottables}/vertical_spruce_slab.json | 0 .../vertical_stone_brick_slab.json | 0 .../vertloottables}/vertical_stone_slab.json | 0 .../vertloottables}/vertical_warped_slab.json | 0 .../vertrecipes}/vertical_acacia_slab.json | 0 .../vertrecipes}/vertical_andesite_slab.json | 0 .../vertrecipes}/vertical_birch_slab.json | 0 .../vertical_blackstone_slab.json | 0 .../vertrecipes}/vertical_brick_slab.json | 0 .../vertical_cobblestone_slab.json | 0 .../vertrecipes}/vertical_crimson_slab.json | 0 .../vertical_cut_red_sandstone_slab.json | 0 .../vertical_cut_sandstone_slab.json | 0 .../vertrecipes}/vertical_dark_oak_slab.json | 0 .../vertical_dark_prismarine_slab.json | 0 .../vertrecipes}/vertical_diorite_slab.json | 0 .../vertical_end_stone_brick_slab.json | 0 .../vertrecipes}/vertical_granite_slab.json | 0 .../vertrecipes}/vertical_jungle_slab.json | 0 .../vertical_mossy_cobblestone_slab.json | 0 .../vertical_mossy_stone_brick_slab.json | 0 .../vertical_nether_brick_slab.json | 0 .../vertrecipes}/vertical_oak_slab.json | 0 .../vertical_polished_andesite_slab.json | 0 ...rtical_polished_blackstone_brick_slab.json | 0 .../vertical_polished_blackstone_slab.json | 0 .../vertical_polished_diorite_slab.json | 0 .../vertical_polished_granite_slab.json | 0 .../vertical_prismarine_brick_slab.json | 0 .../vertical_prismarine_slab.json | 0 .../vertrecipes}/vertical_purpur_slab.json | 0 .../vertrecipes}/vertical_quartz_slab.json | 0 .../vertical_red_nether_brick_slab.json | 0 .../vertical_red_sandstone_slab.json | 0 .../vertrecipes}/vertical_sandstone_slab.json | 0 .../vertical_smooth_quartz_slab.json | 0 .../vertical_smooth_sandstone_slab.json | 0 .../vertical_smooth_stone_slab.json | 0 .../vertrecipes}/vertical_spruce_slab.json | 0 .../vertical_stone_brick_slab.json | 0 .../vertrecipes}/vertical_stone_slab.json | 0 .../vertrecipes}/vertical_warped_slab.json | 0 284 files changed, 292 insertions(+), 360 deletions(-) create mode 100644 src/main/java/tech/nevets/vplus/blocks/LavaSpongeBlock.java create mode 100644 src/main/java/tech/nevets/vplus/blocks/SaturatedLavaSpongeBlock.java create mode 100644 src/main/java/tech/nevets/vplus/items/tools/LongSwordBase.java rename src/main/resources/assets.minecraft/textures.models.armor/{platinum_layer_1.png => sapphire_layer_1.png} (100%) rename src/main/resources/assets.minecraft/textures.models.armor/{platinum_layer_2.png => sapphire_layer_2.png} (100%) delete mode 100644 src/main/resources/assets/vplus/blockstates/green_wall_torch.json delete mode 100644 src/main/resources/assets/vplus/blockstates/greentorch.json delete mode 100644 src/main/resources/assets/vplus/blockstates/platinum_block.json delete mode 100644 src/main/resources/assets/vplus/blockstates/platinum_ore.json create mode 100644 src/main/resources/assets/vplus/blockstates/sapphire_block.json create mode 100644 src/main/resources/assets/vplus/blockstates/sapphire_ore.json delete mode 100644 src/main/resources/assets/vplus/models/block/green_wall_torch.json delete mode 100644 src/main/resources/assets/vplus/models/block/greentorch.json rename src/main/resources/assets/vplus/models/block/{platinum_block.json => sapphire_block.json} (55%) rename src/main/resources/assets/vplus/models/block/{platinum_ore.json => sapphire_ore.json} (57%) delete mode 100644 src/main/resources/assets/vplus/models/item/enchanted_platinum_apple.json create mode 100644 src/main/resources/assets/vplus/models/item/enchanted_sapphire_apple.json delete mode 100644 src/main/resources/assets/vplus/models/item/greentorch.json delete mode 100644 src/main/resources/assets/vplus/models/item/platinum_block.json delete mode 100644 src/main/resources/assets/vplus/models/item/platinum_leggings.json delete mode 100644 src/main/resources/assets/vplus/models/item/platinum_nugget.json delete mode 100644 src/main/resources/assets/vplus/models/item/platinum_ore.json rename src/main/resources/assets/vplus/models/item/{platinum_apple.json => sapphire.json} (54%) rename src/main/resources/assets/vplus/models/item/{platinum_boots.json => sapphire_apple.json} (54%) rename src/main/resources/assets/vplus/models/item/{platinum_hoe.json => sapphire_axe.json} (55%) create mode 100644 src/main/resources/assets/vplus/models/item/sapphire_block.json rename src/main/resources/assets/vplus/models/item/{platinum_ingot.json => sapphire_boots.json} (54%) rename src/main/resources/assets/vplus/models/item/{platinum_chestplate.json => sapphire_chestplate.json} (52%) rename src/main/resources/assets/vplus/models/item/{platinum_helmet.json => sapphire_helmet.json} (54%) rename src/main/resources/assets/vplus/models/item/{platinum_axe.json => sapphire_hoe.json} (55%) create mode 100644 src/main/resources/assets/vplus/models/item/sapphire_leggings.json create mode 100644 src/main/resources/assets/vplus/models/item/sapphire_ore.json rename src/main/resources/assets/vplus/models/item/{platinum_pickaxe.json => sapphire_pickaxe.json} (53%) rename src/main/resources/assets/vplus/models/item/{platinum_shovel.json => sapphire_shovel.json} (53%) rename src/main/resources/assets/vplus/models/item/{platinum_sword.json => sapphire_sword.json} (54%) delete mode 100644 src/main/resources/assets/vplus/textures/block/greentorch.png rename src/main/resources/assets/vplus/textures/block/{platinum_block.png => sapphire_block.png} (100%) rename src/main/resources/assets/vplus/textures/block/{platinum_ore.png => sapphire_ore.png} (100%) rename src/main/resources/assets/vplus/textures/item/{enchanted_platinum_apple.png => enchanted_sapphire_apple.png} (100%) delete mode 100644 src/main/resources/assets/vplus/textures/item/platinum_nugget.png rename src/main/resources/assets/vplus/textures/item/{platinum_ingot.png => sapphire.png} (100%) rename src/main/resources/assets/vplus/textures/item/{platinum_apple.png => sapphire_apple.png} (100%) rename src/main/resources/assets/vplus/textures/item/{platinum_axe.png => sapphire_axe.png} (100%) rename src/main/resources/assets/vplus/textures/item/{platinum_boots.png => sapphire_boots.png} (100%) rename src/main/resources/assets/vplus/textures/item/{platinum_chestplate.png => sapphire_chestplate.png} (100%) rename src/main/resources/assets/vplus/textures/item/{platinum_helmet.png => sapphire_helmet.png} (100%) rename src/main/resources/assets/vplus/textures/item/{platinum_hoe.png => sapphire_hoe.png} (100%) rename src/main/resources/assets/vplus/textures/item/{platinum_leggings.png => sapphire_leggings.png} (100%) rename src/main/resources/assets/vplus/textures/item/{platinum_pickaxe.png => sapphire_pickaxe.png} (100%) rename src/main/resources/assets/vplus/textures/item/{platinum_shovel.png => sapphire_shovel.png} (100%) rename src/main/resources/assets/vplus/textures/item/{platinum_sword.png => sapphire_sword.png} (100%) rename src/main/resources/data/vplus/loot_tables/blocks/{platinum_block.json => sapphire_block.json} (86%) rename src/main/resources/data/vplus/loot_tables/blocks/{platinum_ore.json => sapphire_ore.json} (89%) rename src/main/resources/data/vplus/recipes/{enchanted_platinum_apple.json => enchanted_sapphire_apple.json} (71%) delete mode 100644 src/main/resources/data/vplus/recipes/platinum_axe_smithing.json delete mode 100644 src/main/resources/data/vplus/recipes/platinum_boots_smithing.json delete mode 100644 src/main/resources/data/vplus/recipes/platinum_chestplate_smithing.json delete mode 100644 src/main/resources/data/vplus/recipes/platinum_helmet_smithing.json delete mode 100644 src/main/resources/data/vplus/recipes/platinum_hoe_smithing.json delete mode 100644 src/main/resources/data/vplus/recipes/platinum_ingot_from_nuggets.json delete mode 100644 src/main/resources/data/vplus/recipes/platinum_leggings_smithing.json delete mode 100644 src/main/resources/data/vplus/recipes/platinum_nugget_from_ingot.json delete mode 100644 src/main/resources/data/vplus/recipes/platinum_pickaxe_smithing.json delete mode 100644 src/main/resources/data/vplus/recipes/platinum_shovel_smithing.json delete mode 100644 src/main/resources/data/vplus/recipes/platinum_sword_smithing.json delete mode 100644 src/main/resources/data/vplus/recipes/ruby_axe_smithing.json delete mode 100644 src/main/resources/data/vplus/recipes/ruby_boots_smithing.json rename src/main/resources/data/vplus/recipes/{platinum_ingot.json => sapphire.json} (58%) rename src/main/resources/data/vplus/recipes/{platinum_apple.json => sapphire_apple.json} (73%) rename src/main/resources/data/vplus/recipes/{platinum_axe.json => sapphire_axe.json} (72%) rename src/main/resources/data/vplus/recipes/{platinum_block.json => sapphire_block.json} (68%) rename src/main/resources/data/vplus/recipes/{platinum_boots.json => sapphire_boots.json} (66%) rename src/main/resources/data/vplus/recipes/{platinum_chestplate.json => sapphire_chestplate.json} (66%) rename src/main/resources/data/vplus/recipes/{platinum_ingot_from_blasting.json => sapphire_from_blasting.json} (58%) rename src/main/resources/data/vplus/recipes/{platinum_ingot_from_block.json => sapphire_from_block.json} (64%) rename src/main/resources/data/vplus/recipes/{platinum_helmet.json => sapphire_helmet.json} (66%) rename src/main/resources/data/vplus/recipes/{platinum_hoe.json => sapphire_hoe.json} (74%) rename src/main/resources/data/vplus/recipes/{platinum_leggings.json => sapphire_leggings.json} (67%) rename src/main/resources/data/vplus/recipes/{platinum_pickaxe.json => sapphire_pickaxe.json} (73%) rename src/main/resources/data/vplus/recipes/{platinum_shovel.json => sapphire_shovel.json} (73%) rename src/main/resources/data/vplus/recipes/{platinum_sword.json => sapphire_sword.json} (73%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_acacia_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_andesite_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_birch_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_blackstone_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_brick_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_cobblestone_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_crimson_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_cut_red_sandstone_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_cut_sandstone_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_dark_oak_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_dark_prismarine_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_diorite_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_end_stone_brick_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_granite_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_jungle_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_mossy_cobblestone_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_mossy_stone_brick_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_nether_brick_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_oak_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_petrified_oak_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_polished_andesite_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_polished_blackstone_brick_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_polished_blackstone_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_polished_diorite_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_polished_granite_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_prismarine_brick_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_prismarine_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_purpur_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_quartz_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_red_nether_brick_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_red_sandstone_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_sandstone_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_smooth_quartz_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_smooth_red_sandstone_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_smooth_sandstone_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_smooth_stone_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_spruce_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_stone_brick_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_stone_slab.json (100%) rename {src/main/resources/assets/vplus/models/block => temp/blockmodels}/vertical_warped_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_acacia_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_andesite_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_birch_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_blackstone_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_brick_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_cobblestone_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_crimson_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_cut_red_sandstone_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_cut_sandstone_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_dark_oak_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_dark_prismarine_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_diorite_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_end_stone_brick_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_granite_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_jungle_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_mossy_cobblestone_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_mossy_stone_brick_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_nether_brick_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_oak_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_polished_andesite_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_polished_blackstone_brick_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_polished_blackstone_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_polished_diorite_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_polished_granite_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_prismarine_brick_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_prismarine_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_purpur_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_quartz_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_red_nether_brick_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_red_sandstone_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_sandstone_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_smooth_quartz_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_smooth_red_sandstone_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_smooth_sandstone_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_smooth_stone_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_spruce_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_stone_brick_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_stone_slab.json (100%) rename {src/main/resources/assets/vplus => temp}/blockstates/vertical_warped_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_acacia_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_andesite_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_birch_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_blackstone_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_brick_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_cobblestone_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_crimson_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_cut_red_sandstone_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_cut_sandstone_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_dark_oak_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_dark_prismarine_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_diorite_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_end_stone_brick_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_granite_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_jungle_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_mossy_cobblestone_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_mossy_stone_brick_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_nether_brick_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_oak_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_polished_andesite_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_polished_blackstone_brick_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_polished_blackstone_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_polished_diorite_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_polished_granite_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_prismarine_brick_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_prismarine_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_purpur_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_quartz_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_red_nether_brick_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_red_sandstone_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_sandstone_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_smooth_quartz_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_smooth_red_sandstone_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_smooth_sandstone_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_smooth_stone_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_spruce_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_stone_brick_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_stone_slab.json (100%) rename {src/main/resources/assets/vplus/models/item => temp/itemmodels}/vertical_warped_slab.json (100%) create mode 100644 temp/lang.json rename {src/main/resources/data/vplus => temp}/tags/blocks/vertical_slabs.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_acacia_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_andesite_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_birch_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_blackstone_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_brick_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_cobblestone_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_crimson_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_cut_red_sandstone_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_cut_sandstone_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_dark_oak_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_dark_prismarine_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_diorite_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_end_stone_brick_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_granite_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_jungle_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_mossy_cobblestone_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_mossy_stone_brick_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_nether_brick_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_oak_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_polished_andesite_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_polished_blackstone_brick_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_polished_blackstone_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_polished_diorite_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_polished_granite_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_prismarine_brick_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_prismarine_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_purpur_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_quartz_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_red_nether_brick_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_red_sandstone_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_sandstone_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_smooth_quartz_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_smooth_red_sandstone_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_smooth_sandstone_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_smooth_stone_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_spruce_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_stone_brick_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_stone_slab.json (100%) rename {src/main/resources/data/vplus/loot_tables/blocks => temp/vertloottables}/vertical_warped_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_acacia_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_andesite_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_birch_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_blackstone_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_brick_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_cobblestone_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_crimson_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_cut_red_sandstone_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_cut_sandstone_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_dark_oak_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_dark_prismarine_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_diorite_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_end_stone_brick_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_granite_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_jungle_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_mossy_cobblestone_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_mossy_stone_brick_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_nether_brick_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_oak_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_polished_andesite_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_polished_blackstone_brick_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_polished_blackstone_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_polished_diorite_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_polished_granite_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_prismarine_brick_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_prismarine_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_purpur_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_quartz_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_red_nether_brick_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_red_sandstone_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_sandstone_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_smooth_quartz_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_smooth_sandstone_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_smooth_stone_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_spruce_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_stone_brick_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_stone_slab.json (100%) rename {src/main/resources/data/vplus/recipes => temp/vertrecipes}/vertical_warped_slab.json (100%) diff --git a/src/main/java/tech/nevets/vplus/blocks/LavaSpongeBlock.java b/src/main/java/tech/nevets/vplus/blocks/LavaSpongeBlock.java new file mode 100644 index 0000000..e4e9890 --- /dev/null +++ b/src/main/java/tech/nevets/vplus/blocks/LavaSpongeBlock.java @@ -0,0 +1,75 @@ +package tech.nevets.vplus.blocks; + +import com.google.common.collect.Lists; +import net.minecraft.block.*; +import net.minecraft.fluid.FluidState; +import net.minecraft.tag.FluidTags; +import net.minecraft.util.Pair; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.world.World; + +import java.util.Queue; + +public class LavaSpongeBlock extends Block { + public LavaSpongeBlock() { + super(AbstractBlock.Settings.of(Material.STONE).requiresTool().strength(1.5F, 1.5F)); + } + + public void onBlockAdded(BlockState state, World world, BlockPos pos, BlockState oldState, boolean notify) { + if (!oldState.isOf(state.getBlock())) { + this.update(world, pos); + } + } + + public void neighborUpdate(BlockState state, World world, BlockPos pos, Block sourceBlock, BlockPos sourcePos, boolean notify) { + this.update(world, pos); + super.neighborUpdate(state, world, pos, sourceBlock, sourcePos, notify); + } + + protected void update(World world, BlockPos pos) { + if (this.absorbLava(world, pos)) { + world.setBlockState(pos, VPBlocks.SATURATED_LAVA_SPONGE_BLOCK.getDefaultState(), 2); + world.syncWorldEvent(2001, pos, Block.getRawIdFromState(Blocks.WATER.getDefaultState())); + } + } + + private boolean absorbLava(World world, BlockPos pos) { + Queue> queue = Lists.newLinkedList(); + queue.add(new Pair(pos, 0)); + int i = 0; + + while(!queue.isEmpty()) { + Pair pair = queue.poll(); + BlockPos blockPos = pair.getLeft(); + int j = pair.getRight(); + Direction[] directions = Direction.values(); + + for (Direction direction : directions) { + BlockPos blockPos2 = blockPos.offset(direction); + BlockState blockState = world.getBlockState(blockPos2); + FluidState fluidState = world.getFluidState(blockPos2); + if (fluidState.isIn(FluidTags.LAVA)) { + if (blockState.getBlock() instanceof FluidDrainable && !((FluidDrainable) blockState.getBlock()).tryDrainFluid(world, blockPos2, blockState).isEmpty()) { + ++i; + if (j < 6) { + queue.add(new Pair(blockPos2, j + 1)); + } + } else if (blockState.getBlock() instanceof FluidBlock) { + world.setBlockState(blockPos2, Blocks.AIR.getDefaultState(), 3); + ++i; + if (j < 6) { + queue.add(new Pair(blockPos2, j + 1)); + } + } + } + } + + if (i > 64) { + break; + } + } + + return i > 0; + } +} diff --git a/src/main/java/tech/nevets/vplus/blocks/SaturatedLavaSpongeBlock.java b/src/main/java/tech/nevets/vplus/blocks/SaturatedLavaSpongeBlock.java new file mode 100644 index 0000000..6374e03 --- /dev/null +++ b/src/main/java/tech/nevets/vplus/blocks/SaturatedLavaSpongeBlock.java @@ -0,0 +1,58 @@ +package tech.nevets.vplus.blocks; + +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.block.AbstractBlock; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.Material; +import net.minecraft.particle.ParticleTypes; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.Direction; +import net.minecraft.util.math.random.Random; +import net.minecraft.world.World; + +public class SaturatedLavaSpongeBlock extends Block { + + public SaturatedLavaSpongeBlock() { + super(AbstractBlock.Settings.of(Material.STONE).requiresTool().strength(1.5F, 1.5F)); + } + + @Environment(EnvType.CLIENT) + public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random random) { + Direction direction = Direction.random(random); + if (direction != Direction.UP) { + BlockPos blockPos = pos.offset(direction); + BlockState blockState = world.getBlockState(blockPos); + if (!state.isOpaque() || !blockState.isSideSolidFullSquare(world, blockPos, direction.getOpposite())) { + double d = pos.getX(); + double e = pos.getY(); + double f = pos.getZ(); + if (direction == Direction.DOWN) { + e -= 0.05D; + d += random.nextDouble(); + f += random.nextDouble(); + } else { + e += random.nextDouble() * 0.8D; + if (direction.getAxis() == Direction.Axis.X) { + f += random.nextDouble(); + if (direction == Direction.EAST) { + ++d; + } else { + d += 0.05D; + } + } else { + d += random.nextDouble(); + if (direction == Direction.SOUTH) { + ++f; + } else { + f += 0.05D; + } + } + } + + world.addParticle(ParticleTypes.DRIPPING_LAVA, d, e, f, 0.0D, 0.0D, 0.0D); + } + } + } +} diff --git a/src/main/java/tech/nevets/vplus/blocks/VPBlocks.java b/src/main/java/tech/nevets/vplus/blocks/VPBlocks.java index 286ccb2..251b7b0 100644 --- a/src/main/java/tech/nevets/vplus/blocks/VPBlocks.java +++ b/src/main/java/tech/nevets/vplus/blocks/VPBlocks.java @@ -33,8 +33,8 @@ public class VPBlocks { SAPPHIRE_BLOCK = register("sapphire_block", new Block(AbstractBlock.Settings.of(Material.METAL).requiresTool().strength(3.0F, 3.0F)), VPItemGroups.BLOCKS).getBlock(); RUBY_BLOCK = register("ruby_block", new Block(AbstractBlock.Settings.of(Material.METAL).requiresTool().strength(3.0F, 3.0F)), VPItemGroups.BLOCKS).getBlock(); JADE_BLOCK = register("jade_block", new Block(AbstractBlock.Settings.of(Material.METAL).requiresTool().strength(3.0F, 3.0F)), VPItemGroups.BLOCKS).getBlock(); - LAVA_SPONGE_BLOCK = register("lava_sponge_block", new Block(AbstractBlock.Settings.of(Material.STONE).requiresTool().strength(1.5F, 1.5F)), VPItemGroups.BLOCKS).getBlock(); - SATURATED_LAVA_SPONGE_BLOCK = register("saturated_lava_sponge_block", new Block(AbstractBlock.Settings.of(Material.STONE).requiresTool().strength(1.5F, 1.5F)), VPItemGroups.BLOCKS, new Item.Settings().recipeRemainder(Item.fromBlock(LAVA_SPONGE_BLOCK))).getBlock(); + LAVA_SPONGE_BLOCK = register("lava_sponge", new LavaSpongeBlock(), VPItemGroups.BLOCKS).getBlock(); + SATURATED_LAVA_SPONGE_BLOCK = register("saturated_lava_sponge", new SaturatedLavaSpongeBlock(), VPItemGroups.BLOCKS, new Item.Settings().recipeRemainder(Item.fromBlock(LAVA_SPONGE_BLOCK))).getBlock(); ///////////////////\\\\ITERATOR////\\\\\\\\\\\\\\\\\\\ diff --git a/src/main/java/tech/nevets/vplus/items/VPMaterials.java b/src/main/java/tech/nevets/vplus/items/VPMaterials.java index 4269b56..be43bdf 100644 --- a/src/main/java/tech/nevets/vplus/items/VPMaterials.java +++ b/src/main/java/tech/nevets/vplus/items/VPMaterials.java @@ -10,19 +10,19 @@ import net.minecraft.sound.SoundEvents; public enum VPMaterials implements ToolMaterial, ArmorMaterial { - COPPER(20, Ingredient.ofItems(Items.COPPER_INGOT), "copper", 13, new int[]{2, 4, 5, 2}, SoundEvents.ITEM_ARMOR_EQUIP_GOLD, 0.0F, 0.0F, 2, 200, 5.0F, 3.0F), - EMERALD(30, Ingredient.ofItems(Items.EMERALD), "emerald", 30, new int[]{2, 6, 8, 2}, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 0.5F, 0.0F, 3, 750, 7.0F, 4.0F), - SAPPHIRE(50, Ingredient.ofItems(VPItems.SAPPHIRE), "sapphire", 40, new int[]{6, 8, 10, 6}, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 1.0F, 0.1F, 4, 3000, 8.0F, 6.0F), - RUBY(50, Ingredient.ofItems(VPItems.RUBY), "ruby", 40, new int[]{10, 15, 20, 10}, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 1.0F, .01F, 4, 3000, 8.0F, 6.0F), - JADE(50, Ingredient.ofItems(VPItems.JADE), "jade", 40, new int[]{10, 15, 20, 10}, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 1.0F, 0.1F, 4, 3000, 8.0F, 6.0F); + COPPER("copper", 20, Ingredient.ofItems(Items.COPPER_INGOT), 13, new int[]{2, 4, 5, 2}, SoundEvents.ITEM_ARMOR_EQUIP_GOLD, 0.0F, 0.0F, 2, 200, 5.0F, 3.0F), + EMERALD("emerald", 30, Ingredient.ofItems(Items.EMERALD), 30, new int[]{2, 6, 8, 2}, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 0.5F, 0.0F, 3, 750, 7.0F, 4.0F), + SAPPHIRE("sapphire", 50, Ingredient.ofItems(VPItems.SAPPHIRE), 40, new int[]{6, 8, 10, 6}, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 1.0F, 0.1F, 4, 3000, 8.0F, 6.0F), + RUBY("ruby", 50, Ingredient.ofItems(VPItems.RUBY), 40, new int[]{10, 15, 20, 10}, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 1.0F, .01F, 4, 3000, 8.0F, 6.0F), + JADE("jade", 50, Ingredient.ofItems(VPItems.JADE), 40, new int[]{10, 15, 20, 10}, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 1.0F, 0.1F, 4, 3000, 8.0F, 6.0F); private static final int[] BASE_ARMOR_DURABILITY = new int[]{13, 15, 16, 11}; // Used by both + private String name; private int enchantability; private Ingredient repairIngredient; // Used by armor - private String name; private int armorDurability; private int[] protectionAmounts; private SoundEvent equipSound; @@ -49,7 +49,8 @@ public enum VPMaterials implements ToolMaterial, ArmorMaterial { } // Used for tool materials - VPMaterials(int miningLevel, int toolDurability, float miningSpeed, float attackDamage, int enchantability, Ingredient repairIngredient) { + VPMaterials(String name, int miningLevel, int toolDurability, float miningSpeed, float attackDamage, int enchantability, Ingredient repairIngredient) { + this.name = name; this.miningLevel = miningLevel; this.toolDurability = toolDurability; this.miningSpeed = miningSpeed; @@ -59,10 +60,10 @@ public enum VPMaterials implements ToolMaterial, ArmorMaterial { } //Used for both - VPMaterials(int enchantability, Ingredient repairIngredient, String name, int armorDurability, int[] protectionAmounts, SoundEvent equipSound, float toughness, float knockbackResistance, int miningLevel, int toolDurability, float miningSpeed, float attackDamage) { + VPMaterials(String name, int enchantability, Ingredient repairIngredient, int armorDurability, int[] protectionAmounts, SoundEvent equipSound, float toughness, float knockbackResistance, int miningLevel, int toolDurability, float miningSpeed, float attackDamage) { + this.name = name; this.enchantability = enchantability; this.repairIngredient = repairIngredient; - this.name = name; this.armorDurability = armorDurability; this.protectionAmounts = protectionAmounts; this.equipSound = equipSound; diff --git a/src/main/java/tech/nevets/vplus/items/tools/LongSwordBase.java b/src/main/java/tech/nevets/vplus/items/tools/LongSwordBase.java new file mode 100644 index 0000000..08a7655 --- /dev/null +++ b/src/main/java/tech/nevets/vplus/items/tools/LongSwordBase.java @@ -0,0 +1,10 @@ +package tech.nevets.vplus.items.tools; + +import net.minecraft.item.SwordItem; +import net.minecraft.item.ToolMaterial; + +public class LongSwordBase extends SwordItem { + public LongSwordBase(ToolMaterial toolMaterial, Settings settings) { + super(toolMaterial, 2, -3.F, settings); + } +} diff --git a/src/main/resources/assets.minecraft/textures.models.armor/platinum_layer_1.png b/src/main/resources/assets.minecraft/textures.models.armor/sapphire_layer_1.png similarity index 100% rename from src/main/resources/assets.minecraft/textures.models.armor/platinum_layer_1.png rename to src/main/resources/assets.minecraft/textures.models.armor/sapphire_layer_1.png diff --git a/src/main/resources/assets.minecraft/textures.models.armor/platinum_layer_2.png b/src/main/resources/assets.minecraft/textures.models.armor/sapphire_layer_2.png similarity index 100% rename from src/main/resources/assets.minecraft/textures.models.armor/platinum_layer_2.png rename to src/main/resources/assets.minecraft/textures.models.armor/sapphire_layer_2.png diff --git a/src/main/resources/assets/vplus/blockstates/green_wall_torch.json b/src/main/resources/assets/vplus/blockstates/green_wall_torch.json deleted file mode 100644 index 7314344..0000000 --- a/src/main/resources/assets/vplus/blockstates/green_wall_torch.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "variants": { - "facing=east": { - "model": "minecraft:block/wall_torch" - }, - "facing=north": { - "model": "minecraft:block/wall_torch", - "y": 270 - }, - "facing=south": { - "model": "minecraft:block/wall_torch", - "y": 90 - }, - "facing=west": { - "model": "minecraft:block/wall_torch", - "y": 180 - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/vplus/blockstates/greentorch.json b/src/main/resources/assets/vplus/blockstates/greentorch.json deleted file mode 100644 index 7d14911..0000000 --- a/src/main/resources/assets/vplus/blockstates/greentorch.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "minecraft:block/torch" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/vplus/blockstates/platinum_block.json b/src/main/resources/assets/vplus/blockstates/platinum_block.json deleted file mode 100644 index 82824d2..0000000 --- a/src/main/resources/assets/vplus/blockstates/platinum_block.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "vplus:block/platinum_block"} - } -} \ No newline at end of file diff --git a/src/main/resources/assets/vplus/blockstates/platinum_ore.json b/src/main/resources/assets/vplus/blockstates/platinum_ore.json deleted file mode 100644 index b3f6335..0000000 --- a/src/main/resources/assets/vplus/blockstates/platinum_ore.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "variants": { - "": { "model": "vplus:block/platinum_ore"} - } -} \ No newline at end of file diff --git a/src/main/resources/assets/vplus/blockstates/sapphire_block.json b/src/main/resources/assets/vplus/blockstates/sapphire_block.json new file mode 100644 index 0000000..8a1236b --- /dev/null +++ b/src/main/resources/assets/vplus/blockstates/sapphire_block.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "vplus:block/sapphire_block"} + } +} \ No newline at end of file diff --git a/src/main/resources/assets/vplus/blockstates/sapphire_ore.json b/src/main/resources/assets/vplus/blockstates/sapphire_ore.json new file mode 100644 index 0000000..e9bb272 --- /dev/null +++ b/src/main/resources/assets/vplus/blockstates/sapphire_ore.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "vplus:block/sapphire_ore"} + } +} \ No newline at end of file diff --git a/src/main/resources/assets/vplus/lang/en_us.json b/src/main/resources/assets/vplus/lang/en_us.json index 78de073..dcbcab5 100644 --- a/src/main/resources/assets/vplus/lang/en_us.json +++ b/src/main/resources/assets/vplus/lang/en_us.json @@ -10,18 +10,17 @@ "block.vplus.lava_sponge": "Lava Sponge", "block.vplus.saturated_lava_sponge": "Saturated Lava Sponge", - "block.vplus.platinum_ore": "Platinum Ore", - "block.vplus.platinum_block": "Platinum Block", + "block.vplus.sapphire_ore": "Sapphire Ore", + "block.vplus.sapphire_block": "Sapphire Block", "block.vplus.ruby_ore": "Ruby Ore", "block.vplus.ruby_block": "Ruby Block", - "item.vplus.platinum_ingot": "Platinum Ingot", - "item.vplus.platinum_nugget": "Platinum Nugget", + "item.vplus.sapphire": "Sapphire", "item.vplus.ruby": "Ruby", "item.vplus.copper_sword": "Copper Sword", "item.vplus.emerald_sword": "Emerald Sword", - "item.vplus.platinum_sword": "Platinum Sword", + "item.vplus.sapphire_sword": "Sapphire Sword", "item.vplus.ruby_sword": "Ruby Sword", "item.vplus.copper_helmet": "Copper Helmet", @@ -32,10 +31,10 @@ "item.vplus.emerald_chestplate": "Emerald Chestplate", "item.vplus.emerald_leggings": "Emerald Leggings", "item.vplus.emerald_boots": "Emerald Boots", - "item.vplus.platinum_helmet": "Platinum Helmet", - "item.vplus.platinum_chestplate": "Platinum Chestplate", - "item.vplus.platinum_leggings": "Platinum Leggings", - "item.vplus.platinum_boots": "Platinum Boots", + "item.vplus.sapphire_helmet": "Sapphire Helmet", + "item.vplus.sapphire_chestplate": "Sapphire Chestplate", + "item.vplus.sapphire_leggings": "Sapphire Leggings", + "item.vplus.sapphire_boots": "Sapphire Boots", "item.vplus.ruby_helmet": "Ruby Helmet", "item.vplus.ruby_chestplate": "Ruby Chestplate", "item.vplus.ruby_leggings": "Ruby Leggings", @@ -49,10 +48,10 @@ "item.vplus.emerald_axe": "Emerald Axe", "item.vplus.emerald_shovel": "Emerald Shovel", "item.vplus.emerald_hoe": "Emerald Hoe", - "item.vplus.platinum_pickaxe": "Platinum Pickaxe", - "item.vplus.platinum_axe": "Platinum Axe", - "item.vplus.platinum_shovel": "Platinum Shovel", - "item.vplus.platinum_hoe": "Platinum Hoe", + "item.vplus.sapphire_pickaxe": "Sapphire Pickaxe", + "item.vplus.sapphire_axe": "Sapphire Axe", + "item.vplus.sapphire_shovel": "Sapphire Shovel", + "item.vplus.sapphire_hoe": "Sapphire Hoe", "item.vplus.ruby_pickaxe": "Ruby Pickaxe", "item.vplus.ruby_axe": "Ruby Axe", "item.vplus.ruby_shovel": "Ruby Shovel", @@ -68,48 +67,8 @@ "item.vplus.enchanted_emerald_apple": "Enchanted Emerald Apple", "item.vplus.netherite_apple": "Netherite Apple", "item.vplus.enchanted_netherite_apple": "Enchanted Netherite Apple", - "item.vplus.platinum_apple": "Platinum Apple", - "item.vplus.enchanted_platinum_apple": "Enchanted Platinum Apple", + "item.vplus.sapphire_apple": "Sapphire Apple", + "item.vplus.enchanted_sapphire_apple": "Enchanted Sapphire Apple", "item.vplus.ruby_apple": "Ruby Apple", - "item.vplus.enchanted_ruby_apple": "Enchanted Ruby Apple", - - "block.vplus.vertical_oak_slab":"Vertical Oak Slab", - "block.vplus.vertical_spruce_slab":"Vertical Spruce Slab", - "block.vplus.vertical_birch_slab":"Vertical Birch Slab", - "block.vplus.vertical_jungle_slab":"Vertical Jungle Slab", - "block.vplus.vertical_acacia_slab":"Vertical Acacia Slab", - "block.vplus.vertical_dark_oak_slab":"Vertical Dark Oak Slab", - "block.vplus.vertical_crimson_slab":"Vertical Crimson Slab", - "block.vplus.vertical_warped_slab":"Vertical Warped Slab", - "block.vplus.vertical_stone_slab":"Vertical Stone Slab", - "block.vplus.vertical_smooth_stone_slab":"Vertical Smooth Stone Slab", - "block.vplus.vertical_sandstone_slab":"Vertical Sandstone Slab", - "block.vplus.vertical_cut_sandstone_slab":"Vertical Cut Sandstone Slab", - "block.vplus.vertical_cobblestone_slab":"Vertical Cobblestone Slab", - "block.vplus.vertical_brick_slab":"Vertical Brick Slab", - "block.vplus.vertical_stone_brick_slab":"Vertical Stone Brick Slab", - "block.vplus.vertical_nether_brick_slab":"Vertical Nether Brick Slab", - "block.vplus.vertical_quartz_slab":"Vertical Quartz Slab", - "block.vplus.vertical_red_sandstone_slab":"Vertical Red Sandstone Slab", - "block.vplus.vertical_cut_red_sandstone_slab":"Vertical Cut Red Sandstone Slab", - "block.vplus.vertical_purpur_slab":"Vertical Purpur Slab", - "block.vplus.vertical_prismarine_slab":"Vertical Prismarine Slab", - "block.vplus.vertical_prismarine_brick_slab":"Vertical Prismarine Brick Slab", - "block.vplus.vertical_dark_prismarine_slab":"Vertical Dark Prismarine Slab", - "block.vplus.vertical_polished_granite_slab":"Vertical Polished Granite Slab", - "block.vplus.vertical_smooth_red_sandstone_slab":"Vertical Smooth Red Sandstone Slab", - "block.vplus.vertical_mossy_stone_brick_slab":"Vertical Mossy Stone Brick Slab", - "block.vplus.vertical_polished_diorite_slab":"Vertical Polished Diorite Slab", - "block.vplus.vertical_mossy_cobblestone_slab":"Vertical Mossy Cobblestone Slab", - "block.vplus.vertical_end_stone_brick_slab":"Vertical End Stone Brick Slab", - "block.vplus.vertical_smooth_sandstone_slab":"Vertical Smooth Sandstone Slab", - "block.vplus.vertical_smooth_quartz_slab":"Vertical Smooth Quartz Slab", - "block.vplus.vertical_granite_slab":"Vertical Granite Slab", - "block.vplus.vertical_andesite_slab":"Vertical Andesite Slab", - "block.vplus.vertical_red_nether_brick_slab":"Vertical Red Nether Brick Slab", - "block.vplus.vertical_polished_andesite_slab":"Vertical Polished Andesite Slab", - "block.vplus.vertical_diorite_slab":"Vertical Diorite Slab", - "block.vplus.vertical_blackstone_slab":"Vertical Blackstone Slab", - "block.vplus.vertical_polished_blackstone_slab":"Vertical Polished Blackstone Slab", - "block.vplus.vertical_polished_blackstone_brick_slab":"Vertical Polished Blackstone Brick Slab" + "item.vplus.enchanted_ruby_apple": "Enchanted Ruby Apple" } \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/block/green_wall_torch.json b/src/main/resources/assets/vplus/models/block/green_wall_torch.json deleted file mode 100644 index e30eec7..0000000 --- a/src/main/resources/assets/vplus/models/block/green_wall_torch.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_torch_wall", - "textures": { - "torch": "minecraft:block/torch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/block/greentorch.json b/src/main/resources/assets/vplus/models/block/greentorch.json deleted file mode 100644 index 7c6241d..0000000 --- a/src/main/resources/assets/vplus/models/block/greentorch.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/template_torch", - "textures": { - "torch": "minecraft:block/torch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/block/platinum_block.json b/src/main/resources/assets/vplus/models/block/sapphire_block.json similarity index 55% rename from src/main/resources/assets/vplus/models/block/platinum_block.json rename to src/main/resources/assets/vplus/models/block/sapphire_block.json index 868204b..2cd9e02 100644 --- a/src/main/resources/assets/vplus/models/block/platinum_block.json +++ b/src/main/resources/assets/vplus/models/block/sapphire_block.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "vplus:block/platinum_block" + "all": "vplus:block/sapphire_block" } } \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/block/platinum_ore.json b/src/main/resources/assets/vplus/models/block/sapphire_ore.json similarity index 57% rename from src/main/resources/assets/vplus/models/block/platinum_ore.json rename to src/main/resources/assets/vplus/models/block/sapphire_ore.json index 1d38e84..6d57889 100644 --- a/src/main/resources/assets/vplus/models/block/platinum_ore.json +++ b/src/main/resources/assets/vplus/models/block/sapphire_ore.json @@ -1,6 +1,6 @@ { "parent": "block/cube_all", "textures": { - "all": "vplus:block/platinum_ore" + "all": "vplus:block/sapphire_ore" } } \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/item/enchanted_platinum_apple.json b/src/main/resources/assets/vplus/models/item/enchanted_platinum_apple.json deleted file mode 100644 index 090f560..0000000 --- a/src/main/resources/assets/vplus/models/item/enchanted_platinum_apple.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "vplus:item/enchanted_platinum_apple" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/item/enchanted_sapphire_apple.json b/src/main/resources/assets/vplus/models/item/enchanted_sapphire_apple.json new file mode 100644 index 0000000..cb23499 --- /dev/null +++ b/src/main/resources/assets/vplus/models/item/enchanted_sapphire_apple.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "vplus:item/enchanted_sapphire_apple" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/item/greentorch.json b/src/main/resources/assets/vplus/models/item/greentorch.json deleted file mode 100644 index a734b43..0000000 --- a/src/main/resources/assets/vplus/models/item/greentorch.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:block/torch" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/item/platinum_block.json b/src/main/resources/assets/vplus/models/item/platinum_block.json deleted file mode 100644 index 7a4f5be..0000000 --- a/src/main/resources/assets/vplus/models/item/platinum_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "vplus:block/platinum_block" -} \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/item/platinum_leggings.json b/src/main/resources/assets/vplus/models/item/platinum_leggings.json deleted file mode 100644 index f4b2123..0000000 --- a/src/main/resources/assets/vplus/models/item/platinum_leggings.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "vplus:item/platinum_leggings" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/item/platinum_nugget.json b/src/main/resources/assets/vplus/models/item/platinum_nugget.json deleted file mode 100644 index dab5529..0000000 --- a/src/main/resources/assets/vplus/models/item/platinum_nugget.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "vplus:item/platinum_nugget" - } -} \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/item/platinum_ore.json b/src/main/resources/assets/vplus/models/item/platinum_ore.json deleted file mode 100644 index 99577a5..0000000 --- a/src/main/resources/assets/vplus/models/item/platinum_ore.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "vplus:block/platinum_ore" -} \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/item/platinum_apple.json b/src/main/resources/assets/vplus/models/item/sapphire.json similarity index 54% rename from src/main/resources/assets/vplus/models/item/platinum_apple.json rename to src/main/resources/assets/vplus/models/item/sapphire.json index 54e814a..1678e95 100644 --- a/src/main/resources/assets/vplus/models/item/platinum_apple.json +++ b/src/main/resources/assets/vplus/models/item/sapphire.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "vplus:item/platinum_apple" + "layer0": "vplus:item/sapphire" } } \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/item/platinum_boots.json b/src/main/resources/assets/vplus/models/item/sapphire_apple.json similarity index 54% rename from src/main/resources/assets/vplus/models/item/platinum_boots.json rename to src/main/resources/assets/vplus/models/item/sapphire_apple.json index a70a26f..38ebc95 100644 --- a/src/main/resources/assets/vplus/models/item/platinum_boots.json +++ b/src/main/resources/assets/vplus/models/item/sapphire_apple.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "vplus:item/platinum_boots" + "layer0": "vplus:item/sapphire_apple" } } \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/item/platinum_hoe.json b/src/main/resources/assets/vplus/models/item/sapphire_axe.json similarity index 55% rename from src/main/resources/assets/vplus/models/item/platinum_hoe.json rename to src/main/resources/assets/vplus/models/item/sapphire_axe.json index e30f5da..17c1b91 100644 --- a/src/main/resources/assets/vplus/models/item/platinum_hoe.json +++ b/src/main/resources/assets/vplus/models/item/sapphire_axe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "vplus:item/platinum_hoe" + "layer0": "vplus:item/sapphire_axe" } } \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/item/sapphire_block.json b/src/main/resources/assets/vplus/models/item/sapphire_block.json new file mode 100644 index 0000000..bec66d5 --- /dev/null +++ b/src/main/resources/assets/vplus/models/item/sapphire_block.json @@ -0,0 +1,3 @@ +{ + "parent": "vplus:block/sapphire_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/item/platinum_ingot.json b/src/main/resources/assets/vplus/models/item/sapphire_boots.json similarity index 54% rename from src/main/resources/assets/vplus/models/item/platinum_ingot.json rename to src/main/resources/assets/vplus/models/item/sapphire_boots.json index c238978..086e478 100644 --- a/src/main/resources/assets/vplus/models/item/platinum_ingot.json +++ b/src/main/resources/assets/vplus/models/item/sapphire_boots.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "vplus:item/platinum_ingot" + "layer0": "vplus:item/sapphire_boots" } } \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/item/platinum_chestplate.json b/src/main/resources/assets/vplus/models/item/sapphire_chestplate.json similarity index 52% rename from src/main/resources/assets/vplus/models/item/platinum_chestplate.json rename to src/main/resources/assets/vplus/models/item/sapphire_chestplate.json index 047cb70..cfe609e 100644 --- a/src/main/resources/assets/vplus/models/item/platinum_chestplate.json +++ b/src/main/resources/assets/vplus/models/item/sapphire_chestplate.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "vplus:item/platinum_chestplate" + "layer0": "vplus:item/sapphire_chestplate" } } \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/item/platinum_helmet.json b/src/main/resources/assets/vplus/models/item/sapphire_helmet.json similarity index 54% rename from src/main/resources/assets/vplus/models/item/platinum_helmet.json rename to src/main/resources/assets/vplus/models/item/sapphire_helmet.json index 7b0af57..c8f066f 100644 --- a/src/main/resources/assets/vplus/models/item/platinum_helmet.json +++ b/src/main/resources/assets/vplus/models/item/sapphire_helmet.json @@ -1,6 +1,6 @@ { "parent": "item/generated", "textures": { - "layer0": "vplus:item/platinum_helmet" + "layer0": "vplus:item/sapphire_helmet" } } \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/item/platinum_axe.json b/src/main/resources/assets/vplus/models/item/sapphire_hoe.json similarity index 55% rename from src/main/resources/assets/vplus/models/item/platinum_axe.json rename to src/main/resources/assets/vplus/models/item/sapphire_hoe.json index 2790b37..3b14d29 100644 --- a/src/main/resources/assets/vplus/models/item/platinum_axe.json +++ b/src/main/resources/assets/vplus/models/item/sapphire_hoe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "vplus:item/platinum_axe" + "layer0": "vplus:item/sapphire_hoe" } } \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/item/sapphire_leggings.json b/src/main/resources/assets/vplus/models/item/sapphire_leggings.json new file mode 100644 index 0000000..2cd74a1 --- /dev/null +++ b/src/main/resources/assets/vplus/models/item/sapphire_leggings.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "vplus:item/sapphire_leggings" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/item/sapphire_ore.json b/src/main/resources/assets/vplus/models/item/sapphire_ore.json new file mode 100644 index 0000000..f687add --- /dev/null +++ b/src/main/resources/assets/vplus/models/item/sapphire_ore.json @@ -0,0 +1,3 @@ +{ + "parent": "vplus:block/sapphire_ore" +} \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/item/platinum_pickaxe.json b/src/main/resources/assets/vplus/models/item/sapphire_pickaxe.json similarity index 53% rename from src/main/resources/assets/vplus/models/item/platinum_pickaxe.json rename to src/main/resources/assets/vplus/models/item/sapphire_pickaxe.json index f72e58c..2b44fb1 100644 --- a/src/main/resources/assets/vplus/models/item/platinum_pickaxe.json +++ b/src/main/resources/assets/vplus/models/item/sapphire_pickaxe.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "vplus:item/platinum_pickaxe" + "layer0": "vplus:item/sapphire_pickaxe" } } \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/item/platinum_shovel.json b/src/main/resources/assets/vplus/models/item/sapphire_shovel.json similarity index 53% rename from src/main/resources/assets/vplus/models/item/platinum_shovel.json rename to src/main/resources/assets/vplus/models/item/sapphire_shovel.json index b0aac55..6aeb31d 100644 --- a/src/main/resources/assets/vplus/models/item/platinum_shovel.json +++ b/src/main/resources/assets/vplus/models/item/sapphire_shovel.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "vplus:item/platinum_shovel" + "layer0": "vplus:item/sapphire_shovel" } } \ No newline at end of file diff --git a/src/main/resources/assets/vplus/models/item/platinum_sword.json b/src/main/resources/assets/vplus/models/item/sapphire_sword.json similarity index 54% rename from src/main/resources/assets/vplus/models/item/platinum_sword.json rename to src/main/resources/assets/vplus/models/item/sapphire_sword.json index e9e5ca7..8ee0f99 100644 --- a/src/main/resources/assets/vplus/models/item/platinum_sword.json +++ b/src/main/resources/assets/vplus/models/item/sapphire_sword.json @@ -1,6 +1,6 @@ { "parent": "item/handheld", "textures": { - "layer0": "vplus:item/platinum_sword" + "layer0": "vplus:item/sapphire_sword" } } \ No newline at end of file diff --git a/src/main/resources/assets/vplus/textures/block/greentorch.png b/src/main/resources/assets/vplus/textures/block/greentorch.png deleted file mode 100644 index 14bd2d7006c1cd96f8f2b8e3c8bd2c18e635a10c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`fu1goAr_~T6C_xhW&Z3x_~C!O z{o(pgyg%&!+H*|EJ@DsO!~dNR)1F8hY`yZfe#L6JRJ{VD&_!n$x?&tQiaRi7WGi^j m6kqdoiDq%*&S@5L%nYkcbQVq&*!vo2ID@CFpUXO@geCxu05fC& diff --git a/src/main/resources/assets/vplus/textures/block/platinum_block.png b/src/main/resources/assets/vplus/textures/block/sapphire_block.png similarity index 100% rename from src/main/resources/assets/vplus/textures/block/platinum_block.png rename to src/main/resources/assets/vplus/textures/block/sapphire_block.png diff --git a/src/main/resources/assets/vplus/textures/block/platinum_ore.png b/src/main/resources/assets/vplus/textures/block/sapphire_ore.png similarity index 100% rename from src/main/resources/assets/vplus/textures/block/platinum_ore.png rename to src/main/resources/assets/vplus/textures/block/sapphire_ore.png diff --git a/src/main/resources/assets/vplus/textures/item/enchanted_platinum_apple.png b/src/main/resources/assets/vplus/textures/item/enchanted_sapphire_apple.png similarity index 100% rename from src/main/resources/assets/vplus/textures/item/enchanted_platinum_apple.png rename to src/main/resources/assets/vplus/textures/item/enchanted_sapphire_apple.png diff --git a/src/main/resources/assets/vplus/textures/item/platinum_nugget.png b/src/main/resources/assets/vplus/textures/item/platinum_nugget.png deleted file mode 100644 index cfd9f8a71879519e4d1438b101a23722588d4ff3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1565 zcmbVMUuYaf7~dnbYTAHMsIfkD-5^%#{=K`s+}Q1s+$GJa8{_q`DOBuacJ6M;?asP8 z$!&rd6?_O-3R2KEf{5UYSV06I6!OrQ7KI2x-&&CtEWU_TXsfpC?EP6%i55FBJF_#t z@Av(g@B3C~rVkAb?iu7bZm2RD(+jq-(}r0O{(t3S4`jLB zZcFW~M1qE_7K@BSlQm6b2r*ppD2zle9O*NZafkxPrw;M>gb~h>1!@S)(yj}xpVE3^ zFH9_8as+)@m6XJ#4$wv^&R+;x9pyHXaSOZHqankpDb{ZiO2Q`j7wYu-E(I*KmX+$* z(iYcERfKe6k-54^w&Y{EibJvxAUv_i%p6I)@j)rTkdmNANUQ%)GkueJjd{)Q zJK}gYX@^g362N6hu_0)RriiL4s-rbk2TBg81yRWZMd?BLhR>bJ%fV1IxbG5co8VphQ|EV2YV_+0EybQfVe2b*IHH!s?-MzA{nL)uOJ8 znxuBjwJcEaLJB>ED`i7q!I2!t23X7Gk%p0|Wa|YnpUvrFF;}ofU9pjk^=z(y3w`-A zK?_L=^yTgUDgQ#?uo8r=`{qdsGszt=<%H~2mwKgh7{A)vwH&^aE&!sW3=9D!?~iSv zckJAE1iG~CCT67nkr!Q9Nb0l=13cDX(Yj~e$;@~;DcG(b@;_bd+-)lEKAd%oWSh1s z_LDX{?6D3PuvYf$wi8!b8~m(N9;=O>K!3%tIq<|AtHPyo=eXT8GdVfAJsD@eug+f6 zelg9V_sqq}e0|{fnefv+!>6Ltj}Gpik6$^JdwcEVM>pd*-uM3gFMp4}d&a!;Vf5#X zc=fB5c;lPvS5|J_`aJ%2W99aSef7@XmyMSmxwhjA?bvJa+M8_rbouA?ohR3Cj~v`N z%*I9Yk4&Te