Skip to content

Commit dab9c95

Browse files
knoxhackknoxhack
authored
Merge pull request #19 from dshadowwolf/master-1.10.2-dev
lets fix this up so it actually checks if a materials is enabled before registering spawn for it
2 parents b6281ca + e176bca commit dab9c95

File tree

1 file changed

+103
-35
lines changed

1 file changed

+103
-35
lines changed

‎src/main/java/com/mcmoddev/orespawn/NetherMetalsOreSpawn.java‎

Lines changed: 103 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -16,48 +16,116 @@ public SpawnLogic apply(OreSpawnAPI api) {
1616

1717
// Vanilla
1818
logic.getDimension(-1)
19-
.addOre(Materials.getMaterialByName("coal").oreNether.getDefaultState(), 10, 8, 12, 0, 200)
20-
.addOre(Materials.getMaterialByName("diamond").oreNether.getDefaultState(), 2, 8, 12, 0, 200)
21-
.addOre(Materials.getMaterialByName("emerald").oreNether.getDefaultState(), 4, 8, 12, 0, 200)
22-
.addOre(Materials.getMaterialByName("gold").oreNether.getDefaultState(), 5, 8, 12, 0, 200)
23-
.addOre(Materials.getMaterialByName("iron").oreNether.getDefaultState(), 10, 8, 12, 0, 200);
24-
/*
25-
.addOre(ModBlocks.lapisOre.getDefaultState(), 8, 8, 12, 0, 96)
26-
.addOre(ModBlocks.redstoneOre.getDefaultState(), 8, 8, 12, 0, 96);
27-
*/
19+
.addOre(Materials.getMaterialByName("coal").oreNether.getDefaultState(), 10, 8, 12, 0, 200)
20+
.addOre(Materials.getMaterialByName("diamond").oreNether.getDefaultState(), 2, 8, 12, 0, 200)
21+
.addOre(Materials.getMaterialByName("emerald").oreNether.getDefaultState(), 4, 8, 12, 0, 200)
22+
.addOre(Materials.getMaterialByName("gold").oreNether.getDefaultState(), 5, 8, 12, 0, 200)
23+
.addOre(Materials.getMaterialByName("iron").oreNether.getDefaultState(), 10, 8, 12, 0, 200)
24+
.addOre(Materials.getMaterialByName("lapis").oreNether.getDefaultState(), 8, 8, 12, 0, 96)
25+
.addOre(Materials.getMaterialByName("redstone").oreNether.getDefaultState(), 8, 8, 12, 0, 96);
2826

2927
//Base Metals
3028
if (Loader.isModLoaded("basemetals")) {
31-
logic.getDimension(-1)
32-
.addOre(Materials.getMaterialByName("antimony").oreNether.getDefaultState(), 8, 4, 10, 0, 200)
33-
.addOre(Materials.getMaterialByName("bismuth").oreNether.getDefaultState(), 8, 4, 10, 0, 200)
34-
.addOre(Materials.getMaterialByName("copper").oreNether.getDefaultState(), 10, 12, 20, 0, 200)
35-
.addOre(Materials.getMaterialByName("lead").oreNether.getDefaultState(), 8, 12, 20, 0, 200)
36-
.addOre(Materials.getMaterialByName("mercury").oreNether.getDefaultState(), 4, 4, 10, 0, 200)
37-
.addOre(Materials.getMaterialByName("nickel").oreNether.getDefaultState(), 6, 4, 10, 0, 200)
38-
.addOre(Materials.getMaterialByName("platinum").oreNether.getDefaultState(), 2, 4, 10, 0, 200)
39-
.addOre(Materials.getMaterialByName("silver").oreNether.getDefaultState(), 8, 8, 10, 0, 200)
40-
.addOre(Materials.getMaterialByName("tin").oreNether.getDefaultState(), 10, 12, 20, 0, 200)
41-
.addOre(Materials.getMaterialByName("zinc").oreNether.getDefaultState(), 6, 8, 12, 0, 200);
29+
if( com.mcmoddev.basemetals.util.Config.Options.enableAntimony ) {
30+
logic.getDimension(-1).addOre(Materials.getMaterialByName("antimony").oreNether.getDefaultState(), 8, 4, 10, 0, 200);
31+
}
32+
33+
if( com.mcmoddev.basemetals.util.Config.Options.enableBismuth ) {
34+
logic.getDimension(-1).addOre(Materials.getMaterialByName("bismuth").oreNether.getDefaultState(), 8, 4, 10, 0, 200);
35+
}
36+
37+
if( com.mcmoddev.basemetals.util.Config.Options.enableCopper ) {
38+
logic.getDimension(-1).addOre(Materials.getMaterialByName("copper").oreNether.getDefaultState(), 10, 12, 20, 0, 200);
39+
}
40+
41+
if( com.mcmoddev.basemetals.util.Config.Options.enableLead ) {
42+
logic.getDimension(-1).addOre(Materials.getMaterialByName("lead").oreNether.getDefaultState(), 8, 12, 20, 0, 200);
43+
}
44+
45+
if( com.mcmoddev.basemetals.util.Config.Options.enableMercury ) {
46+
logic.getDimension(-1).addOre(Materials.getMaterialByName("mercury").oreNether.getDefaultState(), 4, 4, 10, 0, 200);
47+
}
48+
49+
if( com.mcmoddev.basemetals.util.Config.Options.enableNickel ) {
50+
logic.getDimension(-1).addOre(Materials.getMaterialByName("nickel").oreNether.getDefaultState(), 6, 4, 10, 0, 200);
51+
}
52+
53+
if( com.mcmoddev.basemetals.util.Config.Options.enablePlatinum ) {
54+
logic.getDimension(-1).addOre(Materials.getMaterialByName("platinum").oreNether.getDefaultState(), 2, 4, 10, 0, 200);
55+
}
56+
57+
if( com.mcmoddev.basemetals.util.Config.Options.enableSilver ) {
58+
logic.getDimension(-1).addOre(Materials.getMaterialByName("silver").oreNether.getDefaultState(), 8, 8, 10, 0, 200);
59+
}
60+
61+
if( com.mcmoddev.basemetals.util.Config.Options.enableTin ) {
62+
logic.getDimension(-1).addOre(Materials.getMaterialByName("tin").oreNether.getDefaultState(), 10, 12, 20, 0, 200);
63+
}
64+
65+
if( com.mcmoddev.basemetals.util.Config.Options.enableZinc ) {
66+
logic.getDimension(-1).addOre(Materials.getMaterialByName("zinc").oreNether.getDefaultState(), 6, 8, 12, 0, 200);
67+
}
68+
69+
4270
}
4371

4472
//Modern Metals
4573
if (Loader.isModLoaded("modernmetals")) {
46-
logic.getDimension(-1)
47-
.addOre(Materials.getMaterialByName("aluminum").oreNether.getDefaultState(), 10, 8, 10, 0, 200)
48-
.addOre(Materials.getMaterialByName("cadmium").oreNether.getDefaultState(), 4, 8, 10, 0, 200)
49-
.addOre(Materials.getMaterialByName("chromium").oreNether.getDefaultState(), 4, 8, 10, 0, 200)
50-
.addOre(Materials.getMaterialByName("iridium").oreNether.getDefaultState(), 6, 8, 10, 0, 200)
51-
.addOre(Materials.getMaterialByName("magnesium").oreNether.getDefaultState(), 6, 8, 10, 0, 200)
52-
.addOre(Materials.getMaterialByName("manganese").oreNether.getDefaultState(), 6, 8, 10, 0, 200)
53-
.addOre(Materials.getMaterialByName("osmium").oreNether.getDefaultState(), 10, 8, 10, 0, 200)
54-
.addOre(Materials.getMaterialByName("plutonium").oreNether.getDefaultState(), 4, 4, 10, 0, 200)
55-
.addOre(Materials.getMaterialByName("rutile").oreNether.getDefaultState(), 8, 8, 10, 0, 200)
56-
.addOre(Materials.getMaterialByName("tantalum").oreNether.getDefaultState(), 8, 8, 10, 0, 200)
57-
.addOre(Materials.getMaterialByName("titanium").oreNether.getDefaultState(), 4, 4, 10, 0, 200)
58-
.addOre(Materials.getMaterialByName("tungsten").oreNether.getDefaultState(), 8, 8, 10, 0, 200)
59-
.addOre(Materials.getMaterialByName("uranium").oreNether.getDefaultState(), 2, 4, 10, 0, 200)
60-
.addOre(Materials.getMaterialByName("zirconium").oreNether.getDefaultState(), 8, 8, 10, 0, 200);
74+
if( com.mcmoddev.modernmetals.util.Config.Options.enableAluminum ) {
75+
logic.getDimension(-1).addOre(Materials.getMaterialByName("aluminum").oreNether.getDefaultState(), 10, 8, 10, 0, 200);
76+
}
77+
78+
if( com.mcmoddev.modernmetals.util.Config.Options.enableCadmium ) {
79+
logic.getDimension(-1).addOre(Materials.getMaterialByName("cadmium").oreNether.getDefaultState(), 4, 8, 10, 0, 200);
80+
}
81+
82+
if( com.mcmoddev.modernmetals.util.Config.Options.enableChromium ) {
83+
logic.getDimension(-1).addOre(Materials.getMaterialByName("chromium").oreNether.getDefaultState(), 4, 8, 10, 0, 200);
84+
}
85+
86+
if( com.mcmoddev.modernmetals.util.Config.Options.enableIridium ) {
87+
logic.getDimension(-1).addOre(Materials.getMaterialByName("iridium").oreNether.getDefaultState(), 6, 8, 10, 0, 200);
88+
}
89+
90+
if( com.mcmoddev.modernmetals.util.Config.Options.enableMagnesium ) {
91+
logic.getDimension(-1).addOre(Materials.getMaterialByName("magnesium").oreNether.getDefaultState(), 6, 8, 10, 0, 200);
92+
}
93+
94+
if( com.mcmoddev.modernmetals.util.Config.Options.enableManganese ) {
95+
logic.getDimension(-1).addOre(Materials.getMaterialByName("manganese").oreNether.getDefaultState(), 6, 8, 10, 0, 200);
96+
}
97+
98+
if( com.mcmoddev.modernmetals.util.Config.Options.enableOsmium ) {
99+
logic.getDimension(-1).addOre(Materials.getMaterialByName("osmium").oreNether.getDefaultState(), 10, 8, 10, 0, 200);
100+
}
101+
102+
if( com.mcmoddev.modernmetals.util.Config.Options.enablePlutonium ) {
103+
logic.getDimension(-1).addOre(Materials.getMaterialByName("plutonium").oreNether.getDefaultState(), 4, 4, 10, 0, 200);
104+
}
105+
106+
if( com.mcmoddev.modernmetals.util.Config.Options.enableRutile ) {
107+
logic.getDimension(-1).addOre(Materials.getMaterialByName("rutile").oreNether.getDefaultState(), 8, 8, 10, 0, 200);
108+
}
109+
110+
if( com.mcmoddev.modernmetals.util.Config.Options.enableTantalum ) {
111+
logic.getDimension(-1).addOre(Materials.getMaterialByName("tantalum").oreNether.getDefaultState(), 8, 8, 10, 0, 200);
112+
}
113+
114+
if( com.mcmoddev.modernmetals.util.Config.Options.enableTitanium ) {
115+
logic.getDimension(-1).addOre(Materials.getMaterialByName("titanium").oreNether.getDefaultState(), 4, 4, 10, 0, 200);
116+
}
117+
118+
if( com.mcmoddev.modernmetals.util.Config.Options.enableTungsten ) {
119+
logic.getDimension(-1).addOre(Materials.getMaterialByName("tungsten").oreNether.getDefaultState(), 8, 8, 10, 0, 200);
120+
}
121+
122+
if( com.mcmoddev.modernmetals.util.Config.Options.enableUranium ) {
123+
logic.getDimension(-1).addOre(Materials.getMaterialByName("uranium").oreNether.getDefaultState(), 2, 4, 10, 0, 200);
124+
}
125+
126+
if( com.mcmoddev.modernmetals.util.Config.Options.enableZirconium ) {
127+
logic.getDimension(-1).addOre(Materials.getMaterialByName("zirconium").oreNether.getDefaultState(), 8, 8, 10, 0, 200);
128+
}
61129
}
62130

63131
return logic;

0 commit comments

Comments
 (0)