Skip to content

Commit 74c0dc0

Browse files
OroArmorOroArmor
committed
Remove shears for patch
1 parent 26f8f86 commit 74c0dc0

8 files changed

Lines changed: 32 additions & 36 deletions

File tree

‎common/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
exclude(module: "fabric-loader")
2222
}
2323

24-
modCompile('com.oroarmor:multi-item-lib:1.3.0') {
24+
modCompile('com.oroarmor:multi-item-lib:1.2.0') {
2525
exclude(module: "fabric-api")
2626
exclude(module: "fabric-loader")
2727
}

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,8 @@ public static void registerItemsWithMultiItemLib() {
117117
if (NetheritePlusConfig.ENABLED.ENABLED_TRIDENT.getValue()) {
118118
UniqueItemRegistry.TRIDENT.addItemToRegistry(NETHERITE_TRIDENT.get());
119119
}
120-
if (NetheritePlusConfig.ENABLED.ENABLED_SHEARS.getValue()) {
121-
System.out.println(NETHERITE_SHEARS.get());
122-
UniqueItemRegistry.SHEARS.addItemToRegistry(NETHERITE_SHEARS.get());
123-
System.out.println(UniqueItemRegistry.SHEARS.isItemInRegistry(NETHERITE_SHEARS.get()));
124-
}
120+
// if (NetheritePlusConfig.ENABLED.ENABLED_SHEARS.getValue()) {
121+
// UniqueItemRegistry.SHEARS.addItemToRegistry(NETHERITE_SHEARS.get());
122+
// }
125123
}
126124
}

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public static void createLavaVisionUpdatePacket(PlayerEntity player) {
6060
}
6161

6262
public static class ANVIL extends ConfigItemGroup {
63-
public static final ConfigItem<Double> XP_REDUCTION = new DoubleConfigItem("xp_reduction", 0.5, "config.netherite_plus.anvil.xp_redcution");
63+
public static final ConfigItem<Double> XP_REDUCTION = new DoubleConfigItem("xp_reduction", 0.5, "config.netherite_plus.anvil.xp_redcution", null, Double.MAX_VALUE, 0);
6464

6565
public static final List<ConfigItem<?>> OPTIONS = ImmutableList.of(XP_REDUCTION);
6666

@@ -70,12 +70,12 @@ public ANVIL() {
7070
}
7171

7272
public static class DAMAGE extends ConfigItemGroup {
73-
public static final ConfigItem<Double> BOW_DAMAGE_ADDITION = new DoubleConfigItem("bow_damage_addition", 0d, "config.netherite_plus.damage.bow_damage_addition");
74-
public static final ConfigItem<Double> BOW_DAMAGE_MULTIPLIER = new DoubleConfigItem("bow_damage_multiplier", 1d, "config.netherite_plus.damage.bow_damage_multiplier");
75-
public static final ConfigItem<Double> CROSSBOW_DAMAGE_ADDITION = new DoubleConfigItem("crossbow_damage_addition", 0d, "config.netherite_plus.damage.crossbow_damage_addition");
76-
public static final ConfigItem<Double> CROSSBOW_DAMAGE_MULTIPLIER = new DoubleConfigItem("crossbow_damage_multiplier", 1d, "config.netherite_plus.damage.crossbow_damage_multiplier");
77-
public static final ConfigItem<Double> TRIDENT_DAMAGE_ADDITION = new DoubleConfigItem("trident_damage_addition", 0d, "config.netherite_plus.damage.trident_damage_addition");
78-
public static final ConfigItem<Double> TRIDENT_DAMAGE_MULTIPLIER = new DoubleConfigItem("trident_damage_multiplier", 1d, "config.netherite_plus.damage.trident_damage_multiplier");
73+
public static final ConfigItem<Double> BOW_DAMAGE_ADDITION = new DoubleConfigItem("bow_damage_addition", 0d, "config.netherite_plus.damage.bow_damage_addition", null, Double.MAX_VALUE, 0);
74+
public static final ConfigItem<Double> BOW_DAMAGE_MULTIPLIER = new DoubleConfigItem("bow_damage_multiplier", 1d, "config.netherite_plus.damage.bow_damage_multiplier", null, Double.MAX_VALUE, 0);
75+
public static final ConfigItem<Double> CROSSBOW_DAMAGE_ADDITION = new DoubleConfigItem("crossbow_damage_addition", 0d, "config.netherite_plus.damage.crossbow_damage_addition", null, Double.MAX_VALUE, 0);
76+
public static final ConfigItem<Double> CROSSBOW_DAMAGE_MULTIPLIER = new DoubleConfigItem("crossbow_damage_multiplier", 1d, "config.netherite_plus.damage.crossbow_damage_multiplier", null, Double.MAX_VALUE, 0);
77+
public static final ConfigItem<Double> TRIDENT_DAMAGE_ADDITION = new DoubleConfigItem("trident_damage_addition", 0d, "config.netherite_plus.damage.trident_damage_addition", null, Double.MAX_VALUE, 0);
78+
public static final ConfigItem<Double> TRIDENT_DAMAGE_MULTIPLIER = new DoubleConfigItem("trident_damage_multiplier", 1d, "config.netherite_plus.damage.trident_damage_multiplier", null, Double.MAX_VALUE, 0);
7979
public static final ConfigItem<Integer> ELYTRA_ARMOR_POINTS = new IntegerConfigItem("elytra_armor_points", 4, "config.netherite_plus.damage.elytra_armor_points");
8080

8181
public static final List<ConfigItem<?>> OPTIONS = ImmutableList.of(BOW_DAMAGE_ADDITION, BOW_DAMAGE_MULTIPLIER, CROSSBOW_DAMAGE_ADDITION, CROSSBOW_DAMAGE_MULTIPLIER, TRIDENT_DAMAGE_ADDITION, TRIDENT_DAMAGE_MULTIPLIER, ELYTRA_ARMOR_POINTS);
@@ -93,7 +93,7 @@ public static class DURABILITIES extends ConfigItemGroup {
9393
public static final ConfigItem<Integer> SHIELD_DURABILITY = new IntegerConfigItem("shield", 672, "config.netherite_plus.durabilities.shield");
9494
public static final ConfigItem<Integer> TRIDENT_DURABILITY = new IntegerConfigItem("trident", 500, "config.netherite_plus.durabilities.trident");
9595
public static final ConfigItem<Integer> SHEARS_DURABILITY = new IntegerConfigItem("shears", 476, "config.netherite_plus.durabilities.shears");
96-
public static final List<ConfigItem<?>> OPTIONS = ImmutableList.of(ELYTRA_DURABILITY, FISHING_ROD_DURABILITY, SHIELD_DURABILITY, BOW_DURABILITY, CROSSBOW_DURABILITY, TRIDENT_DURABILITY, SHEARS_DURABILITY);
96+
public static final List<ConfigItem<?>> OPTIONS = ImmutableList.of(ELYTRA_DURABILITY, FISHING_ROD_DURABILITY, SHIELD_DURABILITY, BOW_DURABILITY, CROSSBOW_DURABILITY, TRIDENT_DURABILITY/*, SHEARS_DURABILITY*/);
9797

9898
public DURABILITIES() {
9999
super(OPTIONS, "durabilities");
@@ -112,17 +112,17 @@ public static class ENABLED extends ConfigItemGroup {
112112
public static final ConfigItem<Boolean> ENABLED_SHULKER_BOXES = new BooleanConfigItem("shulker_boxes", true, "config.netherite_plus.enabled.shulker_boxes");
113113
public static final ConfigItem<Boolean> ENABLED_TRIDENT = new BooleanConfigItem("trident", true, "config.netherite_plus.enabled.trident");
114114
public static final ConfigItem<Boolean> ENABLED_BEACON = new BooleanConfigItem("beacon", true, "config.netherite_plus.enabled.beacon");
115-
public static final ConfigItem<Boolean> ENABLED_SHEARS = new BooleanConfigItem("shears", true, "config.netherite_plus.enabled.shears");
115+
public static final ConfigItem<Boolean> ENABLED_SHEARS = new BooleanConfigItem("shears", false, "config.netherite_plus.enabled.shears");
116116

117-
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);
117+
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*/);
118118

119119
public ENABLED() {
120120
super(OPTIONS, "enabled");
121121
}
122122
}
123123

124124
public static class GRAPHICS extends ConfigItemGroup {
125-
public static final ConfigItem<Double> LAVA_VISION_DISTANCE = new DoubleConfigItem("lava_vision_distance", 0.25, "config.netherite_plus.graphics.lava_vision", NetheritePlusConfig::createLavaVisionUpdatePacket);
125+
public static final ConfigItem<Double> LAVA_VISION_DISTANCE = new DoubleConfigItem("lava_vision_distance", 0.25, "config.netherite_plus.graphics.lava_vision", NetheritePlusConfig::createLavaVisionUpdatePacket, Double.MAX_VALUE, 0);
126126

127127
public static final List<ConfigItem<?>> OPTIONS = ImmutableList.of(LAVA_VISION_DISTANCE);
128128

‎fabric/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ dependencies {
115115

116116
//Libraries
117117
includeLibraries(['com.oroarmor:oro-config-fabric:3.0.0',
118-
'com.oroarmor:multi-item-lib:1.3.0'])
118+
'com.oroarmor:multi-item-lib:1.2.0'])
119119

120120
runAndCompile([/*"net.kyrptonaught:quickshulker:${project.quickshulker}",*/
121121
"com.github.emilyploszaj:trinkets:${project.trinkets}",

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535

3636
@Mixin(BeehiveBlock.class)
3737
public class BeehiveBlockMixin {
38-
@Redirect(method = "onUse", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;getItem()Lnet/minecraft/item/Item;", ordinal = 0))
39-
private Item onUse(ItemStack stack) {
40-
return UniqueItemRegistry.SHEARS.getDefaultItem(stack.getItem());
41-
}
38+
// @Redirect(method = "onUse", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;getItem()Lnet/minecraft/item/Item;", ordinal = 0))
39+
// private Item onUse(ItemStack stack) {
40+
// return UniqueItemRegistry.SHEARS.getDefaultItem(stack.getItem());
41+
// }
4242
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535

3636
@Mixin(EfficiencyEnchantment.class)
3737
public class EfficiencyEnchantmentMixin {
38-
@Redirect(method = "isAcceptableItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;getItem()Lnet/minecraft/item/Item;"))
39-
private Item isAcceptableItem(ItemStack stack) {
40-
return UniqueItemRegistry.SHEARS.getDefaultItem(stack.getItem());
41-
}
38+
// @Redirect(method = "isAcceptableItem", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;getItem()Lnet/minecraft/item/Item;"))
39+
// private Item isAcceptableItem(ItemStack stack) {
40+
// return UniqueItemRegistry.SHEARS.getDefaultItem(stack.getItem());
41+
// }
4242
}

‎forge/src/main/java/com/oroarmor/multi_item_lib/mixin/PumpkinBlockMixin.java‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,8 @@
3535

3636
@Mixin(PumpkinBlock.class)
3737
public class PumpkinBlockMixin {
38-
@Redirect(method = "onUse", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;getItem()Lnet/minecraft/item/Item;"))
39-
private Item onUse(ItemStack stack) {
40-
System.out.println("ASDFJASJDEFKLJASDLKF");
41-
System.out.println(UniqueItemRegistry.SHEARS.getDefaultItem(stack.getItem()));
42-
return UniqueItemRegistry.SHEARS.getDefaultItem(stack.getItem());
43-
}
38+
// @Redirect(method = "onUse", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;getItem()Lnet/minecraft/item/Item;"))
39+
// private Item onUse(ItemStack stack) {
40+
// return UniqueItemRegistry.SHEARS.getDefaultItem(stack.getItem());
41+
// }
4442
}

‎forge/src/main/java/com/oroarmor/multi_item_lib/mixin/TripwireBlockMixin.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535

3636
@Mixin(TripwireBlock.class)
3737
public class TripwireBlockMixin {
38-
@Redirect(method = "onBreak", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;getItem()Lnet/minecraft/item/Item;"))
39-
private Item onUse(ItemStack stack) {
40-
return UniqueItemRegistry.SHEARS.getDefaultItem(stack.getItem());
41-
}
38+
// @Redirect(method = "onBreak", at = @At(value = "INVOKE", target = "Lnet/minecraft/item/ItemStack;getItem()Lnet/minecraft/item/Item;"))
39+
// private Item onUse(ItemStack stack) {
40+
// return UniqueItemRegistry.SHEARS.getDefaultItem(stack.getItem());
41+
// }
4242
}

0 commit comments

Comments
 (0)