Skip to content

Commit

Permalink
fix: IE excavator not yielding geolosys clusters (#3028)
Browse files Browse the repository at this point in the history 
* Fix IE excavator not yielding geolosys clusters

* chore: update changelog

* refactor: change oreClusterGeolosys to oreCluster
  • Loading branch information
@louistakepillz @justinrusso
louistakepillz authored and justinrusso committed Mar 9, 2019
1 parent ed09122 commit 81ce334
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 14 deletions.
1 change: 1 addition & 0 deletions src/config/mputils/changelog.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -541,6 +541,7 @@ Bug Fixes:
* Fix missing recipe for the pipe pulsar due to the pack not having the assembler table (#2762)
* Staged Skeleton Trap Horses in Age 1 (#1611)
* Add hardness to Reinforced Coke Brick (#2784)
* Fix IE excavator not yielding geolosys clusters (#3025)

Enhancements:
* Updated Privacy Policy
Expand Down
28 changes: 14 additions & 14 deletions src/scripts/crafttweaker/integrations/mods/immersive/engineering/excavator.zs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,17 @@ function init() {
// Autunite (Uranium)
Excavator.addMineral("Autunite", 30, 0.15, [], [], [-1], true);
var autunite = Excavator.getMineral("Autunite");
autunite.addOre("geolosysOreUranium", 0.50);
autunite.addOre("oreClusterUranium", 0.50);

// Azurite (Copper)
Excavator.addMineral("Azurite", 30, 0.15, [], [], [-1], true);
var azurite = Excavator.getMineral("Azurite");
azurite.addOre("geolosysOreCopper", 0.50);
azurite.addOre("oreClusterCopper", 0.50);

// Bauxite (Aluminum)
Excavator.addMineral("Bauxite", 30, 0.15, [], [], [-1], true);
var bauxite = Excavator.getMineral("Bauxite");
bauxite.addOre("geolosysOreAluminum", 0.50);
bauxite.addOre("oreClusterAluminum", 0.50);

// Beryl (Emerald)
Excavator.addMineral("Beryl", 5, 0.45, [], [], [-1], true);
Expand All @@ -66,7 +66,7 @@ function init() {
// Cassiterite (Tin)
Excavator.addMineral("Cassiterite", 30, 0.15, [], [], [-1], true);
var cassiterite = Excavator.getMineral("Cassiterite");
cassiterite.addOre("geolosysOreTin", 0.50);
cassiterite.addOre("oreClusterTin", 0.50);

// Cinnabar (Redstone)
Excavator.addMineral("Cinnabar", 30, 0.15, [], [], [-1], true);
Expand All @@ -81,18 +81,18 @@ function init() {
// Galena (Silver and Lead)
Excavator.addMineral("Galena", 30, 0.15, [], [], [-1], true);
var galena = Excavator.getMineral("Galena");
galena.addOre("geolosysOreSilver", 0.70);
galena.addOre("geolosysOreLead", 0.30);
galena.addOre("oreClusterSilver", 0.70);
galena.addOre("oreClusterLead", 0.30);

// Gold
Excavator.addMineral("Gold", 30, 0.15, [], [], [-1], true);
var gold = Excavator.getMineral("Gold");
gold.addOre("geolosysOreGold", 0.50);
gold.addOre("oreClusterGold", 0.50);

// Hematite (Iron)
Excavator.addMineral("Hematite", 30, 0.15, [], [], [-1], true);
var hematite = Excavator.getMineral("Hematite");
hematite.addOre("geolosysOreIron", 0.50);
hematite.addOre("oreClusterIron", 0.50);

// Kimberlight (Diamond)
Excavator.addMineral("Kimberlight", 5, 0.45, [], [], [-1], true);
Expand All @@ -107,26 +107,26 @@ function init() {
// Limonite (Iron and Nickel)
Excavator.addMineral("Limonite", 30, 0.15, [], [], [-1], true);
var limonite = Excavator.getMineral("Limonite");
limonite.addOre("geolosysOreIron", 0.70);
limonite.addOre("geolosysOreNickel", 0.30);
limonite.addOre("oreClusterIron", 0.70);
limonite.addOre("oreClusterNickel", 0.30);

// Malachite (Copper)
Excavator.addMineral("Malachite", 30, 0.15, [], [], [-1], true);
var malachite = Excavator.getMineral("Malachite");
malachite.addOre("geolosysOreCopper", 0.50);
malachite.addOre("oreClusterCopper", 0.50);

// Platinum
Excavator.addMineral("Platinum", 30, 0.15, [], [], [-1], true);
var platinum = Excavator.getMineral("Platinum");
platinum.addOre("geolosysOrePlatinum", 0.50);
platinum.addOre("oreClusterPlatinum", 0.50);

// Osmium
Excavator.addMineral("Osmium", 30, 0.15, [], [], [-1], true);
var osmium = Excavator.getMineral("Osmium");
osmium.addOre("geolosysOreOsmium", 0.50);
osmium.addOre("oreClusterOsmium", 0.50);

// Teallite (Tin)
Excavator.addMineral("Teallite", 30, 0.15, [], [], [-1], true);
var teallite = Excavator.getMineral("Teallite");
teallite.addOre("geolosysOreTin", 0.50);
teallite.addOre("oreClusterTin", 0.50);
}
13 changes: 13 additions & 0 deletions src/scripts/crafttweaker/oredict/ores.zs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,19 @@
<ore:oreGeolosysSphalerite>.add(<geolosys:ore:10>);
<ore:oreGeolosysTeallite>.add(<geolosys:ore:5>);

// Register all geolosys clusters with unique oredict entries (used by the IE excavator)
<ore:oreClusterAluminum>.add(<geolosys:cluster:6>);
<ore:oreClusterCopper>.add(<geolosys:cluster:2>);
<ore:oreClusterGold>.add(<geolosys:cluster:1>);
<ore:oreClusterIron>.add(<geolosys:cluster:0>);
<ore:oreClusterLead>.add(<geolosys:cluster:5>);
<ore:oreClusterNickel>.add(<geolosys:cluster:7>);
<ore:oreClusterOsmium>.add(<geolosys:cluster:12>);
<ore:oreClusterPlatinum>.add(<geolosys:cluster:8>);
<ore:oreClusterSilver>.add(<geolosys:cluster:4>);
<ore:oreClusterTin>.add(<geolosys:cluster:3>);
<ore:oreClusterUranium>.add(<geolosys:cluster:9>);

// Remove ore oredict on geolosys-styled CoT ores.
<ore:oreOsmium>.remove(<materialpart:osmium:ore_minecraft_stone>);

Expand Down

1 comment on commit 81ce334

@phenonymous
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"* Fix IE excavator not yielding geolosys clusters (#3025) should" be under 3.1.0

Please sign in to comment.