updated antimatter and gt core

GT-Reimagined · Nov 4, 2024 · d75f9bf · d75f9bf
1 parent a169c01
commit d75f9bf
Show file tree

Hide file tree

Showing 44 changed files with 99 additions and 158 deletions.
diff --git a/AntimatterAPI b/AntimatterAPI
diff --git a/common/build.gradle b/common/build.gradle
@@ -13,17 +13,18 @@ dependencies{
     implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:0.2.0-beta.11"))
     implementation(project(path: ":tesseract-common", configuration: "namedElements"))
     implementation(project(path: ":antimatter-common", configuration: "namedElements"))
-    implementation("io.github.gregtechintergalactical:gtcore-common:${rootProject.gt_core_version}-${rootProject.minecraft_version}:dev"){
+    implementation("org.gt-reimagined:gtcore-common:${rootProject.gt_core_version}-${rootProject.minecraft_version}"){
         transitive = false
     }
     modImplementation("com.gtnewhorizon.structurelib:structurelib-common:${project.structurelib_version}-${project.minecraft_version}")
     modImplementation("io.github.fabricators_of_create:Porting-Lib:${rootProject.port_lib_version}-beta+1.18.2-stable"){
         exclude(group: "net.fabricmc.fabric-api")
         exclude(group: "com.github.LlamaLad7")
     }
+    modImplementation("net.feltmc:felt-enchanting-api:1.1.0") { transitive false }
     modImplementation("earth.terrarium:botarium-common-1.18.2:${project.botarium_version}")
     modImplementation "maven.modrinth:carbon-config:2ngFmmhP"
-    modCompileOnly("com.github.Trinsdar:ARRP:0.6.7-hotfix")
+    modCompileOnly("dev.trinsdar:arrp:0.6.7")
     modCompileOnly "me.shedaniel:RoughlyEnoughItems-api:${rootProject.rei_version}"
     modCompileOnly("mezz.jei:jei-${rootProject.minecraft_version}-common-api:${rootProject.jei_version}")
 }

diff --git a/common/src/main/java/trinsdar/gt4r/GT4Reimagined.java b/common/src/main/java/trinsdar/gt4r/GT4Reimagined.java
@@ -1,7 +1,5 @@
 package trinsdar.gt4r;
 
-import io.github.gregtechintergalactical.gtcore.data.GTCoreItems;
-import io.github.gregtechintergalactical.gtcore.item.ItemPowerUnit;
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.data.AntimatterMaterialTypes;
 import muramasa.antimatter.datagen.AntimatterDynamics;
@@ -18,6 +16,8 @@
 import net.minecraft.resources.ResourceLocation;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.gtreimagined.gtcore.data.GTCoreItems;
+import org.gtreimagined.gtcore.item.ItemPowerUnit;
 import trinsdar.gt4r.config.OreConfigHandler;
 import trinsdar.gt4r.data.*;
 import trinsdar.gt4r.data.client.ScreenFactories;

diff --git a/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityDigitalChest.java b/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityDigitalChest.java
@@ -1,6 +1,5 @@
 package trinsdar.gt4r.blockentity.single;
 
-import io.github.gregtechintergalactical.gtcore.data.GTCoreItems;
 import muramasa.antimatter.blockentity.BlockEntityMachine;
 import muramasa.antimatter.capability.IFilterableHandler;
 import muramasa.antimatter.capability.item.ITrackedHandler;
@@ -17,6 +16,7 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
+import org.gtreimagined.gtcore.data.GTCoreItems;
 import trinsdar.gt4r.data.GT4RData;
 import trinsdar.gt4r.data.SlotTypes;
 

diff --git a/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityDigitalTank.java b/common/src/main/java/trinsdar/gt4r/blockentity/single/BlockEntityDigitalTank.java
@@ -2,7 +2,6 @@
 
 import earth.terrarium.botarium.common.fluid.base.FluidHolder;
 import earth.terrarium.botarium.common.fluid.utils.FluidHooks;
-import io.github.gregtechintergalactical.gtcore.data.GTCoreItems;
 import muramasa.antimatter.blockentity.BlockEntityTank;
 import muramasa.antimatter.capability.fluid.FluidTank;
 import muramasa.antimatter.capability.fluid.FluidTanks;
@@ -16,6 +15,7 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.state.BlockState;
+import org.gtreimagined.gtcore.data.GTCoreItems;
 import org.jetbrains.annotations.Nullable;
 import trinsdar.gt4r.data.GT4RData;
 import trinsdar.gt4r.data.SlotTypes;

diff --git a/common/src/main/java/trinsdar/gt4r/data/GT4RData.java b/common/src/main/java/trinsdar/gt4r/data/GT4RData.java
@@ -1,8 +1,6 @@
 package trinsdar.gt4r.data;
 
 import earth.terrarium.botarium.common.registry.fluid.FluidProperties;
-import io.github.gregtechintergalactical.gtcore.data.GTCoreTools;
-import io.github.gregtechintergalactical.gtcore.item.ItemPowerUnit;
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.Ref;
 import muramasa.antimatter.cover.CoverFactory;
@@ -36,6 +34,8 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Material;
 import net.minecraft.world.level.material.MaterialColor;
+import org.gtreimagined.gtcore.data.GTCoreTools;
+import org.gtreimagined.gtcore.item.ItemPowerUnit;
 import trinsdar.gt4r.GT4RRef;
 import trinsdar.gt4r.block.BlockCasing;
 import trinsdar.gt4r.block.BlockFakeCasing;

diff --git a/common/src/main/java/trinsdar/gt4r/data/Machines.java b/common/src/main/java/trinsdar/gt4r/data/Machines.java
@@ -1,12 +1,6 @@
 package trinsdar.gt4r.data;
 
 
-import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks;
-import io.github.gregtechintergalactical.gtcore.data.GTCoreMaterials;
-import io.github.gregtechintergalactical.gtcore.machine.DrumMachine;
-import io.github.gregtechintergalactical.gtcore.machine.LockerMachine;
-import io.github.gregtechintergalactical.gtcore.machine.MaterialMachine;
-import io.github.gregtechintergalactical.gtcore.machine.WorkbenchMachine;
 import muramasa.antimatter.blockentity.single.BlockEntityTransformer;
 import muramasa.antimatter.data.AntimatterMaterials;
 import muramasa.antimatter.machine.Tier;
@@ -19,6 +13,12 @@
 import muramasa.antimatter.blockentity.single.BlockEntityDigitalTransformer;
 import muramasa.antimatter.util.Utils;
 import net.minecraft.ChatFormatting;
+import org.gtreimagined.gtcore.data.GTCoreBlocks;
+import org.gtreimagined.gtcore.data.GTCoreMaterials;
+import org.gtreimagined.gtcore.machine.DrumMachine;
+import org.gtreimagined.gtcore.machine.LockerMachine;
+import org.gtreimagined.gtcore.machine.MaterialMachine;
+import org.gtreimagined.gtcore.machine.WorkbenchMachine;
 import trinsdar.gt4r.GT4RRef;
 import trinsdar.gt4r.block.BlockBatBox;
 import trinsdar.gt4r.block.BlockRedstoneMachine;

diff --git a/common/src/main/java/trinsdar/gt4r/data/RecipeMaps.java b/common/src/main/java/trinsdar/gt4r/data/RecipeMaps.java
@@ -1,12 +1,12 @@
 package trinsdar.gt4r.data;
 
-import io.github.gregtechintergalactical.gtcore.data.RecipeBuilders.SteamBuilder;
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.recipe.IRecipe;
 import muramasa.antimatter.recipe.RecipeProxies;
 import muramasa.antimatter.recipe.map.RecipeBuilder;
 import muramasa.antimatter.recipe.map.RecipeMap;
 import net.minecraft.world.item.Items;
+import org.gtreimagined.gtcore.data.RecipeBuilders.SteamBuilder;
 import trinsdar.gt4r.GT4RRef;
 
 import static muramasa.antimatter.machine.Tier.MV;

diff --git a/common/src/main/java/trinsdar/gt4r/data/SlotTypes.java b/common/src/main/java/trinsdar/gt4r/data/SlotTypes.java
@@ -1,10 +1,10 @@
 package trinsdar.gt4r.data;
 
-import io.github.gregtechintergalactical.gtcore.data.GTCoreItems;
 import muramasa.antimatter.capability.item.EmptyContainer;
 import muramasa.antimatter.gui.SlotType;
 import muramasa.antimatter.gui.slot.AbstractSlot;
 import muramasa.antimatter.gui.slot.SlotFake;
+import org.gtreimagined.gtcore.data.GTCoreItems;
 import trinsdar.gt4r.gui.slots.SlotCoil;
 import trinsdar.gt4r.gui.slots.SlotData;
 import trinsdar.gt4r.gui.slots.SlotFluidDisplaySettable;

diff --git a/common/src/main/java/trinsdar/gt4r/data/TierMaps.java b/common/src/main/java/trinsdar/gt4r/data/TierMaps.java
@@ -1,14 +1,14 @@
 package trinsdar.gt4r.data;
 
 import com.google.common.collect.ImmutableMap;
-import io.github.gregtechintergalactical.gtcore.data.GTCoreItems;
 import muramasa.antimatter.machine.Tier;
 import muramasa.antimatter.material.Material;
 import muramasa.antimatter.pipe.types.Cable;
 import muramasa.antimatter.pipe.types.FluidPipe;
 import muramasa.antimatter.pipe.types.Wire;
 import muramasa.antimatter.recipe.ingredient.RecipeIngredient;
 import net.minecraft.world.item.Item;
+import org.gtreimagined.gtcore.data.GTCoreItems;
 import trinsdar.gt4r.GT4RRef;
 import trinsdar.gt4r.items.ItemIntCircuit;
 

diff --git a/common/src/main/java/trinsdar/gt4r/data/ToolTypes.java b/common/src/main/java/trinsdar/gt4r/data/ToolTypes.java
@@ -1,10 +1,9 @@
 package trinsdar.gt4r.data;
 
 import com.google.common.collect.ImmutableMap;
-import io.github.gregtechintergalactical.gtcore.data.GTCoreTags;
-import io.github.gregtechintergalactical.gtcore.item.ItemPowerUnit;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import muramasa.antimatter.AntimatterAPI;
+import muramasa.antimatter.Ref;
 import muramasa.antimatter.data.AntimatterDefaultTools;
 import muramasa.antimatter.item.ItemBattery;
 import muramasa.antimatter.material.Material;
@@ -18,6 +17,8 @@
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.ItemLike;
+import org.gtreimagined.gtcore.data.GTCoreTags;
+import org.gtreimagined.gtcore.item.ItemPowerUnit;
 import org.jetbrains.annotations.NotNull;
 import tesseract.TesseractCapUtils;
 import tesseract.api.gt.IEnergyHandlerItem;
@@ -45,9 +46,9 @@ public ItemStack build(CraftingContainer inv, MaterialRecipe.Result mats) {
 
         @Override
         public Map<String, Object> getFromResult(@NotNull ItemStack stack) {
-            CompoundTag nbt = stack.getTag().getCompound(muramasa.antimatter.Ref.TAG_TOOL_DATA);
-            Material primary = AntimatterAPI.get(Material.class, nbt.getString(muramasa.antimatter.Ref.KEY_TOOL_DATA_PRIMARY_MATERIAL));
-            Material secondary = AntimatterAPI.get(Material.class, nbt.getString(muramasa.antimatter.Ref.KEY_TOOL_DATA_SECONDARY_MATERIAL));
+            CompoundTag nbt = stack.getTag().getCompound(Ref.TAG_TOOL_DATA);
+            Material primary = AntimatterAPI.get(Material.class, nbt.getString(Ref.KEY_TOOL_DATA_PRIMARY_MATERIAL));
+            Material secondary = AntimatterAPI.get(Material.class, nbt.getString(Ref.KEY_TOOL_DATA_SECONDARY_MATERIAL));
             return ImmutableMap.of("primary", primary, "secondary", secondary, "energy", getEnergy(stack).getA(), "maxEnergy", getEnergy(stack).getB());
         }
     });
@@ -79,9 +80,9 @@ public ItemStack build(CraftingContainer inv, MaterialRecipe.Result mats) {
 
         @Override
         public Map<String, Object> getFromResult(@NotNull ItemStack stack) {
-            CompoundTag nbt = stack.getTag().getCompound(muramasa.antimatter.Ref.TAG_TOOL_DATA);
-            Material primary = AntimatterAPI.get(Material.class, nbt.getString(muramasa.antimatter.Ref.KEY_TOOL_DATA_PRIMARY_MATERIAL));
-            Material secondary = AntimatterAPI.get(Material.class, nbt.getString(muramasa.antimatter.Ref.KEY_TOOL_DATA_SECONDARY_MATERIAL));
+            CompoundTag nbt = stack.getTag().getCompound(Ref.TAG_TOOL_DATA);
+            Material primary = AntimatterAPI.get(Material.class, nbt.getString(Ref.KEY_TOOL_DATA_PRIMARY_MATERIAL));
+            Material secondary = AntimatterAPI.get(Material.class, nbt.getString(Ref.KEY_TOOL_DATA_SECONDARY_MATERIAL));
             return ImmutableMap.of("primary", primary, "secondary", secondary, "energy", getEnergy(stack).getA(), "maxEnergy", getEnergy(stack).getB());
         }
     });
@@ -106,15 +107,15 @@ public static void init(){
     private static ItemStack getBrokenItem(ItemStack tool, ItemLike broken){
         ItemStack powerUnit = new ItemStack(broken);
         Tuple<Long, Long> tuple = getEnergy(tool);
-        CompoundTag dataTag = powerUnit.getOrCreateTagElement(muramasa.antimatter.Ref.TAG_ITEM_ENERGY_DATA);
+        CompoundTag dataTag = powerUnit.getOrCreateTagElement(Ref.TAG_ITEM_ENERGY_DATA);
         IEnergyHandlerItem handler = TesseractCapUtils.INSTANCE.getEnergyHandlerItem(powerUnit).orElse(null);
         if (handler != null){
             handler.setEnergy(tuple.getA());
             handler.setCapacity(tuple.getB());
             powerUnit = handler.getContainer().getItemStack();
         } else {
-            dataTag.putLong(muramasa.antimatter.Ref.KEY_ITEM_ENERGY, tuple.getA());
-            dataTag.putLong(muramasa.antimatter.Ref.KEY_ITEM_MAX_ENERGY, tuple.getB());
+            dataTag.putLong(Ref.KEY_ITEM_ENERGY, tuple.getA());
+            dataTag.putLong(Ref.KEY_ITEM_MAX_ENERGY, tuple.getB());
         }
         return powerUnit;
     }

diff --git a/common/src/main/java/trinsdar/gt4r/datagen/GT4RItemTagProvider.java b/common/src/main/java/trinsdar/gt4r/datagen/GT4RItemTagProvider.java
@@ -1,6 +1,5 @@
 package trinsdar.gt4r.datagen;
 
-import io.github.gregtechintergalactical.gtcore.data.GTCoreItems;
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.data.AntimatterMaterialTypes;
 import muramasa.antimatter.data.AntimatterMaterials;
@@ -14,13 +13,14 @@
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.Items;
+import org.gtreimagined.gtcore.data.GTCoreItems;
 import trinsdar.gt4r.GT4RRef;
 import trinsdar.gt4r.data.CustomTags;
 import trinsdar.gt4r.data.GT4RMaterialTags;
 
-import static io.github.gregtechintergalactical.gtcore.data.GTCoreTags.PLATES_IRON_ALUMINIUM;
 import static muramasa.antimatter.util.Utils.getConventionalMaterialType;
 import static muramasa.antimatter.util.Utils.getConventionalStoneType;
+import static org.gtreimagined.gtcore.data.GTCoreTags.PLATES_IRON_ALUMINIUM;
 import static trinsdar.gt4r.data.CustomTags.*;
 import static trinsdar.gt4r.data.GT4RData.*;
 import static trinsdar.gt4r.data.Materials.*;

diff --git a/common/src/main/java/trinsdar/gt4r/events/CommonEvents.java b/common/src/main/java/trinsdar/gt4r/events/CommonEvents.java
@@ -13,8 +13,8 @@
 
 import java.util.UUID;
 
-import static io.github.gregtechintergalactical.gtcore.data.GTCoreTools.DRILL;
 import static muramasa.antimatter.data.AntimatterDefaultTools.PICKAXE;
+import static org.gtreimagined.gtcore.data.GTCoreTools.DRILL;
 
 public class CommonEvents {
     @SuppressWarnings("NoTranslation")

diff --git a/common/src/main/java/trinsdar/gt4r/items/ItemRockCutterUnit.java b/common/src/main/java/trinsdar/gt4r/items/ItemRockCutterUnit.java
@@ -1,9 +1,9 @@
 package trinsdar.gt4r.items;
 
-import io.github.gregtechintergalactical.gtcore.item.ItemPowerUnit;
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.material.Material;
 import muramasa.antimatter.texture.Texture;
+import org.gtreimagined.gtcore.item.ItemPowerUnit;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/common/src/main/java/trinsdar/gt4r/items/MaterialRockCutter.java b/common/src/main/java/trinsdar/gt4r/items/MaterialRockCutter.java
@@ -1,6 +1,5 @@
 package trinsdar.gt4r.items;
 
-import io.github.gregtechintergalactical.gtcore.data.GTCoreTools;
 import muramasa.antimatter.material.Material;
 import muramasa.antimatter.material.MaterialTags;
 import muramasa.antimatter.tool.AntimatterItemTier;
@@ -17,6 +16,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
+import org.gtreimagined.gtcore.data.GTCoreTools;
 import org.jetbrains.annotations.Nullable;
 import tesseract.TesseractCapUtils;
 import tesseract.api.gt.IEnergyHandler;

diff --git a/common/src/main/java/trinsdar/gt4r/loader/WorldGenLoader.java b/common/src/main/java/trinsdar/gt4r/loader/WorldGenLoader.java
@@ -14,10 +14,10 @@
 import trinsdar.gt4r.GT4RConfig;
 import trinsdar.gt4r.GT4RRef;
 
-import static io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks.SHALE;
-import static io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks.SLATE;
 import static muramasa.antimatter.data.AntimatterMaterials.*;
 import static muramasa.antimatter.data.AntimatterStoneTypes.*;
+import static org.gtreimagined.gtcore.data.GTCoreBlocks.SHALE;
+import static org.gtreimagined.gtcore.data.GTCoreBlocks.SLATE;
 import static trinsdar.gt4r.data.GT4RData.*;
 import static trinsdar.gt4r.data.Materials.*;
 

diff --git a/common/src/main/java/trinsdar/gt4r/loader/crafting/BlockCrafting.java b/common/src/main/java/trinsdar/gt4r/loader/crafting/BlockCrafting.java
@@ -1,18 +1,18 @@
 package trinsdar.gt4r.loader.crafting;
 
-import io.github.gregtechintergalactical.gtcore.data.GTCoreItems;
 import muramasa.antimatter.datagen.providers.AntimatterRecipeProvider;
 import net.minecraft.data.recipes.FinishedRecipe;
 import net.minecraft.world.item.ItemStack;
+import org.gtreimagined.gtcore.data.GTCoreItems;
 import trinsdar.gt4r.GT4RRef;
 import muramasa.antimatter.data.ForgeCTags;
 import trinsdar.gt4r.data.CustomTags;
 
 import java.util.function.Consumer;
 
 import static com.google.common.collect.ImmutableMap.of;
-import static io.github.gregtechintergalactical.gtcore.data.GTCoreTags.*;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.PLATE;
+import static org.gtreimagined.gtcore.data.GTCoreTags.*;
 import static trinsdar.gt4r.data.CustomTags.*;
 import static trinsdar.gt4r.data.GT4RData.*;
 import static trinsdar.gt4r.data.Materials.Carbon;

diff --git a/common/src/main/java/trinsdar/gt4r/loader/crafting/MachineCrafting.java b/common/src/main/java/trinsdar/gt4r/loader/crafting/MachineCrafting.java
@@ -1,10 +1,6 @@
 package trinsdar.gt4r.loader.crafting;
 
 import com.google.common.collect.ImmutableMap;
-import io.github.gregtechintergalactical.gtcore.GTCore;
-import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks;
-import io.github.gregtechintergalactical.gtcore.data.GTCoreMaterials;
-import io.github.gregtechintergalactical.gtcore.machine.WorkbenchMachine;
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.data.AntimatterDefaultTools;
 import muramasa.antimatter.data.AntimatterMaterialTypes;
@@ -18,6 +14,10 @@
 import net.minecraft.tags.TagKey;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.Items;
+import org.gtreimagined.gtcore.GTCore;
+import org.gtreimagined.gtcore.data.GTCoreBlocks;
+import org.gtreimagined.gtcore.data.GTCoreMaterials;
+import org.gtreimagined.gtcore.machine.WorkbenchMachine;
 import trinsdar.gt4r.GT4RRef;
 import muramasa.antimatter.data.ForgeCTags;
 import trinsdar.gt4r.data.CustomTags;
@@ -27,13 +27,13 @@
 import java.util.function.Consumer;
 
 import static com.google.common.collect.ImmutableMap.of;
-import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.*;
-import static io.github.gregtechintergalactical.gtcore.data.GTCoreTags.*;
 import static muramasa.antimatter.data.AntimatterDefaultTools.*;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.*;
 import static muramasa.antimatter.data.AntimatterMaterials.Iron;
 import static muramasa.antimatter.machine.Tier.*;
 import static muramasa.antimatter.util.TagUtils.getForgelikeItemTag;
+import static org.gtreimagined.gtcore.data.GTCoreItems.*;
+import static org.gtreimagined.gtcore.data.GTCoreTags.*;
 import static trinsdar.gt4r.data.CustomTags.*;
 import static trinsdar.gt4r.data.GT4RData.*;
 import static trinsdar.gt4r.data.Machines.*;

diff --git a/common/src/main/java/trinsdar/gt4r/loader/crafting/Parts.java b/common/src/main/java/trinsdar/gt4r/loader/crafting/Parts.java
@@ -1,7 +1,5 @@
 package trinsdar.gt4r.loader.crafting;
 
-import io.github.gregtechintergalactical.gtcore.data.GTCoreItems;
-import io.github.gregtechintergalactical.gtcore.data.GTCoreTags;
 import muramasa.antimatter.data.AntimatterDefaultTools;
 import muramasa.antimatter.data.AntimatterMaterialTypes;
 import muramasa.antimatter.data.AntimatterMaterials;
@@ -23,12 +21,12 @@
 import java.util.function.Consumer;
 
 import static com.google.common.collect.ImmutableMap.of;
-import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.*;
-import static io.github.gregtechintergalactical.gtcore.data.GTCoreTags.*;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.FOIL;
 import static muramasa.antimatter.data.AntimatterMaterialTypes.PLATE;
 import static muramasa.antimatter.machine.Tier.MV;
 import static muramasa.antimatter.util.TagUtils.getForgelikeItemTag;
+import static org.gtreimagined.gtcore.data.GTCoreItems.*;
+import static org.gtreimagined.gtcore.data.GTCoreTags.*;
 import static trinsdar.gt4r.data.CustomTags.*;
 import static trinsdar.gt4r.data.GT4RData.*;
 import static trinsdar.gt4r.data.Materials.*;
+1 −1		TesseractAPI
+1 −1		common/gradle.properties
+0 −1		common/src/main/java/muramasa/antimatter/AntimatterAPI.java
+0 −1		common/src/main/java/muramasa/antimatter/AntimatterAPIPlatformHelper.java
+1 −23		common/src/main/java/muramasa/antimatter/blockentity/pipe/BlockEntityFluidPipe.java
+0 −14		common/src/main/java/muramasa/antimatter/blockentity/pipe/BlockEntityItemPipe.java
+4 −2		common/src/main/java/muramasa/antimatter/capability/machine/MachineRecipeHandler.java
+17 −0		common/src/main/java/muramasa/antimatter/client/ClientPlatformHelper.java
+44 −70		common/src/main/java/muramasa/antimatter/client/ModelUtils.java
+3 −4		common/src/main/java/muramasa/antimatter/client/RenderHelper.java
+1 −1		common/src/main/java/muramasa/antimatter/client/baked/BakedMachineSide.java
+1 −1		common/src/main/java/muramasa/antimatter/client/baked/GroupedBakedModel.java
+2 −2		common/src/main/java/muramasa/antimatter/client/baked/MachineBakedModel.java
+2 −2		common/src/main/java/muramasa/antimatter/client/baked/ProxyBakedModel.java
+4 −4		common/src/main/java/muramasa/antimatter/client/dynamic/DynamicTexturers.java
+1 −1		common/src/main/java/muramasa/antimatter/client/model/IModelBuilder.java
+2 −2		common/src/main/java/muramasa/antimatter/client/tesr/MachineTESR.java
+2 −2		common/src/main/java/muramasa/antimatter/datagen/providers/AntimatterRecipeProvider.java
+1 −1		common/src/main/java/muramasa/antimatter/dynamic/ModelConfig.java
+1 −1		common/src/main/java/muramasa/antimatter/dynamic/ModelConfigRandom.java
+2 −2		common/src/main/java/muramasa/antimatter/fluid/AntimatterFluid.java
+5 −10		common/src/main/java/muramasa/antimatter/fluid/FluidUtils.java
+0 −1		common/src/main/java/muramasa/antimatter/gui/MenuHandler.java
+0 −73		common/src/main/java/muramasa/antimatter/gui/widget/InfoRenderWidget.java
+4 −6		common/src/main/java/muramasa/antimatter/integration/ct/CrafttweakerUtils.java
+2 −2		common/src/main/java/muramasa/antimatter/integration/ct/RecipeManager.java
+4 −43		common/src/main/java/muramasa/antimatter/integration/jei/AntimatterJEIPlugin.java
+23 −0		common/src/main/java/muramasa/antimatter/integration/jei/JEIPlatformHelper.java
+4 −4		common/src/main/java/muramasa/antimatter/integration/jei/category/RecipeMapCategory.java
+2 −3		common/src/main/java/muramasa/antimatter/integration/jeirei/AntimatterJEIREIPlugin.java
+4 −6		common/src/main/java/muramasa/antimatter/integration/kubejs/AntimatterKubeJS.java
+8 −0		common/src/main/java/muramasa/antimatter/integration/kubejs/KubeJSPlatform.java
+12 −28		common/src/main/java/muramasa/antimatter/proxy/ClientHandler.java
+1 −1		common/src/main/java/muramasa/antimatter/recipe/IRecipe.java
+13 −35		common/src/main/java/muramasa/antimatter/recipe/RecipeUtil.java
+1 −1		common/src/main/java/muramasa/antimatter/recipe/map/RecipeBuilder.java
+2 −2		common/src/main/java/muramasa/antimatter/recipe/map/RecipeMap.java
+3 −3		common/src/main/java/muramasa/antimatter/recipe/serializer/AntimatterRecipeSerializer.java
+0 −1		common/src/main/java/muramasa/antimatter/util/AntimatterPlatformUtils.java
+0 −5		common/src/main/java/muramasa/antimatter/util/AntimatterPreLaunchUtil.java
+1 −1		fabric/gradle.properties
+7 −4		fabric/src/main/java/muramasa/antimatter/client/fabric/ClientPlatformHelperImpl.java
+25 −32		fabric/src/main/java/muramasa/antimatter/client/fabric/ModelUtilsImpl.java
+4 −3		fabric/src/main/java/muramasa/antimatter/fluid/fabric/FluidUtilsImpl.java
+3 −2		fabric/src/main/java/muramasa/antimatter/integration/ct/fabric/CrafttweakerUtilsImpl.java
+12 −6		fabric/src/main/java/muramasa/antimatter/integration/jei/fabric/JEIPlatformHelperImpl.java
+0 −9		fabric/src/main/java/muramasa/antimatter/integration/kubejs/fabric/AntimatterKubeJSImpl.java
+11 −0		fabric/src/main/java/muramasa/antimatter/integration/kubejs/fabric/KubeJSPlatformImpl.java
+10 −9		fabric/src/main/java/muramasa/antimatter/recipe/fabric/RecipeUtilImpl.java
+1 −0		fabric/src/main/resources/META-INF/services/muramasa.antimatter.client.ClientPlatformHelper
+1 −0		fabric/src/main/resources/META-INF/services/muramasa.antimatter.client.ModelUtils
+1 −0		fabric/src/main/resources/META-INF/services/muramasa.antimatter.fluid.FluidUtils
+1 −0		fabric/src/main/resources/META-INF/services/muramasa.antimatter.integration.ct.CrafttweakerUtils
+1 −0		fabric/src/main/resources/META-INF/services/muramasa.antimatter.integration.jei.JEIPlatformHelper
+1 −0		fabric/src/main/resources/META-INF/services/muramasa.antimatter.integration.kubejs.KubeJSPlatform
+1 −0		fabric/src/main/resources/META-INF/services/muramasa.antimatter.recipe.RecipeUtil
+1 −1		forge/gradle.properties
+7 −10		forge/src/main/java/muramasa/antimatter/client/forge/ClientPlatformHelperImpl.java
+25 −20		forge/src/main/java/muramasa/antimatter/client/forge/ModelUtilsImpl.java
+4 −3		forge/src/main/java/muramasa/antimatter/fluid/forge/FluidUtilsImpl.java
+3 −2		forge/src/main/java/muramasa/antimatter/integration/ct/forge/CrafttweakerUtilsImpl.java
+12 −6		forge/src/main/java/muramasa/antimatter/integration/jei/forge/JEIPlatformHelperImpl.java
+0 −7		forge/src/main/java/muramasa/antimatter/integration/kubejs/forge/AntimatterKubeJSImpl.java
+10 −13		forge/src/main/java/muramasa/antimatter/recipe/forge/RecipeUtilImpl.java
+1 −0		forge/src/main/resources/META-INF/services/muramasa.antimatter.client.ClientPlatformHelper
+1 −0		forge/src/main/resources/META-INF/services/muramasa.antimatter.client.ModelUtils
+1 −0		forge/src/main/resources/META-INF/services/muramasa.antimatter.fluid.FluidUtils
+1 −0		forge/src/main/resources/META-INF/services/muramasa.antimatter.integration.ct.CrafttweakerUtils
+1 −0		forge/src/main/resources/META-INF/services/muramasa.antimatter.integration.jei.JEIPlatformHelper
+1 −0		forge/src/main/resources/META-INF/services/muramasa.antimatter.recipe.RecipeUtil