removed gti circuits and replaced them with gt core circuits

common/src/main/java/muramasa/gregtech/GTRemapping.java

@@ -37,13 +37,20 @@ public static void init(){
         AntimatterRemapping.remapMachine("battery_buffer_one", BATTERY_BUFFER_ONE);
         AntimatterRemapping.remapMachine("battery_buffer_four", BATTERY_BUFFER_FOUR);
         AntimatterRemapping.remapMachine("battery_buffer_nine", BATTERY_BUFFER_EIGHT);
-        remap("circuit_basic", "basic_integrated_circuit");
-        remap("circuit_basic_electronic", "basic_electronic_circuit");
-        remap("circuit_good", "good_electronic_circuit");
-        remap("circuit_adv", "advanced_circuit");
+        remapGTCore("rubber_log", "rubber_log");
+        remapGTCore("rubber_leaves", "rubber_leaves");
+        remapGTCore("rubber_sapling", "rubber_sapling");
+        remapGTCore("circuit_basic", "basic_circuit");
+        remapGTCore("circuit_basic_electronic", "basic_circuit");
+        remapGTCore("basic_integrated_circuit", "basic_circuit");
+        remapGTCore("basic_electronic_circuit", "basic_circuit");
+        remapGTCore("good_integrated_circuit", "good_circuit");
+        remapGTCore("good_electronic_circuit", "good_circuit");
+        remapGTCore("circuit_good", "good_circuit");
+        remapGTCore("circuit_adv", "advanced_circuit");
         remap("circuit_nanoprocessor", "nanoprocessor");
         remap("circuit_quantumprocessor", "quantumprocessor");
-        remap("circuit_energy_flow", "energy_flow_circuit");
+        remapGTCore("circuit_energy_flow", "energy_flow_circuit");
         remap("circuit_wetware", "wetware_circuit");
         remap("vacuumtube", "vacuum_tube");
         remap("adv_circuit_parts", "advanced_circuit_parts");

common/src/main/java/muramasa/gregtech/GregTech.java

@@ -181,7 +181,7 @@ public void onRegistrationEvent(RegistrationEvent event, Side side) {
                 AntimatterJEIREIPlugin.addItemsToHide(l -> {
                     if (!GregTechConfig.GAMEPLAY.HARDER_CIRCUITS){
                         l.addAll(Arrays.asList(CircuitBoardPhenolic));
-                        l.addAll(Arrays.asList(CircuitBasicIntegrated, CircuitGoodIntegrated, CircuitWetware, MicroProcessor, IntegratedProcessor, NanoProcessor, QuantumProcessor));
+                        l.addAll(Arrays.asList(CircuitWetware, MicroProcessor, IntegratedProcessor, NanoProcessor, QuantumProcessor));
                     }
                 });
                 AntimatterPlatformUtils.setBurnTime(SOLID_SUPER_FUEL.asItem(), 100000);

common/src/main/java/muramasa/gregtech/data/GregTechData.java

@@ -164,12 +164,6 @@ public static void init(Side side) {
     public static ItemBasic<?> EngravedCrystalChip = new ItemBasic<>(GTIRef.ID, "engraved_crystal_chip").tip("Needed for Circuits");
     public static ItemBasic<?> EngravedLapotronChip = new ItemBasic<>(GTIRef.ID, "engraved_lapotron_chip").tip("Needed for Circuits");
 
-    public static ItemBasic<?> CircuitBoardBasic = new ItemBasic<>(GTIRef.ID, "basic_circuit_board", "circuits/");
-    public static ItemBasic<?> CircuitBoardAdvanced = new ItemBasic<>(GTIRef.ID, "advanced_circuit_board", "circuits/");
-    public static ItemBasic<?> CircuitBoardEmpty = new ItemBasic<>(GTIRef.ID, "empty_circuit_board", "circuits/");
-    public static ItemBasic<?> CircuitBoardProcessor = new ItemBasic<>(GTIRef.ID, "processor_circuit_board", "circuits/");
-    public static ItemBasic<?> CircuitBoardProcessorEmpty = new ItemBasic<>(GTIRef.ID, "empty_processor_circuit_board", "circuits/");
-
     public static ItemBasic<?> CircuitBoardCoated = new ItemBasic<>(GTIRef.ID, "board_coated", "circuits/").tip("The most basic Board");
     public static ItemBasic<?> CircuitBoardPhenolic = new ItemBasic<>(GTIRef.ID, "board_phenolic", "circuits/").tip("A basic Board");
     public static ItemBasic<?> CircuitBoardPlastic = new ItemBasic<>(GTIRef.ID, "board_plastic", "circuits/").tip("An advanced Board");
@@ -178,13 +172,8 @@ public static void init(Side side) {
     public static ItemBasic<?> CircuitBoardMultiFiber = new ItemBasic<>(GTIRef.ID, "board_multilayer_fiber_reinforced", "circuits/").tip("6th Tier Board");
     public static ItemBasic<?> CircuitBoardWetware = new ItemBasic<>(GTIRef.ID, "board_wetware", "circuits/").tip("7th Tier Board");
 
-    public static ItemBasic<?> CircuitBasicElectronic = new ItemBasic<>(GTIRef.ID, "basic_electronic_circuit", "circuits/").tip("A basic Circuit");
-    public static ItemBasic<?> CircuitBasicIntegrated = new ItemBasic<>(GTIRef.ID, "basic_integrated_circuit", "circuits/").tip("The breakthrough to the electrical age");
     public static ItemBasic<?> MicroProcessor = new ItemBasic<>(GTIRef.ID, "microprocessor", "circuits/").tip("A Basic Circuit");
-    public static ItemBasic<?> CircuitGoodElectronic = new ItemBasic<>(GTIRef.ID, "good_electronic_circuit", "circuits/").tip("A good Circuit");
-    public static ItemBasic<?> CircuitGoodIntegrated = new ItemBasic<>(GTIRef.ID, "good_integrated_circuit", "circuits/").tip("Good Circuit");
     public static ItemBasic<?> IntegratedProcessor = new ItemBasic<>(GTIRef.ID, "integrated_processor", "circuits/").tip("A Good Circuit");
-    public static ItemBasic<?> CircuitAdv = new ItemBasic<>(GTIRef.ID, "advanced_circuit", "circuits/").tip("An advanced Circuit");
     public static ItemBasic<?> ProcessorAssembly = new ItemBasic<>(GTIRef.ID, "processor_assembly", "circuits/").tip("An advanced Circuit");
     public static ItemBasic<?> NanoProcessor = new ItemBasic<>(GTIRef.ID, "nanoprocessor", "circuits/").tip("An advanced Circuit");
     public static ItemBasic<?> Workstation = new ItemBasic<>(GTIRef.ID, "workstation", "circuits/").tip("An extreme Circuit");
@@ -193,12 +182,8 @@ public static void init(Side side) {
     public static ItemBasic<?> Mainframe = new ItemBasic<>(GTIRef.ID, "mainframe", "circuits/").tip("An elite circuit");
     public static ItemBasic<?> QuantumProcessorAssembly = new ItemBasic<>(GTIRef.ID, "quantumprocessor_assembly", "circuits/").tip("An elite circuit");
     public static ItemBasic<?> CrystalProcessor = new ItemBasic<>(GTIRef.ID, "crystal_processor", "circuits/").tip("An elite Circuit");
-    public static ItemBasic<?> CircuitDataStorage = new ItemBasic<>(GTIRef.ID, "data_storage_circuit", "circuits/");
-    public static ItemBasic<?> CircuitDataControl = new ItemBasic<>(GTIRef.ID, "data_control_circuit", "circuits/");
 
-    public static ItemBasic<?> CircuitEnergyFlow = new ItemBasic<>(GTIRef.ID, "energy_flow_circuit", "circuits/").tip("A High Voltage Processor");
     public static ItemBasic<?> CircuitWetware = new ItemBasic<>(GTIRef.ID, "wetware_circuit", "circuits/").tip("You feel like it's watching you");
-    public static ItemBasic<?> DataOrb = new ItemBasic<>(GTIRef.ID, "data_orb", "circuits/");
 
     public static ItemBasic<?> Transistor = new ItemBasic<>(GTIRef.ID, "transistor").tip("An integral part to Circuitry");
     public static ItemBasic<?> SMDTransistor = new ItemBasic<>(GTIRef.ID, "smd_transistor").tip("An integral part to Circuitry");

common/src/main/java/muramasa/gregtech/datagen/GregTechItemTagProvider.java

@@ -1,16 +1,13 @@
 package muramasa.gregtech.datagen;
 
-import io.github.gregtechintergalactical.gtcore.data.GTCoreTags;
 import muramasa.antimatter.datagen.providers.AntimatterBlockTagProvider;
 import muramasa.antimatter.datagen.providers.AntimatterItemTagProvider;
-import muramasa.antimatter.util.TagUtils;
-import muramasa.gregtech.data.GregTechTags;
 import net.minecraft.world.item.Items;
 
+import static io.github.gregtechintergalactical.gtcore.data.GTCoreTags.*;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.*;
 import static muramasa.antimatter.data.AntimatterMaterials.*;
 import static muramasa.gregtech.data.GregTechData.*;
-import static muramasa.gregtech.data.GregTechTags.*;
 import static muramasa.gregtech.data.Materials.*;
 
 public class GregTechItemTagProvider  extends AntimatterItemTagProvider {
@@ -21,13 +18,9 @@ public GregTechItemTagProvider(String providerDomain, String providerName, boole
     @Override
     protected void processTags(String domain) {
         super.processTags(domain);
-        this.tag(CIRCUITS_BASIC).add(CircuitBasicIntegrated, CircuitBasicElectronic);
-        this.tag(CIRCUITS_GOOD).add(CircuitGoodElectronic, CircuitGoodIntegrated);
-        this.tag(CIRCUITS_ADVANCED).add(CircuitAdv);
         //this.tag(GregTechTags.CIRCUITS_EXTREME).add(GregTechData.CircuitDataStorage);
-        this.tag(CIRCUITS_ELITE).add(CircuitDataControl, NanoProcessor);
-        this.tag(GregTechTags.CIRCUITS_MASTER).add(CircuitEnergyFlow, QuantumProcessor);
-        this.tag(CIRCUITS_DATA_ORB).add(DataOrb);
+        this.tag(CIRCUITS_ELITE).add(NanoProcessor);
+        this.tag(CIRCUITS_MASTER).add(QuantumProcessor);
         this.tag(POWER_UNIT_LV).add(PowerUnitLV);
         this.tag(POWER_UNIT_MV).add(PowerUnitMV);
         this.tag(POWER_UNIT_HV).add(PowerUnitHV);

common/src/main/java/muramasa/gregtech/loader/crafting/Machines.java

@@ -2,6 +2,7 @@
 
 import com.google.common.collect.ImmutableMap;
 import io.github.gregtechintergalactical.gtcore.GTCore;
+import io.github.gregtechintergalactical.gtcore.data.GTCoreTags;
 import io.github.gregtechintergalactical.gtcore.machine.WorkbenchMachine;
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.Ref;
@@ -40,7 +41,9 @@
 import static muramasa.antimatter.data.AntimatterMaterials.Wood;
 import static muramasa.antimatter.machine.Tier.*;
 import static muramasa.gregtech.data.GregTechData.*;
+import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.*;
 import static muramasa.gregtech.data.GregTechTags.CIRCUITS_ADVANCED;
+import static muramasa.gregtech.data.GregTechTags.CIRCUITS_GOOD;
 import static muramasa.gregtech.data.Machines.*;
 import static muramasa.gregtech.data.Materials.*;
 import static muramasa.gregtech.data.TierMaps.*;
@@ -494,21 +497,21 @@ public static void loadRecipes(Consumer<FinishedRecipe> output, AntimatterRecipe
         provider.addItemRecipe(output, "machines", "has_wrench", provider.hasSafeItem(WRENCH.getTag()), QUANTUM_TANK.getItem(Tier.LV),
                 ImmutableMap.<Character, Object>builder()
                         .put('H', HULL_LV)
-                        .put('C', CircuitBasicElectronic)
+                        .put('C', GTCoreTags.CIRCUITS_BASIC)
                         .put('F', FieldGenLV)
                         .put('P', PLATE.get(Steel)).build(), "CFC", "PHP", "CPC");
 
         provider.addItemRecipe(output, "machines", "has_wrench", provider.hasSafeItem(WRENCH.getTag()), QUANTUM_TANK.getItem(MV),
                 ImmutableMap.<Character, Object>builder()
                         .put('H', HULL_MV)
-                        .put('C', CircuitGoodElectronic)
+                        .put('C', GTCoreTags.CIRCUITS_GOOD)
                         .put('F', FieldGenMV)
                         .put('P', PLATE.get(Aluminium)).build(), "CFC", "PHP", "CPC");
 
         provider.addItemRecipe(output, "machines", "has_wrench", provider.hasSafeItem(WRENCH.getTag()), QUANTUM_TANK.getItem(Tier.HV),
                 ImmutableMap.<Character, Object>builder()
                         .put('H', HULL_HV)
-                        .put('C', CircuitAdv)
+                        .put('C', GTCoreTags.CIRCUITS_ADVANCED)
                         .put('F', FieldGenHV)
                         .put('P', PLATE.get(StainlessSteel)).build(), "CFC", "PHP", "CPC");
 
@@ -768,7 +771,7 @@ private static void addMultiblockRecipes(Consumer<FinishedRecipe> output, Antima
         provider.addItemRecipe(output, "machines", "has_wrench", provider.hasSafeItem(WRENCH.getTag()), PYROLYSIS_OVEN.getItem(PYROLYSIS_OVEN.getFirstTier()),
                 ImmutableMap.<Character, Object>builder()
                         .put('H', HULL_MV)
-                        .put('C', CircuitGoodElectronic)
+                        .put('C', CIRCUITS_GOOD)
                         .put('P', COVER_PUMP.getItem(MV).getItem())
                         .put('W', WIRE_CUPRONICKEL.getBlockItem(PipeSize.SMALL))
                         .put('B', PistonMV).build(), "BCW", "CHC", "BPW");

common/src/main/java/muramasa/gregtech/loader/crafting/Parts.java

@@ -28,6 +28,7 @@
 import java.util.function.Consumer;
 
 import static com.google.common.collect.ImmutableMap.of;
+import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.CircuitBasic;
 import static muramasa.antimatter.data.AntimatterMaterials.*;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.*;
 import static muramasa.antimatter.data.AntimatterDefaultTools.*;
@@ -52,7 +53,7 @@ public static void loadRecipes(Consumer<FinishedRecipe> output, AntimatterRecipe
     // INT_CIRCUITS.forEach((k, v) -> {
     Ingredient ing = INT_CIRCUITS.get(0);
     provider.shapeless(output, "int_circuit_to_circuit", "gtparts", "has_wrench", provider.hasSafeItem(WRENCH.getTag()),
-        CircuitBasicElectronic.getDefaultInstance(), ing);
+        CircuitBasic.getDefaultInstance(), ing);
     // });
 
       provider.shapeless(output, GTIRef.ID, "", "carbon", "has_carbon_fibre", provider.hasSafeItem(CarbonFibre), DUST.get(FiberReinforcedEpoxyResin, 1), CarbonFibre, DUST.getMaterialTag(EpoxyResin));