Remove incorrect method use for default EMC, switch to proper data file

62832 · Jan 16, 2025 · f71198b · f71198b
1 parent 042836a
commit f71198b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/src/main/java/gripe/_90/appliede/AppliedE.java b/src/main/java/gripe/_90/appliede/AppliedE.java
@@ -10,7 +10,6 @@
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
-import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraftforge.client.event.RegisterColorHandlersEvent;
@@ -41,9 +40,7 @@
 import appeng.client.gui.implementations.IOBusScreen;
 import appeng.client.render.StaticItemColor;
 import appeng.core.AppEng;
-import appeng.core.definitions.AEBlocks;
 import appeng.core.definitions.AEItems;
-import appeng.core.definitions.AEParts;
 import appeng.core.localization.GuiText;
 import appeng.init.client.InitScreens;
 import appeng.items.parts.PartItem;
@@ -76,10 +73,6 @@
 import gripe._90.appliede.part.EMCModulePart;
 import gripe._90.appliede.part.TransmutationTerminalPart;
 
-import moze_intel.projecte.api.imc.CustomEMCRegistration;
-import moze_intel.projecte.api.nss.NSSItem;
-import moze_intel.projecte.emc.mappers.APICustomEMCMapper;
-
 // spotless:off
 @Mod(AppliedE.MODID)
 public final class AppliedE {
@@ -187,13 +180,6 @@ public AppliedE() {
             Upgrades.add(LEARNING_CARD.get(), EMC_INTERFACE.get(), 1, emcInterfaceGroup);
             Upgrades.add(LEARNING_CARD.get(), CABLE_EMC_INTERFACE.get(), 1, emcInterfaceGroup);
             Upgrades.add(LEARNING_CARD.get(), EMC_IMPORT_BUS.get(), 1);
-
-            registerEMC(AEItems.CERTUS_QUARTZ_CRYSTAL, 256);
-            registerEMC(AEBlocks.SKY_STONE_BLOCK, 256);
-            registerEMC(AEItems.CALCULATION_PROCESSOR_PRESS, 2048);
-            registerEMC(AEItems.ENGINEERING_PROCESSOR_PRESS, 2048);
-            registerEMC(AEItems.LOGIC_PROCESSOR_PRESS, 2048);
-            registerEMC(AEParts.CABLE_ANCHOR, 32);
         });
 
         if (ModList.get().isLoaded("ae2wtlib")) {
@@ -210,10 +196,6 @@ public static ResourceLocation id(String path) {
         return new ResourceLocation(MODID, path);
     }
 
-    private static void registerEMC(ItemLike item, int emc) {
-        APICustomEMCMapper.INSTANCE.registerCustomEMC(MODID, new CustomEMCRegistration(NSSItem.createItem(item), emc));
-    }
-
     private static <P extends IPart> Item part(Class<P> partClass, Function<IPartItem<P>, P> factory) {
         PartModels.registerModels(PartModelsHelper.createModels(partClass));
         return new PartItem<>(new Item.Properties(), partClass, factory);

diff --git a/src/main/resources/data/appliede/pe_custom_conversions/defaults.json b/src/main/resources/data/appliede/pe_custom_conversions/defaults.json
@@ -0,0 +1,14 @@
+{
+  "comment": "Default values for Applied Energistics 2 items.",
+  "values": {
+    "before": {
+      "ae2:certus_quartz_crystal": 256,
+      "ae2:sky_stone_block": 256,
+      "ae2:calculation_processor_press": 2048,
+      "ae2:engineering_processor_press": 2048,
+      "ae2:logic_processor_press": 2048,
+      "ae2:silicon_press": 2048,
+      "ae2:cable_anchor": 32
+    }
+  }
+}