Update to 2.8.0 and fixed disassembler

Author: Taskeren

dependencies.gradle

@@ -34,6 +34,15 @@
  * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph
  */
 
+repositories {
+	maven {
+		url = "https://jitpack.io"
+		mavenContent {
+			includeGroupByRegex("com\\.github\\..+")
+		}
+	}
+}
+
 dependencies {
 	runtimeOnly(gtnhDev("Forgelin"))
 	// already provided by Forgelin, but we need to add it here to avoid a warning
@@ -48,6 +57,10 @@ dependencies {
 
 	runtimeOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
 	runtimeOnly(gtnhDev("BlockRenderer6343")) { transitive = false }
+
+	shadowImplementation("com.github.ElytraServers:conditional-mixin-legacy:1.0.0") {
+		exclude group: "io.github.legacymoddingmc"
+	}
 }
 
 @SuppressWarnings('GrMethodMayBeStatic')

gradle.properties

@@ -104,7 +104,7 @@ forceEnableMixins = true
 
 # If enabled, you may use 'shadowCompile' for dependencies. They will be integrated into your jar. It is your
 # responsibility to check the license and request permission for distribution if required.
-usesShadowedDependencies = false
+usesShadowedDependencies = true
 
 # If disabled, won't remove unused classes from shadowed dependencies. Some libraries use reflection to access
 # their own classes, making the minimization unreliable.
@@ -192,4 +192,4 @@ disableCheckstyle = true
 # This is meant to be set in $HOME/.gradle/gradle.properties.
 # ideaCheckSpotlessOnBuild = true
 
-elytra.manifest.version=2.8.0-rc-1
+elytra.manifest.version=2.8.0

src/main/kotlin/cn/elytra/mod/gtnn/modules/disassembler/Disassembler.kt

@@ -2,6 +2,7 @@ package cn.elytra.mod.gtnn.modules.disassembler
 
 import cn.elytra.mod.gtnn.mod_v2.ModuleDefinitionBase
 import cn.elytra.mod.gtnn.mod_v2.util.gte
+import cn.elytra.mod.gtnn.mod_v2.util.lt
 import cn.elytra.mod.gtnn.util.VoltageIndexedMap
 import cpw.mods.fml.common.event.FMLInitializationEvent
 import cpw.mods.fml.common.event.FMLLoadCompleteEvent
@@ -50,13 +51,20 @@ object Disassembler : ModuleDefinitionBase("disassembler") {
 
 	override fun gatherMixinsToApply(): Set<String> {
 		return buildMixinClassSet {
-			// shaped
-			add("gt5u.DisassemblerReversedRecipe_GTShapedRecipe_Mixin")
-			// shapeless
-			if(isModVersionValid("gregtech") { it gte "5.09.51.155" }) {
-				add("gt5u.DisassemblerReversedRecipe_GTShapelessRecipe_Mixin")
+			if(isModVersionValid("gregtech") { it gte "5.09.51.0" && it lt "5.09.51.357" /* the fucking pr #4514 */ }) {
+				// shaped
+				add("gt5u.DisassemblerReversedRecipe_GTShapedRecipe_Mixin")
+				// shapeless
+				if(isModVersionValid("gregtech") { it gte "5.09.51.155" }) {
+					add("gt5u.DisassemblerReversedRecipe_GTShapelessRecipe_Mixin")
+				} else {
+					log.info("Ignored GregTech shapeless recipes because of GT5-Unofficial#3138 broke the mixin.")
+				}
 			} else {
-				log.info("Ignored GregTech shapeless recipes because of GT5-Unofficial#3138 broke the mixin.")
+				log.info("Using call-site injection because GT5-Unofficial#4514 broke the mixin.")
+
+				add("gt5u.gt_recipes.Disassembler_BWUtil_Mixin")
+				add("gt5u.gt_recipes.Disassembler_GTModHandler_Mixin")
 			}
 		}
 	}

src/mixin/java/cn/elytra/mod/gtnn/mixin/gt5u/gt_recipes/Disassembler_BWUtil_Mixin.java

@@ -0,0 +1,24 @@
+package cn.elytra.mod.gtnn.mixin.gt5u.gt_recipes;
+
+import bartworks.util.BWUtil;
+import cn.elytra.mod.gtnn.modules.disassembler.ReversedRecipeRegistry;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.sugar.Local;
+import gregtech.api.util.GTShapedRecipe;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(value = BWUtil.class, remap = false)
+public class Disassembler_BWUtil_Mixin {
+
+	@WrapOperation(method = "createGTCraftingRecipe(Lnet/minecraft/item/ItemStack;[Lnet/minecraft/enchantment/Enchantment;[IZZZZZZZZZZZZZ[Ljava/lang/Object;)Lnet/minecraftforge/oredict/ShapedOreRecipe;", at = @At(value = "NEW", target = "(Lnet/minecraft/item/ItemStack;ZZ[Lnet/minecraft/enchantment/Enchantment;[I[Ljava/lang/Object;)Lgregtech/api/util/GTShapedRecipe;"))
+	private static GTShapedRecipe nn$createGTCraftingRecipe(ItemStack aResult, boolean aRemovableByGT, boolean aKeepingNBT, Enchantment[] enchants, int[] enchantLevels, Object[] aRecipe, Operation<GTShapedRecipe> original, @Local(ordinal = 3, argsOnly = true) boolean canDisassemble) {
+		GTShapedRecipe recipe = original.call(aResult, aRemovableByGT, aKeepingNBT, enchants, enchantLevels, aRecipe);
+		if(canDisassemble) ReversedRecipeRegistry.registerShaped(aResult, aRecipe);
+		return recipe;
+	}
+
+}

src/mixin/java/cn/elytra/mod/gtnn/mixin/gt5u/gt_recipes/Disassembler_GTModHandler_Mixin.java

@@ -0,0 +1,32 @@
+package cn.elytra.mod.gtnn.mixin.gt5u.gt_recipes;
+
+import cn.elytra.mod.gtnn.modules.disassembler.ReversedRecipeRegistry;
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
+import com.llamalad7.mixinextras.sugar.Local;
+import gregtech.api.util.GTModHandler;
+import gregtech.api.util.GTShapedRecipe;
+import gregtech.api.util.GTShapelessRecipe;
+import net.minecraft.enchantment.Enchantment;
+import net.minecraft.item.ItemStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+
+@Mixin(value = GTModHandler.class, remap = false)
+public class Disassembler_GTModHandler_Mixin {
+
+	@WrapOperation(method = "addCraftingRecipe(Lnet/minecraft/item/ItemStack;[Lnet/minecraft/enchantment/Enchantment;[IZZZZZZZZZZZZZ[Ljava/lang/Object;)Z", at = @At(value = "NEW", target = "(Lnet/minecraft/item/ItemStack;ZZ[Lnet/minecraft/enchantment/Enchantment;[I[Ljava/lang/Object;)Lgregtech/api/util/GTShapedRecipe;"))
+	private static GTShapedRecipe nn$addCraftingRecipe(ItemStack aResult, boolean aRemovableByGT, boolean aKeepingNBT, Enchantment[] enchants, int[] enchantLevels, Object[] aRecipe, Operation<GTShapedRecipe> original, @Local(ordinal = 3, argsOnly = true) boolean canDisassemble) {
+		GTShapedRecipe recipe = original.call(aResult, aRemovableByGT, aKeepingNBT, enchants, enchantLevels, aRecipe);
+		if(canDisassemble) ReversedRecipeRegistry.registerShaped(aResult, aRecipe);
+		return recipe;
+	}
+
+	@WrapOperation(method = "addShapelessCraftingRecipe(Lnet/minecraft/item/ItemStack;[Lnet/minecraft/enchantment/Enchantment;[IZZZZZ[Ljava/lang/Object;)Z", at = @At(value = "NEW", target = "(Lnet/minecraft/item/ItemStack;ZZZ[Lnet/minecraft/enchantment/Enchantment;[I[Ljava/lang/Object;)Lgregtech/api/util/GTShapelessRecipe;"))
+	private static GTShapelessRecipe nn$addShapelessCraftingRecipe(ItemStack aResult, boolean aRemovableByGT, boolean aKeepingNBT, boolean overwriteNBT, Enchantment[] enchants, int[] enchantLevels, Object[] aRecipe, Operation<GTShapelessRecipe> original, @Local(ordinal = 2, argsOnly = true) boolean canDisassemble) {
+		GTShapelessRecipe recipe = original.call(aResult, aRemovableByGT, aKeepingNBT, overwriteNBT, enchants, enchantLevels, aRecipe);
+		if(canDisassemble) ReversedRecipeRegistry.registerShapeless(aResult, aRecipe);
+		return recipe;
+	}
+
+}