aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api/enums
diff options
context:
space:
mode:
authorboubou19 <miisterunknown@gmail.com>2023-04-01 18:11:43 +0200
committerGitHub <noreply@github.com>2023-04-01 18:11:43 +0200
commit5f50e4a36ec000657b0a1664784acf00275293c6 (patch)
tree5ef81441032735438c9fd9c620224ca58e46e537 /src/main/java/gregtech/api/enums
parent6b77557e0e87cf5afd9ebd3985323ff1249e615c (diff)
downloadGT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.tar.gz
GT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.tar.bz2
GT5-Unofficial-5f50e4a36ec000657b0a1664784acf00275293c6.zip
update spotless formatting (#1827)
Diffstat (limited to 'src/main/java/gregtech/api/enums')
-rw-r--r--src/main/java/gregtech/api/enums/GT_HatchElement.java3
-rw-r--r--src/main/java/gregtech/api/enums/GT_Values.java10
-rw-r--r--src/main/java/gregtech/api/enums/ItemList.java8
-rw-r--r--src/main/java/gregtech/api/enums/MaterialBuilder.java6
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java484
-rw-r--r--src/main/java/gregtech/api/enums/MaterialsBotania.java169
-rw-r--r--src/main/java/gregtech/api/enums/MaterialsKevlar.java1012
-rw-r--r--src/main/java/gregtech/api/enums/MaterialsOreAlum.java102
-rw-r--r--src/main/java/gregtech/api/enums/OrePrefixes.java170
-rw-r--r--src/main/java/gregtech/api/enums/SoundResource.java5
-rw-r--r--src/main/java/gregtech/api/enums/Textures.java6
-rw-r--r--src/main/java/gregtech/api/enums/ToolDictNames.java3
12 files changed, 1321 insertions, 657 deletions
diff --git a/src/main/java/gregtech/api/enums/GT_HatchElement.java b/src/main/java/gregtech/api/enums/GT_HatchElement.java
index 8d8603a10e..ac8dc7c4dd 100644
--- a/src/main/java/gregtech/api/enums/GT_HatchElement.java
+++ b/src/main/java/gregtech/api/enums/GT_HatchElement.java
@@ -86,7 +86,8 @@ public enum GT_HatchElement implements IHatchElement<GT_MetaTileEntity_MultiBloc
@Override
public long count(GT_MetaTileEntity_MultiBlockBase t) {
- return t.getExoticEnergyHatches().size();
+ return t.getExoticEnergyHatches()
+ .size();
}
},;
diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java
index 6ccf092461..eb742c902f 100644
--- a/src/main/java/gregtech/api/enums/GT_Values.java
+++ b/src/main/java/gregtech/api/enums/GT_Values.java
@@ -86,9 +86,13 @@ public class GT_Values {
* tier. These leave a bit of headroom for cable and transformer losses, but not enough to make it a great gain.
*/
// this will correctly map ULV to 7.
- public static final long[] VP = Arrays.stream(V).map(
- i -> BigInteger.valueOf(i).multiply(BigInteger.valueOf(30)).divide(BigInteger.valueOf(32)).longValueExact())
- .toArray();
+ public static final long[] VP = Arrays.stream(V)
+ .map(
+ i -> BigInteger.valueOf(i)
+ .multiply(BigInteger.valueOf(30))
+ .divide(BigInteger.valueOf(32))
+ .longValueExact())
+ .toArray();
// Why -7? Mystery of the universe. Something may break if you change this so please do not without extensive
// testing.
// TODO:Adding that in coremod!!!
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index 25957078aa..e1b6ada3e6 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -2163,8 +2163,12 @@ public enum ItemList implements IItemContainer {
StringBuilder tCamelCasedDisplayNameBuilder = new StringBuilder();
final String[] tDisplayNameWords = aDisplayName.split("\\W");
for (String tWord : tDisplayNameWords) {
- if (tWord.length() > 0) tCamelCasedDisplayNameBuilder.append(tWord.substring(0, 1).toUpperCase(Locale.US));
- if (tWord.length() > 1) tCamelCasedDisplayNameBuilder.append(tWord.substring(1).toLowerCase(Locale.US));
+ if (tWord.length() > 0) tCamelCasedDisplayNameBuilder.append(
+ tWord.substring(0, 1)
+ .toUpperCase(Locale.US));
+ if (tWord.length() > 1) tCamelCasedDisplayNameBuilder.append(
+ tWord.substring(1)
+ .toLowerCase(Locale.US));
}
if (tCamelCasedDisplayNameBuilder.length() == 0) {
// CamelCased DisplayName is empty, so use hash of aDisplayName
diff --git a/src/main/java/gregtech/api/enums/MaterialBuilder.java b/src/main/java/gregtech/api/enums/MaterialBuilder.java
index d265faae8e..fd131bbc8c 100644
--- a/src/main/java/gregtech/api/enums/MaterialBuilder.java
+++ b/src/main/java/gregtech/api/enums/MaterialBuilder.java
@@ -42,7 +42,8 @@ public class MaterialBuilder {
public MaterialBuilder(int metaItemSubID, TextureSet iconSet, String defaultLocalName) {
this.metaItemSubID = metaItemSubID;
this.iconSet = iconSet;
- this.name = defaultLocalName.replace(" ", "").replace("-", "");
+ this.name = defaultLocalName.replace(" ", "")
+ .replace("-", "");
this.defaultLocalName = defaultLocalName;
}
@@ -72,7 +73,8 @@ public class MaterialBuilder {
color,
extraData,
materialList,
- aspects).setHasCorrespondingFluid(hasCorrespondingFluid).setHasCorrespondingGas(hasCorrespondingGas)
+ aspects).setHasCorrespondingFluid(hasCorrespondingFluid)
+ .setHasCorrespondingGas(hasCorrespondingGas)
.setCanBeCracked(canBeCracked);
}
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index 3ff4d70920..c64b7a6d14 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -1329,9 +1329,12 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
aColor);
mExtraData = aExtraData;
mMaterialList.addAll(aMaterialList);
- if (mMaterialList.size() == 1) mChemicalFormula = mMaterialList.get(0).toString(true);
- else mChemicalFormula = mMaterialList.stream().map(MaterialStack::toString).collect(Collectors.joining())
- .replaceAll("_", "-");
+ if (mMaterialList.size() == 1) mChemicalFormula = mMaterialList.get(0)
+ .toString(true);
+ else mChemicalFormula = mMaterialList.stream()
+ .map(MaterialStack::toString)
+ .collect(Collectors.joining())
+ .replaceAll("_", "-");
int tAmountOfComponents = 0, tMeltingPoint = 0;
for (MaterialStack tMaterial : mMaterialList) {
@@ -1352,18 +1355,39 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
}
private static void setSmeltingInto() {
- SamariumMagnetic.setSmeltingInto(Samarium).setMaceratingInto(Samarium).setArcSmeltingInto(Samarium);
- NeodymiumMagnetic.setSmeltingInto(Neodymium).setMaceratingInto(Neodymium).setArcSmeltingInto(Neodymium);
- SteelMagnetic.setSmeltingInto(Steel).setMaceratingInto(Steel).setArcSmeltingInto(Steel);
- Iron.setSmeltingInto(Iron).setMaceratingInto(Iron).setArcSmeltingInto(WroughtIron);
- AnyIron.setSmeltingInto(Iron).setMaceratingInto(Iron).setArcSmeltingInto(WroughtIron);
- PigIron.setSmeltingInto(Iron).setMaceratingInto(Iron).setArcSmeltingInto(WroughtIron);
- WroughtIron.setSmeltingInto(WroughtIron).setMaceratingInto(WroughtIron).setArcSmeltingInto(WroughtIron);
- IronMagnetic.setSmeltingInto(Iron).setMaceratingInto(Iron).setArcSmeltingInto(WroughtIron);
- Copper.setSmeltingInto(Copper).setMaceratingInto(Copper).setArcSmeltingInto(AnnealedCopper);
- AnyCopper.setSmeltingInto(Copper).setMaceratingInto(Copper).setArcSmeltingInto(AnnealedCopper);
- AnnealedCopper.setSmeltingInto(AnnealedCopper).setMaceratingInto(AnnealedCopper)
- .setArcSmeltingInto(AnnealedCopper);
+ SamariumMagnetic.setSmeltingInto(Samarium)
+ .setMaceratingInto(Samarium)
+ .setArcSmeltingInto(Samarium);
+ NeodymiumMagnetic.setSmeltingInto(Neodymium)
+ .setMaceratingInto(Neodymium)
+ .setArcSmeltingInto(Neodymium);
+ SteelMagnetic.setSmeltingInto(Steel)
+ .setMaceratingInto(Steel)
+ .setArcSmeltingInto(Steel);
+ Iron.setSmeltingInto(Iron)
+ .setMaceratingInto(Iron)
+ .setArcSmeltingInto(WroughtIron);
+ AnyIron.setSmeltingInto(Iron)
+ .setMaceratingInto(Iron)
+ .setArcSmeltingInto(WroughtIron);
+ PigIron.setSmeltingInto(Iron)
+ .setMaceratingInto(Iron)
+ .setArcSmeltingInto(WroughtIron);
+ WroughtIron.setSmeltingInto(WroughtIron)
+ .setMaceratingInto(WroughtIron)
+ .setArcSmeltingInto(WroughtIron);
+ IronMagnetic.setSmeltingInto(Iron)
+ .setMaceratingInto(Iron)
+ .setArcSmeltingInto(WroughtIron);
+ Copper.setSmeltingInto(Copper)
+ .setMaceratingInto(Copper)
+ .setArcSmeltingInto(AnnealedCopper);
+ AnyCopper.setSmeltingInto(Copper)
+ .setMaceratingInto(Copper)
+ .setArcSmeltingInto(AnnealedCopper);
+ AnnealedCopper.setSmeltingInto(AnnealedCopper)
+ .setMaceratingInto(AnnealedCopper)
+ .setArcSmeltingInto(AnnealedCopper);
Netherrack.setSmeltingInto(NetherBrick);
MeatRaw.setSmeltingInto(MeatCooked);
Sand.setSmeltingInto(Glass);
@@ -1378,18 +1402,29 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
}
private static void setDirectSmelting() {
- Cinnabar.setDirectSmelting(Mercury).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT).add(SubTag.SMELTING_TO_GEM);
- Tetrahedrite.setDirectSmelting(Copper).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT)
- .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE);
- Chalcopyrite.setDirectSmelting(Copper).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT)
- .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE);
- Malachite.setDirectSmelting(Copper).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT);
- Pentlandite.setDirectSmelting(Nickel).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT);
- Sphalerite.setDirectSmelting(Zinc).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT);
- Pyrite.setDirectSmelting(Iron).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT);
- BasalticMineralSand.setDirectSmelting(Iron).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT);
- GraniticMineralSand.setDirectSmelting(Iron).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT);
- YellowLimonite.setDirectSmelting(Iron).add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT);
+ Cinnabar.setDirectSmelting(Mercury)
+ .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT)
+ .add(SubTag.SMELTING_TO_GEM);
+ Tetrahedrite.setDirectSmelting(Copper)
+ .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT)
+ .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE);
+ Chalcopyrite.setDirectSmelting(Copper)
+ .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT)
+ .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE);
+ Malachite.setDirectSmelting(Copper)
+ .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT);
+ Pentlandite.setDirectSmelting(Nickel)
+ .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT);
+ Sphalerite.setDirectSmelting(Zinc)
+ .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT);
+ Pyrite.setDirectSmelting(Iron)
+ .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT);
+ BasalticMineralSand.setDirectSmelting(Iron)
+ .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT);
+ GraniticMineralSand.setDirectSmelting(Iron)
+ .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT);
+ YellowLimonite.setDirectSmelting(Iron)
+ .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT);
BrownLimonite.setDirectSmelting(Iron);
BandedIron.setDirectSmelting(Iron);
Magnetite.setDirectSmelting(Iron);
@@ -1399,8 +1434,10 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
Garnierite.setDirectSmelting(Nickel);
Cobaltite.setDirectSmelting(Cobalt);
Stibnite.setDirectSmelting(Antimony);
- Cooperite.setDirectSmelting(Platinum).add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE);
- Molybdenite.setDirectSmelting(Molybdenum).add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE);
+ Cooperite.setDirectSmelting(Platinum)
+ .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE);
+ Molybdenite.setDirectSmelting(Molybdenum)
+ .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE);
Galena.setDirectSmelting(Lead);
RoastedIron.setDirectSmelting(Iron);
RoastedAntimony.setDirectSmelting(Antimony);
@@ -1413,35 +1450,69 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
}
private static void setMultipliers() {
- Amber.setOreMultiplier(2).setSmeltingMultiplier(2);
- InfusedAir.setOreMultiplier(2).setSmeltingMultiplier(2);
- InfusedFire.setOreMultiplier(2).setSmeltingMultiplier(2);
- InfusedEarth.setOreMultiplier(2).setSmeltingMultiplier(2);
- InfusedWater.setOreMultiplier(2).setSmeltingMultiplier(2);
- InfusedEntropy.setOreMultiplier(2).setSmeltingMultiplier(2);
- InfusedOrder.setOreMultiplier(2).setSmeltingMultiplier(2);
- InfusedVis.setOreMultiplier(2).setSmeltingMultiplier(2);
- InfusedDull.setOreMultiplier(2).setSmeltingMultiplier(2);
- Salt.setOreMultiplier(2).setSmeltingMultiplier(2);
- RockSalt.setOreMultiplier(2).setSmeltingMultiplier(2);
- Scheelite.setOreMultiplier(2).setSmeltingMultiplier(2);
- Tungstate.setOreMultiplier(2).setSmeltingMultiplier(2);
- Cassiterite.setOreMultiplier(2).setSmeltingMultiplier(2);
- CassiteriteSand.setOreMultiplier(2).setSmeltingMultiplier(2);
- NetherQuartz.setOreMultiplier(2).setSmeltingMultiplier(2);
- CertusQuartz.setOreMultiplier(2).setSmeltingMultiplier(2);
- TricalciumPhosphate.setOreMultiplier(3).setSmeltingMultiplier(3);
- Saltpeter.setOreMultiplier(4).setSmeltingMultiplier(4);
- Apatite.setOreMultiplier(4).setSmeltingMultiplier(4).setByProductMultiplier(2);
- Electrotine.setOreMultiplier(5).setSmeltingMultiplier(5);
- Teslatite.setOreMultiplier(5).setSmeltingMultiplier(5);
- Redstone.setOreMultiplier(5).setSmeltingMultiplier(5);
- Glowstone.setOreMultiplier(5).setSmeltingMultiplier(5);
- Lapis.setOreMultiplier(6).setSmeltingMultiplier(6).setByProductMultiplier(4);
- Sodalite.setOreMultiplier(6).setSmeltingMultiplier(6).setByProductMultiplier(4);
- Lazurite.setOreMultiplier(6).setSmeltingMultiplier(6).setByProductMultiplier(4);
- Monazite.setOreMultiplier(8).setSmeltingMultiplier(8).setByProductMultiplier(2);
- Cryolite.setOreMultiplier(4).setByProductMultiplier(4);
+ Amber.setOreMultiplier(2)
+ .setSmeltingMultiplier(2);
+ InfusedAir.setOreMultiplier(2)
+ .setSmeltingMultiplier(2);
+ InfusedFire.setOreMultiplier(2)
+ .setSmeltingMultiplier(2);
+ InfusedEarth.setOreMultiplier(2)
+ .setSmeltingMultiplier(2);
+ InfusedWater.setOreMultiplier(2)
+ .setSmeltingMultiplier(2);
+ InfusedEntropy.setOreMultiplier(2)
+ .setSmeltingMultiplier(2);
+ InfusedOrder.setOreMultiplier(2)
+ .setSmeltingMultiplier(2);
+ InfusedVis.setOreMultiplier(2)
+ .setSmeltingMultiplier(2);
+ InfusedDull.setOreMultiplier(2)
+ .setSmeltingMultiplier(2);
+ Salt.setOreMultiplier(2)
+ .setSmeltingMultiplier(2);
+ RockSalt.setOreMultiplier(2)
+ .setSmeltingMultiplier(2);
+ Scheelite.setOreMultiplier(2)
+ .setSmeltingMultiplier(2);
+ Tungstate.setOreMultiplier(2)
+ .setSmeltingMultiplier(2);
+ Cassiterite.setOreMultiplier(2)
+ .setSmeltingMultiplier(2);
+ CassiteriteSand.setOreMultiplier(2)
+ .setSmeltingMultiplier(2);
+ NetherQuartz.setOreMultiplier(2)
+ .setSmeltingMultiplier(2);
+ CertusQuartz.setOreMultiplier(2)
+ .setSmeltingMultiplier(2);
+ TricalciumPhosphate.setOreMultiplier(3)
+ .setSmeltingMultiplier(3);
+ Saltpeter.setOreMultiplier(4)
+ .setSmeltingMultiplier(4);
+ Apatite.setOreMultiplier(4)
+ .setSmeltingMultiplier(4)
+ .setByProductMultiplier(2);
+ Electrotine.setOreMultiplier(5)
+ .setSmeltingMultiplier(5);
+ Teslatite.setOreMultiplier(5)
+ .setSmeltingMultiplier(5);
+ Redstone.setOreMultiplier(5)
+ .setSmeltingMultiplier(5);
+ Glowstone.setOreMultiplier(5)
+ .setSmeltingMultiplier(5);
+ Lapis.setOreMultiplier(6)
+ .setSmeltingMultiplier(6)
+ .setByProductMultiplier(4);
+ Sodalite.setOreMultiplier(6)
+ .setSmeltingMultiplier(6)
+ .setByProductMultiplier(4);
+ Lazurite.setOreMultiplier(6)
+ .setSmeltingMultiplier(6)
+ .setByProductMultiplier(4);
+ Monazite.setOreMultiplier(8)
+ .setSmeltingMultiplier(8)
+ .setByProductMultiplier(2);
+ Cryolite.setOreMultiplier(4)
+ .setByProductMultiplier(4);
}
private static void setEnchantmentKnockbackTools() {
@@ -1630,7 +1701,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
YellowLimonite.addOreByProducts(Nickel, BrownLimonite, Cobalt);
Lepidolite.addOreByProducts(Lithium, Caesium);
Andradite.addOreByProducts(GarnetYellow, Iron);
- Pyrolusite.addOreByProducts(Manganese, Tantalite, Niobium).add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE);
+ Pyrolusite.addOreByProducts(Manganese, Tantalite, Niobium)
+ .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE);
TricalciumPhosphate.addOreByProducts(Apatite, Phosphate, Pyrochlore);
Apatite.addOreByProducts(TricalciumPhosphate, Phosphate, Pyrochlore);
Pyrochlore.addOreByProducts(Apatite, Calcite, Niobium);
@@ -1838,8 +1910,11 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
private static void initSubTags() {
SubTag.ELECTROMAGNETIC_SEPERATION_NEODYMIUM.addTo(Bastnasite, Monazite, Forcicium, Forcillium);
- SubTag.ELECTROMAGNETIC_SEPERATION_GOLD
- .addTo(Magnetite, VanadiumMagnetite, BasalticMineralSand, GraniticMineralSand);
+ SubTag.ELECTROMAGNETIC_SEPERATION_GOLD.addTo(
+ Magnetite,
+ VanadiumMagnetite,
+ BasalticMineralSand,
+ GraniticMineralSand);
SubTag.NO_RECIPES.addTo(MagnetohydrodynamicallyConstrainedStarMatter);
@@ -1861,8 +1936,13 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
Chromite,
Andradite);
- SubTag.BLASTFURNACE_CALCITE_DOUBLE
- .addTo(Pyrite, BrownLimonite, YellowLimonite, BasalticMineralSand, GraniticMineralSand, Magnetite);
+ SubTag.BLASTFURNACE_CALCITE_DOUBLE.addTo(
+ Pyrite,
+ BrownLimonite,
+ YellowLimonite,
+ BasalticMineralSand,
+ GraniticMineralSand,
+ Magnetite);
SubTag.BLASTFURNACE_CALCITE_TRIPLE.addTo(Iron, PigIron, DeepIron, ShadowIron, WroughtIron, MeteoricIron);
@@ -2240,14 +2320,22 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
Monazite.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE);
Quartzite.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ);
Quartz.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ);
- SiliconDioxide
- .add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ);
+ SiliconDioxide.add(
+ SubTag.CRYSTAL,
+ SubTag.NO_SMASHING,
+ SubTag.NO_SMELTING,
+ SubTag.CRYSTALLISABLE,
+ SubTag.QUARTZ);
Dilithium.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ);
NetherQuartz.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ);
CertusQuartz.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ);
Fluix.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ);
- TricalciumPhosphate
- .add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.FLAMMABLE, SubTag.EXPLOSIVE);
+ TricalciumPhosphate.add(
+ SubTag.CRYSTAL,
+ SubTag.NO_SMASHING,
+ SubTag.NO_SMELTING,
+ SubTag.FLAMMABLE,
+ SubTag.EXPLOSIVE);
Phosphate.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.FLAMMABLE, SubTag.EXPLOSIVE);
InfusedAir.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.MAGICAL, SubTag.UNBURNABLE);
InfusedFire.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.MAGICAL, SubTag.UNBURNABLE);
@@ -2313,16 +2401,19 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
mMaterialHandlers.forEach(IMaterialHandler::onMaterialsInit); // This is where addon mods can add/manipulate
// materials
initMaterialProperties(); // No more material addition or manipulation should be done past this point!
- MATERIALS_ARRAY = MATERIALS_MAP.values().toArray(new Materials[0]); // Generate standard object array. This is a
- // lot faster to loop over.
+ MATERIALS_ARRAY = MATERIALS_MAP.values()
+ .toArray(new Materials[0]); // Generate standard object array. This is a
+ // lot faster to loop over.
VALUES = Arrays.asList(MATERIALS_ARRAY);
if (!NewHorizonsCoreMod.isModLoaded() && !GT_Mod.gregtechproxy.mEnableAllComponents)
OrePrefixes.initMaterialComponents();
else {
OrePrefixes.ingotHot.mDisabledItems.addAll(
- Arrays.stream(Materials.values()).parallel().filter(OrePrefixes.ingotHot::doGenerateItem)
- .filter(m -> m.mBlastFurnaceTemp < 1750 && m.mAutoGenerateBlastFurnaceRecipes)
- .collect(Collectors.toSet()));
+ Arrays.stream(Materials.values())
+ .parallel()
+ .filter(OrePrefixes.ingotHot::doGenerateItem)
+ .filter(m -> m.mBlastFurnaceTemp < 1750 && m.mAutoGenerateBlastFurnaceRecipes)
+ .collect(Collectors.toSet()));
OrePrefixes.ingotHot.disableComponent(Materials.Reinforced);
OrePrefixes.ingotHot.disableComponent(Materials.ConductiveIron);
OrePrefixes.ingotHot.disableComponent(Materials.FierySteel);
@@ -2384,22 +2475,32 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
}
private static void addTemperatureValues(Materials aMaterial, String aConfigPath) {
- aMaterial.mMeltingPoint = GregTech_API.sMaterialProperties
- .get(aConfigPath, "MeltingPoint", aMaterial.mMeltingPoint);
- aMaterial.mBlastFurnaceRequired = GregTech_API.sMaterialProperties
- .get(aConfigPath, "BlastFurnaceRequired", aMaterial.mBlastFurnaceRequired);
- aMaterial.mBlastFurnaceTemp = (short) GregTech_API.sMaterialProperties
- .get(aConfigPath, "BlastFurnaceTemp", aMaterial.mBlastFurnaceTemp);
+ aMaterial.mMeltingPoint = GregTech_API.sMaterialProperties.get(
+ aConfigPath,
+ "MeltingPoint",
+ aMaterial.mMeltingPoint);
+ aMaterial.mBlastFurnaceRequired = GregTech_API.sMaterialProperties.get(
+ aConfigPath,
+ "BlastFurnaceRequired",
+ aMaterial.mBlastFurnaceRequired);
+ aMaterial.mBlastFurnaceTemp = (short) GregTech_API.sMaterialProperties.get(
+ aConfigPath,
+ "BlastFurnaceTemp",
+ aMaterial.mBlastFurnaceTemp);
aMaterial.mGasTemp = GregTech_API.sMaterialProperties.get(aConfigPath, "GasTemp", aMaterial.mGasTemp);
aMaterial.setHeatDamage(
(float) GregTech_API.sMaterialProperties.get(aConfigPath, "HeatDamage", aMaterial.mHeatDamage));
}
private static void addDensityValues(Materials aMaterial, String aConfigPath) {
- aMaterial.mDensityMultiplier = GregTech_API.sMaterialProperties
- .get(aConfigPath, "DensityMultiplier", aMaterial.mDensityMultiplier);
- aMaterial.mDensityDivider = GregTech_API.sMaterialProperties
- .get(aConfigPath, "DensityDivider", aMaterial.mDensityDivider);
+ aMaterial.mDensityMultiplier = GregTech_API.sMaterialProperties.get(
+ aConfigPath,
+ "DensityMultiplier",
+ aMaterial.mDensityMultiplier);
+ aMaterial.mDensityDivider = GregTech_API.sMaterialProperties.get(
+ aConfigPath,
+ "DensityDivider",
+ aMaterial.mDensityDivider);
aMaterial.mDensity = (long) GregTech_API.sMaterialProperties.get(
aConfigPath,
"Density",
@@ -2408,10 +2509,14 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
}
private static void addColorValues(Materials aMaterial, String aConfigPath) {
- aMaterial.mTransparent = GregTech_API.sMaterialProperties
- .get(aConfigPath, "Transparent", aMaterial.mTransparent);
- String aColor = GregTech_API.sMaterialProperties
- .get(aConfigPath, "DyeColor", aMaterial.mColor == Dyes._NULL ? "None" : aMaterial.mColor.toString());
+ aMaterial.mTransparent = GregTech_API.sMaterialProperties.get(
+ aConfigPath,
+ "Transparent",
+ aMaterial.mTransparent);
+ String aColor = GregTech_API.sMaterialProperties.get(
+ aConfigPath,
+ "DyeColor",
+ aMaterial.mColor == Dyes._NULL ? "None" : aMaterial.mColor.toString());
aMaterial.mColor = aColor.equals("None") ? Dyes._NULL : Dyes.get(aColor);
String[] aRGBA = GregTech_API.sMaterialProperties.get(
aConfigPath,
@@ -2423,7 +2528,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
+ ","
+ aMaterial.mRGBa[3]
+ ",")
- .split(",");
+ .split(",");
aMaterial.mRGBa[0] = Short.parseShort(aRGBA[0]);
aMaterial.mRGBa[1] = Short.parseShort(aRGBA[1]);
aMaterial.mRGBa[2] = Short.parseShort(aRGBA[2]);
@@ -2431,12 +2536,18 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
}
private static void addToolValues(Materials aMaterial, String aConfigPath) {
- aMaterial.mDurability = GregTech_API.sMaterialProperties
- .get(aConfigPath, "ToolDurability", aMaterial.mDurability);
- aMaterial.mToolSpeed = (float) GregTech_API.sMaterialProperties
- .get(aConfigPath, "ToolSpeed", aMaterial.mToolSpeed);
- aMaterial.mToolQuality = (byte) GregTech_API.sMaterialProperties
- .get(aConfigPath, "ToolQuality", aMaterial.mToolQuality);
+ aMaterial.mDurability = GregTech_API.sMaterialProperties.get(
+ aConfigPath,
+ "ToolDurability",
+ aMaterial.mDurability);
+ aMaterial.mToolSpeed = (float) GregTech_API.sMaterialProperties.get(
+ aConfigPath,
+ "ToolSpeed",
+ aMaterial.mToolSpeed);
+ aMaterial.mToolQuality = (byte) GregTech_API.sMaterialProperties.get(
+ aConfigPath,
+ "ToolQuality",
+ aMaterial.mToolQuality);
// Moved from GT_Proxy? (Not sure)
aMaterial.mHandleMaterial = (aMaterial == Desh ? aMaterial.mHandleMaterial
: aMaterial == Diamond || aMaterial == Thaumium ? Wood
@@ -2456,32 +2567,42 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
}
private static void addEnchantmentValues(Materials aMaterial, String aConfigPath) {
- aMaterial.mEnchantmentToolsLevel = (byte) GregTech_API.sMaterialProperties
- .get(aConfigPath, "EnchantmentLevel", aMaterial.mEnchantmentToolsLevel);
+ aMaterial.mEnchantmentToolsLevel = (byte) GregTech_API.sMaterialProperties.get(
+ aConfigPath,
+ "EnchantmentLevel",
+ aMaterial.mEnchantmentToolsLevel);
String aEnchantmentName = GregTech_API.sMaterialProperties.get(
aConfigPath,
"Enchantment",
aMaterial.mEnchantmentTools != null ? aMaterial.mEnchantmentTools.getName() : "");
if (aMaterial.mEnchantmentTools != null && !aEnchantmentName.equals(aMaterial.mEnchantmentTools.getName()))
IntStream.range(0, Enchantment.enchantmentsList.length)
- .filter(i -> aEnchantmentName.equals(Enchantment.enchantmentsList[i].getName()))
- .forEach(i -> aMaterial.mEnchantmentTools = Enchantment.enchantmentsList[i]);
+ .filter(i -> aEnchantmentName.equals(Enchantment.enchantmentsList[i].getName()))
+ .forEach(i -> aMaterial.mEnchantmentTools = Enchantment.enchantmentsList[i]);
}
private static void addProcessingIntoValues(Materials aMaterial, String aConfigPath) {
aMaterial.mSmeltInto = MATERIALS_MAP.get(
GregTech_API.sMaterialProperties.get(aConfigPath, "MaterialSmeltInto", aMaterial.mSmeltInto.mName));
aMaterial.mMacerateInto = MATERIALS_MAP.get(
- GregTech_API.sMaterialProperties
- .get(aConfigPath, "MaterialMacerateInto", aMaterial.mMacerateInto.mName));
+ GregTech_API.sMaterialProperties.get(
+ aConfigPath,
+ "MaterialMacerateInto",
+ aMaterial.mMacerateInto.mName));
aMaterial.mArcSmeltInto = MATERIALS_MAP.get(
- GregTech_API.sMaterialProperties
- .get(aConfigPath, "MaterialArcSmeltInto", aMaterial.mArcSmeltInto.mName));
+ GregTech_API.sMaterialProperties.get(
+ aConfigPath,
+ "MaterialArcSmeltInto",
+ aMaterial.mArcSmeltInto.mName));
aMaterial.mDirectSmelting = MATERIALS_MAP.get(
- GregTech_API.sMaterialProperties
- .get(aConfigPath, "MaterialDirectSmeltInto", aMaterial.mDirectSmelting.mName));
- aMaterial.mAutoGenerateBlastFurnaceRecipes = GregTech_API.sMaterialProperties
- .get(aConfigPath, "AutoGenerateBlastFurnaceRecipes", aMaterial.mAutoGenerateBlastFurnaceRecipes);
+ GregTech_API.sMaterialProperties.get(
+ aConfigPath,
+ "MaterialDirectSmeltInto",
+ aMaterial.mDirectSmelting.mName));
+ aMaterial.mAutoGenerateBlastFurnaceRecipes = GregTech_API.sMaterialProperties.get(
+ aConfigPath,
+ "AutoGenerateBlastFurnaceRecipes",
+ aMaterial.mAutoGenerateBlastFurnaceRecipes);
}
private static void addMultiplierValues(Materials aMaterial, String aConfigPath) {
@@ -2489,11 +2610,15 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
aMaterial.setOreMultiplier(
GregTech_API.sMaterialProperties.get(aConfigPath, "OreMultiplier", aMaterial.mOreMultiplier));
aMaterial.setSmeltingMultiplier(
- GregTech_API.sMaterialProperties
- .get(aConfigPath, "OreSmeltingMultiplier", aMaterial.mSmeltingMultiplier));
+ GregTech_API.sMaterialProperties.get(
+ aConfigPath,
+ "OreSmeltingMultiplier",
+ aMaterial.mSmeltingMultiplier));
aMaterial.setByProductMultiplier(
- GregTech_API.sMaterialProperties
- .get(aConfigPath, "OreByProductMultiplier", aMaterial.mByProductMultiplier));
+ GregTech_API.sMaterialProperties.get(
+ aConfigPath,
+ "OreByProductMultiplier",
+ aMaterial.mByProductMultiplier));
}
private static void addHasGasFluid(Materials aMaterial, String aConfigPath) {
@@ -2516,16 +2641,22 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
}
private static void addInternalStuff(Materials aMaterial, String aConfigPath) {
- aMaterial.mMetaItemSubID = GregTech_API.sMaterialProperties
- .get(aConfigPath, "MaterialID", aMaterial.mCustomOre ? -1 : aMaterial.mMetaItemSubID);
+ aMaterial.mMetaItemSubID = GregTech_API.sMaterialProperties.get(
+ aConfigPath,
+ "MaterialID",
+ aMaterial.mCustomOre ? -1 : aMaterial.mMetaItemSubID);
aMaterial.mTypes = GregTech_API.sMaterialProperties.get(
aConfigPath,
"MaterialTypes",
aMaterial.mCustomOre ? 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128 : aMaterial.mTypes);
- aMaterial.mUnificatable = GregTech_API.sMaterialProperties
- .get(aConfigPath, "Unificatable", aMaterial.mUnificatable);
- aMaterial.mHasParentMod = GregTech_API.sMaterialProperties
- .get(aConfigPath, "HasParentMod", aMaterial.mHasParentMod);
+ aMaterial.mUnificatable = GregTech_API.sMaterialProperties.get(
+ aConfigPath,
+ "Unificatable",
+ aMaterial.mUnificatable);
+ aMaterial.mHasParentMod = GregTech_API.sMaterialProperties.get(
+ aConfigPath,
+ "HasParentMod",
+ aMaterial.mHasParentMod);
}
private static void addLocalisation(Materials aMaterial, String aConfigPath) {
@@ -2533,8 +2664,10 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
aConfigPath,
"MaterialName",
aMaterial.mCustomOre ? "CustomOre" + aMaterial.mCustomID : aMaterial.mDefaultLocalName);
- aMaterial.mChemicalFormula = GregTech_API.sMaterialProperties
- .get(aConfigPath, "ChemicalFormula", aMaterial.mChemicalFormula);
+ aMaterial.mChemicalFormula = GregTech_API.sMaterialProperties.get(
+ aConfigPath,
+ "ChemicalFormula",
+ aMaterial.mChemicalFormula);
}
private static String getConfigPath(Materials aMaterial) {
@@ -2547,18 +2680,25 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
if (GT_Mod.gregtechproxy.mChangeHarvestLevels && aMaterial.mToolQuality > 0
&& aMaterial.mMetaItemSubID < GT_Mod.gregtechproxy.mHarvestLevel.length
&& aMaterial.mMetaItemSubID >= 0) {
- GT_Mod.gregtechproxy.mHarvestLevel[aMaterial.mMetaItemSubID] = GregTech_API.sMaterialProperties
- .get(aConfigPath, "HarvestLevel", aMaterial.mToolQuality);
+ GT_Mod.gregtechproxy.mHarvestLevel[aMaterial.mMetaItemSubID] = GregTech_API.sMaterialProperties.get(
+ aConfigPath,
+ "HarvestLevel",
+ aMaterial.mToolQuality);
}
}
private static void addHarvestLevels() {
- GT_Mod.gregtechproxy.mChangeHarvestLevels = GregTech_API.sMaterialProperties
- .get("harvestlevel", "ActivateHarvestLevelChange", false);
- GT_Mod.gregtechproxy.mMaxHarvestLevel = Math
- .min(15, GregTech_API.sMaterialProperties.get("harvestlevel", "MaxHarvestLevel", 7));
- GT_Mod.gregtechproxy.mGraniteHavestLevel = GregTech_API.sMaterialProperties
- .get("harvestlevel", "GraniteHarvestLevel", 3);
+ GT_Mod.gregtechproxy.mChangeHarvestLevels = GregTech_API.sMaterialProperties.get(
+ "harvestlevel",
+ "ActivateHarvestLevelChange",
+ false);
+ GT_Mod.gregtechproxy.mMaxHarvestLevel = Math.min(
+ 15,
+ GregTech_API.sMaterialProperties.get("harvestlevel", "MaxHarvestLevel", 7));
+ GT_Mod.gregtechproxy.mGraniteHavestLev