Skip to content

Commit

Permalink
Merge pull request #635 from last8kings/master-ceu
Browse files Browse the repository at this point in the history 
hotfixes
  • Loading branch information
@planetme
planetme authored Jan 2, 2024
2 parents e56afad + bc868e5 commit 0fcf64f
Show file tree
Hide file tree
Showing 11 changed files with 265 additions and 92 deletions.
2 changes: 2 additions & 0 deletions config/jei/itemBlacklist.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ advanced {
enchantment:enchantment.thorns.lvl2
rftools:matter_booster
enchantment:enchantment.thorns.lvl3
gregtech:meta_item_1:492;
rftools:energyplus_module
enchantment:enchantment.thorns.lvl1
enchantment:enchantment.arrowFire.lvl1
Expand Down Expand Up @@ -210,6 +211,7 @@ advanced {
rftools:shape_card
enchantment:enchantment.arrowInfinite.lvl1
enchantment:enchantment.binding_curse.lvl1
gregtech:meta_gem:1647;
enchantment:enchantment.spaceBreathing.lvl1
enchantment:enchantment.mending.lvl1
gaspunk:grenade:{"gaspunk:contained_gas":"gaspunk:radon",grenade_skin:0}
Expand Down
46 changes: 23 additions & 23 deletions groovy/material/FirstDegreeMaterials.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ public class FirstDegreeMaterials{
.components(Nitrogen, 78, Oxygen, 21, Argon, 1)
.color(0x90bbe0)
.build();

ZincOxide = new Material.Builder(8203, SuSyUtility.susyId("zinc_oxide"))
.dust()
.components(Zinc, 1, Oxygen, 1)
Expand Down Expand Up @@ -1860,7 +1860,7 @@ public class FirstDegreeMaterials{
.color(0xd40d5c)
.iconSet(SHINY)
.build();

DecarburizedAir = new Material.Builder(8371, SuSyUtility.susyId('decarburized_air'))
.fluid(FluidTypes.GAS)
.components(Nitrogen, 78, Oxygen, 21, Argon, 1)
Expand Down Expand Up @@ -2309,7 +2309,7 @@ public class FirstDegreeMaterials{
.components(Titanium, 4, Carbon, 32, Hydrogen, 80, Oxygen, 16)
.colorAverage()
.build();

DilutedPhosphoricAcid = new Material.Builder(8437, SuSyUtility.susyId('diluted_phosphoric_acid'))
.fluid(FluidTypes.ACID)
.components(PhosphoricAcid, 3, Water, 1)
Expand Down Expand Up @@ -2763,7 +2763,7 @@ public class FirstDegreeMaterials{
.build();

CementedHexachloroplatinicAcidSolution.setFormula("(?)(H2PtCl6)3(ZnCl2)(H2O)8", true)

AmmoniumHexachloroplatinate = new Material.Builder(8503, SuSyUtility.susyId('ammonium_hexachloroplatinate'))
.dust()
.components(Nitrogen, 2, Hydrogen, 8, Platinum, 1, Chlorine, 6)
Expand Down Expand Up @@ -2860,23 +2860,23 @@ public class FirstDegreeMaterials{
.components(Molybdenum, 1, Sulfur, 3)
.colorAverage()
.build();

AmmoniumIsopolytungstateSolution = new Material.Builder(8518, SuSyUtility.susyId('ammonium_isopolytungstate_solution'))
.fluid()
.components(Nitrogen, 5, Hydrogen, 21, Tungsten, 6, Oxygen, 21, Water, 5)
.colorAverage()
.build();

AmmoniumIsopolytungstateSolution.setFormula("[(NH4)5(HW6O21)](H2O)5", true)

AmmoniumParatungstate = new Material.Builder(8519, SuSyUtility.susyId('ammonium_paratungstate'))
.dust()
.components(Nitrogen, 10, Hydrogen, 42, Tungsten, 12, Oxygen, 42, Water, 4)
.colorAverage()
.build();

AmmoniumParatungstate.setFormula("(NH4)10(H2W12O42) * 4H2O", true)

ManganeseIIHydroxide = new Material.Builder(8520, SuSyUtility.susyId('manganese_ii_hydroxide'))
.dust()
.components(Manganese, 1, Oxygen, 2, Hydrogen, 2)
Expand Down Expand Up @@ -3101,12 +3101,12 @@ public class FirstDegreeMaterials{
.components(Calcium, 1, Zirconium, 1, Oxygen, 3)
.colorAverage()
.build();

NickelIINitrateSolution = new Material.Builder(8551, SuSyUtility.susyId('nickel_nitrate_solution'))
.fluid()
.components(Nickel, 1, Nitrogen, 2, Oxygen, 6, Water, 1)
.colorAverage()
.build();
.fluid()
.components(Nickel, 1, Nitrogen, 2, Oxygen, 6, Water, 1)
.colorAverage()
.build();

NickelIINitrateSolution.setFormula("[Ni(NO3)2](H2O)", true);

Expand All @@ -3116,65 +3116,65 @@ public class FirstDegreeMaterials{
.flags(DISABLE_DECOMPOSITION)
.colorAverage()
.build();

TantalumPentachloride = new Material.Builder(8553, SuSyUtility.susyId('tantalum_pentachloride'))
.dust().fluid(FluidTypes.GAS)
.flags(NO_UNIFICATION)
.fluidTemp(513)
.components(Tantalum, 1, Chlorine, 5)
.colorAverage()
.build();

NiobiumPentachloride = new Material.Builder(8554, SuSyUtility.susyId('niobium_pentachloride'))
.dust().fluid(FluidTypes.GAS)
.flags(NO_UNIFICATION)
.fluidTemp(521)
.components(Niobium, 1, Chlorine, 5)
.color(0xcfcf1d)
.build();

NiobiumOxideDihydrate = new Material.Builder(8555, SuSyUtility.susyId('niobium_oxide_dihydrate'))
.dust()
.components(Niobium, 2, Oxygen, 5, Water, 2)
.colorAverage()
.build();

NiobiumOxideDihydrate.setFormula("Nb2O5 * (H2O)2", true)

PurifiedFluoroniobicAcidSolution = new Material.Builder(8556, SuSyUtility.susyId('purified_fluoroniobic_acid_solution'))
.fluid(FluidTypes.ACID)
.components(Hydrogen, 6, Niobium, 3, Fluorine, 9, Water, 6)
.colorAverage()
.build();

PurifiedFluoroniobicAcidSolution.setFormula("(H2NbF7)1.35(H2O)6", true)

NiobiumOxide = new Material.Builder(8557, SuSyUtility.susyId('niobium_oxide'))
.dust()
.components(Niobium, 2, Oxygen, 5)
.colorAverage()
.build();

FluorotantalicAcidSolution = new Material.Builder(8558, SuSyUtility.susyId('fluorotantalic_acid_solution'))
.fluid(FluidTypes.ACID)
.components(Hydrogen, 2, Tantalum, 1, Fluorine, 7, Water, 1)
.colorAverage()
.build();

FluorotantalicAcidSolution.setFormula("(H2TaF7)0.9(H2O)", true)

PotassiumHeptafluorotantalate = new Material.Builder(8559, SuSyUtility.susyId('potassium_heptafluorotantalate'))
.dust()
.components(Potassium, 2, Tantalum, 1, Fluorine, 7)
.colorAverage()
.build();

DilutedAmmoniaSolution = new Material.Builder(8560, SuSyUtility.susyId('diluted_ammonia_solution'))
.fluid()
.components(Ammonia, 1, Water, 2)
.colorAverage()
.build();

TantalumFluoride = new Material.Builder(8561, SuSyUtility.susyId('tantalum_fluoride'))
.dust()
.components(Tantalum, 1, Fluorine, 5)
Expand Down Expand Up @@ -3259,7 +3259,7 @@ public class FirstDegreeMaterials{
.build();

StrontiumSulfideSolution.setFormula("(SrS)(H2O)", true)

StrontiumOxide = new Material.Builder(8575, SuSyUtility.susyId("strontium_oxide"))
.dust()
.components(Strontium, 1, Oxygen, 1)
Expand Down Expand Up @@ -3293,4 +3293,4 @@ public class FirstDegreeMaterials{
.colorAverage()
.build();
}
}
}
29 changes: 29 additions & 0 deletions groovy/material/OreMaterials.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -571,5 +571,34 @@ public class OreMaterials{
.flags(FLAMMABLE, NO_SMELTING, NO_SMASHING, MORTAR_GRINDABLE)
.build();

OrthomagmaticDeposit = new Material.Builder(7076, SuSyUtility.susyId("orthomagmatic_deposit"))
.ore()
.color(0x80081e)
.build();

MetamorphicDeposit = new Material.Builder(7077, SuSyUtility.susyId("metamorphic_deposit"))
.ore()
.color(0x21011c)
.build();

SedimentaryDeposit = new Material.Builder(7078, SuSyUtility.susyId("sedimentary_deposit"))
.ore()
.color(0xfce46d)
.build();

HydrothermalDeposit = new Material.Builder(7079, SuSyUtility.susyId("hydrothermal_deposit"))
.ore()
.color(0xe8e1c1)
.build();

AlluvialDeposit = new Material.Builder(7080, SuSyUtility.susyId("alluvial_deposit"))
.ore()
.color(0xb59e35)
.build();

MagmaticHydrothermalDeposit = new Material.Builder(7081, SuSyUtility.susyId("magmatic_hydrothermal_deposit"))
.ore()
.color(0x91835d)
.build();
}
}
41 changes: 25 additions & 16 deletions groovy/material/SuSyMaterials.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,15 @@ class SuSyMaterials {
public static Material Carnotite;
public static Material AlluvialPlatinum;

// Deposits for scanning

public static Material OrthomagmaticDeposit;
public static Material MetamorphicDeposit;
public static Material SedimentaryDeposit;
public static Material HydrothermalDeposit;
public static Material AlluvialDeposit;
public static Material MagmaticHydrothermalDeposit;

// Roasted Ores

public static Material RoastedSperrylite;
Expand Down Expand Up @@ -408,7 +417,7 @@ class SuSyMaterials {
public static Material PropanalMixture;
public static Material ZSMFive;
public static Material AminatedEthyleneMixture;
public static Material NeutralizedAminatedEthyleneMixture;
public static Material NeutralizedAminatedEthyleneMixture;
public static Material SiftedPyrochlore;
public static Material PyrochloreConcentrate;
public static Material ImpurePyrochloreSlurry;
Expand Down Expand Up @@ -480,9 +489,9 @@ class SuSyMaterials {
public static Material CelestineSlurry;
public static Material BariumResidue;

public static Material OrganosiliconMixture;
public static Material ImpurePolydimethylsiloxaneMixture;
public static Material RawPolydimethylsiloxaneMixture;
public static Material OrganosiliconMixture;
public static Material ImpurePolydimethylsiloxaneMixture;
public static Material RawPolydimethylsiloxaneMixture;
public static Material AcrylicPhotoemulsion;
public static Material TreatedCollagen;

Expand Down Expand Up @@ -1366,17 +1375,17 @@ class SuSyMaterials {
public static Material NBromopropane;
public static Material TetrapropylammoniumBromide;
public static Material Propionaldehyde;
public static Material Triethylenetetramine;
public static Material Aminoethylpiperazine;
public static Material Diethylenetriamine;
public static Material Piperazine;
public static Material Cyclooctadiene;
public static Material TriethylPhosphate;
public static Material IsopropenylAcetate;
public static Material Acetylacetone;
public static Material NickelIIBisacetylacetonate;
public static Material BiscyclooctadienenickelZero;
public static Material DiethylaluminiumAcetylacetonate;
public static Material Triethylenetetramine;
public static Material Aminoethylpiperazine;
public static Material Diethylenetriamine;
public static Material Piperazine;
public static Material Cyclooctadiene;
public static Material TriethylPhosphate;
public static Material IsopropenylAcetate;
public static Material Acetylacetone;
public static Material NickelIIBisacetylacetonate;
public static Material BiscyclooctadienenickelZero;
public static Material DiethylaluminiumAcetylacetonate;
public static Material OxalicAcid;
public static Material OneAmidoethylTwoAlkylTwoImidazoline;
public static Material Chlorodiphenylphosphine;
Expand Down Expand Up @@ -1487,7 +1496,7 @@ class SuSyMaterials {
public static Material TetrabromobisphenolASolution;
public static Material EpoxyCuringMixture;
public static Material WetFlameRetardantEpoxy;
public static Material PropyleneOxideSolution;
public static Material PropyleneOxideSolution;
public static Material DilutedZincChlorideSolution;
public static Material HydrogenSilsesquioxanePhotoresist;
public static Material CrudeTerephthalicAcidSolution;
Expand Down
8 changes: 4 additions & 4 deletions groovy/postInit/chemistry/OreSorting.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def sedimentary_tier_1 = [
'gregtech:ore_malachite_0' : 10000,
'gregtech:ore_cinnabar_0' : 10000,
'gregtech:ore_fluorite_0' : 10000,
'gregtech:ore_bauxite_0' : 10000,
'susy:resource_block:0' : 10000,
'gregtech:ore_pyrolusite_0' : 10000
];

Expand All @@ -131,7 +131,7 @@ def sedimentary_tier_2 = [
'gregtech:ore_cinnabar_0' : 10000,
'gregtech:ore_fluorite_0' : 10000,
'gregtech:ore_magnesite_0' : 10000,
'gregtech:ore_bauxite_0' : 10000,
'susy:resource_block:0' : 10000,
'gregtech:ore_pyrolusite_0' : 10000
];

Expand All @@ -147,7 +147,7 @@ def sedimentary_tier_3 = [
'gregtech:ore_cinnabar_0' : 10000,
'gregtech:ore_fluorite_0' : 10000,
'gregtech:ore_magnesite_0' : 10000,
'gregtech:ore_bauxite_0' : 10000,
'susy:resource_block:0' : 10000,
'gregtech:ore_ilmenite_0' : 10000,
'susy:resource_block:1' : 10000,
'gregtech:ore_pyrolusite_0' : 10000
Expand All @@ -166,7 +166,7 @@ def sedimentary_tier_4 = [
'gregtech:ore_uraninite_0' : 10000,
'gregtech:ore_fluorite_0' : 10000,
'gregtech:ore_magnesite_0' : 10000,
'gregtech:ore_bauxite_0' : 10000,
'susy:resource_block:0' : 10000,
'gregtech:ore_ilmenite_0' : 10000,
'susy:resource_block:1' : 10000,
'gregtech:ore_pyrolusite_0' : 10000,
Expand Down
23 changes: 17 additions & 6 deletions groovy/postInit/electronics/Batteries.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,12 @@ mods.gregtech.assembler.recipeBuilder()
.buildAndRegister()

MIXER_RECIPES.recipeBuilder()
.fluidInputs(Materials.SulfurTrioxide.getFluid(1000))
.fluidInputs(Materials.Water.getFluid(1000))
.fluidOutputs(Materials.SulfuricAcid.getFluid(1000))
.EUt(7)
.duration(40)
.buildAndRegister()
.fluidInputs(Materials.SulfurTrioxide.getFluid(1000))
.fluidInputs(Materials.Water.getFluid(1000))
.fluidOutputs(Materials.SulfuricAcid.getFluid(1000))
.EUt(7)
.duration(40)
.buildAndRegister()

mods.gregtech.electric_blast_furnace.recipeBuilder()
.inputs(ore('dustSodium') * 4)
Expand Down Expand Up @@ -259,6 +259,17 @@ mods.gregtech.assembler.recipeBuilder()
.buildAndRegister()

// Remove Batteries

mods.gregtech.autoclave.removeByInput(480, [metaitem('energium_dust') * 9], [fluid('water') * 1000])
mods.gregtech.autoclave.removeByInput(320, [metaitem('energium_dust') * 9], [fluid('distilled_water') * 1000])
mods.gregtech.autoclave.removeByInput(256, [metaitem('energium_dust') * 9], [fluid('black_steel') * 288])
mods.gregtech.autoclave.removeByInput(192, [metaitem('energium_dust') * 9], [fluid('blue_steel') * 72])

mods.gregtech.autoclave.removeByInput(480, [metaitem('dustLapotron') * 15], [fluid('water') * 1000])
mods.gregtech.autoclave.removeByInput(320, [metaitem('dustLapotron') * 15], [fluid('distilled_water') * 1000])
mods.gregtech.autoclave.removeByInput(256, [metaitem('dustLapotron') * 15], [fluid('blue_steel') * 288])
mods.gregtech.autoclave.removeByInput(192, [metaitem('dustLapotron') * 15], [fluid('red_steel') * 72])

mods.hei.removeAndHide(metaitem('energy_crystal'));
mods.hei.removeAndHide(metaitem('lapotron_crystal'));

Expand Down
Loading

0 comments on commit 0fcf64f

Please sign in to comment.