update to GT 1.3.0

CHANGELOG.md

@@ -1,7 +1,7 @@
 ### ADDITIONS:
-- Added Decoration Blocks
+- 
 
 ### FIXES:
 
 ### CHANGES:
-- updated to GT 1.2.3
+- updated to GT 1.3.0

gradle.properties

@@ -2,7 +2,7 @@ org.gradle.jvmargs=-Xmx4G -Xss4M
 
 mod_id=gcyr
 mod_name=Gregicality Rocketry
-mod_version=0.1.8
+mod_version=0.1.9
 maven_group=argent_matter
 
 loom.platform=forge

settings.gradle

@@ -36,8 +36,8 @@ dependencyResolutionManagement {
         def vineFlowerVersion = "1.+"
         def macheteVersion = "1.+"
         def configurationVersion = "2.2.0"
-        def gtCeuVersion = "1.2.3"
-        def ldLibVersion = "1.0.25.j"
+        def gtCeuVersion = "1.3.0"
+        def ldLibVersion = "1.0.25.p"
         def mixinExtrasVersion = "0.2.0"
         def mixinVersion = "0.8.6-SNAPSHOT"
 

src/main/java/argent_matter/gcyr/common/data/GCyRMachines.java

@@ -60,8 +60,6 @@ public class GCyRMachines {
     public static final Int2LongFunction defaultTankSizeFunction = tier -> (tier <= GTValues.LV ? 8 : tier == GTValues.MV ? 12 : tier == GTValues.HV ? 16 : tier == GTValues.EV ? 32 : 64) * FluidHelper.getBucket();
 
 
-    public final static MachineDefinition[] HEAT_EXCHANGER = registerSimpleMachines("heat_exchanger", GCyRRecipeTypes.HEAT_EXCHANGER_RECIPES);
-
     public final static MachineDefinition[] OXYGEN_SPREADER = registerTieredMachines("oxygen_spreader", OxygenSpreaderMachine::new,
             (tier, builder) -> builder
                     .langValue("%s Oxygen Spreader".formatted(VNF[tier]))
@@ -73,31 +71,6 @@ public class GCyRMachines {
                     .register(),
             HIGH_TIERS);
 
-
-    public static final MachineDefinition EVAPORATION_PLANT = REGISTRATE.multiblock("evaporation_plant", WorkableElectricMultiblockMachine::new)
-            .langValue("Evaporation Tower")
-            .rotationState(RotationState.NON_Y_AXIS)
-            .recipeType(GCyRRecipeTypes.EVAPORATION_RECIPES)
-            .recipeModifier(GTRecipeModifiers.ELECTRIC_OVERCLOCK.apply(OverclockingLogic.NON_PERFECT_OVERCLOCK))
-            .appearanceBlock(CASING_STAINLESS_EVAPORATION)
-            .pattern(definition -> FactoryBlockPattern.start(RIGHT, BACK, UP)
-                    .aisle("YSYY", "YYYY", "YYYY", "YYYY")
-                    .aisle("XXXX", "X##X", "X##X", "XXXX").setRepeatable(3, 5)
-                    .aisle(" XX ", "X##X", "X##X", " XX ")
-                    .where('S', Predicates.controller(blocks(definition.getBlock())))
-                    .where('Y', blocks(CASING_STAINLESS_EVAPORATION.get())
-                            .or(Predicates.abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(2))
-                            .or(Predicates.abilities(PartAbility.IMPORT_FLUIDS).setExactLimit(1)))
-                    .where('X', blocks(CASING_STAINLESS_EVAPORATION.get())
-                            .or(Predicates.abilities(PartAbility.EXPORT_FLUIDS_1X).setMaxLayerLimited(1)))
-                    .where('#', Predicates.air())
-                    .where(' ', Predicates.any())
-                    .build())
-            .partSorter(Comparator.comparingInt(a -> a.self().getPos().getY()))
-            .workableCasingRenderer(GCyR.id("block/casings/solid/machine_casing_stainless_evaporation"),
-                    GTCEu.id("block/multiblock/distillation_tower"), false)
-            .register();
-
     public static final MachineDefinition ROCKET_SCANNER = REGISTRATE.multiblock("rocket_scanner", RocketScannerMachine::new)
             .langValue("Rocket Scanner")
             .rotationState(RotationState.NON_Y_AXIS)

src/main/java/argent_matter/gcyr/common/data/GCyRMaterials.java

@@ -27,9 +27,6 @@ public static void modifyMaterials() {
         IronMagnetic.addFlags(GENERATE_FOIL);
         TitaniumTungstenCarbide.addFlags(GENERATE_ROD);
         Titanium.setProperty(PropertyKey.ORE, new OreProperty());
-
-        Bromine.setProperty(PropertyKey.FLUID, new FluidProperty());
-        Bromine.getProperty(PropertyKey.FLUID).getStorage().enqueueRegistration(FluidStorageKeys.LIQUID, new FluidBuilder().attribute(FluidAttributes.ACID));
     }
 
     //region first degree mats
@@ -39,18 +36,6 @@ public static void modifyMaterials() {
             .components(Potassium, 1, Chlorine, 1)
             .buildAndRegister();
 
-    public static final Material PotassiumCarbonate = new Material.Builder(GCyR.id("potassium_carbonate"))
-            .dust(1)
-            .color(0xF6F2C1)
-            .components(Potassium, 2,Carbon, 1, Oxygen, 3)
-            .buildAndRegister();
-
-    public static final Material PotassiumHydroxide = new Material.Builder(GCyR.id("potassium_hydroxide"))
-            .dust(1)
-            .color(0xFF084E)
-            .components(Potassium, 1, Oxygen, 1, Hydrogen, 1)
-            .buildAndRegister();
-
     public static final Material Bisalloy400 = new Material.Builder(GCyR.id("bisalloy_400"))
             .ingot(5).fluid()
             .color(0x0ca819)
@@ -137,70 +122,6 @@ public static void modifyMaterials() {
 
     //endregion
 
-
-    //region bromine chain
-    public static final Material RawBrine = new Material.Builder(GCyR.id("raw_brine"))
-            .liquid()
-            .color(0x9f6b26)
-            .components(Water, 4, Salt, 20, Magnesium, 3, Lithium, 2, Bromine, 1)
-            .flags(DISABLE_DECOMPOSITION)
-            .buildAndRegister();
-    public static final Material HotBrine = new Material.Builder(GCyR.id("hot_brine"))
-            .liquid(320)
-            .color(0xbe6026)
-            .components(Water, 4, Salt, 20, Magnesium, 3, Lithium, 2, Bromine, 1)
-            .flags(DISABLE_DECOMPOSITION)
-            .buildAndRegister();
-    public static final Material HotChlorinatedBrominatedBrine = new Material.Builder(GCyR.id("hot_chlorinated_brominated_brine"))
-            .liquid(320)
-            .color(0xab765d)
-            .components(HotBrine, 1, Chlorine, 1)
-            .flags(DISABLE_DECOMPOSITION)
-            .buildAndRegister();
-    public static final Material DebrominatedBrine = new Material.Builder(GCyR.id("debrominated_brine"))
-            .liquid()
-            .color(0xab8c6d)
-            .components(Water, 4, Salt, 20, Magnesium, 3, Lithium, 2)
-            .flags(DECOMPOSITION_BY_ELECTROLYZING)
-            .buildAndRegister();
-    public static final Material HotDebrominatedBrine = new Material.Builder(GCyR.id("hot_debrominated_brine"))
-            .liquid(320)
-            .color(0xab896d)
-            .components(Water, 4, Salt, 20, Magnesium, 3, Lithium, 2)
-            .flags(DISABLE_DECOMPOSITION)
-            .buildAndRegister();
-    public static final Material HotAlkalineDebrominatedBrine = new Material.Builder(GCyR.id("hot_alkaline_debrominated_brine"))
-            .liquid(320)
-            .color(0xbe8938)
-            .components(HotDebrominatedBrine, 2, Chlorine, 1)
-            .flags(DISABLE_DECOMPOSITION)
-            .buildAndRegister();
-    public static final Material BrominatedChlorineVapor = new Material.Builder(GCyR.id("brominated_chlorine_vapor"))
-            .gas()
-            .color(0xbb9b72)
-            .components(Chlorine, 1, Bromine, 1, Steam, 1)
-            .flags(DISABLE_DECOMPOSITION)
-            .buildAndRegister();
-    public static final Material AcidicBromineSolution = new Material.Builder(GCyR.id("acidic_bromine_solution"))
-            .liquid()
-            .color(0xc49b52)
-            .components(Chlorine, 1, Bromine, 1)
-            .flags(DISABLE_DECOMPOSITION)
-            .buildAndRegister();
-    public static final Material AcidicBromineExhaust = new Material.Builder(GCyR.id("acidic_bromine_exhaust"))
-            .gas()
-            .color(0x8f681e)
-            .components(Steam, 3, Chlorine, 1)
-            .buildAndRegister();
-    public static final Material ConcentratedBromineSolution = new Material.Builder(GCyR.id("concentrated_bromine_solution"))
-            .liquid()
-            .color(0x91481e)
-            .components(Bromine, 2, Chlorine, 1)
-            .flags(DISABLE_DECOMPOSITION)
-            .buildAndRegister();
-    //endregion
-
-
     //region organic chemistry materials
     public static final Material PyromelliticDianhydride = new Material.Builder(GCyR.id("pyrometillic_dianhydride"))
             .dust()
@@ -237,14 +158,6 @@ public static void modifyMaterials() {
             .components(Oxydianiline, 1, Dimethylformamide, 1)
             .buildAndRegister();
 
-    public static final Material AminoPhenol = new Material.Builder(GCyR.id("aminophenol"))
-            .fluid()
-            .color(0x784421)
-            .flags(DISABLE_DECOMPOSITION)
-            .components(Carbon, 6, Hydrogen, 7, Nitrogen, 1, Oxygen, 1)
-            .buildAndRegister()
-            .setFormula("H2NC6H4OH", true);
-
     public static final Material KaptonK = new Material.Builder(GCyR.id("kapton_k"))
             .polymer(1)
             .fluid(FluidStorageKeys.LIQUID, new FluidBuilder().temperature(493))

src/main/java/argent_matter/gcyr/common/data/GCyRRecipeTypes.java

@@ -21,14 +21,6 @@ public class GCyRRecipeTypes {
             .setProgressBar(GuiTextures.PROGRESS_BAR_MACERATE, LEFT_TO_RIGHT)
             .setSound(GTSoundEntries.MOTOR);
 
-    public static final GTRecipeType EVAPORATION_RECIPES = register("evaporation", ELECTRIC).setMaxIOSize(0, 0, 1, 6).setEUIO(IO.IN)
-            .setProgressBar(GuiTextures.PROGRESS_BAR_MACERATE, LEFT_TO_RIGHT)
-            .setSound(GTSoundEntries.MOTOR);
-
-    public static final GTRecipeType HEAT_EXCHANGER_RECIPES = register("heat_exchanger", ELECTRIC).setMaxIOSize(2, 2, 2, 2).setEUIO(IO.IN)
-            .setProgressBar(GuiTextures.PROGRESS_BAR_MACERATE, LEFT_TO_RIGHT)
-            .setSound(GTSoundEntries.MOTOR);
-
     public static final GTRecipeType DYSON_ENERGY_RECIPES = register("dyson_controller", MULTIBLOCK)
             .setMaxIOSize(8, 0, 0, 0).setEUIO(IO.BOTH)
             .setProgressBar(GuiTextures.PROGRESS_BAR_ARROW_MULTIPLE, LEFT_TO_RIGHT)

src/main/java/argent_matter/gcyr/data/recipe/MiscRecipes.java

@@ -114,8 +114,6 @@ public static void init(Consumer<FinishedRecipe> provider) {
         //region machines
 
         MetaTileEntityLoader.registerMachineRecipe(provider, GCyRMachines.OXYGEN_SPREADER, "PCP", "FHF", "PCP", 'H', HULL, 'P', PUMP, 'F', GTItems.FLUID_FILTER, 'C', CIRCUIT);
-        MetaTileEntityLoader.registerMachineRecipe(provider, GCyRMachines.HEAT_EXCHANGER, "PCP", "DHD", "PCP", 'H', HULL, 'P', PUMP, 'D', VOLTAGE_COIL, 'C', CIRCUIT);
-        VanillaRecipeHelper.addShapedRecipe(provider, true, GCyR.id("evaporation_plant"), GCyRMachines.EVAPORATION_PLANT.asStack(), "CBC", "FMF", "CBC", 'M', GTMachines.HULL[HV].asStack(), 'B', new UnificationEntry(wireGtDouble, Kanthal), 'C', CustomTags.HV_CIRCUITS, 'F', GTItems.ELECTRIC_PUMP_HV);
         VanillaRecipeHelper.addShapedRecipe(provider, GCyR.id("rocket_scanner"), GCyRMachines.ROCKET_SCANNER.asStack(), "PCP", "CHC", "SCS", 'H', GTMachines.HULL[EV].asStack(), 'P', GCyRBlocks.LAUNCH_PAD.asStack(), 'C', CustomTags.EV_CIRCUITS, 'S', new UnificationEntry(plate, Titanium));
         VanillaRecipeHelper.addShapedRecipe(provider, GCyR.id("space_station_packager"), GCyRMachines.SPACE_STATION_PACKAGER.asStack(), "PCP", "FHF", "PCP", 'H', GTMachines.HULL[LuV].asStack(), 'P', new UnificationEntry(frameGt, StainlessSteel), 'C', CustomTags.LuV_CIRCUITS, 'F', GTBlocks.PLASTCRETE.asStack());
         VanillaRecipeHelper.addShapedRecipe(provider, GCyR.id("dyson_system_controller"), GCyRMachines.DYSON_SYSTEM_CONTROLLER.asStack(), "PCP", "FHF", "PCP", 'H', GTMachines.HULL[UHV].asStack(), 'P', new UnificationEntry(plate, Darmstadtium), 'C', CustomTags.UHV_CIRCUITS, 'F', GCyMBlocks.CASING_ATOMIC.asStack());

src/main/java/argent_matter/gcyr/data/recipe/chemistry/ChemistryRecipes.java

@@ -1,6 +1,5 @@
 package argent_matter.gcyr.data.recipe.chemistry;
 
-import argent_matter.gcyr.GCyR;
 import net.minecraft.data.recipes.FinishedRecipe;
 
 import java.util.function.Consumer;
@@ -15,68 +14,7 @@
 public class ChemistryRecipes {
 
     public static void init(Consumer<FinishedRecipe> provider) {
-        bromineProcess(provider);
-    }
-
-    private static void bromineProcess(Consumer<FinishedRecipe> provider) {
-        EVAPORATION_RECIPES.recipeBuilder(GCyR.id("brine_evaporation"))
-                .inputFluids(SaltWater.getFluid(20000))
-                .outputFluids(RawBrine.getFluid(1000))
-                .duration(1000).EUt(VA[HV]).save(provider);
-        FLUID_HEATER_RECIPES.recipeBuilder(GCyR.id("brine_heating"))
-                .inputFluids(RawBrine.getFluid(1000))
-                .outputFluids(HotBrine.getFluid(1000))
-                .duration(12000).EUt(VA[HV]).save(provider);
-
-        // Main chain
-        CHEMICAL_RECIPES.recipeBuilder(GCyR.id("brine_chlorination"))
-                .inputFluids(HotBrine.getFluid(1000))
-                .inputFluids(Chlorine.getFluid(1000))
-                .outputFluids(HotChlorinatedBrominatedBrine.getFluid(2000))
-                .duration(100).EUt(VA[HV]).save(provider);
-        CHEMICAL_RECIPES.recipeBuilder(GCyR.id("brine_filtration"))
-                .inputFluids(HotChlorinatedBrominatedBrine.getFluid(1000))
-                .inputFluids(Chlorine.getFluid(1000))
-                .inputFluids(Steam.getFluid(1000))
-                .outputFluids(HotAlkalineDebrominatedBrine.getFluid(1000))
-                .outputFluids(BrominatedChlorineVapor.getFluid(2000))
-                .duration(300).EUt(VA[HV]).save(provider);
-        HEAT_EXCHANGER_RECIPES.recipeBuilder(GCyR.id("brominated_chlorine_vapor_condensation"))
-                .inputFluids(BrominatedChlorineVapor.getFluid(1000))
-                .inputFluids(Water.getFluid(1000))
-                .outputFluids(AcidicBromineSolution.getFluid(1000))
-                .outputFluids(Water.getFluid(1000))
-                .duration(200).EUt(VA[HV]).save(provider);
-        CHEMICAL_RECIPES.recipeBuilder(GCyR.id("bromine_vapor_concentration"))
-                .inputFluids(AcidicBromineSolution.getFluid(1000))
-                .inputFluids(Steam.getFluid(1000))
-                .outputFluids(ConcentratedBromineSolution.getFluid(1000))
-                .outputFluids(AcidicBromineExhaust.getFluid(1000))
-                .duration(100).EUt(VA[HV]).save(provider);
-        DISTILLATION_RECIPES.recipeBuilder(GCyR.id("bromine_distillation"))
-                .inputFluids(ConcentratedBromineSolution.getFluid(1000))
-                .outputFluids(Chlorine.getFluid(500))
-                .outputFluids(Bromine.getFluid(1000))
-                .duration(500).EUt(VA[HV]).save(provider);
 
-        // byproduct loop
-        CHEMICAL_RECIPES.recipeBuilder(GCyR.id("brine_neutralization"))
-                .inputFluids(HotAlkalineDebrominatedBrine.getFluid(3000))
-                .outputFluids(Chlorine.getFluid(1000))
-                .outputFluids(HotDebrominatedBrine.getFluid(2000))
-                .duration(100).EUt(VA[HV]).save(provider);
-        HEAT_EXCHANGER_RECIPES.recipeBuilder(GCyR.id("debrominated_brine_raw_brine_mixing"))
-                .inputFluids(RawBrine.getFluid(1000))
-                .inputFluids(HotDebrominatedBrine.getFluid(1000))
-                .outputFluids(HotBrine.getFluid(1000))
-                .outputFluids(DebrominatedBrine.getFluid(1000))
-                .duration(200).EUt(VA[HV]).save(provider);
-        CHEMICAL_RECIPES.recipeBuilder(GCyR.id("acidic_bromine_exhaust_heating"))
-                .inputFluids(AcidicBromineExhaust.getFluid(1000))
-                .inputFluids(HotBrine.getFluid(1000))
-                .outputFluids(HotChlorinatedBrominatedBrine.getFluid(1000))
-                .outputFluids(Steam.getFluid(3000))
-                .duration(100).EUt(VA[HV]).save(provider);
     }
 
 }

src/main/java/argent_matter/gcyr/data/recipe/chemistry/PolymerRecipes.java

@@ -1,6 +1,7 @@
 package argent_matter.gcyr.data.recipe.chemistry;
 
 import argent_matter.gcyr.GCyR;
+import com.gregtechceu.gtceu.common.data.GTMaterials;
 import net.minecraft.data.recipes.FinishedRecipe;
 
 import java.util.function.Consumer;
@@ -19,14 +20,6 @@ public static void init(Consumer<FinishedRecipe> provider) {
 
     public static void kaptonKProcess(Consumer<FinishedRecipe> provider) {
         // Kapton K
-        CHEMICAL_RECIPES.recipeBuilder(GCyR.id("aminophenol"))
-                .inputFluids(Phenol.getFluid(1000))
-                .inputFluids(NitrationMixture.getFluid(1000))
-                .notConsumable(dust, Iron)
-                .outputFluids(AminoPhenol.getFluid(1000))
-                .outputFluids(DilutedSulfuricAcid.getFluid(1000))
-                .duration(300).EUt(VA[HV]).save(provider);
-
         CHEMICAL_RECIPES.recipeBuilder(GCyR.id("chloronitrobenzene"))
                 .inputFluids(Chlorobenzene.getFluid(1000))
                 .inputFluids(NitricAcid.getFluid(1000))