Most of shears completed

Author: OroArmor

common/src/main/java/com/oroarmor/netherite_plus/NetheritePlusMod.java

@@ -29,7 +29,6 @@
 import java.util.List;
 
 import com.oroarmor.config.ConfigItemGroup;
-import com.oroarmor.config.command.ConfigCommand;
 import com.oroarmor.multi_item_lib.UniqueItemRegistry;
 import com.oroarmor.netherite_plus.advancement.criterion.NetheritePlusCriteria;
 import com.oroarmor.netherite_plus.config.NetheritePlusConfig;
@@ -40,15 +39,13 @@
 import com.oroarmor.netherite_plus.screen.NetheriteBeaconScreenHandler;
 import com.oroarmor.netherite_plus.screen.NetheritePlusScreenHandlers;
 import com.oroarmor.netherite_plus.stat.NetheritePlusStats;
-import me.shedaniel.architectury.event.events.CommandRegistrationEvent;
 import me.shedaniel.architectury.networking.NetworkManager;
 import me.shedaniel.architectury.registry.Registries;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.server.command.CommandManager;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Lazy;
 
@@ -104,17 +101,26 @@ public static Identifier id(String id) {
     }
 
     public static void registerItemsWithMultiItemLib() {
-        if (NetheritePlusConfig.ENABLED.ENABLED_SHIELDS.getValue())
+        if (NetheritePlusConfig.ENABLED.ENABLED_SHIELDS.getValue()) {
             UniqueItemRegistry.SHIELD.addItemToRegistry(NETHERITE_SHIELD.get());
-        if (NetheritePlusConfig.ENABLED.ENABLED_FISHING_ROD.getValue())
+        }
+        if (NetheritePlusConfig.ENABLED.ENABLED_FISHING_ROD.getValue()) {
             UniqueItemRegistry.FISHING_ROD.addItemToRegistry(NETHERITE_FISHING_ROD.get());
-        if (NetheritePlusConfig.ENABLED.ENABLED_ELYTRA.getValue())
+        }
+        if (NetheritePlusConfig.ENABLED.ENABLED_ELYTRA.getValue()) {
             UniqueItemRegistry.ELYTRA.addItemToRegistry(NETHERITE_ELYTRA.get());
+        }
         if (NetheritePlusConfig.ENABLED.ENABLED_BOWS_AND_CROSSBOWS.getValue()) {
             UniqueItemRegistry.BOW.addItemToRegistry(NETHERITE_BOW.get());
             UniqueItemRegistry.CROSSBOW.addItemToRegistry(NETHERITE_CROSSBOW.get());
         }
-        if (NetheritePlusConfig.ENABLED.ENABLED_TRIDENT.getValue())
+        if (NetheritePlusConfig.ENABLED.ENABLED_TRIDENT.getValue()) {
             UniqueItemRegistry.TRIDENT.addItemToRegistry(NETHERITE_TRIDENT.get());
+        }
+        if (NetheritePlusConfig.ENABLED.ENABLED_SHEARS.getValue()) {
+            System.out.println(NETHERITE_SHEARS.get());
+            UniqueItemRegistry.SHEARS.addItemToRegistry(NETHERITE_SHEARS.get());
+            System.out.println(UniqueItemRegistry.SHEARS.isItemInRegistry(NETHERITE_SHEARS.get()));
+        }
     }
 }

common/src/main/java/com/oroarmor/netherite_plus/config/NetheritePlusConfig.java

@@ -92,7 +92,8 @@ public static class DURABILITIES extends ConfigItemGroup {
         public static final ConfigItem<Integer> FISHING_ROD_DURABILITY = new IntegerConfigItem("fishing_rod", 128, "config.netherite_plus.durabilities.fishing_rod");
         public static final ConfigItem<Integer> SHIELD_DURABILITY = new IntegerConfigItem("shield", 672, "config.netherite_plus.durabilities.shield");
         public static final ConfigItem<Integer> TRIDENT_DURABILITY = new IntegerConfigItem("trident", 500, "config.netherite_plus.durabilities.trident");
-        public static final List<ConfigItem<?>> OPTIONS = ImmutableList.of(ELYTRA_DURABILITY, FISHING_ROD_DURABILITY, SHIELD_DURABILITY, BOW_DURABILITY, CROSSBOW_DURABILITY, TRIDENT_DURABILITY);
+        public static final ConfigItem<Integer> SHEARS_DURABILITY = new IntegerConfigItem("shears", 476, "config.netherite_plus.durabilities.shears");
+        public static final List<ConfigItem<?>> OPTIONS = ImmutableList.of(ELYTRA_DURABILITY, FISHING_ROD_DURABILITY, SHIELD_DURABILITY, BOW_DURABILITY, CROSSBOW_DURABILITY, TRIDENT_DURABILITY, SHEARS_DURABILITY);
 
         public DURABILITIES() {
             super(OPTIONS, "durabilities");
@@ -111,8 +112,9 @@ public static class ENABLED extends ConfigItemGroup {
         public static final ConfigItem<Boolean> ENABLED_SHULKER_BOXES = new BooleanConfigItem("shulker_boxes", true, "config.netherite_plus.enabled.shulker_boxes");
         public static final ConfigItem<Boolean> ENABLED_TRIDENT = new BooleanConfigItem("trident", true, "config.netherite_plus.enabled.trident");
         public static final ConfigItem<Boolean> ENABLED_BEACON = new BooleanConfigItem("beacon", true, "config.netherite_plus.enabled.beacon");
+        public static final ConfigItem<Boolean> ENABLED_SHEARS = new BooleanConfigItem("shears", true, "config.netherite_plus.enabled.shears");
 
-        public static final List<ConfigItem<?>> OPTIONS = ImmutableList.of(ENABLED_SHULKER_BOXES, ENABLED_ELYTRA, ENABLED_SHIELDS, ENABLED_BOWS_AND_CROSSBOWS, ENABLED_FISHING_ROD, ENABLED_HORSE_ARMOR, ENABLED_FAKE_NETHERITE_BLOCKS, ENABLED_ANVIL, ENABLED_CONFIG_PRINT, ENABLED_TRIDENT, ENABLED_BEACON);
+        public static final List<ConfigItem<?>> OPTIONS = ImmutableList.of(ENABLED_SHULKER_BOXES, ENABLED_ELYTRA, ENABLED_SHIELDS, ENABLED_BOWS_AND_CROSSBOWS, ENABLED_FISHING_ROD, ENABLED_HORSE_ARMOR, ENABLED_FAKE_NETHERITE_BLOCKS, ENABLED_ANVIL, ENABLED_CONFIG_PRINT, ENABLED_TRIDENT, ENABLED_BEACON, ENABLED_SHEARS);
 
         public ENABLED() {
             super(OPTIONS, "enabled");

common/src/main/java/com/oroarmor/netherite_plus/item/NetheritePlusItems.java

@@ -36,6 +36,7 @@
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemGroup;
+import net.minecraft.item.ShearsItem;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Rarity;
 import net.minecraft.util.registry.Registry;
@@ -83,6 +84,8 @@ public final class NetheritePlusItems {
 
     public static RegistrySupplier<Item> NETHERITE_ANVIL_ITEM;
 
+    public static RegistrySupplier<Item> NETHERITE_SHEARS;
+
     private static RegistrySupplier<Item> register(RegistrySupplier<Block> block, Supplier<BlockItem> item) {
         return register(block.getId(), item::get);
     }
@@ -157,6 +160,9 @@ public static void init() {
         if (NetheritePlusConfig.ENABLED.ENABLED_BEACON.getValue()) {
             NETHERITE_BEACON = register(NetheritePlusBlocks.NETHERITE_BEACON, () -> new BlockItem(NetheritePlusBlocks.NETHERITE_BEACON.get(), new Item.Settings().maxCount(64).group(ItemGroup.MISC).fireproof()));
         }
+        if(NetheritePlusConfig.ENABLED.ENABLED_SHEARS.getValue()) {
+            NETHERITE_SHEARS = register(id("netherite_shears"), () -> new ShearsItem(new Item.Settings().group(ItemGroup.TOOLS).fireproof().maxDamage(NetheritePlusConfig.DURABILITIES.SHEARS_DURABILITY.getValue())));
+        }
     }
 
     private static void registerShield() {

fabric/build.gradle

@@ -44,6 +44,10 @@ repositories {
             includeGroup "curse.maven"
         }
     }
+    maven {
+        name = 'Ladysnake Mods'
+        url = 'https://ladysnake.jfrog.io/artifactory/mods'
+    }
 }
 
 sourceCompatibility = JavaVersion.VERSION_1_8
@@ -58,8 +62,8 @@ def runAndCompile(List<String> mods, boolean run) {
             }
             if (run) {
                 modRuntime (it) {
-                    exclude(module: "modmenu")
                     exclude(module: "fabric-api")
+                    exclude(module: "modmenu")
                 }
             }
         }
@@ -116,7 +120,9 @@ dependencies {
     runAndCompile([/*"net.kyrptonaught:quickshulker:${project.quickshulker}",*/
                    "com.github.emilyploszaj:trinkets:${project.trinkets}",
                    "com.misterpemodder:shulkerboxtooltip:${project.shulkerboxtooltip}+"+/*${project.minecraft_version}*/"1.16.4",
-    ], true)
+    ], false)
+
+    modRuntime "io.github.onyxstudios.Cardinal-Components-API:cardinal-components-entity:2.8.1"
 
 //    modCompileOnly "curse.maven:betterend-413596:3168267"
 

forge/build.gradle

@@ -37,8 +37,8 @@ dependencies {
         exclude(module: "fabric-loader")
     }
 
-    modImplementation('com.oroarmor:oro-config-forge:3.1.0')
-    modRuntime('com.oroarmor:oro-config-forge:3.1.0')
+    modImplementation('com.oroarmor:oro-config-forge:3.0.0')
+    modRuntime('com.oroarmor:oro-config-forge:3.0.0')
 
     implementation(project(path: ":common")) {
         exclude(module: "fabric-loader")

forge/src/main/java/com/oroarmor/multi_item_lib/UniqueItemRegistry.java

@@ -36,6 +36,7 @@ public final class UniqueItemRegistry {
 	public static UniqueItemRegistry BOW = new UniqueItemRegistry(Items.BOW);
 	public static UniqueItemRegistry CROSSBOW = new UniqueItemRegistry(Items.CROSSBOW);
 	public static UniqueItemRegistry TRIDENT = new UniqueItemRegistry(Items.TRIDENT);
+	public static UniqueItemRegistry SHEARS = new UniqueItemRegistry(Items.SHEARS);
 
 	private final List<Item> itemList;
 

forge/src/main/java/com/oroarmor/multi_item_lib/mixin/BeehiveBlockMixin.java

@@ -0,0 +1,42 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2021 OroArmor (Eli Orona)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.oroarmor.multi_item_lib.mixin;
+
+import com.oroarmor.multi_item_lib.UniqueItemRegistry;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import net.minecraft.block.BeehiveBlock;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+@Mixin(BeehiveBlock.class)
+public class BeehiveBlockMixin {
+    @Redirect(method = "onUse", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;getItem()Lnet/minecraft/item/Item;", ordinal = 0))
+    private Item onUse(ItemStack stack) {
+        return UniqueItemRegistry.SHEARS.getDefaultItem(stack.getItem());
+    }
+}

forge/src/main/java/com/oroarmor/multi_item_lib/mixin/CrossbowItemMixin.java

@@ -35,8 +35,9 @@
 
 @Mixin(CrossbowItem.class)
 public class CrossbowItemMixin {
-	@Redirect(method = "getSpeed", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;getItem()Lnet/minecraft/item/Item;"))
-	private static Item tickMovement(ItemStack itemStack) {
-		return UniqueItemRegistry.CROSSBOW.getDefaultItem(itemStack.getItem());
-	}
+
+    @Redirect(method = "getSpeed", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;getItem()Lnet/minecraft/item/Item;"))
+    private static Item tickMovement(ItemStack itemStack) {
+        return UniqueItemRegistry.CROSSBOW.getDefaultItem(itemStack.getItem());
+    }
 }

forge/src/main/java/com/oroarmor/multi_item_lib/mixin/EfficiencyEnchantmentMixin.java

@@ -0,0 +1,42 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2021 OroArmor (Eli Orona)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.oroarmor.multi_item_lib.mixin;
+
+import com.oroarmor.multi_item_lib.UniqueItemRegistry;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import net.minecraft.enchantment.EfficiencyEnchantment;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+@Mixin(EfficiencyEnchantment.class)
+public class EfficiencyEnchantmentMixin {
+    @Redirect(method = "isAcceptableItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;getItem()Lnet/minecraft/item/Item;"))
+    private Item isAcceptableItem(ItemStack stack) {
+        return UniqueItemRegistry.SHEARS.getDefaultItem(stack.getItem());
+    }
+}

forge/src/main/java/com/oroarmor/multi_item_lib/mixin/FishBobberEntityMixin.java

@@ -0,0 +1,44 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2021 OroArmor (Eli Orona)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.oroarmor.multi_item_lib.mixin;
+
+import com.oroarmor.multi_item_lib.UniqueItemRegistry;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.projectile.FishingBobberEntity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+@Mixin(FishingBobberEntity.class)
+public abstract class FishBobberEntityMixin {
+
+    @Redirect(method = "removeIfInvalid", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;getItem()Lnet/minecraft/item/Item;"))
+    private Item replaceGetItem1(ItemStack itemStack, PlayerEntity playerEntity) {
+        return UniqueItemRegistry.FISHING_ROD.getDefaultItem(itemStack.getItem());
+    }
+}