Port to 1.16.5 with Mixin (replacing ASM)

- Update to ForgeGradle 6.0 and Forge 1.16.5-36.2.42
- Replace ASM bytecode manipulation with Mixin injection
- Use CurseMaven for dependency management (ProjectE, Building Gadgets, JEI)
- Remove ProjectEX dependency, use only ProjectE API
- Implement PlayerItemIndexMixin to hook Building Gadgets inventory system
- Add EMC-based block placement via tryMatch/applyMatch hooks

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: yuu1111

build.gradle

@@ -1,22 +1,16 @@
-group=net.teamfruit
-modid=emcgadgets
-modname=EMCGadgets
-modvendor=TeamFruit
-version_major=1
-version_minor=1
-version_patch=1
-extra_changelog_location=
-extra_fmlcore=net.teamfruit.emcgadgets.asm.EMCGadgetsCorePlugin
-extra_fmlmod=true
-extra_fmlat=
-extra_curseforge_id=366813
-extra_github_owner=Team-Fruit
-extra_github_repo=EMCGadgets
-org.gradle.jvmargs=-Xmx2048m
+# Gradle
+org.gradle.jvmargs=-Xmx3G
+org.gradle.daemon=false
+org.gradle.java.home=C:\\Program Files\\Java\\jdk-17
 
-forgegradle=net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT
-forgegradle_plugin=net.minecraftforge.gradle.forge
-version_minecraft=1.12.2
-version_forge=14.23.5.2847
-version_minforge=14.23.0.2503
-version_mappings=stable_39
+# Mod
+mod_version=2.0.0
+mod_id=emcgadgets
+mod_name=EMCGadgets
+mod_vendor=TeamFruit
+mod_license=MIT
+mod_authors=TeamFruit
+
+# Minecraft
+mc_version=1.16.5
+forge_version=36.2.42

gradle.properties

@@ -1,6 +1,7 @@
-#Tue Mar 10 17:51:58 JST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,9 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven { url = 'https://maven.minecraftforge.net/' }
+        maven { url = 'https://repo.spongepowered.org/repository/maven-public/' }
+    }
+}
+
+rootProject.name = 'EMCGadgets'

libs/Place Here Library Jar File.txt

@@ -1,33 +1,26 @@
 package net.teamfruit.emcgadgets;
 
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;
-import net.minecraftforge.fml.common.network.NetworkCheckHandler;
-import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
-import java.util.Map;
-
-@Mod(
-		modid = Reference.MOD_ID,
-		name = Reference.MOD_NAME,
-		version = Reference.VERSION,
-		dependencies = Reference.DEPENDENCIES,
-		acceptableRemoteVersions = "*",
-		guiFactory = "net.teamfruit.emcgadgets.gui.config.ConfigGuiFactory"
-)
+@Mod(EMCGadgets.MOD_ID)
 public class EMCGadgets {
 
-	@Mod.Instance(Reference.MOD_ID)
-	public static EMCGadgets INSTANCE;
-
-	@NetworkCheckHandler
-	public boolean netCheckHandler(Map<String, String> mods, Side side) {
-		return true;
-	}
+    public static final String MOD_ID = "emcgadgets";
+    public static final Logger LOGGER = LogManager.getLogger();
 
-	@Mod.EventHandler
-	public void init(FMLInitializationEvent event) {
-		ModConfig.loadKeyItems();
-	}
+    public EMCGadgets() {
+        ModConfig.register();
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup);
+        MinecraftForge.EVENT_BUS.register(this);
+    }
 
+    private void setup(final FMLCommonSetupEvent event) {
+        LOGGER.info("EMCGadgets initializing...");
+        ModConfig.loadKeyItems();
+    }
 }

settings.gradle

@@ -1,46 +1,75 @@
 package net.teamfruit.emcgadgets;
 
-import com.latmod.mods.projectex.integration.PersonalEMC;
+import moze_intel.projecte.api.ItemInfo;
+import moze_intel.projecte.api.ProjectEAPI;
 import moze_intel.projecte.api.capabilities.IKnowledgeProvider;
-import moze_intel.projecte.utils.EMCHelper;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.NonNullList;
 
+import java.math.BigInteger;
+
 public class EMCInventoryManipulation {
 
-	@CoreInvoke
-	public static int useEmc(ItemStack target, EntityPlayer player, int amountRequired) {
-		if (hasTablet(player.inventory.mainInventory)) {
-			IKnowledgeProvider provider = PersonalEMC.get(player);
+	public static int useEmc(ItemStack target, PlayerEntity player, int amountRequired) {
+		return player.getCapability(ProjectEAPI.KNOWLEDGE_CAPABILITY).map(provider -> {
+			if (!hasTablet(player.inventory.items)) {
+				EMCGadgets.LOGGER.debug("useEmc: No tablet found");
+				return 0;
+			}
+			if (!provider.hasKnowledge(target)) {
+				EMCGadgets.LOGGER.debug("useEmc: No knowledge of {}", target);
+				return 0;
+			}
+			long itemEmc = ProjectEAPI.getEMCProxy().getValue(ItemInfo.fromStack(target));
+			if (itemEmc <= 0) {
+				EMCGadgets.LOGGER.debug("useEmc: Item {} has no EMC value", target);
+				return 0;
+			}
+			BigInteger playerEmcBefore = provider.getEmc();
+			BigInteger itemEmcBig = BigInteger.valueOf(itemEmc);
+			long placeableCount = playerEmcBefore.divide(itemEmcBig).longValueExact();
+			if (placeableCount <= 0) {
+				EMCGadgets.LOGGER.debug("useEmc: Not enough EMC. Have {}, need {}", playerEmcBefore, itemEmc);
+				return 0;
+			}
+			// 実際に提供する数量 (要求数と購入可能数の小さい方)
+			int actualAmount = (int) Math.min(amountRequired, placeableCount);
+			BigInteger emcToUse = itemEmcBig.multiply(BigInteger.valueOf(actualAmount));
+			BigInteger playerEmcAfter = playerEmcBefore.subtract(emcToUse);
+			provider.setEmc(playerEmcAfter);
 
-			if (provider.hasKnowledge(target)) {
-				long itemEmc = EMCHelper.getEmcValue(target);
-				long placeableCount = provider.getEmc() / itemEmc;
-				if (placeableCount > 0) {
-					long useEmc = amountRequired * itemEmc;
-					provider.setEmc(provider.getEmc() - useEmc);
-					return longToInt(placeableCount);
-				}
+			// サーバーサイドの場合、クライアントに同期
+			if (player instanceof net.minecraft.entity.player.ServerPlayerEntity) {
+				provider.syncEmc((net.minecraft.entity.player.ServerPlayerEntity) player);
 			}
-		}
-		return 0;
-	}
 
-	@CoreInvoke
-	public static long countEmc(ItemStack itemStack, EntityPlayer player) {
-		if (hasTablet(player.inventory.mainInventory)) {
-			IKnowledgeProvider provider = PersonalEMC.get(player);
+			EMCGadgets.LOGGER.debug("useEmc: Consumed {} EMC for {} x {}. EMC: {} -> {}",
+				emcToUse, actualAmount, target.getItem(), playerEmcBefore, playerEmcAfter);
+			return actualAmount;
+		}).orElse(0);
+	}
 
-			if (provider.hasKnowledge(itemStack)) {
-				long itemEmc = EMCHelper.getEmcValue(itemStack);
-				if (itemEmc <= 0L) return 0L;
-				long placeableCount = provider.getEmc() / itemEmc;
-				if (placeableCount > 0)
-					return placeableCount;
+	public static long countEmc(ItemStack itemStack, PlayerEntity player) {
+		return player.getCapability(ProjectEAPI.KNOWLEDGE_CAPABILITY).map(provider -> {
+			if (!hasTablet(player.inventory.items)) {
+				return 0L;
 			}
-		}
-		return 0L;
+			if (!provider.hasKnowledge(itemStack)) {
+				return 0L;
+			}
+			long itemEmc = ProjectEAPI.getEMCProxy().getValue(ItemInfo.fromStack(itemStack));
+			if (itemEmc <= 0) {
+				return 0L;
+			}
+			BigInteger playerEmc = provider.getEmc();
+			BigInteger itemEmcBig = BigInteger.valueOf(itemEmc);
+			try {
+				return playerEmc.divide(itemEmcBig).longValueExact();
+			} catch (ArithmeticException e) {
+				return Long.MAX_VALUE;
+			}
+		}).orElse(0L);
 	}
 
 	private static boolean hasTablet(NonNullList<ItemStack> inventory) {
@@ -51,9 +80,8 @@ private static boolean hasTablet(NonNullList<ItemStack> inventory) {
 	private static int longToInt(long count) {
 		try {
 			return Math.toIntExact(count);
-		} catch (ArithmeticException var3) {
+		} catch (ArithmeticException e) {
 			return Integer.MAX_VALUE;
 		}
 	}
-
-}
+}

src/main/java/net/teamfruit/emcgadgets/CoreInvoke.java

@@ -1,48 +1,54 @@
 package net.teamfruit.emcgadgets;
 
-import com.google.common.base.Predicates;
 import net.minecraft.item.Item;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.common.config.Config;
-import net.minecraftforge.common.config.ConfigManager;
-import net.minecraftforge.fml.client.event.ConfigChangedEvent;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.registry.ForgeRegistries;
+import net.minecraftforge.common.ForgeConfigSpec;
+import net.minecraftforge.fml.ModLoadingContext;
+import net.minecraftforge.fml.config.ModConfig.Type;
+import net.minecraftforge.registries.ForgeRegistries;
 
 import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
-import java.util.stream.Collectors;
 
-@Config(modid = Reference.MOD_ID, name = Reference.MOD_NAME)
 public class ModConfig {
 
-    @Config.Name("Key Item")
-    @Config.Comment({ "This item is required when using EMC Gadget" })
-    public static String[] keyItemNames = {
-            "projecte:item.pe_transmutation_tablet",
-            "projectex:arcane_tablet",
-    };
-
-    @Config.Ignore
-    public static Set<Item> keyItems;
-
-    public static void loadKeyItems() {
-        keyItems = Arrays.stream(keyItemNames)
-                .map(e -> ForgeRegistries.ITEMS.getValue(new ResourceLocation(e)))
-                .filter(Predicates.notNull())
-                .collect(Collectors.toSet());
-    }
-
-    @Mod.EventBusSubscriber(modid = Reference.MOD_ID)
-    public static class Handler {
-
-        @SubscribeEvent
-        public static void onConfigChanged(final ConfigChangedEvent.OnConfigChangedEvent event) {
-            if (event.getModID().equals(Reference.MOD_ID)) {
-                ConfigManager.load(Reference.MOD_ID, Config.Type.INSTANCE);
-                loadKeyItems();
-            }
-        }
-    }
+	private static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder();
+	public static final ForgeConfigSpec SPEC;
+
+	private static final ForgeConfigSpec.ConfigValue<List<? extends String>> KEY_ITEM_NAMES;
+
+	public static Set<Item> keyItems = new HashSet<>();
+
+	static {
+		BUILDER.comment("EMCGadgets Configuration");
+
+		KEY_ITEM_NAMES = BUILDER
+				.comment("Items required to use EMC with Building Gadgets",
+						"The player must have one of these items in their inventory")
+				.defineList("keyItems",
+						Arrays.asList("projecte:transmutation_tablet"),
+						obj -> obj instanceof String);
+
+		SPEC = BUILDER.build();
+	}
+
+	public static void register() {
+		ModLoadingContext.get().registerConfig(Type.COMMON, SPEC);
+	}
+
+	public static void loadKeyItems() {
+		keyItems.clear();
+		for (String name : KEY_ITEM_NAMES.get()) {
+			ResourceLocation loc = ResourceLocation.tryParse(name);
+			if (loc != null) {
+				Item item = ForgeRegistries.ITEMS.getValue(loc);
+				if (item != null) {
+					keyItems.add(item);
+				}
+			}
+		}
+		EMCGadgets.LOGGER.info("Loaded {} key items: {}", keyItems.size(), keyItems);
+	}
 }