merge conflict 2

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<Pair<BlockPos, Integer>> queue = Lists.newLinkedList();
+        queue.add(new Pair(pos, 0));
+        int i = 0;
+
+        while(!queue.isEmpty()) {
+            Pair<BlockPos, Integer> 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;
+    }
+}

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

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////\\\\\\\\\\\\\\\\\\\
 

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;

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

src/main/resources/assets/vplus/blockstates/green_wall_torch.json

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

src/main/resources/assets/vplus/blockstates/greentorch.json

@@ -1,7 +0,0 @@
-{
-  "variants": {
-    "": {
-      "model": "minecraft:block/torch"
-    }
-  }
-}

src/main/resources/assets/vplus/blockstates/platinum_block.json

@@ -1,5 +0,0 @@
-{
-  "variants": {
-    "": { "model": "vplus:block/platinum_block"}
-  }
-}

src/main/resources/assets/vplus/blockstates/platinum_ore.json

@@ -1,5 +0,0 @@
-{
-  "variants": {
-    "": { "model": "vplus:block/platinum_ore"}
-  }
-}

src/main/resources/assets/vplus/blockstates/sapphire_block.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "vplus:block/sapphire_block"}
+  }
+}

src/main/resources/assets/vplus/blockstates/sapphire_ore.json

@@ -0,0 +1,5 @@
+{
+  "variants": {
+    "": { "model": "vplus:block/sapphire_ore"}
+  }
+}

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

src/main/resources/assets/vplus/models/block/green_wall_torch.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:block/template_torch_wall",
-  "textures": {
-    "torch": "minecraft:block/torch"
-  }
-}

src/main/resources/assets/vplus/models/block/greentorch.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:block/template_torch",
-  "textures": {
-    "torch": "minecraft:block/torch"
-  }
-}

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

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

src/main/resources/assets/vplus/models/item/enchanted_platinum_apple.json

@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "vplus:item/enchanted_platinum_apple"
-  }
-}

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

src/main/resources/assets/vplus/models/item/greentorch.json

@@ -1,6 +0,0 @@
-{
-  "parent": "minecraft:item/generated",
-  "textures": {
-    "layer0": "minecraft:block/torch"
-  }
-}

src/main/resources/assets/vplus/models/item/platinum_block.json

@@ -1,3 +0,0 @@
-{
-  "parent": "vplus:block/platinum_block"
-}

src/main/resources/assets/vplus/models/item/platinum_leggings.json

@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "vplus:item/platinum_leggings"
-  }
-}

src/main/resources/assets/vplus/models/item/platinum_nugget.json

@@ -1,6 +0,0 @@
-{
-  "parent": "item/generated",
-  "textures": {
-    "layer0": "vplus:item/platinum_nugget"
-  }
-}

src/main/resources/assets/vplus/models/item/platinum_ore.json

@@ -1,3 +0,0 @@
-{
-  "parent": "vplus:block/platinum_ore"
-}

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

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

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

src/main/resources/assets/vplus/models/item/sapphire_block.json

@@ -0,0 +1,3 @@
+{
+  "parent": "vplus:block/sapphire_block"
+}

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

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

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

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

src/main/resources/assets/vplus/models/item/sapphire_leggings.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "vplus:item/sapphire_leggings"
+  }
+}

src/main/resources/assets/vplus/models/item/sapphire_ore.json

@@ -0,0 +1,3 @@
+{
+  "parent": "vplus:block/sapphire_ore"
+}

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

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

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

src/main/resources/data/minecraft/tags/blocks/beacon_base_blocks.json

@@ -1,7 +1,8 @@
 {
   "replace": false,
   "values": [
-    "vplus:platinum_block",
-    "vplus:ruby_block"
+    "vplus:sapphire_block",
+    "vplus:ruby_block",
+    "vplus:jade_block"
   ]
 }

src/main/resources/data/minecraft/tags/items/beacon_payment_items.json

@@ -1,7 +1,8 @@
 {
   "repalce": false,
   "values": [
-    "vplus:platinum_ingot",
-    "vplus:ruby"
+    "vplus:sapphire",
+    "vplus:ruby",
+    "vplus:jade"
   ]
 }

src/main/resources/data/vplus/loot_tables/blocks/sapphire_block.json

@@ -6,7 +6,7 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "vplus:platinum_block"
+          "name": "vplus:sapphire_block"
         }
       ],
       "conditions": [

src/main/resources/data/vplus/loot_tables/blocks/sapphire_ore.json

@@ -24,7 +24,7 @@
                   }
                 }
               ],
-              "name": "vplus:platinum_ore"
+              "name": "vplus:sapphire_ore"
             },
             {
               "type": "minecraft:item",
@@ -32,8 +32,8 @@
                 {
                   "function": "minecraft:set_count",
                   "count": {
-                    "min": 3.0,
-                    "max": 7.0,
+                    "min": 1.0,
+                    "max": 1.0,
                     "type": "minecraft:uniform"
                   }
                 },
@@ -46,7 +46,7 @@
                   }
                 }
               ],
-              "name": "vplus:platinum_nugget"
+              "name": "vplus:sapphire"
             }
           ]
         }

src/main/resources/data/vplus/recipes/enchanted_sapphire_apple.json

@@ -7,14 +7,14 @@
   ],
   "key": {
     "i": {
-      "item": "vplus:platinum_block"
+      "item": "vplus:sapphire_block"
     },
     "A": {
       "item": "minecraft:apple"
     }
   },
   "result": {
-    "item": "vplus:enchanted_platinum_apple",
+    "item": "vplus:enchanted_sapphire_apple",
     "count": 1
   }
 }

src/main/resources/data/vplus/recipes/platinum_axe_smithing.json

@@ -1,12 +0,0 @@
-{
-  "type": "minecraft:smithing",
-  "base": {
-    "item": "minecraft:netherite_axe"
-  },
-  "addition": {
-    "item": "vplus:platinum_ingot"
-  },
-  "result": {
-    "item": "vplus:platinum_axe"
-  }
-}

src/main/resources/data/vplus/recipes/platinum_boots_smithing.json

@@ -1,12 +0,0 @@
-{
-  "type": "minecraft:smithing",
-  "base": {
-    "item": "minecraft:netherite_boots"
-  },
-  "addition": {
-    "item": "vplus:platinum_ingot"
-  },
-  "result": {
-    "item": "vplus:platinum_boots"
-  }
-}

src/main/resources/data/vplus/recipes/platinum_chestplate_smithing.json

@@ -1,12 +0,0 @@
-{
-  "type": "minecraft:smithing",
-  "base": {
-    "item": "minecraft:netherite_chestplate"
-  },
-  "addition": {
-    "item": "vplus:platinum_ingot"
-  },
-  "result": {
-    "item": "vplus:platinum_chestplate"
-  }
-}

src/main/resources/data/vplus/recipes/platinum_helmet_smithing.json

@@ -1,12 +0,0 @@
-{
-  "type": "minecraft:smithing",
-  "base": {
-    "item": "minecraft:netherite_helmet"
-  },
-  "addition": {
-    "item": "vplus:platinum_ingot"
-  },
-  "result": {
-    "item": "vplus:platinum_helmet"
-  }
-}

src/main/resources/data/vplus/recipes/platinum_hoe_smithing.json

@@ -1,12 +0,0 @@
-{
-  "type": "minecraft:smithing",
-  "base": {
-    "item": "minecraft:netherite_hoe"
-  },
-  "addition": {
-    "item": "vplus:platinum_ingot"
-  },
-  "result": {
-    "item": "vplus:platinum_hoe"
-  }
-}

src/main/resources/data/vplus/recipes/platinum_ingot_from_nuggets.json

@@ -1,17 +0,0 @@
-{
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "###",
-    "###",
-    "###"
-  ],
-  "key": {
-    "#": {
-      "item": "vplus:platinum_nugget"
-    }
-  },
-  "result": {
-    "item": "vplus:platinum_ingot",
-    "count": 1
-  }
-}

src/main/resources/data/vplus/recipes/platinum_leggings_smithing.json

@@ -1,12 +0,0 @@
-{
-  "type": "minecraft:smithing",
-  "base": {
-    "item": "minecraft:netherite_leggings"
-  },
-  "addition": {
-    "item": "vplus:platinum_ingot"
-  },
-  "result": {
-    "item": "vplus:platinum_leggings"
-  }
-}

src/main/resources/data/vplus/recipes/platinum_nugget_from_ingot.json

@@ -1,15 +0,0 @@
-{
-  "type": "minecraft:crafting_shaped",
-  "pattern": [
-    "#"
-  ],
-  "key": {
-    "#": {
-      "item": "vplus:platinum_ingot"
-    }
-  },
-  "result": {
-    "item": "vplus:platinum_nugget",
-    "count": 9
-  }
-}

src/main/resources/data/vplus/recipes/platinum_pickaxe_smithing.json

@@ -1,12 +0,0 @@
-{
-  "type": "minecraft:smithing",
-  "base": {
-    "item": "minecraft:netherite_pickaxe"
-  },
-  "addition": {
-    "item": "vplus:platinum_ingot"
-  },
-  "result": {
-    "item": "vplus:platinum_pickaxe"
-  }
-}

src/main/resources/data/vplus/recipes/platinum_shovel_smithing.json

@@ -1,12 +0,0 @@
-{
-  "type": "minecraft:smithing",
-  "base": {
-    "item": "minecraft:netherite_shovel"
-  },
-  "addition": {
-    "item": "vplus:platinum_ingot"
-  },
-  "result": {
-    "item": "vplus:platinum_shovel"
-  }
-}

src/main/resources/data/vplus/recipes/platinum_sword_smithing.json

@@ -1,12 +0,0 @@
-{
-  "type": "minecraft:smithing",
-  "base": {
-    "item": "minecraft:netherite_sword"
-  },
-  "addition": {
-    "item": "vplus:platinum_ingot"
-  },
-  "result": {
-    "item": "vplus:platinum_sword"
-  }
-}

src/main/resources/data/vplus/recipes/ruby_axe_smithing.json

@@ -1,12 +0,0 @@
-{
-  "type": "minecraft:smithing",
-  "base": {
-    "item": "vplus:platinum_axe"
-  },
-  "addition": {
-    "item": "vplus:ruby"
-  },
-  "result": {
-    "item": "vplus:ruby_axe"
-  }
-}

src/main/resources/data/vplus/recipes/ruby_boots_smithing.json

@@ -1,12 +0,0 @@
-{
-  "type": "minecraft:smithing",
-  "base": {
-    "item": "vplus:platinum_boots"
-  },
-  "addition": {
-    "item": "vplus:ruby"
-  },
-  "result": {
-    "item": "vplus:ruby_boots"
-  }
-}

src/main/resources/data/vplus/recipes/sapphire.json

@@ -1,9 +1,9 @@
 {
   "type": "minecraft:smelting",
   "ingredient": {
-    "item": "vplus:platinum_ore"
+    "item": "vplus:sapphire_ore"
   },
-  "result": "vplus:platinum_ingot",
+  "result": "vplus:sapphire",
   "experience": 2.5,
   "cookingtime": 200
 }

src/main/resources/data/vplus/recipes/sapphire_apple.json

@@ -7,14 +7,14 @@
   ],
   "key": {
     "i": {
-      "item": "vplus:platinum_ingot"
+      "item": "vplus:sapphire"
     },
     "A": {
       "item": "minecraft:apple"
     }
   },
   "result": {
-    "item": "vplus:platinum_apple",
+    "item": "vplus:sapphire_apple",
     "count": 1
   }
 }

src/main/resources/data/vplus/recipes/sapphire_axe.json

@@ -10,10 +10,10 @@
       "item": "minecraft:stick"
     },
     "X": {
-      "item": "vplus:platinum_ingot"
+      "item": "vplus:sapphire"
     }
   },
   "result": {
-    "item": "vplus:platinum_axe"
+    "item": "vplus:sapphire_axe"
   }
 }

src/main/resources/data/vplus/recipes/sapphire_block.json

@@ -7,11 +7,11 @@
   ],
   "key": {
     "#": {
-      "item": "vplus:platinum_ingot"
+      "item": "vplus:sapphire"
     }
   },
   "result": {
-    "item": "vplus:platinum_block",
+    "item": "vplus:sapphire_block",
     "count": 1
   }
 }

src/main/resources/data/vplus/recipes/sapphire_boots.json

@@ -6,11 +6,11 @@
   ],
   "key": {
     "#": {
-      "item": "vplus:platinum_ingot"
+      "item": "vplus:sapphire"
     }
   },
   "result": {
-    "item": "vplus:platinum_boots",
+    "item": "vplus:sapphire_boots",
     "count": 1
   }
 }

src/main/resources/data/vplus/recipes/sapphire_chestplate.json

@@ -7,11 +7,11 @@
   ],
   "key": {
     "#": {
-      "item": "vplus:platinum_ingot"
+      "item": "vplus:sapphire"
     }
   },
   "result": {
-    "item": "vplus:platinum_chestplate",
+    "item": "vplus:sapphire_chestplate",
     "count": 1
   }
 }

src/main/resources/data/vplus/recipes/sapphire_from_blasting.json

@@ -1,9 +1,9 @@
 {
   "type": "minecraft:blasting",
   "ingredient": {
-    "item": "vplus:platinum_ore"
+    "item": "vplus:sapphire_ore"
   },
-  "result": "vplus:platinum_ingot",
+  "result": "vplus:sapphire",
   "experience": 2.5,
   "cookingtime": 100
 }

src/main/resources/data/vplus/recipes/sapphire_from_block.json

@@ -5,11 +5,11 @@
   ],
   "key": {
     "#": {
-      "item": "vplus:platinum_block"
+      "item": "vplus:sapphire_block"
     }
   },
   "result": {
-    "item": "vplus:platinum_ingot",
+    "item": "vplus:sapphire",
     "count": 9
   }
 }

src/main/resources/data/vplus/recipes/sapphire_helmet.json

@@ -6,11 +6,11 @@
   ],
   "key": {
     "#": {
-      "item": "vplus:platinum_ingot"
+      "item": "vplus:sapphire"
     }
   },
   "result": {
-    "item": "vplus:platinum_helmet",
+    "item": "vplus:sapphire_helmet",
     "count": 1
   }
 }

src/main/resources/data/vplus/recipes/sapphire_hoe.json

@@ -7,14 +7,14 @@
   ],
   "key": {
     "#": {
-      "item": "vplus:platinum_ingot"
+      "item": "vplus:sapphire"
     },
     "/": {
       "item": "minecraft:stick"
     }
   },
   "result": {
-    "item": "vplus:platinum_hoe",
+    "item": "vplus:sapphire_hoe",
     "count": 1
   }
 }

src/main/resources/data/vplus/recipes/sapphire_leggings.json

@@ -7,11 +7,11 @@
   ],
   "key": {
     "#": {
-      "item": "vplus:platinum_ingot"
+      "item": "vplus:sapphire"
     }
   },
   "result": {
-    "item": "vplus:platinum_leggings",
+    "item": "vplus:sapphire_leggings",
     "count": 1
   }
 }

src/main/resources/data/vplus/recipes/sapphire_pickaxe.json

@@ -7,14 +7,14 @@
   ],
   "key": {
     "#": {
-      "item": "vplus:platinum_ingot"
+      "item": "vplus:sapphire"
     },
     "/": {
       "item": "minecraft:stick"
     }
   },
   "result": {
-    "item": "vplus:platinum_pickaxe",
+    "item": "vplus:sapphire_pickaxe",
     "count": 1
   }
 }

src/main/resources/data/vplus/recipes/sapphire_shovel.json

@@ -7,14 +7,14 @@
   ],
   "key": {
     "#": {
-      "item": "vplus:platinum_ingot"
+      "item": "vplus:sapphire"
     },
     "/": {
       "item": "minecraft:stick"
     }
   },
   "result": {
-    "item": "vplus:platinum_shovel",
+    "item": "vplus:sapphire_shovel",
     "count": 1
   }
 }

src/main/resources/data/vplus/recipes/sapphire_sword.json

@@ -7,14 +7,14 @@
   ],
   "key": {
     "#": {
-      "item": "vplus:platinum_ingot"
+      "item": "vplus:sapphire"
     },
     "/": {
       "item": "minecraft:stick"
     }
   },
   "result": {
-    "item": "vplus:platinum_sword",
+    "item": "vplus:sapphire_sword",
     "count": 1
   }
 }