Revert usage of loom interface injection

Fixes #58, bug in fabric-loom: FabricMC/fabric-loom#611
florensie · Apr 10, 2022 · 70aa948 · 70aa948
1 parent 74ec104
commit 70aa948
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [7.0.1] - 2022-04-10
+### Fixed
+- Removed use of loom's interface injection as it caused issues with refmap remapping
+
 ## [7.0.0] - 2022-04-09
 ### Added
 - You can now toggle an Artifact to effects-only, which will hide it on the player model
@@ -241,7 +245,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Initial release
 
-[Unreleased]: https://github.com/florensie/artifacts-fabric/compare/v7.0.0...HEAD
+[Unreleased]: https://github.com/florensie/artifacts-fabric/compare/v7.0.1...HEAD
+[7.0.0]: https://github.com/florensie/artifacts-fabric/compare/v7.0.0...v7.0.1
 [7.0.0]: https://github.com/florensie/artifacts-fabric/compare/v6.0.0...v7.0.0
 [6.0.0]: https://github.com/florensie/artifacts-fabric/compare/v5.0.1...v6.0.0
 [5.0.2]: https://github.com/florensie/artifacts-fabric/compare/v5.0.1...v5.0.2

diff --git a/gradle.properties b/gradle.properties
@@ -9,7 +9,7 @@ minecraft_version=1.18.2-rc1
 loader_version=0.13.3
 
 # Mod Properties
-mod_version=7.0.0
+mod_version=7.0.1
 maven_group=artifacts
 archives_base_name=artifacts
 

diff --git a/src/main/java/artifacts/common/item/curio/belt/AntidoteVesselItem.java b/src/main/java/artifacts/common/item/curio/belt/AntidoteVesselItem.java
@@ -1,6 +1,7 @@
 package artifacts.common.item.curio.belt;
 
 import artifacts.common.item.curio.CurioItem;
+import artifacts.extensions.MobEffectInstanceExtensions;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.world.effect.MobEffectCategory;
 import net.minecraft.world.entity.LivingEntity;
@@ -13,7 +14,7 @@ protected void curioTick(LivingEntity livingEntity, ItemStack stack) {
 		// Reduce duration of all negative status effects to 80
 		livingEntity.getActiveEffectsMap().forEach((effect, instance) -> {
 			if (!effect.isInstantenous() && effect.getCategory() != MobEffectCategory.BENEFICIAL && instance.getDuration() > 80) {
-				instance.artifacts$setDuration(80);
+				((MobEffectInstanceExtensions) instance).artifacts$setDuration(80);
 			}
 		});
 	}

diff --git a/src/main/java/artifacts/mixin/statuseffect/MobEffectInstanceMixin.java b/src/main/java/artifacts/mixin/statuseffect/MobEffectInstanceMixin.java
@@ -19,7 +19,7 @@ public abstract class MobEffectInstanceMixin implements MobEffectInstanceExtensi
 	public void artifacts$setDuration(int duration) {
 		// Recursively set duration for hidden effects
 		if (this.hiddenEffect != null) {
-			this.hiddenEffect.artifacts$setDuration(duration);
+			((MobEffectInstanceExtensions) this.hiddenEffect).artifacts$setDuration(duration);
 		}
 
 		this.duration = duration;

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -66,10 +66,6 @@
   },
 
   "custom": {
-    "loom:injected_interfaces": {
-      "net/minecraft/class_1429": ["artifacts/extensions/AnimalExtensions"],
-      "net/minecraft/class_1293": ["artifacts/extensions/MobEffectInstanceExtensions"]
-    },
     "cardinal-components": [
       "artifacts:dropped_item_entity",
       "artifacts:entity_kill_tracker",