Merged 1.10.3 release

changelog.md

@@ -1 +1,4 @@
-- fixed bug with Fishing Fanatic enchantment breaking the fishing rod (reported by @Colours)
+- changed required Majrusz Library version from 6.1.0+ to 6.1.7+
+- fixed game crash `java.lang.NullPointerException: Registry Object not present` (reported by @Maddogkyler, @Note, @'RQ)
+- fixed Korean translation not working properly
+- fixed bug when right-clicking a hoe with Harvester enchantment not working properly on a server

common/src/main/java/com/majruszsenchantments/MajruszsEnchantments.java

@@ -9,10 +9,10 @@
 import com.majruszsenchantments.particles.TelekinesisParticleType;
 import com.mlib.annotation.Dist;
 import com.mlib.annotation.OnlyIn;
-import com.mlib.contexts.OnParticlesRegistered;
 import com.mlib.item.CustomEnchantment;
 import com.mlib.item.ItemHelper;
 import com.mlib.modhelper.ModHelper;
+import com.mlib.registry.Custom;
 import com.mlib.registry.RegistryGroup;
 import com.mlib.registry.RegistryObject;
 import net.minecraft.core.particles.ParticleType;
@@ -82,9 +82,11 @@ private MajruszsEnchantments() {}
 	@OnlyIn( Dist.CLIENT )
 	public static class Client {
 		static {
-			OnParticlesRegistered.listen( data->data.register( DODGE_PARTICLE.get(), DodgeParticle.Factory::new ) );
-			OnParticlesRegistered.listen( data->data.register( SMELTER_PARTICLE.get(), SmelterParticle.Factory::new ) );
-			OnParticlesRegistered.listen( data->data.register( TELEKINESIS_PARTICLE.get(), TelekinesisParticle.Factory::new ) );
+			HELPER.create( Custom.Particles.class, particles->{
+				particles.register( DODGE_PARTICLE.get(), DodgeParticle.Factory::new );
+				particles.register( SMELTER_PARTICLE.get(), SmelterParticle.Factory::new );
+				particles.register( TELEKINESIS_PARTICLE.get(), TelekinesisParticle.Factory::new );
+			} );
 		}
 	}
 }

common/src/main/java/com/majruszsenchantments/enchantments/HarvesterEnchantment.java

@@ -63,7 +63,7 @@ private void apply( OnPlayerInteracted data ) {
 			this.tickNearbyCrops( data );
 			this.damageHoe( data );
 		}
-		data.cancelInteraction( InteractionResult.CONSUME );
+		data.finish();
 	}
 
 	private void collectCrop( OnPlayerInteracted data ) {
@@ -139,7 +139,6 @@ private void tickNearbyCrops( OnPlayerInteracted data ) {
 	}
 
 	private void damageHoe( OnPlayerInteracted data ) {
-		data.player.swing( data.hand, true );
 		ItemHelper.damage( data.player, data.hand, 1 );
 	}
 }

common/src/main/resources/assets/majruszsenchantments/lang/ko_kr.json

@@ -89,7 +89,7 @@
   "enchantment.majruszsenchantments.vampirism_curse.description": "플레이어에게 여러 약화효과를 부여하고 플레이어가 낮 동안 밖에 있을 경우 화염 피해를 입게 됩니다. 마법 부여 흡혈의 효과가 증가합니다.",
   "enchantment.majruszsenchantments.corrosion_curse": "부식 저주",
   "enchantment.majruszsenchantments.corrosion_curse.desc": "플레이어가 물에 닿을 경우 플레이어와 장비의 내구도에 피해를 줍니다.",
-  "enchantment.majruszsenchantments.corrosion_curse.description": "플레이어가 물에 닿을 경우 플레이어와 장비의 내구도에 피해를 줍니다."
+  "enchantment.majruszsenchantments.corrosion_curse.description": "플레이어가 물에 닿을 경우 플레이어와 장비의 내구도에 피해를 줍니다.",
 
   "item.majruszsenchantments.wonderful_book": "마법 부여 주문의 책",
   "item.majruszsenchantments.wonderful_book.enchanting_energy": "마법 부여 에너지:",

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.2
+mod_version=1.10.3
 mod_display_name=Majrusz's Enchantments
 mod_description=Mod that adds plenty of unique and balanced enchantments to the game.
 mod_authors=Majrusz
@@ -23,21 +23,21 @@ mod_logo=logo.png
 forge_version=1.20.1-47.1.0
 forge_version_loader=[47,)
 forge_version_range=[47.1,)
-forge_mlib_version_range=[6.1.0,7.0.0)
+forge_mlib_version_range=[6.1.7,7.0.0)
 
 # NeoForge
 neoforge_version=1.20.1-47.1.76
 neoforge_version_loader=[47,)
 neoforge_version_range=1.20.1-47.1.76
-neoforge_mlib_version_range=[6.1.0,7.0.0)
+neoforge_mlib_version_range=[6.1.7,7.0.0)
 
 # Fabric
 fabric_loader_version=0.14.22
 fabric_api_version=0.89.0+1.20.1
-fabric_mlib_version_range=>=6.1.0
+fabric_mlib_version_range=>=6.1.7
 
 # Majrusz Library
-mlib_version=1.20.1-6.1.0
+mlib_version=1.20.1-6.1.7
 
 # Publishing
 modrinth_project_id=jJthQvHv