Skip to content

2 Small Changes #2754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rundas01 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

2 Small Changes #2754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35cc2ab
Update Elements.java
Rundas01 Mar 12, 2025
cde7901
Changed the average protons/neutrons/mass in the material tree from s…
Rundas01 Mar 12, 2025
f27c180
spotless
Rundas01 Mar 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 64 additions & 64 deletions src/main/java/gregtech/api/unification/Elements.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@ private Elements() {}
public static final Element He3 = add(2, 1, -1, "H&D", "Helium-3", "He-3", true);
public static final Element Li = add(3, 4, "Lithium", "Li");
public static final Element Be = add(4, 5, "Beryllium", "Be");
public static final Element B = add(5, 5, "Boron", "B");
public static final Element B = add(5, 6, "Boron", "B");
public static final Element C = add(6, 6, "Carbon", "C");
public static final Element N = add(7, 7, "Nitrogen", "N");
public static final Element O = add(8, 8, "Oxygen", "O");
public static final Element F = add(9, 9, "Fluorine", "F");
public static final Element F = add(9, 10, "Fluorine", "F");
public static final Element Ne = add(10, 10, "Neon", "Ne");
public static final Element Na = add(11, 11, "Sodium", "Na");
public static final Element Na = add(11, 12, "Sodium", "Na");
public static final Element Mg = add(12, 12, "Magnesium", "Mg");
public static final Element Al = add(13, 13, "Aluminium", "Al");
public static final Element Al = add(13, 14, "Aluminium", "Al");
public static final Element Si = add(14, 14, "Silicon", "Si");
public static final Element P = add(15, 15, "Phosphorus", "P");
public static final Element P = add(15, 16, "Phosphorus", "P");
public static final Element S = add(16, 16, "Sulfur", "S");
public static final Element Cl = add(17, 18, "Chlorine", "Cl");
public static final Element Ar = add(18, 22, "Argon", "Ar");
Expand All @@ -59,96 +59,96 @@ private Elements() {}
public static final Element Co = add(27, 32, "Cobalt", "Co");
public static final Element Ni = add(28, 30, "Nickel", "Ni");
public static final Element Cu = add(29, 34, "Copper", "Cu");
public static final Element Zn = add(30, 35, "Zinc", "Zn");
public static final Element Ga = add(31, 39, "Gallium", "Ga");
public static final Element Ge = add(32, 40, "Germanium", "Ge");
public static final Element Zn = add(30, 34, "Zinc", "Zn");
public static final Element Ga = add(31, 38, "Gallium", "Ga");
public static final Element Ge = add(32, 42, "Germanium", "Ge");
public static final Element As = add(33, 42, "Arsenic", "As");
public static final Element Se = add(34, 45, "Selenium", "Se");
public static final Element Br = add(35, 45, "Bromine", "Br");
public static final Element Se = add(34, 46, "Selenium", "Se");
public static final Element Br = add(35, 44, "Bromine", "Br");
public static final Element Kr = add(36, 48, "Krypton", "Kr");
public static final Element Rb = add(37, 48, "Rubidium", "Rb");
public static final Element Sr = add(38, 49, "Strontium", "Sr");
public static final Element Sr = add(38, 50, "Strontium", "Sr");
public static final Element Y = add(39, 50, "Yttrium", "Y");
public static final Element Zr = add(40, 51, "Zirconium", "Zr");
public static final Element Nb = add(41, 53, "Niobium", "Nb");
public static final Element Mo = add(42, 53, "Molybdenum", "Mo");
public static final Element Tc = add(43, 55, "Technetium", "Tc");
public static final Element Ru = add(44, 57, "Ruthenium", "Ru");
public static final Element Zr = add(40, 50, "Zirconium", "Zr");
public static final Element Nb = add(41, 52, "Niobium", "Nb");
public static final Element Mo = add(42, 56, "Molybdenum", "Mo");
public static final Element Tc = add(43, 56, "Technetium", "Tc");
public static final Element Ru = add(44, 58, "Ruthenium", "Ru");
public static final Element Rh = add(45, 58, "Rhodium", "Rh");
public static final Element Pd = add(46, 60, "Palladium", "Pd");
public static final Element Ag = add(47, 60, "Silver", "Ag");
public static final Element Cd = add(48, 64, "Cadmium", "Cd");
public static final Element In = add(49, 65, "Indium", "In");
public static final Element Sn = add(50, 68, "Tin", "Sn");
public static final Element Cd = add(48, 66, "Cadmium", "Cd");
public static final Element In = add(49, 64, "Indium", "In");
public static final Element Sn = add(50, 70, "Tin", "Sn");
public static final Element Sb = add(51, 70, "Antimony", "Sb");
public static final Element Te = add(52, 75, "Tellurium", "Te");
public static final Element Te = add(52, 74, "Tellurium", "Te");
public static final Element I = add(53, 74, "Iodine", "I");
public static final Element Xe = add(54, 77, "Xenon", "Xe");
public static final Element Xe = add(54, 78, "Xenon", "Xe");
public static final Element Cs = add(55, 77, "Caesium", "Cs");
public static final Element Ba = add(56, 81, "Barium", "Ba");
public static final Element La = add(57, 81, "Lanthanum", "La");
public static final Element Ba = add(56, 82, "Barium", "Ba");
public static final Element La = add(57, 82, "Lanthanum", "La");
public static final Element Ce = add(58, 82, "Cerium", "Ce");
public static final Element Pr = add(59, 81, "Praseodymium", "Pr");
public static final Element Nd = add(60, 84, "Neodymium", "Nd");
public static final Element Pm = add(61, 83, "Promethium", "Pm");
public static final Element Sm = add(62, 88, "Samarium", "Sm");
public static final Element Eu = add(63, 88, "Europium", "Eu");
public static final Element Gd = add(64, 93, "Gadolinium", "Gd");
public static final Element Tb = add(65, 93, "Terbium", "Tb");
public static final Element Dy = add(66, 96, "Dysprosium", "Dy");
public static final Element Ho = add(67, 97, "Holmium", "Ho");
public static final Element Er = add(68, 99, "Erbium", "Er");
public static final Element Tm = add(69, 99, "Thulium", "Tm");
public static final Element Yb = add(70, 103, "Ytterbium", "Yb");
public static final Element Lu = add(71, 103, "Lutetium", "Lu");
public static final Element Pr = add(59, 82, "Praseodymium", "Pr");
public static final Element Nd = add(60, 82, "Neodymium", "Nd");
public static final Element Pm = add(61, 86, "Promethium", "Pm");
public static final Element Sm = add(62, 90, "Samarium", "Sm");
public static final Element Eu = add(63, 90, "Europium", "Eu");
public static final Element Gd = add(64, 94, "Gadolinium", "Gd");
public static final Element Tb = add(65, 94, "Terbium", "Tb");
public static final Element Dy = add(66, 98, "Dysprosium", "Dy");
public static final Element Ho = add(67, 98, "Holmium", "Ho");
public static final Element Er = add(68, 98, "Erbium", "Er");
public static final Element Tm = add(69, 100, "Thulium", "Tm");
public static final Element Yb = add(70, 104, "Ytterbium", "Yb");
public static final Element Lu = add(71, 104, "Lutetium", "Lu");
public static final Element Hf = add(72, 106, "Hafnium", "Hf");
public static final Element Ta = add(73, 107, "Tantalum", "Ta");
public static final Element W = add(74, 109, "Tungsten", "W");
public static final Element Re = add(75, 111, "Rhenium", "Re");
public static final Element Ta = add(73, 108, "Tantalum", "Ta");
public static final Element W = add(74, 110, "Tungsten", "W");
public static final Element Re = add(75, 110, "Rhenium", "Re");
public static final Element Os = add(76, 114, "Osmium", "Os");
public static final Element Ir = add(77, 115, "Iridium", "Ir");
public static final Element Pt = add(78, 117, "Platinum", "Pt");
public static final Element Au = add(79, 117, "Gold", "Au");
public static final Element Hg = add(80, 120, "Mercury", "Hg");
public static final Element Tl = add(81, 123, "Thallium", "Tl");
public static final Element Pb = add(82, 125, "Lead", "Pb");
public static final Element Bi = add(83, 125, "Bismuth", "Bi");
public static final Element Po = add(84, 124, "Polonium", "Po");
public static final Element At = add(85, 124, "Astatine", "At");
public static final Element Au = add(79, 118, "Gold", "Au");
public static final Element Hg = add(80, 122, "Mercury", "Hg");
public static final Element Tl = add(81, 124, "Thallium", "Tl");
public static final Element Pb = add(82, 126, "Lead", "Pb");
public static final Element Bi = add(83, 126, "Bismuth", "Bi");
public static final Element Po = add(84, 126, "Polonium", "Po");
public static final Element At = add(85, 125, "Astatine", "At");
public static final Element Rn = add(86, 134, "Radon", "Rn");
public static final Element Fr = add(87, 134, "Francium", "Fr");
public static final Element Ra = add(88, 136, "Radium", "Ra");
public static final Element Ac = add(89, 136, "Actinium", "Ac");
public static final Element Th = add(90, 140, "Thorium", "Th");
public static final Element Pa = add(91, 138, "Protactinium", "Pa");
public static final Element Fr = add(87, 136, "Francium", "Fr");
public static final Element Ra = add(88, 138, "Radium", "Ra");
public static final Element Ac = add(89, 138, "Actinium", "Ac");
public static final Element Th = add(90, 142, "Thorium", "Th");
public static final Element Pa = add(91, 140, "Protactinium", "Pa");
public static final Element U = add(92, 146, 1.4090285e+17, null, "Uranium", "U", false);
public static final Element U238 = add(92, 146, 1.4090285e+17, null, "Uranium-238", "U-238", true);
public static final Element U235 = add(92, 143, 2.2195037e+16, null, "Uranium-235", "U-235", true);
public static final Element Np = add(93, 144, "Neptunium", "Np");
public static final Element Pu = add(94, 152, 760332960000.0, null, "Plutonium", "Pu", false);
public static final Element Pu = add(94, 150, 2522880000000000L, null, "Plutonium", "Pu", false);
public static final Element Pu239 = add(94, 145, 760332960000.0, null, "Plutonium-239", "Pu-239", true);
public static final Element Pu241 = add(94, 147, 450649440.0, null, "Plutonium-241", "Pu-241", true);
public static final Element Am = add(95, 150, "Americium", "Am");
public static final Element Cm = add(96, 153, "Curium", "Cm");
public static final Element Bk = add(97, 152, "Berkelium", "Bk");
public static final Element Am = add(95, 148, "Americium", "Am");
public static final Element Cm = add(96, 152, "Curium", "Cm");
public static final Element Bk = add(97, 150, "Berkelium", "Bk");
public static final Element Cf = add(98, 153, "Californium", "Cf");
public static final Element Es = add(99, 153, "Einsteinium", "Es");
public static final Element Fm = add(100, 157, "Fermium", "Fm");
public static final Element Md = add(101, 157, "Mendelevium", "Md");
public static final Element No = add(102, 157, "Nobelium", "No");
public static final Element Lr = add(103, 159, "Lawrencium", "Lr");
public static final Element Rf = add(104, 161, "Rutherfordium", "Rf");
public static final Element Rf = add(104, 163, "Rutherfordium", "Rf");
public static final Element Db = add(105, 163, "Dubnium", "Db");
public static final Element Sg = add(106, 165, "Seaborgium", "Sg");
public static final Element Bh = add(107, 163, "Bohrium", "Bh");
public static final Element Hs = add(108, 169, "Hassium", "Hs");
public static final Element Mt = add(109, 167, "Meitnerium", "Mt");
public static final Element Ds = add(110, 171, "Darmstadtium", "Ds");
public static final Element Rg = add(111, 169, "Roentgenium", "Rg");
public static final Element Bh = add(107, 160, "Bohrium", "Bh");
public static final Element Hs = add(108, 163, "Hassium", "Hs");
public static final Element Mt = add(109, 165, "Meitnerium", "Mt");
public static final Element Ds = add(110, 172, "Darmstadtium", "Ds");
public static final Element Rg = add(111, 171, "Roentgenium", "Rg");
public static final Element Cn = add(112, 173, "Copernicium", "Cn");
public static final Element Nh = add(113, 171, "Nihonium", "Nh");
public static final Element Fl = add(114, 175, "Flerovium", "Fl");
public static final Element Mc = add(115, 173, "Moscovium", "Mc");
public static final Element Nh = add(113, 173, "Nihonium", "Nh");
public static final Element Fl = add(114, 171, "Flerovium", "Fl");
public static final Element Mc = add(115, 174, "Moscovium", "Mc");
public static final Element Lv = add(116, 177, "Livermorium", "Lv");
public static final Element Ts = add(117, 177, "Tennessine", "Ts");
public static final Element Og = add(118, 176, "Oganesson", "Og");
Expand Down
17 changes: 14 additions & 3 deletions src/main/java/gregtech/integration/jei/basic/MaterialTree.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import gregtech.api.unification.material.Material;
import gregtech.api.unification.material.properties.PropertyKey;
import gregtech.api.unification.ore.OrePrefix;
import gregtech.api.unification.stack.MaterialStack;

import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
Expand Down Expand Up @@ -84,9 +85,19 @@ public MaterialTree(Material material) {

name = material.getLocalizedName();
formula = material.getChemicalFormula();
avgM = material.getMass();
avgP = material.getProtons();
avgN = material.getNeutrons();
int componentAmounts = 0;
if (material.isElement()) {
componentAmounts = 1;
}
if (material.getMaterialComponents().isEmpty()) {
componentAmounts = 1;
}
for (MaterialStack ms : material.getMaterialComponents()) {
componentAmounts += ms.amount;
}
avgM = material.getMass() * componentAmounts;
avgP = material.getProtons() * componentAmounts;
avgN = material.getNeutrons() * componentAmounts;
if (material.hasProperty(PropertyKey.BLAST)) {
blastTemp = material.getBlastTemperature();
} else {
Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/assets/gregtech/lang/en_us.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5657,9 +5657,9 @@ gregtech.jei.fluid.dep_chance_hover=The percentage chance for the vein to be dep
gregtech.jei.fluid.dep_amount_hover=The amount the vein will be depleted by
gregtech.jei.fluid.dep_yield_hover=The maximum yield of the vein when it is fully depleted

gregtech.jei.materials.average_mass=Average mass: %,d
gregtech.jei.materials.average_protons=Average protons: %,d
gregtech.jei.materials.average_neutrons=Average neutrons: %,d
gregtech.jei.materials.average_mass=Average mass per mole: %,d
gregtech.jei.materials.average_protons=Average protons per mole: %,d
gregtech.jei.materials.average_neutrons=Average neutrons per mole: %,d

gregtech.veins.ore.bauxite=Bauxite Vein
gregtech.veins.ore.magnetite=Magnetite Vein
Expand Down
Loading