diff --git a/AntimatterAPI b/AntimatterAPI index 5c182c31..2b4b52b5 160000 --- a/AntimatterAPI +++ b/AntimatterAPI @@ -1 +1 @@ -Subproject commit 5c182c3133a31de08655397480b70eec24f11d57 +Subproject commit 2b4b52b5107216d8dab6c9339c55599ba763bb75 diff --git a/common/build.gradle b/common/build.gradle index d1fc7007..6c260eb3 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -13,7 +13,7 @@ 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}") @@ -21,9 +21,10 @@ dependencies{ 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 index aa265279..56a1c60e 100644 --- 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 index 0460b00f..38b29876 100644 --- 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 index 8ccedd7f..cce545b2 100644 --- 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 index 44bf5fe7..d27593cd 100644 --- 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 index 3c44ede5..e23dc35a 100644 --- 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 index 0b6587b5..1cd801e2 100644 --- 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 index 92757ccf..d1d4b0a1 100644 --- 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 index 1150e524..cfe8b1bd 100644 --- a/common/src/main/java/trinsdar/gt4r/data/TierMaps.java +++ b/common/src/main/java/trinsdar/gt4r/data/TierMaps.java @@ -1,7 +1,6 @@ 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; @@ -9,6 +8,7 @@ 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 index 098d22d6..cd571a1d 100644 --- 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 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 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 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 index a91492ad..8499203c 100644 --- 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 index 009b7f6a..ba8459db 100644 --- 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 index af4b5532..d72c95ad 100644 --- 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 index ab4a6c17..a2c41e7f 100644 --- 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 index e8870c5e..b6c10852 100644 --- 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 index f2c38bf3..5be783fd 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/crafting/BlockCrafting.java +++ b/common/src/main/java/trinsdar/gt4r/loader/crafting/BlockCrafting.java @@ -1,9 +1,9 @@ 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; @@ -11,8 +11,8 @@ 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 index 753eb36e..be7b9e38 100644 --- 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 index b6295a33..9286f3ac 100644 --- 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.*; diff --git a/common/src/main/java/trinsdar/gt4r/loader/crafting/ToolCrafting.java b/common/src/main/java/trinsdar/gt4r/loader/crafting/ToolCrafting.java index d85bf063..a9bad9d5 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/crafting/ToolCrafting.java +++ b/common/src/main/java/trinsdar/gt4r/loader/crafting/ToolCrafting.java @@ -1,6 +1,5 @@ package trinsdar.gt4r.loader.crafting; -import io.github.gregtechintergalactical.gtcore.data.GTCoreTools; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.data.AntimatterDefaultTools; import muramasa.antimatter.data.AntimatterMaterialTypes; @@ -12,6 +11,7 @@ import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.world.item.enchantment.Enchantment; import net.minecraft.world.item.ItemStack; +import org.gtreimagined.gtcore.data.GTCoreTools; import trinsdar.gt4r.GT4RConfig; import trinsdar.gt4r.GT4RRef; import trinsdar.gt4r.data.CustomTags; @@ -23,10 +23,10 @@ import java.util.function.Consumer; import static com.google.common.collect.ImmutableMap.of; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.MotorLV; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreTags.*; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.Diamond; +import static org.gtreimagined.gtcore.data.GTCoreItems.MotorLV; +import static org.gtreimagined.gtcore.data.GTCoreTags.*; import static trinsdar.gt4r.data.CustomTags.*; import static trinsdar.gt4r.data.Materials.*; import static trinsdar.gt4r.data.ToolTypes.ROCK_CUTTER; diff --git a/common/src/main/java/trinsdar/gt4r/loader/crafting/ToolCraftingTableRecipes.java b/common/src/main/java/trinsdar/gt4r/loader/crafting/ToolCraftingTableRecipes.java index 426ac387..a2887384 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/crafting/ToolCraftingTableRecipes.java +++ b/common/src/main/java/trinsdar/gt4r/loader/crafting/ToolCraftingTableRecipes.java @@ -2,7 +2,6 @@ import com.google.common.collect.ImmutableSet; import com.mojang.datafixers.util.Pair; -import io.github.gregtechintergalactical.gtcore.block.RedstoneWire; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.AntimatterConfig; import muramasa.antimatter.data.AntimatterDefaultTools; @@ -15,6 +14,7 @@ import net.minecraft.data.recipes.FinishedRecipe; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import org.gtreimagined.gtcore.block.RedstoneWire; import trinsdar.gt4r.GT4RRef; import java.util.Map; diff --git a/common/src/main/java/trinsdar/gt4r/loader/crafting/VanillaOverrides.java b/common/src/main/java/trinsdar/gt4r/loader/crafting/VanillaOverrides.java index 3d7b3d94..1e6edcf6 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/crafting/VanillaOverrides.java +++ b/common/src/main/java/trinsdar/gt4r/loader/crafting/VanillaOverrides.java @@ -24,7 +24,6 @@ import java.util.function.Consumer; import static com.google.common.collect.ImmutableMap.of; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.StickyResin; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.Coal; import static muramasa.antimatter.data.AntimatterMaterials.Stone; diff --git a/common/src/main/java/trinsdar/gt4r/loader/crafting/WoodCrafting.java b/common/src/main/java/trinsdar/gt4r/loader/crafting/WoodCrafting.java index eba5f9e2..50b25333 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/crafting/WoodCrafting.java +++ b/common/src/main/java/trinsdar/gt4r/loader/crafting/WoodCrafting.java @@ -1,6 +1,5 @@ package trinsdar.gt4r.loader.crafting; -import io.github.gregtechintergalactical.gtcore.GTCoreConfig; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.datagen.providers.AntimatterRecipeProvider; import muramasa.antimatter.util.AntimatterPlatformUtils; @@ -12,6 +11,7 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; +import org.gtreimagined.gtcore.GTCoreConfig; import trinsdar.gt4r.GT4RConfig; import trinsdar.gt4r.GT4RRef; diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/AlloySmelterLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/AlloySmelterLoader.java index c4ad6697..3c087645 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/AlloySmelterLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/AlloySmelterLoader.java @@ -1,10 +1,10 @@ package trinsdar.gt4r.loader.machines; -import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.data.AntimatterMaterials; import muramasa.antimatter.material.Material; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; +import org.gtreimagined.gtcore.data.GTCoreItems; import trinsdar.gt4r.data.GT4RMaterialTags; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/AssemblyLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/AssemblyLoader.java index 92bc9d50..4ec01672 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/AssemblyLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/AssemblyLoader.java @@ -16,13 +16,13 @@ import trinsdar.gt4r.data.RecipeMaps; import trinsdar.gt4r.data.TierMaps; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.*; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreTags.*; import static muramasa.antimatter.machine.Tier.*; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; import static muramasa.antimatter.util.TagUtils.getForgelikeItemTag; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; +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/machines/CannerLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/CannerLoader.java index f70a2dab..8e72b194 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/CannerLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/CannerLoader.java @@ -2,10 +2,10 @@ import net.minecraft.world.item.ItemStack; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.*; import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST; import static muramasa.antimatter.data.AntimatterMaterials.Redstone; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; +import static org.gtreimagined.gtcore.data.GTCoreItems.*; import static trinsdar.gt4r.data.Materials.Cadmium; import static trinsdar.gt4r.data.Materials.Lithium; import static trinsdar.gt4r.data.Materials.Sodium; diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/CentrifugingLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/CentrifugingLoader.java index e74244af..296ac5de 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/CentrifugingLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/CentrifugingLoader.java @@ -1,7 +1,6 @@ package trinsdar.gt4r.loader.machines; import earth.terrarium.botarium.common.fluid.base.FluidHolder; -import io.github.gregtechintergalactical.gtcore.data.GTCoreTags; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.data.AntimatterMaterials; import muramasa.antimatter.material.Material; @@ -12,20 +11,21 @@ import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; +import org.gtreimagined.gtcore.data.GTCoreTags; import tesseract.FluidPlatformUtils; import tesseract.TesseractGraphWrappers; import trinsdar.gt4r.data.GT4RData; import java.util.List; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.Plantball; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.StickyResin; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; import static net.minecraft.world.item.Items.*; import static net.minecraft.world.item.Items.DIRT; import static net.minecraft.world.level.block.Blocks.GRASS_BLOCK; +import static org.gtreimagined.gtcore.data.GTCoreItems.Plantball; +import static org.gtreimagined.gtcore.data.GTCoreItems.StickyResin; import static trinsdar.gt4r.data.Materials.*; import static trinsdar.gt4r.data.RecipeMaps.CENTRIFUGE; diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/CompressorLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/CompressorLoader.java index 1d73d56f..df25d4a7 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/CompressorLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/CompressorLoader.java @@ -1,18 +1,18 @@ package trinsdar.gt4r.loader.machines; -import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.tags.ItemTags; +import org.gtreimagined.gtcore.data.GTCoreItems; import trinsdar.gt4r.data.CustomTags; import muramasa.antimatter.data.ForgeCTags; import trinsdar.gt4r.data.GT4RData; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.CompressedFireClay; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.Plantball; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; +import static org.gtreimagined.gtcore.data.GTCoreItems.CompressedFireClay; +import static org.gtreimagined.gtcore.data.GTCoreItems.Plantball; import static trinsdar.gt4r.data.CustomTags.CORALS; import static trinsdar.gt4r.data.CustomTags.VINES; import static trinsdar.gt4r.data.Materials.*; diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/ExtractorLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/ExtractorLoader.java index 7721c89c..fdf73396 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/ExtractorLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/ExtractorLoader.java @@ -1,10 +1,10 @@ package trinsdar.gt4r.loader.machines; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; -import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; -import io.github.gregtechintergalactical.gtcore.data.GTCoreTags; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; +import org.gtreimagined.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.data.GTCoreItems; +import org.gtreimagined.gtcore.data.GTCoreTags; import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/ExtruderLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/ExtruderLoader.java index f7d629d6..41f5c878 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/ExtruderLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/ExtruderLoader.java @@ -1,6 +1,5 @@ package trinsdar.gt4r.loader.machines; -import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.pipe.PipeSize; @@ -13,6 +12,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; import net.minecraft.world.level.ItemLike; +import org.gtreimagined.gtcore.data.GTCoreItems; import trinsdar.gt4r.data.GT4RData; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/FermentingLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/FermentingLoader.java index 420c9934..59a5a9df 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/FermentingLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/FermentingLoader.java @@ -1,7 +1,7 @@ package trinsdar.gt4r.loader.machines; -import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; +import org.gtreimagined.gtcore.data.GTCoreItems; import static muramasa.antimatter.data.AntimatterMaterials.Water; import static trinsdar.gt4r.data.TierMaps.INT_CIRCUITS; diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/FluidCanningLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/FluidCanningLoader.java index a4564871..35209861 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/FluidCanningLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/FluidCanningLoader.java @@ -13,8 +13,8 @@ import tesseract.TesseractGraphWrappers; import trinsdar.gt4r.data.RecipeMaps; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.*; import static muramasa.antimatter.recipe.ingredient.RecipeIngredient.of; +import static org.gtreimagined.gtcore.data.GTCoreItems.*; import static trinsdar.gt4r.data.Materials.Mercury; import static trinsdar.gt4r.data.Materials.Propane; import static trinsdar.gt4r.data.Materials.SulfuricAcid; diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/FluidSolidifierLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/FluidSolidifierLoader.java index c34b15ca..1bba100a 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/FluidSolidifierLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/FluidSolidifierLoader.java @@ -1,11 +1,11 @@ package trinsdar.gt4r.loader.machines; -import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; import muramasa.antimatter.material.Material; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.antimatter.util.AntimatterPlatformUtils; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import org.gtreimagined.gtcore.data.GTCoreItems; import static muramasa.antimatter.Ref.L; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/FurnaceLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/FurnaceLoader.java index 25e2dbb7..fd2e11a3 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/FurnaceLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/FurnaceLoader.java @@ -1,6 +1,5 @@ package trinsdar.gt4r.loader.machines; -import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; import muramasa.antimatter.data.AntimatterMaterialTypes; import muramasa.antimatter.data.AntimatterMaterials; import muramasa.antimatter.datagen.builder.AntimatterCookingRecipeBuilder; @@ -9,6 +8,7 @@ import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import net.minecraft.data.recipes.SimpleCookingRecipeBuilder; import net.minecraft.data.recipes.FinishedRecipe; +import org.gtreimagined.gtcore.data.GTCoreItems; import trinsdar.gt4r.GT4RRef; import trinsdar.gt4r.data.GT4RData; import trinsdar.gt4r.data.GT4RMaterialTags; diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/MaceratorLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/MaceratorLoader.java index df932521..23996aff 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/MaceratorLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/MaceratorLoader.java @@ -25,14 +25,14 @@ import java.util.ArrayList; import java.util.List; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.Biochaff; -import static io.github.gregtechintergalactical.gtcore.data.GTCoreItems.Plantball; import static muramasa.antimatter.material.Material.NULL; import static muramasa.antimatter.material.MaterialTags.BY_PRODUCT_MULTI; import static muramasa.antimatter.material.MaterialTags.MACERATE_INTO; import static muramasa.antimatter.material.MaterialTags.ORE_MULTI; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.*; +import static org.gtreimagined.gtcore.data.GTCoreItems.Biochaff; +import static org.gtreimagined.gtcore.data.GTCoreItems.Plantball; import static trinsdar.gt4r.data.Materials.Brick; import static trinsdar.gt4r.data.Materials.Clay; import static trinsdar.gt4r.data.Materials.Limestone; diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/WiremillLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/WiremillLoader.java index c71da5fd..bc6632d0 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/WiremillLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/WiremillLoader.java @@ -1,12 +1,12 @@ package trinsdar.gt4r.loader.machines; -import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; import muramasa.antimatter.AntimatterAPI; import muramasa.antimatter.pipe.PipeSize; import muramasa.antimatter.pipe.types.Wire; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; +import org.gtreimagined.gtcore.data.GTCoreItems; import trinsdar.gt4r.data.GT4RData; import static muramasa.antimatter.data.AntimatterMaterials.Charcoal; diff --git a/common/src/main/java/trinsdar/gt4r/loader/multi/ImplosionCompressor.java b/common/src/main/java/trinsdar/gt4r/loader/multi/ImplosionCompressor.java index 9c34bc65..46b6b27a 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/multi/ImplosionCompressor.java +++ b/common/src/main/java/trinsdar/gt4r/loader/multi/ImplosionCompressor.java @@ -1,8 +1,8 @@ package trinsdar.gt4r.loader.multi; -import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; +import org.gtreimagined.gtcore.data.GTCoreItems; import trinsdar.gt4r.data.GT4RData; import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST; diff --git a/common/src/main/java/trinsdar/gt4r/loader/multi/IndustrialSawmill.java b/common/src/main/java/trinsdar/gt4r/loader/multi/IndustrialSawmill.java index 7d7d9b1f..0aabd560 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/multi/IndustrialSawmill.java +++ b/common/src/main/java/trinsdar/gt4r/loader/multi/IndustrialSawmill.java @@ -1,8 +1,5 @@ package trinsdar.gt4r.loader.multi; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; -import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; -import io.github.gregtechintergalactical.gtcore.data.GTCoreTags; import muramasa.antimatter.recipe.ingredient.RecipeIngredient; import muramasa.antimatter.util.AntimatterPlatformUtils; import net.minecraft.tags.TagKey; @@ -11,6 +8,9 @@ import net.minecraft.world.item.Items; import net.minecraft.tags.ItemTags; import net.minecraft.world.level.ItemLike; +import org.gtreimagined.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.data.GTCoreItems; +import org.gtreimagined.gtcore.data.GTCoreTags; import static muramasa.antimatter.data.AntimatterMaterialTypes.*; import static muramasa.antimatter.data.AntimatterMaterials.Water; diff --git a/common/src/main/java/trinsdar/gt4r/machine/QuantumChestItemHandler.java b/common/src/main/java/trinsdar/gt4r/machine/QuantumChestItemHandler.java index 913e947e..6483a383 100644 --- a/common/src/main/java/trinsdar/gt4r/machine/QuantumChestItemHandler.java +++ b/common/src/main/java/trinsdar/gt4r/machine/QuantumChestItemHandler.java @@ -1,9 +1,9 @@ package trinsdar.gt4r.machine; -import io.github.gregtechintergalactical.gtcore.data.SlotTypes; -import io.github.gregtechintergalactical.gtcore.machine.InfiniteSlotTrackedHandler; import muramasa.antimatter.capability.machine.MachineItemHandler; +import org.gtreimagined.gtcore.data.SlotTypes; +import org.gtreimagined.gtcore.machine.InfiniteSlotTrackedHandler; import trinsdar.gt4r.blockentity.single.BlockEntityQuantumChest; public class QuantumChestItemHandler extends MachineItemHandler { diff --git a/fabric/build.gradle b/fabric/build.gradle index 2a84c1bd..24b3440b 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -33,42 +33,36 @@ dependencies{ exclude(group: "net.fabricmc.fabric-api") exclude(group: "com.github.LlamaLad7") } - modImplementation("net.feltmc:felt-recipe-api:1.0.0-${project.minecraft_version}"){ + modImplementation("net.feltmc:felt-recipe-api:1.0.1"){ exclude(group: "net.fabricmc.fabric-api") exclude(group: "com.terraformersmc") } - modImplementation("net.feltmc:felt-player-item-api:1.0.0-${project.minecraft_version}"){ + modImplementation("net.feltmc:felt-player-item-api:1.1.0"){ exclude(group: "net.fabricmc.fabric-api") exclude(group: "com.terraformersmc") } - modImplementation("net.feltmc:felt-enchanting-api:1.0.0-${project.minecraft_version}") { transitive false } - modImplementation("earth.terrarium:botarium-fabric-1.18.2:${project.botarium_version}") - modImplementation(include("com.github.Trinsdar.Felt-API:felt-durability-item-api:c4015755f9")){ transitive false } + modImplementation("net.feltmc:felt-enchanting-api:1.1.0") { transitive false } common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false } - /*modImplementation("io.github.fabricators_of_create:Porting-Lib:1.1.310-beta+1.18.2-dev.${rootProject.port_lib_hash}"){ - exclude(group: "net.fabricmc.fabric-api") - }*/ - modImplementation("com.github.Trinsdar:ARRP:0.6.7-hotfix") - modImplementation "maven.modrinth:carbon-config:2ngFmmhP" - implementation("io.github.gregtechintergalactical:gtcore-fabric:${rootProject.gt_core_version}-${rootProject.minecraft_version}:dev"){ - transitive = false - } - include("io.github.gregtechintergalactical:gtcore-fabric:${rootProject.gt_core_version}-${rootProject.minecraft_version}"){ + modImplementation("dev.trinsdar:arrp:0.6.7") + modImplementation(include("org.gt-reimagined:gtcore-fabric:${rootProject.gt_core_version}-${rootProject.minecraft_version}")){ transitive = false } + modImplementation("com.terraformersmc.terraform-api:terraform-wood-api-v1:3.1.0") modRuntimeOnly("com.gtnewhorizon.structurelib:structurelib-fabric:${project.structurelib_version}-${project.minecraft_version}") - modRuntimeOnly "com.teamresourceful.resourcefullib:resourcefullib-fabric-1.18.2:${project.resourcefullib_version}" modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:${rootProject.rei_version}" - modCompileOnly("mezz.jei:jei-${rootProject.minecraft_version}-common-api:${rootProject.jei_version}") - modCompileOnly("mezz.jei:jei-${rootProject.minecraft_version}-fabric-api:${rootProject.jei_version}") + modCompileOnly("mezz.jei:jei-${rootProject.minecraft_version}-fabric:${rootProject.jei_version}") modImplementation("teamreborn:energy:${rootProject.energy_version}") { transitive = false } modRuntimeOnly("com.terraformersmc:modmenu:${rootProject.mod_menu_version}") { exclude(group: "net.fabricmc.fabric-api") } + modImplementation "maven.modrinth:carbon-config:${project.carbon_config_fabric_version}" + modImplementation("earth.terrarium:botarium-fabric-1.18.2:${project.botarium_version}") + modRuntimeOnly "com.teamresourceful.resourcefullib:resourcefullib-fabric-1.18.2:${project.resourcefullib_version}" modRuntimeOnly("dev.latvian.mods:kubejs-fabric:${rootProject.kubejs_version}") + } architectury { diff --git a/fabric/src/main/java/trinsdar/gt4r/machine/fabric/QuantumChestItemHandlerImpl.java b/fabric/src/main/java/trinsdar/gt4r/machine/fabric/QuantumChestItemHandlerImpl.java deleted file mode 100644 index ce5ae5c6..00000000 --- a/fabric/src/main/java/trinsdar/gt4r/machine/fabric/QuantumChestItemHandlerImpl.java +++ /dev/null @@ -1,53 +0,0 @@ -package trinsdar.gt4r.machine.fabric; - -import io.github.feltmc.feltapi.api.durabilityitem.IsDamageableItem; -import muramasa.antimatter.Antimatter; -import net.minecraft.core.Registry; -import net.minecraft.nbt.CompoundTag; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.Item; -import net.minecraft.world.item.ItemStack; - -public class QuantumChestItemHandlerImpl { - public static CompoundTag save(CompoundTag pCompoundTag, ItemStack stack) { - ResourceLocation resourcelocation = Registry.ITEM.getKey(stack.getItem()); - pCompoundTag.putString("id", resourcelocation == null ? "minecraft:air" : resourcelocation.toString()); - pCompoundTag.putInt("Count", stack.getCount()); - if (stack.getTag() != null) { - pCompoundTag.put("tag", stack.getTag().copy()); - } - /*final CapabilityDispatcher disp = ((GTCapabilityProviderAccessor)stack.getCapabilityProvider()).getCapabilitiesGT(); - if (disp != null) - { - CompoundTag cnbt = disp.serializeNBT(); - if (!cnbt.isEmpty()) { - pCompoundTag.put("ForgeCaps", cnbt); - } - }*/ - - return pCompoundTag; - } - - public static ItemStack of(CompoundTag pCompoundTag) { - try { - //CompoundTag capNBT = pCompoundTag.contains("ForgeCaps") ? pCompoundTag.getCompound("ForgeCaps") : null; - Item rawItem = Registry.ITEM.get(new ResourceLocation(pCompoundTag.getString("id"))); - int count = pCompoundTag.getInt("Count"); - ItemStack stack = new ItemStack(rawItem, count); - //stack.setCapNbt(capNBT); - if (pCompoundTag.contains("tag", 10)) { - CompoundTag tag = pCompoundTag.getCompound("tag"); - stack.setTag(tag); - stack.getItem().verifyTagAfterLoad(pCompoundTag); - } - - if ((stack.getItem() instanceof IsDamageableItem item && item.isDamageable(stack)) || stack.getItem().canBeDepleted()) { - stack.setDamageValue(stack.getDamageValue()); - } - return stack; - } catch (RuntimeException runtimeexception) { - Antimatter.LOGGER.debug("Tried to load invalid item: {}", pCompoundTag, runtimeexception); - return ItemStack.EMPTY; - } - } -} diff --git a/forge/build.gradle b/forge/build.gradle index 08d54021..447e74ba 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -34,7 +34,7 @@ dependencies { transitive = false; } modImplementation("earth.terrarium:botarium-forge-1.18.2:${project.botarium_version}") - modImplementation("io.github.reforgedmods.terraform-api:terraform-utils-v1:3.1.5") + modImplementation("dev.trinsdar:terraform-utils-v1:3.1.5") modImplementation("com.teamresourceful.resourcefullib:resourcefullib-forge-1.18.2:${project.resourcefullib_version}") //JEI //modRuntimeOnly("mezz.jei:jei-${rootProject.minecraft_version}-forge:${rootProject.jei_version}") @@ -44,13 +44,14 @@ dependencies { modImplementation "maven.modrinth:carbon-config:${project.carbon_config_forge_version}" implementation("io.github.llamalad7:mixinextras-forge:0.3.5") minecraftRuntimeLibraries(group: 'com.github.Speiger', name: 'Primitive-Collections', version: '[0.8,0.9)') - implementation("io.github.gregtechintergalactical:gtcore-forge:${rootProject.gt_core_version}-${rootProject.minecraft_version}:dev"){ + implementation("org.gt-reimagined:gtcore-forge:${rootProject.gt_core_version}-${rootProject.minecraft_version}:deobf"){ + transitive = false + } + include("org.gt-reimagined:gtcore-forge:${rootProject.gt_core_version}-${rootProject.minecraft_version}"){ transitive = false } - include("io.github.gregtechintergalactical:gtcore-forge:${rootProject.gt_core_version}-${rootProject.minecraft_version}") modRuntimeOnly(include("io.github.reforgedmods.terraform-api:terraform-wood-api-v1:3.1.5")) modRuntimeOnly("com.gtnewhorizon.structurelib:structurelib-forge:${project.structurelib_version}-${project.minecraft_version}") - modRuntimeOnly "com.teamresourceful.resourcefullib:resourcefullib-forge-1.18.2:${project.resourcefullib_version}" modRuntimeOnly("dev.latvian.mods:kubejs-forge:${rootProject.kubejs_version}") runtimeOnly("curse.maven:portality-291493:3840074") runtimeOnly("curse.maven:titanium-287342:4117991") diff --git a/forge/src/main/java/trinsdar/gt4r/events/forge/ForgeEventBusEvents.java b/forge/src/main/java/trinsdar/gt4r/events/forge/ForgeEventBusEvents.java index 085ed2e3..ca80c464 100644 --- a/forge/src/main/java/trinsdar/gt4r/events/forge/ForgeEventBusEvents.java +++ b/forge/src/main/java/trinsdar/gt4r/events/forge/ForgeEventBusEvents.java @@ -1,7 +1,5 @@ package trinsdar.gt4r.events.forge; -import io.github.gregtechintergalactical.gtcore.data.GTCoreBlocks; -import io.github.gregtechintergalactical.gtcore.data.GTCoreItems; import net.minecraft.world.InteractionHand; import net.minecraft.world.entity.player.Player; import net.minecraft.world.item.Item; @@ -11,6 +9,8 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; +import org.gtreimagined.gtcore.data.GTCoreBlocks; +import org.gtreimagined.gtcore.data.GTCoreItems; import trinsdar.gt4r.GT4RRef; import trinsdar.gt4r.events.CommonEvents; diff --git a/gradle.properties b/gradle.properties index a07092d7..60f25359 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ fabric_api_version=0.76.0+1.18.2 fabric_transfer_api_version=1.6.+ fabric_loader_version=0.14.6 -gt_core_version=0.1.1-pre38 +gt_core_version=0.1.3 terraform_version=3.1.4 jei_version=10.2.1.1004 crafttweaker_version=9.1.207