From 393a143d5afe4156bfb36cfa76c8ed24ac5c56b4 Mon Sep 17 00:00:00 2001 From: trinsdar <30245301+Trinsdar@users.noreply.github.com> Date: Tue, 23 Jan 2024 23:55:19 -0500 Subject: [PATCH] updated antimatter, removed duplicate recipes, disabled fusion recipes for now also removed plasmas --- AntimatterAPI | 2 +- .../java/trinsdar/gt4r/data/GT4RMaterialEvents.java | 10 +++++----- .../trinsdar/gt4r/loader/crafting/WoodCrafting.java | 13 ------------- .../java/trinsdar/gt4r/loader/multi/Fusion.java | 13 +++++++------ gradle.properties | 4 ++-- 5 files changed, 15 insertions(+), 27 deletions(-) diff --git a/AntimatterAPI b/AntimatterAPI index 21e2c61d..8ac353a4 160000 --- a/AntimatterAPI +++ b/AntimatterAPI @@ -1 +1 @@ -Subproject commit 21e2c61d4666f482de78630ab94a1157da977fc3 +Subproject commit 8ac353a44eec39b4a1891cc1133b11cf8c33f2db diff --git a/common/src/main/java/trinsdar/gt4r/data/GT4RMaterialEvents.java b/common/src/main/java/trinsdar/gt4r/data/GT4RMaterialEvents.java index 14b1a983..529990d4 100644 --- a/common/src/main/java/trinsdar/gt4r/data/GT4RMaterialEvents.java +++ b/common/src/main/java/trinsdar/gt4r/data/GT4RMaterialEvents.java @@ -34,7 +34,7 @@ public static void onMaterialEvent(GT4RMaterialEvent event){ event.setMaterial(Iridium).asMetal(2719, 3000, AntimatterMaterialTypes.PLATE).asOre(3, 7, false).harvestLevel(3); event.setMaterial(Lead).asMetal(600, 0, AntimatterMaterialTypes.PLATE, AntimatterMaterialTypes.PLATE_DENSE, AntimatterMaterialTypes.ROD).harvestLevel(2); event.setMaterial(Manganese).asMetal(1519, 0); - event.setMaterial(Nickel).asMetal(1728, 0, AntimatterMaterialTypes.PLATE).asOre(false).asPlasma(); + event.setMaterial(Nickel).asMetal(1728, 0, AntimatterMaterialTypes.PLATE).asOre(false); event.setMaterial(Osmium).asMetal(3306, 3306, AntimatterMaterialTypes.PLATE, AntimatterMaterialTypes.ROD); event.setMaterial(Platinum).asMetal(2041, 0, AntimatterMaterialTypes.PLATE, AntimatterMaterialTypes.ROD).asOre(3, 7, false).harvestLevel(2); event.setMaterial(Plutonium).asMetal(912, 0); @@ -53,18 +53,18 @@ public static void onMaterialEvent(GT4RMaterialEvent event){ event.setMaterial(Deuterium).asGas(); event.setMaterial(Fluorine).asGas(); event.setMaterial(Hydrogen).asGas(15); - event.setMaterial(Helium).asPlasma(); + event.setMaterial(Helium).asGas(); event.setMaterial(Helium3).asGas(); event.setMaterial(Lithium).asMetal(454, 0); event.setMaterial(Magnesium).asMetal(923, 0); event.setMaterial(Mercury).asFluid(); - event.setMaterial(Nitrogen).asPlasma(); - event.setMaterial(Oxygen).asPlasma(); + event.setMaterial(Nitrogen).asGas(); + event.setMaterial(Oxygen).asGas(); event.setMaterial(Phosphor).asDust(317); event.setMaterial(Potassium).asMetal(336, 0); event.setMaterial(Silicon).asMetal(1687, 1000, AntimatterMaterialTypes.PLATE); event.setMaterial(Sodium).asDust(370); - event.setMaterial(Sulfur).asDust(388).asPlasma(); + event.setMaterial(Sulfur).asDust(388); event.setMaterial(Tin).asMetal(505, 505, AntimatterMaterialTypes.PLATE, AntimatterMaterialTypes.ROD, AntimatterMaterialTypes.GEAR).asOre(1, 5, false); event.setMaterial(Tritium).asGas(); event.setMaterial(Zinc).asMetal(692, 0, AntimatterMaterialTypes.PLATE); 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 81a6e28a..2359e75d 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/crafting/WoodCrafting.java +++ b/common/src/main/java/trinsdar/gt4r/loader/crafting/WoodCrafting.java @@ -37,19 +37,6 @@ public static void loadRecipes(Consumer consumer, AntimatterReci } } - String[] stones = {"stone", "smooth_stone", "sandstone", "cut_sandstone", "cobblestone", "red_sandstone", "cut_red_sandstone", "prismarine", "dark_prismarine", "polished_granite", "smooth_red_sandstone", "polished_diorite", "mossy_cobblestone", "smooth_sandstone", "smooth_quartz", "granite", "andesite", "polished_andesite", "diorite", "blackstone", "polished_blackstone", "purpur", "quartz", "brick", "stone_brick", "nether_brick", "prismarine_brick", "mossy_stone_brick", "end_stone_brick", "red_nether_brick", "polished_blackstone_brick"}; - for (String stone : stones) { - Item full = AntimatterPlatformUtils.getItemFromID(new ResourceLocation(stone + (stone.equals("purpur") || stone.equals("quartz") ? "_block" : stone.contains("brick") ? "s" : ""))); - Item slab = AntimatterPlatformUtils.getItemFromID(new ResourceLocation(stone + "_slab")); - String[] pattern = stone.equals("purpur") || stone.equals("quartz") || stone.equals("sandstone") || stone.equals("red_sandstone") || stone.equals("stone_brick") || stone.equals("nether_brick") || stone.equals("polished_blackstone") ? new String[]{"SS"} : new String[]{"S", "S"}; - provider.addItemRecipe(consumer, GT4RRef.ID, stone + "_slab_to_" + stone, "slabs", full, of('S', slab), pattern); - } - String[] wood = {"oak", "birch", "spruce", "jungle", "acacia", "dark_oak", "crimson", "warped"}; - for (String s : wood) { - ResourceLocation name = new ResourceLocation(s + "_planks"); - ResourceLocation slab = new ResourceLocation(s + "_slab"); - provider.addItemRecipe(consumer, GT4RRef.ID, slab.getPath() + "_to_" + name.getPath(), "slabs", AntimatterPlatformUtils.getItemFromID(name), of('S', AntimatterPlatformUtils.getItemFromID(slab)), "S", "S"); - } if (AntimatterAPI.isModLoaded(GT4RRef.MOD_TERRESTRIA)){ String[] woodTypes = {"cypress", "hemlock", "japanese_maple", "rainbow_eucalyptus", "redwood", "rubber", "sakura", "willow", "yucca_palm"}; for (String woodType : woodTypes) { diff --git a/common/src/main/java/trinsdar/gt4r/loader/multi/Fusion.java b/common/src/main/java/trinsdar/gt4r/loader/multi/Fusion.java index b137dda1..9e9f3e84 100644 --- a/common/src/main/java/trinsdar/gt4r/loader/multi/Fusion.java +++ b/common/src/main/java/trinsdar/gt4r/loader/multi/Fusion.java @@ -3,25 +3,26 @@ import muramasa.antimatter.data.AntimatterMaterials; import trinsdar.gt4r.data.RecipeMaps; +import static muramasa.antimatter.data.AntimatterMaterialTypes.DUST; import static muramasa.antimatter.data.AntimatterMaterials.Gold; import static muramasa.antimatter.data.AntimatterMaterials.Iron; import static trinsdar.gt4r.data.Materials.*; public class Fusion { public static void init(){ - RecipeMaps.FUSION.RB().fi(Helium3.getGas(125), Deuterium.getGas(125)).fo(Helium.getPlasma(125)).add("helium",16, 2048, 60000000); + /*RecipeMaps.FUSION.RB().fi(Helium3.getGas(125), Deuterium.getGas(125)).fo(Helium.getPlasma(125)).add("helium",16, 2048, 60000000); RecipeMaps.FUSION.RB().fi(Tritium.getGas(125), Deuterium.getGas(125)).fo(Helium.getPlasma(125)).add("helium_1",16, 4096, 40000000); RecipeMaps.FUSION.RB().fi(Helium3.getGas(125), Carbon.getLiquid(125)).fo(Oxygen.getPlasma(125)).add("oxygen",32, 4096, 80000000); - RecipeMaps.FUSION.RB().fi(Magnesium.getLiquid(16), Silicon.getLiquid(16)).fo(Iron.getPlasma(125)).add("magnesium",32, 8192, 360000000); + RecipeMaps.FUSION.RB().fi(Magnesium.getLiquid(16), Silicon.getLiquid(16)).fo(Iron.getLiquid(16)).add("magnesium",32, 8192, 360000000); RecipeMaps.FUSION.RB().fi(Hydrogen.getGas(16), Manganese.getLiquid(16)).fo(Iron.getLiquid(16)).add("manganese",64, 8192, 120000000); - RecipeMaps.FUSION.RB().fi(Lithium.getLiquid(16), Aluminium.getLiquid(16)).fo(Sulfur.getPlasma(125)).add("sulfur",32, 10240, 240000000); - RecipeMaps.FUSION.RB().fi(Deuterium.getGas(375), Beryllium.getLiquid(16)).fo(Nitrogen.getPlasma(175)).add("nitrogen",16, 16384, 180000000); + RecipeMaps.FUSION.RB().fi(Lithium.getLiquid(16), Aluminium.getLiquid(16)).io(DUST.get(Sulfur)).add("sulfur",32, 10240, 240000000); + RecipeMaps.FUSION.RB().fi(Deuterium.getGas(375), Beryllium.getLiquid(16)).fo(Nitrogen.getGas(175)).add("nitrogen",16, 16384, 180000000); RecipeMaps.FUSION.RB().fi(Helium.getGas(16), Tungsten.getLiquid(16)).fo(Osmium.getLiquid(16)).add("osmium",64, 24578, 150000000); - RecipeMaps.FUSION.RB().fi(Fluorine.getGas(125), Potassium.getLiquid(16)).fo(Nickel.getPlasma(125)).add("nickel",16, 32768, 480000000); + RecipeMaps.FUSION.RB().fi(Fluorine.getGas(125), Potassium.getLiquid(16)).fo(Nickel.getLiquid(16)).add("nickel",16, 32768, 480000000); RecipeMaps.FUSION.RB().fi(Tungsten.getLiquid(16), Beryllium.getLiquid(16)).fo(Platinum.getLiquid(16)).add("platinum",32, 32768, 150000000); RecipeMaps.FUSION.RB().fi(Tungsten.getLiquid(16), Lithium.getLiquid(16)).fo(Iridium.getLiquid(16)).add("iridium",32, 32768, 300000000); RecipeMaps.FUSION.RB().fi(Magnesium.getLiquid(16), Mercury.getLiquid(16)).fo(Uranium238.getLiquid(16)).add("uranium238",64, 49152, 240000000); RecipeMaps.FUSION.RB().fi(Aluminium.getLiquid(16), Gold.getLiquid(16)).fo(Uranium238.getLiquid(16)).add("uranium238_1",64, 49152, 240000000); - RecipeMaps.FUSION.RB().fi(Helium.getGas(16), Uranium238.getLiquid(16)).fo(Plutonium239.getLiquid(16)).add("plutonium239",128, 49152, 480000000); + RecipeMaps.FUSION.RB().fi(Helium.getGas(16), Uranium238.getLiquid(16)).fo(Plutonium239.getLiquid(16)).add("plutonium239",128, 49152, 480000000);*/ } } diff --git a/gradle.properties b/gradle.properties index f2f9b1eb..c39b3a43 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx5G org.gradle.daemon=false org.gradle.parallel=true -mod_version=0.1-alpha-5 +mod_version=0.1-alpha-6 archive_base_name=gt4r modid=gt4r @@ -31,7 +31,7 @@ energy_version=2.2.0 top_forge_file=3671753 structurelib_version=2.0.0-pre10 carbon_config_fabric_version=ec9yfAHJ -carbon_config_forge_version=95tti5dP +carbon_config_forge_version=L3ipBBnb maven_group=com.github.gregtech-intergalactical