Updates!

Updated to 1.18.1, added copper items, new recipes

.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="16" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>

.idea/misc.xml

@@ -4,7 +4,7 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_16" default="true" project-jdk-name="azul-16" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="azul-16" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
 </project>

.idea/runConfigurations.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-    id 'fabric-loom' version '0.9-SNAPSHOT'
+    id 'fabric-loom' version '0.10-SNAPSHOT'
     id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_16
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -32,7 +32,7 @@ processResources {
 
 tasks.withType(JavaCompile).configureEach {
     it.options.encoding = "UTF-8"
-    it.options.release = 16
+    it.options.release = 17
 }
 
 java {

gradle.properties

@@ -1,16 +1,16 @@
 # Done to increase the memory available to gradle.
-#org.gradle.jvmargs=-Xmx2G
+org.gradle.jvmargs=-Xmx4G
 
 # Fabric Properties
 # check these on https://fabricmc.net/versions.html
-minecraft_version=1.17.1
-yarn_mappings=1.17.1+build.63
-loader_version=0.11.7
+minecraft_version=1.18.1
+yarn_mappings=1.18.1+build.1
+loader_version=0.12.12
 
 # Mod Properties
-mod_version = 0.2.0
+mod_version = 1.1.1
 maven_group = tech.nevets
 archives_base_name = vplus
 
 # Dependencies
-fabric_version=0.41.0+1.17
+fabric_version=0.44.0+1.18

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/tech/nevets/vplus/Main.java

@@ -21,6 +21,5 @@ public class Main implements ModInitializer {
         VPArmor.vpArmor();
         VPOreGen.vpOres();
         VPFuels.vpFuels();
-        VPZoom.vpZoom();
     }
 }

src/main/java/tech/nevets/vplus/armor/ArmorMaterials.java

@@ -15,6 +15,9 @@ import tech.nevets.vplus.items.VPItems;
 import java.util.function.Supplier;
 
 public enum ArmorMaterials implements ArmorMaterial {
+    COPPER("copper", 13, new int[]{2, 4, 5, 2}, 20, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F, 0.0F, () -> {
+        return Ingredient.ofItems(new ItemConvertible[]{Items.COPPER_INGOT});
+    }),
     EMERALD("emerald", 30, new int[]{2, 6, 8, 2}, 30, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 1.0F, 0.0F, () -> {
         return Ingredient.ofItems(new ItemConvertible[]{Items.EMERALD});
     }),

src/main/java/tech/nevets/vplus/armor/VPArmor.java

@@ -7,6 +7,7 @@ import net.minecraft.util.registry.Registry;
 
 public class VPArmor {
 
+    public static final ArmorMaterial COPPER_ARMOR = ArmorMaterials.COPPER;
     public static final ArmorMaterial EMERALD_ARMOR = ArmorMaterials.EMERALD;
     public static final ArmorMaterial PLATINUM_ARMOR = ArmorMaterials.PLATINUM;
     public static final ArmorMaterial RUBY_ARMOR = ArmorMaterials.RUBY;
@@ -19,24 +20,28 @@ public class VPArmor {
     }
 
     public static void initializeHelmet() {
+        Registry.register(Registry.ITEM, new Identifier("vplus", "copper_helmet"), new BaseArmor(COPPER_ARMOR, EquipmentSlot.HEAD));
         Registry.register(Registry.ITEM, new Identifier("vplus", "emerald_helmet"), new BaseArmor(EMERALD_ARMOR, EquipmentSlot.HEAD));
         Registry.register(Registry.ITEM, new Identifier("vplus", "platinum_helmet"), new BaseArmor(PLATINUM_ARMOR, EquipmentSlot.HEAD));
         Registry.register(Registry.ITEM, new Identifier("vplus", "ruby_helmet"), new BaseArmor(RUBY_ARMOR, EquipmentSlot.HEAD));
     }
 
     public static void initializeChestplates() {
+        Registry.register(Registry.ITEM, new Identifier("vplus", "copper_chestplate"), new BaseArmor(COPPER_ARMOR, EquipmentSlot.CHEST));
         Registry.register(Registry.ITEM, new Identifier("vplus", "emerald_chestplate"), new BaseArmor(EMERALD_ARMOR, EquipmentSlot.CHEST));
         Registry.register(Registry.ITEM, new Identifier("vplus", "platinum_chestplate"), new BaseArmor(PLATINUM_ARMOR, EquipmentSlot.CHEST));
         Registry.register(Registry.ITEM, new Identifier("vplus", "ruby_chestplate"), new BaseArmor(RUBY_ARMOR, EquipmentSlot.CHEST));
     }
 
     public static void initialzeLeggings() {
+        Registry.register(Registry.ITEM, new Identifier("vplus", "copper_leggings"), new BaseArmor(COPPER_ARMOR, EquipmentSlot.LEGS));
         Registry.register(Registry.ITEM, new Identifier("vplus", "emerald_leggings"), new BaseArmor(EMERALD_ARMOR, EquipmentSlot.LEGS));
         Registry.register(Registry.ITEM, new Identifier("vplus", "platinum_leggings"), new BaseArmor(PLATINUM_ARMOR, EquipmentSlot.LEGS));
         Registry.register(Registry.ITEM, new Identifier("vplus", "ruby_leggings"), new BaseArmor(RUBY_ARMOR, EquipmentSlot.LEGS));
     }
 
     public static void initializeBoots() {
+        Registry.register(Registry.ITEM, new Identifier("vplus", "copper_boots"), new BaseArmor(COPPER_ARMOR, EquipmentSlot.FEET));
         Registry.register(Registry.ITEM, new Identifier("vplus", "emerald_boots"), new BaseArmor(EMERALD_ARMOR, EquipmentSlot.FEET));
         Registry.register(Registry.ITEM, new Identifier("vplus", "platinum_boots"), new BaseArmor(PLATINUM_ARMOR, EquipmentSlot.FEET));
         Registry.register(Registry.ITEM, new Identifier("vplus", "ruby_boots"), new BaseArmor(RUBY_ARMOR, EquipmentSlot.FEET));

src/main/java/tech/nevets/vplus/clientmixin/ZoomMixin.java

@@ -1,4 +1,4 @@
-package tech.nevets.vplus.mixin;
+package tech.nevets.vplus.clientmixin;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -13,7 +13,7 @@ import tech.nevets.vplus.misc.VPZoom;
 @Environment(EnvType.CLIENT)
 @Mixin(GameRenderer.class)
 public class ZoomMixin {
-    @Inject(method = "getFov(Lnet/minecraft/client/render/Camera;FZ)D", at = @At("HEAD"), cancellable = true)
+    @Inject(method = "getFov(Lnet/minecraft/client/render/Camera;FZ)D", at = @At("RETURN"), cancellable = true)
     public void getZoomLevel(CallbackInfoReturnable<Double> callbackInfo) {
         if(ZoomInit.isZooming()) {
             callbackInfo.setReturnValue(VPZoom.zoomLevel);

src/main/java/tech/nevets/vplus/food/CopperApple.java

@@ -0,0 +1,13 @@
+package tech.nevets.vplus.food;
+
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.entity.effect.StatusEffects;
+import net.minecraft.item.FoodComponent;
+import net.minecraft.item.Item;
+import tech.nevets.vplus.items.VPItemGroups;
+
+public class CopperApple extends Item {
+    public CopperApple() {
+        super(new Settings().group(VPItemGroups.FOOD).food(new FoodComponent.Builder().hunger(12).saturationModifier(16).alwaysEdible().statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 20*120, 5),1f).build()));
+    }
+}

src/main/java/tech/nevets/vplus/food/EnchantedCopperApple.java

@@ -0,0 +1,18 @@
+package tech.nevets.vplus.food;
+
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.entity.effect.StatusEffects;
+import net.minecraft.item.FoodComponent;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import tech.nevets.vplus.items.VPItemGroups;
+
+public class EnchantedCopperApple extends Item {
+    public EnchantedCopperApple() {
+        super(new Settings().group(VPItemGroups.FOOD).food(new FoodComponent.Builder().hunger(12).saturationModifier(16).alwaysEdible().statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 20*120, 6),1f).build()));
+    }
+
+    public boolean hasGlint(ItemStack stack) {
+        return true;
+    }
+}

src/main/java/tech/nevets/vplus/food/VPFood.java

@@ -8,6 +8,8 @@ public class VPFood {
 
     public static final Item IRONAPPLE = new IronApple();
     public static final Item ENCHANTEDIRONAPPLE = new EnchantedIronApple();
+    public static final Item COPPERAPPLE = new CopperApple();
+    public static final Item ENCHANTEDCOPPERAPPLE = new EnchantedCopperApple();
     public static final Item DIAMONDAPPLE = new DiamondApple();
     public static final Item ENCHANTEDDIAMONDAPPLE = new EnchantedDiamondApple();
     public static final Item EMERALDAPPLE = new EmeraldApple();
@@ -27,6 +29,8 @@ public class VPFood {
     public static void initializeApples() {
         Registry.register(Registry.ITEM, new Identifier("vplus", "iron_apple"), IRONAPPLE);
         Registry.register(Registry.ITEM, new Identifier("vplus", "enchanted_iron_apple"), ENCHANTEDIRONAPPLE);
+        Registry.register(Registry.ITEM, new Identifier("vplus", "copper_apple"), COPPERAPPLE);
+        Registry.register(Registry.ITEM, new Identifier("vplus", "enchanted_copper_apple"), ENCHANTEDCOPPERAPPLE);
         Registry.register(Registry.ITEM, new Identifier("vplus", "diamond_apple"), DIAMONDAPPLE);
         Registry.register(Registry.ITEM, new Identifier("vplus", "enchanted_diamond_apple"), ENCHANTEDDIAMONDAPPLE);
         Registry.register(Registry.ITEM, new Identifier("vplus", "emerald_apple"), EMERALDAPPLE);

src/main/java/tech/nevets/vplus/init/ClientInit.java

@@ -0,0 +1,12 @@
+package tech.nevets.vplus.init;
+
+import net.fabricmc.api.ClientModInitializer;
+import tech.nevets.vplus.misc.VPZoom;
+
+public class ClientInit  implements ClientModInitializer {
+
+    @Override
+    public void onInitializeClient() {
+        VPZoom.vpZoom();
+    }
+}

src/main/java/tech/nevets/vplus/misc/VPOreGen.java

@@ -8,45 +8,41 @@ import net.minecraft.util.registry.Registry;
 import net.minecraft.util.registry.RegistryKey;
 import net.minecraft.world.gen.GenerationStep;
 import net.minecraft.world.gen.YOffset;
-import net.minecraft.world.gen.decorator.Decorator;
-import net.minecraft.world.gen.decorator.RangeDecoratorConfig;
-import net.minecraft.world.gen.feature.ConfiguredFeature;
-import net.minecraft.world.gen.feature.Feature;
-import net.minecraft.world.gen.feature.OreFeatureConfig;
-import net.minecraft.world.gen.heightprovider.UniformHeightProvider;
+import net.minecraft.world.gen.decorator.*;
+import net.minecraft.world.gen.feature.*;
 import tech.nevets.vplus.blocks.VPBlocks;
 
 public class VPOreGen {
 
-    private static ConfiguredFeature<?, ?> ORE_PLATINUM_OVERWORLD = Feature.ORE
+    private static ConfiguredFeature<?, ?> ORE_PLATINUM_OVERWORLD_CONFIGURED = Feature.ORE
             .configure(new OreFeatureConfig(
-                    OreFeatureConfig.Rules.BASE_STONE_OVERWORLD,
+                    OreConfiguredFeatures.BASE_STONE_OVERWORLD,
                     VPBlocks.PLATINUMORE.getDefaultState(),
-                    3)) // vein size
-            .range(new RangeDecoratorConfig(
-                    UniformHeightProvider.create(YOffset.aboveBottom(0), YOffset.fixed(15))))
-            .spreadHorizontally()
-            .repeat(2); // number of veins per chunk
+                    3)); // vein size
+    public static PlacedFeature ORE_PLATINUM_OVERWORLD_PLACED = ORE_PLATINUM_OVERWORLD_CONFIGURED.withPlacement(
+            CountPlacementModifier.of(2), // number of veins per chunk
+            SquarePlacementModifier.of(),
+            HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(15))
+    );
 
-    private static ConfiguredFeature<?, ?> ORE_RUBY_OVERWORLD = Feature.ORE
+    private static ConfiguredFeature<?, ?> ORE_RUBY_OVERWORLD_CONFIGURED = Feature.ORE
             .configure(new OreFeatureConfig(
-                    OreFeatureConfig.Rules.BASE_STONE_OVERWORLD,
-                    VPBlocks.RUBYORE.getDefaultState(),
-                    1)) // vein size
-            .range(new RangeDecoratorConfig(
-                    UniformHeightProvider.create(YOffset.aboveBottom(0), YOffset.fixed(256))))
-            .spreadHorizontally()
-            .repeat(8); // number of veins per chunk
+                    OreConfiguredFeatures.BASE_STONE_OVERWORLD,
+                    VPBlocks.PLATINUMORE.getDefaultState(),
+                    1)); // vein size
+    public static PlacedFeature ORE_RUBY_OVERWORLD_PLACED = ORE_PLATINUM_OVERWORLD_CONFIGURED.withPlacement(
+            CountPlacementModifier.of(8), // number of veins per chunk
+            SquarePlacementModifier.of(),
+            HeightRangePlacementModifier.uniform(YOffset.getBottom(), YOffset.fixed(15))
+    );
 
     public static void vpOres() {
-        RegistryKey<ConfiguredFeature<?, ?>> platinumOreOverworld = RegistryKey.of(Registry.CONFIGURED_FEATURE_KEY,
-                new Identifier("vplus", "platinum_ore"));
-        Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, platinumOreOverworld.getValue(), ORE_PLATINUM_OVERWORLD);
-        BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, platinumOreOverworld);
+        Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, new Identifier("vplus", "platinum_ore"), ORE_PLATINUM_OVERWORLD_CONFIGURED);
+        Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("vplus", "platinum_ore"), ORE_PLATINUM_OVERWORLD_PLACED);
+        BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, RegistryKey.of(Registry.PLACED_FEATURE_KEY, new Identifier("vplus", "platinum_ore")));
 
-        RegistryKey<ConfiguredFeature<?, ?>> rubyOreOverworld = RegistryKey.of(Registry.CONFIGURED_FEATURE_KEY,
-                new Identifier("vplus", "ruby_ore"));
-        Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, rubyOreOverworld.getValue(), ORE_RUBY_OVERWORLD);
-        BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, rubyOreOverworld);
+        Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, new Identifier("vplus", "ruby_ore"), ORE_RUBY_OVERWORLD_CONFIGURED);
+        Registry.register(BuiltinRegistries.PLACED_FEATURE, new Identifier("vplus", "ruby_ore"), ORE_RUBY_OVERWORLD_PLACED);
+        BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, RegistryKey.of(Registry.PLACED_FEATURE_KEY, new Identifier("vplus", "ruby_ore")));
     }
 }

src/main/java/tech/nevets/vplus/tools/ToolMaterials.java

@@ -9,6 +9,9 @@ import net.minecraft.util.Lazy;
 import tech.nevets.vplus.items.VPItems;
 
 public enum ToolMaterials implements ToolMaterial {
+    COPPER (2, 200, 5.0F, 3.0F, 20, () -> {
+        return Ingredient.ofItems(new ItemConvertible[]{Items.COPPER_INGOT});
+    }),
     EMERALD(3, 750, 7.0F, 4.0F, 30, () -> {
         return Ingredient.ofItems(new ItemConvertible[]{Items.EMERALD});
     }),

src/main/java/tech/nevets/vplus/tools/VPTools.java

@@ -14,30 +14,35 @@ public class VPTools {
     }
 
     public static void initializeAxes() {
+        Registry.register(Registry.ITEM, new Identifier("vplus", "copper_axe"), new AxeBase(ToolMaterials.COPPER));
         Registry.register(Registry.ITEM, new Identifier("vplus", "emerald_axe"), new AxeBase(ToolMaterials.EMERALD));
         Registry.register(Registry.ITEM, new Identifier("vplus", "platinum_axe"), new AxeBase(ToolMaterials.PLATINUM));
         Registry.register(Registry.ITEM, new Identifier("vplus", "ruby_axe"), new AxeBase(ToolMaterials.RUBY));
     }
 
     public static void initializeHoes() {
+        Registry.register(Registry.ITEM, new Identifier("vplus", "copper_hoe"), new HoeBase(ToolMaterials.COPPER));
         Registry.register(Registry.ITEM, new Identifier("vplus", "emerald_hoe"), new HoeBase(ToolMaterials.EMERALD));
         Registry.register(Registry.ITEM, new Identifier("vplus", "platinum_hoe"), new HoeBase(ToolMaterials.PLATINUM));
         Registry.register(Registry.ITEM, new Identifier("vplus", "ruby_hoe"), new HoeBase(ToolMaterials.RUBY));
     }
 
     public static void initializePickaxes() {
+        Registry.register(Registry.ITEM, new Identifier("vplus", "copper_pickaxe"), new PickaxeBase(ToolMaterials.COPPER));
         Registry.register(Registry.ITEM, new Identifier("vplus", "emerald_pickaxe"), new PickaxeBase(ToolMaterials.EMERALD));
         Registry.register(Registry.ITEM, new Identifier("vplus", "platinum_pickaxe"), new PickaxeBase(ToolMaterials.PLATINUM));
         Registry.register(Registry.ITEM, new Identifier("vplus", "ruby_pickaxe"), new PickaxeBase(ToolMaterials.RUBY));
     }
 
     public static void initializeShovels() {
+        Registry.register(Registry.ITEM, new Identifier("vplus", "copper_shovel"), new ShovelBase(ToolMaterials.COPPER));
         Registry.register(Registry.ITEM, new Identifier("vplus", "emerald_shovel"), new ShovelBase(ToolMaterials.EMERALD));
         Registry.register(Registry.ITEM, new Identifier("vplus", "platinum_shovel"), new ShovelBase(ToolMaterials.PLATINUM));
         Registry.register(Registry.ITEM, new Identifier("vplus", "ruby_shovel"), new ShovelBase(ToolMaterials.RUBY));
     }
 
     public static void initializeSwords() {
+        Registry.register(Registry.ITEM, new Identifier("vplus", "copper_sword"), new SwordBase(ToolMaterials.COPPER));
         Registry.register(Registry.ITEM, new Identifier("vplus", "emerald_sword"), new SwordBase(ToolMaterials.EMERALD));
         Registry.register(Registry.ITEM, new Identifier("vplus", "platinum_sword"), new SwordBase(ToolMaterials.PLATINUM));
         Registry.register(Registry.ITEM, new Identifier("vplus", "ruby_sword"), new SwordBase(ToolMaterials.RUBY));

src/main/resources/assets/vplus/lang/en_us.json

@@ -19,10 +19,15 @@
   "item.vplus.platinum_nugget": "Platinum Nugget",
   "item.vplus.ruby": "Ruby",
 
+  "item.vplus.copper_sword": "Copper Sword",
   "item.vplus.emerald_sword": "Emerald Sword",
   "item.vplus.platinum_sword": "Platinum Sword",
   "item.vplus.ruby_sword": "Ruby Sword",
 
+  "item.vplus.copper_helmet": "Copper Helmet",
+  "item.vplus.copper_chestplate": "Copper Chestplate",
+  "item.vplus.copper_leggings": "Copper Leggings",
+  "item.vplus.copper_boots": "Copper Boots",
   "item.vplus.emerald_helmet": "Emerald Helmet",
   "item.vplus.emerald_chestplate": "Emerald Chestplate",
   "item.vplus.emerald_leggings": "Emerald Leggings",
@@ -36,6 +41,10 @@
   "item.vplus.ruby_leggings": "Ruby Leggings",
   "item.vplus.ruby_boots": "Ruby Boots",
 
+  "item.vplus.copper_pickaxe": "Copper Pickaxe",
+  "item.vplus.copper_axe": "Copper Axe",
+  "item.vplus.copper_shovel": "Copper Shovel",
+  "item.vplus.copper_hoe": "Copper Hoe",
   "item.vplus.emerald_pickaxe": "Emerald Pickaxe",
   "item.vplus.emerald_axe": "Emerald Axe",
   "item.vplus.emerald_shovel": "Emerald Shovel",
@@ -51,12 +60,14 @@
 
   "item.vplus.iron_apple": "Iron Apple",
   "item.vplus.enchanted_iron_apple": "Enchanted Iron Apple",
+  "item.vplus.copper_apple": "Copper Apple",
+  "item.vplus.enchanted_copper_apple": "Enchanted Copper Apple",
   "item.vplus.diamond_apple": "Diamond Apple",
   "item.vplus.enchanted_diamond_apple": "Enchanted Diamond Apple",
   "item.vplus.emerald_apple": "Emerald Apple",
   "item.vplus.enchanted_emerald_apple": "Enchanted Emerald Apple",
   "item.vplus.netherite_apple": "Netherite Apple",
-  "item.vplus.enchanted_Netherite_apple": "Enchanted 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.ruby_apple": "Ruby Apple",

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/main/resources/data/minecraft/recipes/diamond_horse_armor.json

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

src/main/resources/data/minecraft/recipes/gold_horse_armor.json

@@ -0,0 +1,17 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "  g",
+    "ggg",
+    "g g"
+  ],
+  "key": {
+    "g": {
+      "item": "minecraft:gold_ingot"
+    }
+  },
+  "result": {
+    "item": "minecraft:golden_horse_armor",
+    "count": 1
+  }
+}

src/main/resources/data/minecraft/recipes/iron_horse_armor.json

@@ -0,0 +1,17 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "  i",
+    "iii",
+    "i i"
+  ],
+  "key": {
+    "i": {
+      "item": "minecraft:iron_ingot"
+    }
+  },
+  "result": {
+    "item": "minecraft:iron_horse_armor",
+    "count": 1
+  }
+}

src/main/resources/data/minecraft/recipes/leather_horse_armor.json

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

src/main/resources/data/minecraft/recipes/nametag.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "#i#",
+    " # ",
+    " # "
+  ],
+  "key": {
+    "#": {
+      "item": "minecraft:string"
+    },
+    "i": {
+      "item": "minecraft:iron_ingot"
+    }
+  },
+  "result": {
+    "item": "minecraft:name_tag",
+    "count": 1
+  }
+}

src/main/resources/data/minecraft/recipes/saddle.json

@@ -0,0 +1,19 @@
+{
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        "#i#",
+        "# #"
+    ],
+    "key": {
+        "#": {
+            "item": "minecraft:leather"
+        },
+        "i": {
+            "item": "minecraft:iron_ingot"
+        }
+    },
+    "result": {
+        "item": "minecraft:saddle",
+        "count": 1
+    }
+}

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

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "iii",
+    "iAi",
+    "iii"
+  ],
+  "key": {
+    "i": {
+      "item": "minecraft:copper_ingot"
+    },
+    "A": {
+      "item": "minecraft:apple"
+    }
+  },
+  "result": {
+    "item": "vplus:copper_apple",
+    "count": 1
+  }
+}

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

@@ -0,0 +1,19 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "XX",
+    "X#",
+    " #"
+  ],
+  "key": {
+    "#": {
+      "item": "minecraft:stick"
+    },
+    "X": {
+      "item": "minecraft:copper_ingot"
+    }
+  },
+  "result": {
+    "item": "vplus:copper_axe"
+  }
+}

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

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "# #",
+    "# #"
+  ],
+  "key": {
+    "#": {
+      "item": "minecraft:copper_ingot"
+    }
+  },
+  "result": {
+    "item": "vplus:copper_boots",
+    "count": 1
+  }
+}

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

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

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

@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "###",
+    "# #"
+  ],
+  "key": {
+    "#": {
+      "item": "minecraft:copper_ingot"
+    }
+  },
+  "result": {
+    "item": "vplus:copper_helmet",
+    "count": 1
+  }
+}

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

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "##",
+    " /",
+    " /"
+  ],
+  "key": {
+    "#": {
+      "item": "minecraft:copper_ingot"
+    },
+    "/": {
+      "item": "minecraft:stick"
+    }
+  },
+  "result": {
+    "item": "vplus:copper_hoe",
+    "count": 1
+  }
+}

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

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

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

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "###",
+    " / ",
+    " / "
+  ],
+  "key": {
+    "#": {
+      "item": "minecraft:copper_ingot"
+    },
+    "/": {
+      "item": "minecraft:stick"
+    }
+  },
+  "result": {
+    "item": "vplus:copper_pickaxe",
+    "count": 1
+  }
+}

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

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "#",
+    "/",
+    "/"
+  ],
+  "key": {
+    "#": {
+      "item": "minecraft:copper_ingot"
+    },
+    "/": {
+      "item": "minecraft:stick"
+    }
+  },
+  "result": {
+    "item": "vplus:copper_shovel",
+    "count": 1
+  }
+}

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

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "#",
+    "#",
+    "/"
+  ],
+  "key": {
+    "#": {
+      "item": "minecraft:copper_ingot"
+    },
+    "/": {
+      "item": "minecraft:stick"
+    }
+  },
+  "result": {
+    "item": "vplus:copper_sword",
+    "count": 1
+  }
+}

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

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "iii",
+    "iAi",
+    "iii"
+  ],
+  "key": {
+    "i": {
+      "item": "minecraft:copper_block"
+    },
+    "A": {
+      "item": "minecraft:apple"
+    }
+  },
+  "result": {
+    "item": "vplus:enchanted_copper_apple",
+    "count": 1
+  }
+}

src/main/resources/fabric.mod.json

@@ -6,11 +6,11 @@
   "name": "Vanilla Plus",
   "description": "Adding things that should be in the vanilla game!",
   "authors": [
-    "nevetS-718"
+    "Steven"
   ],
   "contact": {
     "homepage": "https://nevets.tech/",
-    "sources": "https://github.com/nevetS-718/VanillaPlus"
+    "sources": "https://git.nevets.tech/Steven/VanillaPlus"
   },
 
   "license": "CC0-1.0",
@@ -20,19 +20,28 @@
   "entrypoints": {
     "main": [
       "tech.nevets.vplus.Main"
+    ],
+    "client": [
+      "tech.nevets.vplus.init.ClientInit"
     ]
   },
   "mixins": [
-    "vplus.mixins.json"
+    {
+      "config": "vplus.mixins.json",
+      "environment": "server"
+    },
+    {
+      "config": "vplus.clientmixins.json",
+      "environment": "client"
+    }
   ],
 
   "depends": {
-    "fabricloader": ">=0.11.3",
+    "fabricloader": ">=0.12.9",
     "fabric": "*",
-    "minecraft": "1.17.x",
-    "java": ">=16"
+    "minecraft": "1.18.x",
+    "java": ">=17"
   },
   "suggests": {
-    "another-mod": "*"
   }
 }

src/main/resources/vplus.clientmixins.json

@@ -0,0 +1,13 @@
+{
+  "required": true,
+  "package": "tech.nevets.vplus.clientmixin",
+  "compatibilityLevel": "JAVA_17",
+  "mixins": [
+  ],
+  "client": [
+    "ZoomMixin"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

src/main/resources/vplus.mixins.json

@@ -1,14 +1,12 @@
 {
-  "required": true,
-  "minVersion": "0.8",
+  "required": false,
   "package": "tech.nevets.vplus.mixin",
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
   "mixins": [
-    "ZoomMixin"
   ],
   "client": [
   ],
   "injectors": {
-    "defaultRequire": 1
+    "defaultRequire": 0
   }
 }