From 675be2170327abed31c92ca898205db14b5dc4c5 Mon Sep 17 00:00:00 2001 From: trinsdar <30245301+Trinsdar@users.noreply.github.com> Date: Tue, 27 Feb 2024 22:41:26 -0500 Subject: [PATCH] updated antimatter and gt core --- AntimatterAPI | 2 +- .../java/trinsdar/gt4r/loader/crafting/ModCompatRecipes.java | 2 +- .../java/trinsdar/gt4r/loader/machines/CentrifugingLoader.java | 2 -- .../java/trinsdar/gt4r/loader/machines/ElectrolyzerLoader.java | 2 -- gradle.properties | 2 +- 5 files changed, 3 insertions(+), 7 deletions(-) diff --git a/AntimatterAPI b/AntimatterAPI index 8ac353a4..b764d718 160000 --- a/AntimatterAPI +++ b/AntimatterAPI @@ -1 +1 @@ -Subproject commit 8ac353a44eec39b4a1891cc1133b11cf8c33f2db +Subproject commit b764d71881e3690f35e6fc7dac4b0ca260a9563d diff --git a/common/src/main/java/trinsdar/gt4r/loader/crafting/ModCompatRecipes.java b/common/src/main/java/trinsdar/gt4r/loader/crafting/ModCompatRecipes.java index 03ca8e6d..a1d33d01 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/crafting/ModCompatRecipes.java +++ b/common/src/main/java/trinsdar/gt4r/loader/crafting/ModCompatRecipes.java @@ -15,7 +15,7 @@ public class ModCompatRecipes { public static void loadIE(Consumer output, AntimatterRecipeProvider provider){ - provider.addStackRecipe(output, GT4RRef.ID, "treated_wood", "mod_compat", "has_wood", provider.hasSafeItem(ItemTags.PLANKS), new ItemStack(AntimatterPlatformUtils.getBlockFromId(new ResourceLocation(GT4RRef.MOD_IE, "treated_wood_horizontal")), 8), ImmutableMap.of('P', ItemTags.PLANKS, 'C', Materials.Creosote.getLiquid().getBucket()), "PPP", "PCP", "PPP"); + provider.addStackRecipe(output, GT4RRef.ID, "treated_wood", "mod_compat", new ItemStack(AntimatterPlatformUtils.getBlockFromId(new ResourceLocation(GT4RRef.MOD_IE, "treated_wood_horizontal")), 8), ImmutableMap.of('P', ItemTags.PLANKS, 'C', Materials.Creosote.getLiquid().getBucket()), "PPP", "PCP", "PPP"); } } 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 8f911922..02b88f19 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/CentrifugingLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/CentrifugingLoader.java @@ -160,8 +160,6 @@ private static FluidHolder getFluid(Material mat, int amount){ return mat.getLiquid(amount); } else if (mat.has(AntimatterMaterialTypes.GAS)){ return mat.getGas(amount); - } else if (mat.has(AntimatterMaterialTypes.PLASMA)){ - return mat.getPlasma(amount); } else { return mat.getLiquid(amount); } diff --git a/common/src/main/java/trinsdar/gt4r/loader/machines/ElectrolyzerLoader.java b/common/src/main/java/trinsdar/gt4r/loader/machines/ElectrolyzerLoader.java index 8eb7b873..5558265a 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/machines/ElectrolyzerLoader.java +++ b/common/src/main/java/trinsdar/gt4r/loader/machines/ElectrolyzerLoader.java @@ -88,8 +88,6 @@ private static FluidHolder getFluid(Material mat, int amount){ return mat.getLiquid(amount); } else if (mat.has(GAS)){ return mat.getGas(amount); - } else if (mat.has(AntimatterMaterialTypes.PLASMA)){ - return mat.getPlasma(amount); } else { return mat.getLiquid(amount); } diff --git a/gradle.properties b/gradle.properties index c39b3a43..2970e851 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-pre15 +gt_core_version=0.1.1-pre18 terraform_version=3.1.4 jei_version=10.1.0.223 crafttweaker_version=9.1.90