Stop making use of deprecated apis

build.gradle

@@ -101,6 +101,10 @@ allprojects {
 			rename { "${it}_${base.archivesName.get()}" }
 		}
 	}
+
+	tasks.withType(JavaCompile) {
+		options.deprecation = true
+	}
 }
 
 loom {

gradle.properties

@@ -9,7 +9,7 @@ org.gradle.jvmargs=-Xmx2G
 	loader_version = 0.15.10
 
 # Legacy Fabric API
-	mod_remapping_api = 1.21.1
+	mod_remapping_api = 1.22.0
 	forge_version = 4.3.5.318
 	mixin_extras_version=0.2.1
 	spasm_version=0.2

mod-compat/src/main/java/fr/catcore/fabricatedforge/compat/mixin/codechickencore/ClassDiscovererMixin.java

@@ -9,6 +9,7 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
@@ -19,8 +20,9 @@
 
 @Mixin(ClassDiscoverer.class)
 public abstract class ClassDiscovererMixin {
-    @Shadow public ArrayList classes;
-    @Shadow public ModClassLoader modClassLoader;
+    @Shadow(remap = false) public ArrayList classes;
+    @Shadow(remap = false) public ModClassLoader modClassLoader;
+    @Unique
     public String[] superclassesString;
 
     @Inject(method = "<init>", at = @At("RETURN"), remap = false)
@@ -41,6 +43,10 @@ private void checkClassBeforeLoadingIt(ClassDiscoverer instance, String resource
         checkAddClass(resource);
     }
 
+    /**
+     * @author ChickenBones
+     * Backported from CCC for MC 1.4.7
+     */
     private void checkAddClass(String resource) {
         try {
             String classname = resource.replace(".class", "").replace("\\", ".").replace("/", ".");

mod-compat/src/main/java/fr/catcore/fabricatedforge/compat/mixin/codechickencore/FieldMappingMixin.java

@@ -24,6 +24,6 @@ private void remap(String declaringclass, String fieldname, String type, Callbac
         }
         MappingUtils.ClassMember pair = Constants.mapFieldFromRemappedClass(this.owner, this.name, this.type);
         this.name = pair.name;
-        this.type = pair.desc;
+        this.type = Constants.mapTypeDescriptor(pair.desc);
     }
 }

mod-compat/src/main/java/fr/catcore/fabricatedforge/compat/mixin/codechickencore/MethodMappingMixin.java

@@ -35,6 +35,6 @@ private void remap() {
         }
         MappingUtils.ClassMember pair = Constants.mapMethodFromRemappedClass(this.owner, this.name, this.desc);
         this.name = pair.name;
-        this.desc = pair.desc;
+        this.desc = Constants.mapMethodDescriptor(pair.desc);
     }
 }

src/main/java/fr/catcore/fabricatedforge/mixin/FabricatedForgeMixinPlugin.java

@@ -1,6 +1,6 @@
 package fr.catcore.fabricatedforge.mixin;
 
-import fr.catcore.modremapperapi.utils.MixinUtils;
+import fr.catcore.cursedmixinextensions.CursedMixinExtensions;
 import org.objectweb.asm.tree.ClassNode;
 import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
 import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
@@ -40,6 +40,6 @@ public void preApply(String targetClassName, ClassNode targetClass, String mixin
 
     @Override
     public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
-        MixinUtils.applyASMMagic(targetClassName, targetClass, mixinClassName, mixinInfo);
+        CursedMixinExtensions.postApply(targetClass);
     }
 }

src/main/java/fr/catcore/fabricatedforge/mixin/forgefml/client/FireSpriteMixin.java

@@ -1,8 +1,8 @@
 package fr.catcore.fabricatedforge.mixin.forgefml.client;
 
 import cpw.mods.fml.client.FMLTextureFX;
+import fr.catcore.cursedmixinextensions.annotations.ChangeSuperClass;
 import fr.catcore.fabricatedforge.mixininterface.IFMLTextureFX;
-import fr.catcore.modremapperapi.api.mixin.ChangeSuperClass;
 import net.minecraft.client.FireSprite;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;

src/main/java/fr/catcore/fabricatedforge/mixin/forgefml/client/NetherPortalSpriteMixin.java

@@ -1,8 +1,8 @@
 package fr.catcore.fabricatedforge.mixin.forgefml.client;
 
 import cpw.mods.fml.client.FMLTextureFX;
+import fr.catcore.cursedmixinextensions.annotations.ChangeSuperClass;
 import fr.catcore.fabricatedforge.mixininterface.IFMLTextureFX;
-import fr.catcore.modremapperapi.api.mixin.ChangeSuperClass;
 import net.minecraft.client.NetherPortalSprite;
 import net.minecraft.util.math.MathHelper;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/fr/catcore/fabricatedforge/mixin/forgefml/client/class_586Mixin.java

@@ -1,8 +1,8 @@
 package fr.catcore.fabricatedforge.mixin.forgefml.client;
 
 import cpw.mods.fml.client.FMLTextureFX;
+import fr.catcore.cursedmixinextensions.annotations.ChangeSuperClass;
 import fr.catcore.fabricatedforge.mixininterface.IFMLTextureFX;
-import fr.catcore.modremapperapi.api.mixin.ChangeSuperClass;
 import net.minecraft.client.class_586;
 import net.minecraft.util.math.MathHelper;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/fr/catcore/fabricatedforge/mixin/forgefml/client/class_587Mixin.java

@@ -1,8 +1,8 @@
 package fr.catcore.fabricatedforge.mixin.forgefml.client;
 
 import cpw.mods.fml.client.FMLTextureFX;
+import fr.catcore.cursedmixinextensions.annotations.ChangeSuperClass;
 import fr.catcore.fabricatedforge.mixininterface.IFMLTextureFX;
-import fr.catcore.modremapperapi.api.mixin.ChangeSuperClass;
 import net.minecraft.client.class_587;
 import net.minecraft.util.math.MathHelper;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/fr/catcore/fabricatedforge/mixin/forgefml/client/class_589Mixin.java

@@ -1,8 +1,8 @@
 package fr.catcore.fabricatedforge.mixin.forgefml.client;
 
 import cpw.mods.fml.client.FMLTextureFX;
+import fr.catcore.cursedmixinextensions.annotations.ChangeSuperClass;
 import fr.catcore.fabricatedforge.mixininterface.IFMLTextureFX;
-import fr.catcore.modremapperapi.api.mixin.ChangeSuperClass;
 import net.minecraft.client.class_589;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;

src/main/java/fr/catcore/fabricatedforge/mixin/forgefml/client/class_590Mixin.java

@@ -1,8 +1,8 @@
 package fr.catcore.fabricatedforge.mixin.forgefml.client;
 
 import cpw.mods.fml.client.FMLTextureFX;
+import fr.catcore.cursedmixinextensions.annotations.ChangeSuperClass;
 import fr.catcore.fabricatedforge.mixininterface.IFMLTextureFX;
-import fr.catcore.modremapperapi.api.mixin.ChangeSuperClass;
 import net.minecraft.client.class_590;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;

src/main/java/fr/catcore/fabricatedforge/mixin/forgefml/client/texture/ClockSpriteMixin.java

@@ -1,8 +1,8 @@
 package fr.catcore.fabricatedforge.mixin.forgefml.client.texture;
 
 import cpw.mods.fml.client.FMLTextureFX;
+import fr.catcore.cursedmixinextensions.annotations.ChangeSuperClass;
 import fr.catcore.fabricatedforge.mixininterface.IFMLTextureFX;
-import fr.catcore.modremapperapi.api.mixin.ChangeSuperClass;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.texture.ClockSprite;
 import org.spongepowered.asm.mixin.Mixin;

src/main/java/fr/catcore/fabricatedforge/mixin/forgefml/client/texture/CompassSpriteMixin.java

@@ -1,8 +1,8 @@
 package fr.catcore.fabricatedforge.mixin.forgefml.client.texture;
 
 import cpw.mods.fml.client.FMLTextureFX;
+import fr.catcore.cursedmixinextensions.annotations.ChangeSuperClass;
 import fr.catcore.fabricatedforge.mixininterface.IFMLTextureFX;
-import fr.catcore.modremapperapi.api.mixin.ChangeSuperClass;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.texture.CompassSprite;
 import net.minecraft.util.math.BlockPos;

src/main/java/fr/catcore/fabricatedforge/mixin/forgefml/item/itemgroup/ItemGroupMixin.java

@@ -1,9 +1,9 @@
 package fr.catcore.fabricatedforge.mixin.forgefml.item.itemgroup;
 
+import fr.catcore.cursedmixinextensions.annotations.NewConstructor;
+import fr.catcore.cursedmixinextensions.annotations.Public;
+import fr.catcore.cursedmixinextensions.annotations.ShadowConstructor;
 import fr.catcore.fabricatedforge.mixininterface.IItemGroup;
-import fr.catcore.modremapperapi.api.mixin.NewConstructor;
-import fr.catcore.modremapperapi.api.mixin.Public;
-import fr.catcore.modremapperapi.api.mixin.ShadowConstructor;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.item.Item;

src/main/java/fr/catcore/fabricatedforge/mixin/forgefml/util/WeightedRandomChestContentMixin.java

@@ -1,8 +1,8 @@
 package fr.catcore.fabricatedforge.mixin.forgefml.util;
 
+import fr.catcore.cursedmixinextensions.annotations.NewConstructor;
+import fr.catcore.cursedmixinextensions.annotations.ShadowSuperConstructor;
 import fr.catcore.fabricatedforge.mixininterface.IWeightedRandomChestContent;
-import fr.catcore.modremapperapi.api.mixin.NewConstructor;
-import fr.catcore.modremapperapi.api.mixin.SuperConstructor;
 import net.minecraft.block.entity.ChestBlockEntity;
 import net.minecraft.block.entity.DispenserBlockEntity;
 import net.minecraft.item.ItemStack;
@@ -32,7 +32,7 @@ private void fmlCtr(int par1, int par2, int par3, int par4, int par5, CallbackIn
         this.itemStack = new ItemStack(par1, 1, par2);
     }
 
-    @SuperConstructor
+    @ShadowSuperConstructor
     public abstract void weight$ctr(int weight);
 
     @NewConstructor

src/main/java/fr/catcore/fabricatedforge/mixin/forgefml/world/WorldMixin.java

@@ -2,12 +2,12 @@
 
 import com.google.common.collect.SetMultimap;
 import fr.catcore.cursedmixinextensions.annotations.ReplaceConstructor;
+import fr.catcore.cursedmixinextensions.annotations.ShadowSuperConstructor;
 import fr.catcore.fabricatedforge.forged.reflection.ReflectedWorld;
 import fr.catcore.fabricatedforge.mixininterface.IBlock;
 import fr.catcore.fabricatedforge.mixininterface.IBlockEntity;
 import fr.catcore.fabricatedforge.mixininterface.IChunk;
 import fr.catcore.fabricatedforge.mixininterface.IWorld;
-import fr.catcore.modremapperapi.api.mixin.SuperConstructor;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.block.Block;
@@ -164,7 +164,7 @@ public Biome getBiomeGenForCoordsBody(int par1, int par2) {
         return this.dimension.biomeSource.method_3853(par1, par2);
     }
 
-    @SuperConstructor
+    @ShadowSuperConstructor
     private void superCtr() {}
 
     @Environment(EnvType.CLIENT)

src/main/java/fr/catcore/fabricatedforge/mixin/forgefml/world/chunk/ChunkMixin.java

@@ -1,10 +1,10 @@
 package fr.catcore.fabricatedforge.mixin.forgefml.world.chunk;
 
+import fr.catcore.cursedmixinextensions.annotations.NewConstructor;
+import fr.catcore.cursedmixinextensions.annotations.ShadowConstructor;
 import fr.catcore.fabricatedforge.forged.reflection.ReflectedWorld;
 import fr.catcore.fabricatedforge.mixininterface.IBlock;
 import fr.catcore.fabricatedforge.mixininterface.IChunk;
-import fr.catcore.modremapperapi.api.mixin.NewConstructor;
-import fr.catcore.modremapperapi.api.mixin.ShadowConstructor;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.block.Block;

src/main/java/net/minecraftforge/event/ASMEventHandler.java

@@ -46,7 +46,7 @@ public Class<?> createWrapper(Method callback) {
         MethodVisitor mv = cw.visitMethod(1, "<init>", "(Ljava/lang/Object;)V", (String)null, (String[])null);
         mv.visitCode();
         mv.visitVarInsn(25, 0);
-        mv.visitMethodInsn(183, "java/lang/Object", "<init>", "()V");
+        mv.visitMethodInsn(183, "java/lang/Object", "<init>", "()V", false);
         mv.visitVarInsn(25, 0);
         mv.visitVarInsn(25, 1);
         mv.visitFieldInsn(181, desc, "instance", "Ljava/lang/Object;");
@@ -60,7 +60,7 @@ public Class<?> createWrapper(Method callback) {
         mv.visitTypeInsn(192, instType);
         mv.visitVarInsn(25, 1);
         mv.visitTypeInsn(192, eventType);
-        mv.visitMethodInsn(182, instType, callback.getName(), Type.getMethodDescriptor(callback));
+        mv.visitMethodInsn(182, instType, callback.getName(), Type.getMethodDescriptor(callback), false);
         mv.visitInsn(177);
         mv.visitMaxs(2, 2);
         mv.visitEnd();