Skip to content
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

Ore Rework #371

Merged
merged 23 commits into from
Dec 23, 2021
Merged

Ore Rework #371

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
5a1cea6
Fix chosen byproduct in ore processing
serenibyss Dec 16, 2021
3f6d9b7
Fix ore byproducts
serenibyss Dec 16, 2021
bb52f88
add more platinum sludge ores
TechLord22 Dec 16, 2021
4ca994f
Electrotine, Pyrochlore, Blue Alloy, Saltpeter vein
serenibyss Dec 16, 2021
4ed8021
nerf Centrifuging step of ore processing
serenibyss Dec 17, 2021
41d0df3
buff PGS creation recipes
serenibyss Dec 17, 2021
f95c560
rebalance ore processing durations/EUts
serenibyss Dec 18, 2021
7348d89
ore multipliers, trim unneeded ores
serenibyss Dec 18, 2021
45ea069
cull unneeded ores
serenibyss Dec 18, 2021
8e82a89
remove old ore veins
serenibyss Dec 19, 2021
a38645d
fix rebase issue
serenibyss Dec 19, 2021
8d04cde
fix worldgen with multiple veins in a chunk
serenibyss Dec 19, 2021
d15058e
add gt5u style nether veins
TechLord22 Dec 19, 2021
4d069b5
5u style overworld veins
serenibyss Dec 19, 2021
00e883f
5u style end veins
TechLord22 Dec 19, 2021
c724973
clean up last few vein inconsistencies
serenibyss Dec 19, 2021
fcd0cfd
Rework ore byproduct page (#370)
kumquat-ir Dec 19, 2021
50c7d2f
fix gold cable amperage
serenibyss Dec 19, 2021
db3d10b
clean up ore prefix secondary materials
serenibyss Dec 19, 2021
a5fc76f
salt gems
TechLord22 Dec 19, 2021
4459625
start ore byproduct tweaks
serenibyss Dec 19, 2021
29d9830
Finish ore byproducts
serenibyss Dec 23, 2021
14a7aaf
small byproduct page fixes (#398)
kumquat-ir Dec 23, 2021
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
2 changes: 2 additions & 0 deletions src/main/java/gregtech/api/items/materialitem/MetaPrefixItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ private void registerSpecialOreDict(ItemStack item, Material material, OrePrefix
OreDictUnifier.registerOre(item, prefix.name() + material.toCamelCaseString() + "239");
} else if (material == Materials.Uranium238) {
OreDictUnifier.registerOre(item, prefix.name() + material.toCamelCaseString() + "238");
} else if (material == Materials.Saltpeter) {
OreDictUnifier.registerOre(item, prefix.name() + material.toCamelCaseString());
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/gregtech/api/recipes/RecipeMaps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,7 +768,7 @@ public class RecipeMaps {


@ZenProperty
public static final RecipeMap<SimpleRecipeBuilder> THERMAL_CENTRIFUGE_RECIPES = new RecipeMap<>("thermal_centrifuge", 1, 1, 1, 3, 0, 0, 0, 0, new SimpleRecipeBuilder().duration(400).EUt(60), false)
public static final RecipeMap<SimpleRecipeBuilder> THERMAL_CENTRIFUGE_RECIPES = new RecipeMap<>("thermal_centrifuge", 1, 1, 1, 3, 0, 0, 0, 0, new SimpleRecipeBuilder().duration(400).EUt(30), false)
.setSlotOverlay(false, false, GuiTextures.CRUSHED_ORE_OVERLAY)
.setSlotOverlay(true, false, GuiTextures.DUST_OVERLAY)
.setProgressBar(GuiTextures.PROGRESS_BAR_ARROW, MoveType.HORIZONTAL)
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/gregtech/api/unification/OreDictUnifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,15 @@ public static ItemStack getIngotOrDust(MaterialStack materialStack) {
return getIngotOrDust(materialStack.material, materialStack.amount);
}

public static ItemStack getGem(MaterialStack materialStack) {
if (materialStack.material.hasProperty(PropertyKey.GEM)
&& !OrePrefix.gem.isIgnored(materialStack.material)
&& materialStack.amount == OrePrefix.gem.materialAmount) {
return get(OrePrefix.gem, materialStack.material, (int) (materialStack.amount / M));
}
return getDust(materialStack);
}

synchronized private static <T> void addAndSort(List<T> list, T itemToAdd, Comparator<T> comparator) {
list.add(itemToAdd);

Expand Down
19 changes: 4 additions & 15 deletions src/main/java/gregtech/api/unification/material/Materials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,6 @@ public static void register() {
public static Material StainlessSteel;
public static Material Steel;
public static Material Stibnite;
public static Material Tanzanite;
public static Material Tetrahedrite;
public static Material TinAlloy;
public static Material Topaz;
Expand All @@ -370,12 +369,9 @@ public static void register() {
public static Material Quartzite;
public static Material Graphite;
public static Material Graphene;
public static Material Jasper;
public static Material Osmiridium;
public static Material Bornite;
public static Material Chalcocite;
public static Material Enargite;
public static Material Tennantite;

public static Material GalliumArsenide;
public static Material Potash;
Expand Down Expand Up @@ -409,15 +405,11 @@ public static void register() {
public static Material Pentlandite;
public static Material Spodumene;
public static Material Lepidolite;
public static Material Glauconite;
public static Material GlauconiteSand;
public static Material Malachite;
public static Material Mica;
public static Material Barite;
public static Material Alunite;
public static Material Dolomite;
public static Material Wollastonite;
public static Material Kaolinite;
public static Material Talc;
public static Material Soapstone;
public static Material Kyanite;
Expand Down Expand Up @@ -459,14 +451,12 @@ public static void register() {
public static Material UraniumRhodiumDinaquadide;
public static Material EnrichedNaquadahTriniumEuropiumDuranide;
public static Material RutheniumTriniumAmericiumNeutronate;

public static Material PlatinumRaw;
public static Material InertMetalMixture;
public static Material RhodiumSulfate;
public static Material RutheniumTetroxide;
public static Material OsmiumTetroxide;
public static Material IridiumChloride;

public static Material FluoroantimonicAcid;
public static Material TitaniumTrifluoride;
public static Material CalciumPhosphide;
Expand All @@ -478,6 +468,7 @@ public static void register() {
public static Material AntimonyTrifluoride;
public static Material EnrichedNaquadahSulfate;
public static Material NaquadriaSulfate;
public static Material Pyrochlore;

/**
* Organic chemistry
Expand Down Expand Up @@ -636,7 +627,6 @@ public static void register() {
public static Material Gelatin;
public static Material Agar;
public static Material Andesite;
public static Material Vinteum;
public static Material Milk;
public static Material Cocoa;
public static Material Wheat;
Expand Down Expand Up @@ -684,7 +674,6 @@ public static void register() {
public static Material Amethyst;
public static Material Lapis;
public static Material Blaze;
public static Material Niter;
public static Material Apatite;
public static Material BlackSteel;
public static Material DamascusSteel;
Expand All @@ -696,11 +685,9 @@ public static void register() {
public static Material Marble;
public static Material GraniteBlack;
public static Material GraniteRed;
public static Material Chrysotile;
public static Material VanadiumMagnetite;
public static Material QuartzSand;
public static Material Pollucite;
public static Material Vermiculite;
public static Material Bentonite;
public static Material FullersEarth;
public static Material Pitchblende;
Expand Down Expand Up @@ -731,11 +718,12 @@ public static void register() {
public static Material AquaRegia;
public static Material SaltWater;
public static Material Clay;
public static Material Redstone;

/**
* Third Degree Materials
*/
public static Material Redstone;
public static Material Electrotine;
public static Material EnderEye;
public static Material Diatomite;
public static Material RedSteel;
Expand All @@ -755,6 +743,7 @@ public static void register() {
* Fourth Degree Materials
*/
public static Material RedAlloy;
public static Material BlueAlloy;
public static Material BasalticMineralSand;
public static Material HSSE;
public static Material HSSS;
Expand Down
26 changes: 13 additions & 13 deletions src/main/java/gregtech/api/unification/material/materials/ElementMaterials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public static void register() {
.build();

Antimony = new Material.Builder(4, "antimony")
.ingot().fluid().ore()
.ingot().fluid()
.color(0xDCDCF0).iconSet(SHINY)
.flags(EXT_METAL, MORTAR_GRINDABLE)
.element(Elements.Sb)
Expand Down Expand Up @@ -89,7 +89,7 @@ public static void register() {
.build();

Bismuth = new Material.Builder(11, "bismuth")
.ingot(1).fluid().ore()
.ingot(1).fluid()
.color(0x64A0A0).iconSet(METALLIC)
.element(Elements.Bi)
.build();
Expand Down Expand Up @@ -161,7 +161,7 @@ public static void register() {
.build();

Chrome = new Material.Builder(22, "chrome")
.ingot(3).fluid().ore()
.ingot(3).fluid()
.color(0xEAC4D8).iconSet(SHINY)
.flags(EXT2_METAL, GENERATE_ROTOR, GENERATE_DENSE)
.element(Elements.Cr)
Expand All @@ -171,7 +171,7 @@ public static void register() {
.build();

Cobalt = new Material.Builder(23, "cobalt")
.ingot().fluid().ore()
.ingot().fluid().ore() // leave for TiCon ore processing
.color(0x5050FA).iconSet(METALLIC)
.flags(STD_METAL, GENERATE_GEAR, GENERATE_BOLT_SCREW)
.element(Elements.Co)
Expand Down Expand Up @@ -315,7 +315,7 @@ public static void register() {
.color(0xFFE650).iconSet(SHINY)
.flags(EXT2_METAL, GENERATE_RING, MORTAR_GRINDABLE, EXCLUDE_BLOCK_CRAFTING_BY_HAND_RECIPES, GENERATE_SPRING, GENERATE_SPRING_SMALL)
.element(Elements.Au)
.cableProperties(GTValues.V[3], 2, 2)
.cableProperties(GTValues.V[3], 3, 2)
.fluidPipeProperties(1671, 35, true)
.build();

Expand Down Expand Up @@ -371,7 +371,7 @@ public static void register() {
.build();

Iridium = new Material.Builder(50, "iridium")
.ingot(3).fluid().ore()
.ingot(3).fluid()
.color(0xA1E4E4).iconSet(METALLIC)
.flags(EXT2_METAL, GENERATE_ROTOR, GENERATE_DENSE)
.element(Elements.Ir)
Expand Down Expand Up @@ -530,7 +530,7 @@ public static void register() {
.build();

Niobium = new Material.Builder(71, "niobium")
.ingot().fluid().ore()
.ingot().fluid()
.color(0xBEB4C8).iconSet(METALLIC)
.flags(STD_METAL)
.element(Elements.Nb)
Expand Down Expand Up @@ -559,7 +559,7 @@ public static void register() {
.build();

Osmium = new Material.Builder(75, "osmium")
.ingot(4).fluid().ore()
.ingot(4).fluid()
.color(0x3232FF).iconSet(METALLIC)
.flags(EXT2_METAL, GENERATE_ROTOR, GENERATE_DENSE)
.element(Elements.Os)
Expand Down Expand Up @@ -607,7 +607,7 @@ public static void register() {
.build();

Plutonium239 = new Material.Builder(81, "plutonium")
.ingot(3).fluid()
.ingot(3).fluid().ore(true)
.color(0xF03232).iconSet(METALLIC)
.flags(EXT_METAL)
.element(Elements.Pu239)
Expand Down Expand Up @@ -881,15 +881,15 @@ public static void register() {
.build();

Uranium238 = new Material.Builder(116, "uranium")
.ingot(3).fluid().ore(true)
.ingot(3).fluid()
.color(0x32F032).iconSet(METALLIC)
.flags(STD_METAL)
.element(Elements.U238)
.toolStats(6.0f, 3.0f, 512, 21)
.build();

Uranium235 = new Material.Builder(117, "uranium235")
.ingot(3).fluid().ore(true)
.ingot(3).fluid()
.color(0x46FA46).iconSet(SHINY)
.flags(STD_METAL, GENERATE_ROD)
.element(Elements.U235)
Expand Down Expand Up @@ -928,7 +928,7 @@ public static void register() {
.build();

Zinc = new Material.Builder(122, "zinc")
.ingot(1).fluid().ore()
.ingot(1).fluid()
.color(0xEBEBFA).iconSet(METALLIC)
.flags(STD_METAL, MORTAR_GRINDABLE, GENERATE_FOIL, GENERATE_RING, GENERATE_FINE_WIRE)
.element(Elements.Zn)
Expand All @@ -954,7 +954,7 @@ public static void register() {
.build();

NaquadahEnriched = new Material.Builder(125, "naquadah_enriched")
.ingot(4).fluid().ore()
.ingot(4).fluid()
.color(0x3C3C3C, false).iconSet(METALLIC)
.flags(EXT_METAL, GENERATE_FOIL)
.element(Elements.Nq1)
Expand Down
Loading