Merged 1.10.6 release

changelog.md

@@ -1,4 +1,2 @@
-- updated Chinese translation (thanks to @UDTakerBean)
-- made Misanthropy not obtainable via enchanting table on axes to match other vanilla enchantments
-- changed final Fishing Fanatic level text formatting
-- optimized Horse Frost Walker enchantment
+- added config for enchantability of shields and horse armors
+- updated Chinese translation (thanks to @Fiocher)

common/src/main/java/com/majruszsenchantments/data/Config.java

@@ -1,10 +1,16 @@
 package com.majruszsenchantments.data;
 
+import com.majruszlibrary.data.Reader;
 import com.majruszlibrary.data.Serializables;
 
 public class Config {
+	public static boolean IS_SHIELD_ENCHANTABLE = true;
+	public static boolean IS_HORSE_ARMOR_ENCHANTABLE = true;
+
 	static {
 		Serializables.getStatic( Config.class )
+			.define( "is_shield_enchantable", Reader.bool(), ()->IS_SHIELD_ENCHANTABLE, v->IS_SHIELD_ENCHANTABLE = v )
+			.define( "is_horse_armor_enchantable", Reader.bool(), ()->IS_HORSE_ARMOR_ENCHANTABLE, v->IS_HORSE_ARMOR_ENCHANTABLE = v )
 			.define( "enchantments", Enchantments.class )
 			.define( "curses", Curses.class );
 

common/src/main/java/com/majruszsenchantments/mixin/MixinHorseArmorItem.java

@@ -1,5 +1,6 @@
 package com.majruszsenchantments.mixin;
 
+import com.majruszsenchantments.data.Config;
 import net.minecraft.world.item.HorseArmorItem;
 import net.minecraft.world.item.ItemStack;
 import org.spongepowered.asm.mixin.Mixin;
@@ -9,7 +10,9 @@
 public abstract class MixinHorseArmorItem extends MixinItem {
 	@Override
 	protected void getEnchantmentValue( CallbackInfoReturnable< Integer > callback ) {
-		callback.setReturnValue( 1 );
+		if( Config.IS_HORSE_ARMOR_ENCHANTABLE ) {
+			callback.setReturnValue( 1 );
+		}
 	}
 
 	@Override

common/src/main/java/com/majruszsenchantments/mixin/MixinShieldItem.java

@@ -1,5 +1,6 @@
 package com.majruszsenchantments.mixin;
 
+import com.majruszsenchantments.data.Config;
 import net.minecraft.world.item.ShieldItem;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@@ -8,6 +9,8 @@
 public abstract class MixinShieldItem extends MixinItem {
 	@Override
 	protected void getEnchantmentValue( CallbackInfoReturnable< Integer > callback ) {
-		callback.setReturnValue( 1 );
+		if( Config.IS_SHIELD_ENCHANTABLE ) {
+			callback.setReturnValue( 1 );
+		}
 	}
 }

gradle.properties

@@ -8,7 +8,7 @@ minecraft_version_range=[1.20.1,)
 # Mod
 mod_id=majruszsenchantments
 mod_archives_name=majruszs-enchantments
-mod_version=1.10.5
+mod_version=1.10.6
 mod_display_name=Majrusz's Enchantments
 mod_description=Mod that adds plenty of unique and balanced enchantments to the game.
 mod_authors=Majrusz
@@ -40,7 +40,7 @@ fabric_minecraft_version_range=>=1.20.1
 fabric_majruszlibrary_version_range=>=7.0.0
 
 # Majrusz Library
-majruszlibrary_version=1.20.1-7.0.0
+majruszlibrary_version=1.20.1-7.0.3
 
 # Publishing
 modrinth_project_id=jJthQvHv