From 0e82f262d0a35bd52633e17e7baa44f5ed72ee88 Mon Sep 17 00:00:00 2001 From: Ruling-0 <47913168+Ruling-0@users.noreply.github.com> Date: Thu, 30 Jul 2026 21:54:51 -0500 Subject: [PATCH] Migrate to the unified material system --- dependencies.gradle | 3 ++- repositories.gradle | 1 + .../java/emt/gthandler/common/loader/EMT_GT_Loader.java | 6 ++---- src/main/java/emt/tile/solar/Solars.java | 5 +++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index d5f2387..f3766c8 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -11,5 +11,6 @@ dependencies { api('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') api('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.53.05:dev') + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.99.99-mu2:dev') + compileOnly('com.ruling_0:MaterialLib:0.2.0-mu:dev') } diff --git a/repositories.gradle b/repositories.gradle index ffb7db9..1721fc3 100644 --- a/repositories.gradle +++ b/repositories.gradle @@ -1,6 +1,7 @@ // Add any additional repositories for your dependencies here repositories { + mavenLocal() exclusiveContent { forRepository { maven { diff --git a/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java b/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java index 02f0067..973443e 100644 --- a/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java +++ b/src/main/java/emt/gthandler/common/loader/EMT_GT_Loader.java @@ -15,12 +15,10 @@ import net.minecraftforge.oredict.OreDictionary; import emt.init.EMTItems; import emt.init.EMTRecipes; import emt.util.EMTCraftingAspects; +import gregtech.api.enums.Circuits; import gregtech.api.enums.GTValues; import gregtech.api.enums.ItemList; -import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; import gregtech.api.enums.TierEU; -import gregtech.api.util.GTOreDictUnificator; import ic2.api.item.IC2Items; import thaumcraft.api.aspects.Aspect; import thaumcraft.api.aspects.AspectList; @@ -32,7 +30,7 @@ public class EMT_GT_Loader { GTValues.RA.stdBuilder() .itemInputs( new ItemStack(Items.book), - GTOreDictUnificator.get(OrePrefixes.circuit, Materials.LV, 1L), + Circuits.LV.get(1), new ItemStack(ConfigItems.itemShard, 1, OreDictionary.WILDCARD_VALUE)) .itemOutputs(mkbook()).duration(6 * SECONDS).eut(TierEU.RECIPE_MV / 2).addTo(assemblerRecipes); diff --git a/src/main/java/emt/tile/solar/Solars.java b/src/main/java/emt/tile/solar/Solars.java index 3a9f83d..2ef9f78 100644 --- a/src/main/java/emt/tile/solar/Solars.java +++ b/src/main/java/emt/tile/solar/Solars.java @@ -17,8 +17,9 @@ import emt.init.EMTBlocks; import emt.item.block.ItemBlockSolars; import emt.util.EMTConfigHandler; import gregtech.api.enums.GTValues; -import gregtech.api.enums.Materials; import gregtech.api.enums.TierEU; +import gregtech.api.enums.materials.Materials; +import gregtech.api.material.MaterialUtils; import thaumcraft.api.aspects.Aspect; // Solar Factory @@ -143,7 +144,7 @@ public enum Solars { for (Solars s : Solars.VALUES) { if (s.aspect != null) { GTValues.RA.stdBuilder().itemInputs(new ItemStack(EMTBlocks.solars[s.instance], 1, s.meta)) - .fluidInputs(Materials.Chlorine.getGas(1000)) + .fluidInputs(MaterialUtils.gas(Materials.Chlorine, 1000)) .itemOutputs( new ItemStack( EMTBlocks.solars[getBaseSolar(s.output).instance],