Browse Source

Fixed some Ars Unification things and Added Actually Additions Black Quartz to my Worldgen

Gregorius Techneticies 4 months ago
parent
commit
3e9c3e6646
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 4C7DC365E9F99806

+ 5
- 0
.defaultconfigs/config/ActuallyAdditions.cfg View File

@@ -0,0 +1,5 @@
1
+# Configuration file
2
+"World Gen" {
3
+    # If the Black Quartz generates in the world
4
+    B:"Black Quartz"=false
5
+}

+ 1
- 0
CHANGELOG.md View File

@@ -19,6 +19,7 @@ Nothing (I tend to only add finished Stuff to the Changelog).
19 19
 [FIXED] 7 Bits are definitely not enough to store Numbers that can go up to 12 Billion. Fusion Reactor Start Energy is now properly saved when unloaded.
20 20
 [FIXED] Terrafirmacraft Plus not being detected as Terrafirmacraft.
21 21
 [FIXED] Clay Ore that comes from Hematite Bedrock Drilling is now processable.
22
+[FIXED] Some Ars Magica Unification things.
22 23
 [CHANGED] Blastproofness Tooltip now also mentions Strong Dynamite Proofness and doesn't stop at TNT-Proof anymore.
23 24
 [CHANGED] NEI Fuel Lists are now no longer listing the confusing and irrelevant EU/t Value.
24 25
 [CHANGED] More Reactor Test Stuffs from Erik3003.

+ 2
- 2
src/main/java/gregapi/GT_API_Post.java View File

@@ -170,7 +170,7 @@ public class GT_API_Post extends Abstract_Mod {
170 170
 		if (MD.AA.mLoaded) {
171 171
 			MT.OREMATS.Barite.addOreByProducts(MT.BlackQuartz);
172 172
 		}
173
-
173
+		
174 174
 	}
175 175
 
176 176
 	@Override
@@ -422,7 +422,7 @@ public class GT_API_Post extends Abstract_Mod {
422 422
 			OreDictManager.INSTANCE.setItemData(ST.make(MD.VOLTZ, "veGemOre"  , 1, 5), OP.oreVanillastone.dat(MT.Grossular));
423 423
 			OreDictManager.INSTANCE.setItemData(ST.make(MD.VOLTZ, "veGemOre"  , 1, 6), OP.oreVanillastone.dat(MT.Almandine));
424 424
 			OreDictManager.INSTANCE.setItemData(ST.make(MD.VOLTZ, "veGemOre"  , 1, 7), OP.oreVanillastone.dat(MT.Andradite));
425
-
425
+			
426 426
 			OM.data(MD.VOLTZ, "veSheetMetal"                    , 1,   0, ANY.Steel             ,  U);
427 427
 			OM.data(MD.VOLTZ, "veSheetMetal"                    , 1,   1, ANY.Steel             ,  U2);
428 428
 			OM.data(MD.VOLTZ, "veSheetMetal"                    , 1,   2, ANY.Steel             ,  U4);

+ 2
- 2
src/main/java/gregapi/GT_API_Proxy_Client.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2019 Gregorius Techneticies
2
+ * Copyright (c) 2020 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -107,7 +107,7 @@ public class GT_API_Proxy_Client extends GT_API_Proxy {
107 107
 			sNegR.addAll(Arrays.asList(MT.InfusedEntropy.mRGBa[i], MT.NetherStar.mRGBa[i]));
108 108
 			sNegG.addAll(Arrays.asList(MT.InfusedEntropy.mRGBa[i], MT.NetherStar.mRGBa[i]));
109 109
 			sNegB.addAll(Arrays.asList(MT.InfusedEntropy.mRGBa[i], MT.NetherStar.mRGBa[i]));
110
-			sRainbow.addAll(Arrays.asList(MT.Infinity.mRGBa[i], MT.Infinity.mRGBa[i], MT.Infinity.mRGBa[i], MT.Infinity.mRGBa[i], MT.Infinity.mRGBa[i], MT.Infinity.mRGBa[i], MT.Infinity.mRGBa[i], MT.Infinity.mRGBa[i], MT.Infinity.mRGBa[i], MT.Infinity.mRGBa[i], MT.InfusedBalance.mRGBa[i], MT.GaiaSpirit.mRGBa[i], MT.GaiaSpirit.mRGBa[i], MT.Shimmerwood.mRGBa[i], MT.Shimmerwood.mRGBa[i]));
110
+			sRainbow.addAll(Arrays.asList(MT.Infinity.mRGBa[i], MT.Infinity.mRGBa[i], MT.Infinity.mRGBa[i], MT.Infinity.mRGBa[i], MT.Infinity.mRGBa[i], MT.Infinity.mRGBa[i], MT.Infinity.mRGBa[i], MT.Infinity.mRGBa[i], MT.Infinity.mRGBa[i], MT.Infinity.mRGBa[i], MT.InfusedBalance.mRGBa[i], MT.GaiaSpirit.mRGBa[i], MT.GaiaSpirit.mRGBa[i], MT.Shimmerwood.mRGBa[i], MT.Shimmerwood.mRGBa[i], MT.UNUSED.Chimerite.mRGBa[i]));
111 111
 		}
112 112
 	}
113 113
 	

+ 9
- 9
src/main/java/gregapi/data/MT.java View File

@@ -1108,8 +1108,8 @@ public class MT {
1108 1108
 	AventurineRed           = aventurine    ( 8451, "Red Aventurine"                                , 116,  46,  33, DYE_INDEX_Red        ),
1109 1109
 	
1110 1110
 	
1111
-	Topaz                   = valgemelec    ( 8306, "Topaz"                 , SET_GEM_HORIZONTAL    , 255, 128,   0, 127).lens(DYE_INDEX_Orange     )                                                                                                                   .uumMcfg( 0, Al2O3          , 5*U, SiO2             , 3*U, F                , 2*U, H2O              , 3*U)                                                  .aspects(TC.VITREUS, 4, TC.LUCRUM                   , 6).qual(3,  7.0,   256,  3),
1112
-	BlueTopaz               = valgemelec    ( 8307, "Blue Topaz"            , SET_GEM_HORIZONTAL    , 123, 150, 220, 127).lens(DYE_INDEX_Blue       )                                                                                                                   .uumMcfg( 0, Al2O3          , 5*U, SiO2             , 3*U, F                , 2*U, H2O              , 3*U)                                                  .aspects(TC.VITREUS, 4, TC.LUCRUM                   , 6).qual(3,  7.0,   256,  3),
1111
+	Topaz                   = valgemelec    ( 8306, "Topaz"                 , SET_GEM_HORIZONTAL    , 255, 128,   0, 127).lens(DYE_INDEX_Orange     )                                                                                                                   .uumMcfg( 0, Al2O3          , 5*U, SiO2             , 3*U, F                , 2*U, H2O              , 3*U)                                                  .aspects(TC.VITREUS, 4, TC.LUCRUM, 4, TC.POTENTIA   , 2).qual(3,  7.0,   256,  3),
1112
+	BlueTopaz               = valgemelec    ( 8307, "Blue Topaz"            , SET_GEM_HORIZONTAL    , 123, 150, 220, 127).lens(DYE_INDEX_Blue       )                                                                                                                   .uumMcfg( 0, Al2O3          , 5*U, SiO2             , 3*U, F                , 2*U, H2O              , 3*U)                                                  .aspects(TC.VITREUS, 4, TC.LUCRUM, 4, TC.POTENTIA   , 2).qual(3,  7.0,   256,  3),
1113 1113
 	Tanzanite               = valgemelec    ( 8308, "Tanzanite"             , SET_GEM_HORIZONTAL    ,  64,   0, 200, 127).lens(DYE_INDEX_Purple     )                                                                                                                   .uumMcfg( 0, Al2O3          ,15*U, SiO2             ,18*U, Ca               , 4*U, H2O              , 3*U, O                , 4*U)                          .aspects(TC.VITREUS, 3, TC.LUCRUM                   , 5).qual(3,  7.0,   256,  2),
1114 1114
 	Amazonite               = valgemelec    ( 8417, "Amazonite"             , SET_LAPIS             ,  71, 241, 170, 255).lens(DYE_INDEX_Green      ).put(MD.VOLTZ)                                                                                                     .uumMcfg( 0, Al2O3          , 5*U, SiO2             ,18*U, K                , 2*U, O                , 1*U)                                                  .aspects(TC.VITREUS, 3, TC.LUCRUM                   , 5).qual(3,  7.0,   256,  2),
1115 1115
 	Alexandrite             = valgemelec    ( 8388, "Alexandrite"           , SET_OPAL              , 255, 255,   0, 127).lens(DYE_INDEX_Yellow     )                                                                                                                   .uumMcfg( 0, Al2O3          , 1*U, Be               , 1*U, O                , 1*U)                                                                          .aspects(TC.VITREUS, 4, TC.LUCRUM, 2, TC.AURAM      , 1).qual(3,  7.0,   256,  2),
@@ -1158,10 +1158,10 @@ public class MT {
1158 1158
 	Ametrine                = valgem        (00000, "Ametrine"              , SET_RUBY              , 182, 141, 149, 127),
1159 1159
 	*/
1160 1160
 	
1161
-	Vinteum                 = dcmp          ( 8316, "Vinteum"               , SET_EMERALD           ,  80,  80, 255, 255).put(G_GEM_ORES, MAGICAL, CRYSTAL, MORTAR, BRITTLE, UNBURNABLE)                                                                                .setMcfg( 0, Ma             , 1*U)                                                                                                                          .aspects(TC.VITREUS, 2, TC.PRAECANTIO, 1).qual(3, 10.0, 128,  3),
1162
-	VinteumPurified         = dcmp          ( 8327, "VinteumPurified"       , SET_EMERALD           , 230, 100, 255, 255).put(G_GEM_ORES, MAGICAL, CRYSTAL, MORTAR, BRITTLE, UNBURNABLE)                                                                                .setMcfg( 0, Ma             , 1*U)                                                                                                                          .aspects(TC.VITREUS, 2, TC.PRAECANTIO, 2).qual(3, 12.0, 256,  3).setLocal("Purified Vinteum"),
1163
-	ArcaneAsh               = dust          ( 8367, "Arcane Ashes"          , SET_FINE              , 150,  50, 180, 255).put(MAGICAL, "ArcaneAsh")                                                                                                                                                                                                                                                                                 .aspects(TC.PRAECANTIO, 1),
1164
-	ArcaneCompound          = dust          ( 8366, "Arcane Compound"       , SET_ROUGH             , 180, 140,  50, 255).put(MAGICAL, FURNACE)                                                                                                                                                                                                                                                                                     .aspects(TC.PRAECANTIO, 1).setSmelting(ArcaneAsh, U*2),
1161
+	Vinteum                 = dcmp          ( 8316, "Vinteum"               , SET_EMERALD           ,  80,  80, 255, 255).put(G_GEM_ORES, MAGICAL, CRYSTAL, MORTAR, BRITTLE, UNBURNABLE)                                                                                .setMcfg( 0, Ma             , 1*U)                                                                                                                          .aspects(TC.VITREUS, 1, TC.PRAECANTIO, 2).qual(3, 10.0, 128,  3),
1162
+	VinteumPurified         = dcmp          ( 8327, "VinteumPurified"       , SET_EMERALD           , 230, 100, 255, 255).put(G_GEM_ORES, MAGICAL, CRYSTAL, MORTAR, BRITTLE, UNBURNABLE)                                                                                .setMcfg( 0, Ma             , 1*U)                                                                                                                          .aspects(TC.ORDO, 2, TC.PRAECANTIO, 6).qual(3, 12.0, 256,  3).setLocal("Purified Vinteum"),
1163
+	ArcaneAsh               = dust          ( 8367, "Arcane Ashes"          , SET_FINE              , 150,  50, 180, 255).put(MAGICAL, "ArcaneAsh")                                                                                                                                                                                                                                                                                 .aspects(TC.PRAECANTIO, 1, TC.IGNIS, 1),
1164
+	ArcaneCompound          = dust          ( 8366, "Arcane Compound"       , SET_ROUGH             , 180, 140,  50, 255).put(MAGICAL, FURNACE)                                                                                                                                                                                                                                                                                     .aspects(TC.PRAECANTIO, 3).setSmelting(ArcaneAsh, U*2),
1165 1165
 	
1166 1166
 	
1167 1167
 	CrimsonMiddle           = gem           ( 8282, "Crimson Middle"        , SET_DIAMOND           , 240,  50,  50, 127).lens(DYE_INDEX_Red        ).put(GLOWING, LIGHTING, MORTAR, BRITTLE)                                                                                                                                                                                                                                       .aspects(TC.VITREUS, 2, TC.LUX, 2, TC.IGNIS         , 2),
@@ -2932,9 +2932,9 @@ public class MT {
2932 2932
 		TerrasteelAlloyStrengthened = unused        ("TerrasteelAlloyStrengthened"  ).put(G_INGOT, MAGICAL, "StrengthenedTerrasteelAlloy").setLocal("Strengthened Terrasteel Alloy"),
2933 2933
 		Vis                         = unused        ("Vis"                          ).put(DECOMPOSABLE).setMcfg( 0, Ma, 1*U).aspects(TC.AURAM, 2, TC.PRAECANTIO, 1),
2934 2934
 		Unstable                    = unused        ("Unstable"                     ).put(AUTO_BLACKLIST, "Unstableingot", MD.ExU).aspects(TC.PERDITIO, 4),
2935
-		Moonstone                   = unused        ("Moonstone"                    ).put(G_GEM_ORES).aspects(TC.VITREUS, 1, TC.ALIENIS, 1).setOriginalMod(MD.ARS).visDefault(),
2936
-		Sunstone                    = unused        ("Sunstone"                     ).put(G_GEM_ORES).aspects(TC.VITREUS, 1, TC.ALIENIS, 1).setOriginalMod(MD.ARS).visDefault(),
2937
-		Chimerite                   = unused        ("Chimerite"                    ).put(G_GEM_ORES).setOriginalMod(MD.ARS).visDefault(),
2935
+		Moonstone                   = unused        ("Moonstone"                    ).put(G_GEM_ORES).setOreMultiplier(2).aspects(TC.ALIENIS, 1, TC.PRAECANTIO, 1, TC.VACUOS, 1).setOriginalMod(MD.ARS).visDefault(), // Light Blue like HSLA Steel
2936
+		Sunstone                    = unused        ("Sunstone"                     ).put(G_GEM_ORES).setOreMultiplier(4).aspects(TC.VITREUS, 1, TC.IGNIS, 3).setOriginalMod(MD.ARS).visDefault(), // Bright Orange like Amber but slightly more red
2937
+		Chimerite                   = unused        ("Chimerite"                    ).put(G_GEM_ORES).setOreMultiplier(3).aspects(TC.SENSUS, 3, TC.PERMUTATIO, 1).setOriginalMod(MD.ARS).visDefault(), // Needs to be white for Rainbow Effect
2938 2938
 		Voidstone                   = unused        ("Voidstone"                    ).aspects(TC.VITREUS, 1, TC.VACUOS, 1),
2939 2939
 		Mercassium                  = unused        ("Mercassium"                   ).qual(3,  6.0,  64,  1).put(G_INGOT_ORES),
2940 2940
 		Osmonium                    = unused        ("Osmonium"                     ).qual(3,  6.0,  64,  1).put(G_INGOT_ORES),

+ 2
- 1
src/main/java/gregapi/load/LoaderItemList.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2019 Gregorius Techneticies
2
+ * Copyright (c) 2020 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -364,6 +364,7 @@ public class LoaderItemList implements Runnable {
364 364
 		StoneLayer.REPLACEABLE_BLOCKS.add(ST.block(MD.ReC, "reactorcraft_block_fluoriteore"  , null));
365 365
 		StoneLayer.REPLACEABLE_BLOCKS.add(ST.block(MD.ReC, "reactorcraft_block_ore"          , null));
366 366
 		StoneLayer.REPLACEABLE_BLOCKS.add(ST.block(MD.ElC, "electricraft_block_ore"          , null));
367
+		StoneLayer.REPLACEABLE_BLOCKS.add(ST.block(MD.AA, "blockMisc"                        , null));
367 368
 		
368 369
 		
369 370
 		IL.Bottle_Empty                         .set(ST.make(Items.glass_bottle, 1, 0));

+ 12
- 1
src/main/java/gregapi/load/LoaderUnificationTargets.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2019 Gregorius Techneticies
2
+ * Copyright (c) 2020 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -249,6 +249,16 @@ public class LoaderUnificationTargets implements Runnable {
249 249
 		OreDictManager.INSTANCE.setTarget(OP.dust           , MT.WaxMagic               , ST.make(MD.FRMB, "wax", 1, 0));
250 250
 		OreDictManager.INSTANCE.setTarget(OP.dust           , MT.WaxSoulful             , ST.make(MD.FRMB, "wax", 1, 1));
251 251
 		OreDictManager.INSTANCE.setTarget(OP.dust           , MT.WaxAmnesic             , ST.make(MD.FRMB, "wax", 1, 2));
252
+		OreDictManager.INSTANCE.setTarget(OP.oreVanillastone, MT.Vinteum                , ST.make(MD.ARS, "vinteumOre", 1, 0));
253
+		OreDictManager.INSTANCE.setTarget(OP.oreVanillastone, MT.UNUSED.Chimerite       , ST.make(MD.ARS, "vinteumOre", 1, 1));
254
+		OreDictManager.INSTANCE.setTarget(OP.oreVanillastone, MT.BlueTopaz              , ST.make(MD.ARS, "vinteumOre", 1, 2));
255
+		OreDictManager.INSTANCE.setTarget(OP.ore            , MT.UNUSED.Sunstone        , ST.make(MD.ARS, "vinteumOre", 1, 3));
256
+		OreDictManager.INSTANCE.setTarget(OP.oreMoon        , MT.UNUSED.Moonstone       , ST.make(MD.ARS, "vinteumOre", 1, 4));
257
+		OreDictManager.INSTANCE.setTarget(OP.blockGem       , MT.UNUSED.Moonstone       , ST.make(MD.ARS, "vinteumOre", 1, 5));
258
+		OreDictManager.INSTANCE.setTarget(OP.blockDust      , MT.Vinteum                , ST.make(MD.ARS, "vinteumOre", 1, 6));
259
+		OreDictManager.INSTANCE.setTarget(OP.blockGem       , MT.BlueTopaz              , ST.make(MD.ARS, "vinteumOre", 1, 7));
260
+		OreDictManager.INSTANCE.setTarget(OP.blockGem       , MT.UNUSED.Sunstone        , ST.make(MD.ARS, "vinteumOre", 1, 8));
261
+		OreDictManager.INSTANCE.setTarget(OP.blockGem       , MT.UNUSED.Chimerite       , ST.make(MD.ARS, "vinteumOre", 1, 9));
252 262
 		OreDictManager.INSTANCE.setTarget(OP.dust           , MT.Vinteum                , ST.make(MD.ARS, "itemOre", 1, 0));
253 263
 		OreDictManager.INSTANCE.setTarget(OP.dust           , MT.ArcaneCompound         , ST.make(MD.ARS, "itemOre", 1, 1));
254 264
 		OreDictManager.INSTANCE.setTarget(OP.dust           , MT.ArcaneAsh              , ST.make(MD.ARS, "itemOre", 1, 2));
@@ -315,6 +325,7 @@ public class LoaderUnificationTargets implements Runnable {
315 325
 		OreDictManager.INSTANCE.setTarget(OP.blockGem       , MT.VoidCrystal            , ST.make(MD.AA, "blockCrystal", 1, 3));
316 326
 		OreDictManager.INSTANCE.setTarget(OP.blockGem       , MT.Emeradic               , ST.make(MD.AA, "blockCrystal", 1, 4));
317 327
 		OreDictManager.INSTANCE.setTarget(OP.blockGem       , MT.Enori                  , ST.make(MD.AA, "blockCrystal", 1, 5));
328
+		OreDictManager.INSTANCE.setTarget(OP.oreVanillastone, MT.BlackQuartz            , ST.make(MD.AA, "blockMisc", 1, 3));
318 329
 		OreDictManager.INSTANCE.setTarget(OP.blockGem       , MT.Charcoal               , ST.make(MD.AA, "blockMisc", 1, 5));
319 330
 		OreDictManager.INSTANCE.setTarget(OP.blockGem       , MT.CoalCoke               , ST.make(MD.RC, "cube", 1, 0));
320 331
 		OreDictManager.INSTANCE.setTarget(OP.gem            , MT.CoalCoke               , ST.make(MD.RC, "fuel.coke", 1, 0));

+ 19
- 18
src/main/java/gregtech/loaders/b/Loader_Worldgen.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2019 Gregorius Techneticies
2
+ * Copyright (c) 2020 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -581,23 +581,24 @@ public class Loader_Worldgen implements Runnable {
581 581
 		new WorldgenOresSmall("ore.small.sulfur_o"          , T,   5,  15,   8, MT.S                            , GEN_OVERWORLD, GEN_GT, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_MARS);
582 582
 		
583 583
 		
584
-		new WorldgenOresSmall("ore.small.certus"            , MD.AE     .mLoaded,  20,  40,   1, MT.CertusQuartz        , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_MARS, GEN_PLANETS, GEN_ALFHEIM, GEN_ASTEROIDS, GEN_MOON);
585
-		new WorldgenOresSmall("ore.small.vinteum"           , MD.ARS    .mLoaded,  30,  60,   8, MT.Vinteum             , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_MARS, GEN_PLANETS, GEN_ALFHEIM);
586
-		new WorldgenOresSmall("ore.small.perdito"           , MD.TC     .mLoaded,  10,  60,   8, MT.InfusedEntropy      , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_MARS, GEN_PLANETS, GEN_ALFHEIM, GEN_NETHER, GEN_END);
587
-		new WorldgenOresSmall("ore.small.ignis"             , MD.TC     .mLoaded,  10,  60,   8, MT.InfusedFire         , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_MARS, GEN_PLANETS, GEN_ALFHEIM, GEN_NETHER, GEN_END);
588
-		new WorldgenOresSmall("ore.small.aer"               , MD.TC     .mLoaded,  10,  60,   8, MT.InfusedAir          , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_MARS, GEN_PLANETS, GEN_ALFHEIM, GEN_NETHER, GEN_END);
589
-		new WorldgenOresSmall("ore.small.aqua"              , MD.TC     .mLoaded,  10,  60,   8, MT.InfusedWater        , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_MARS, GEN_PLANETS, GEN_ALFHEIM, GEN_NETHER, GEN_END);
590
-		new WorldgenOresSmall("ore.small.terra"             , MD.TC     .mLoaded,  10,  60,   8, MT.InfusedEarth        , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_MARS, GEN_PLANETS, GEN_ALFHEIM, GEN_NETHER, GEN_END);
591
-		new WorldgenOresSmall("ore.small.ordo"              , MD.TC     .mLoaded,  10,  60,   8, MT.InfusedOrder        , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_MARS, GEN_PLANETS, GEN_ALFHEIM, GEN_NETHER, GEN_END);
592
-		new WorldgenOresSmall("ore.small.nikolite"          , MD.RP     .mLoaded,  10,  40,   4, MT.Nikolite            , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_MARS, GEN_PLANETS, GEN_ALFHEIM, GEN_NETHER, GEN_END);
593
-		new WorldgenOresSmall("ore.small.teslatite"         , MD.BP     .mLoaded,  10,  40,   4, MT.Teslatite           , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_MARS, GEN_PLANETS, GEN_ALFHEIM, GEN_NETHER, GEN_END);
594
-		new WorldgenOresSmall("ore.small.electrotine"       , MD.PR     .mLoaded,  10,  40,   4, MT.Electrotine         , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_MARS, GEN_PLANETS, GEN_ALFHEIM, GEN_NETHER, GEN_END);
595
-		new WorldgenOresSmall("ore.small.bischofite"        , MD.IHL    .mLoaded,  40,  80,   1, MT.OREMATS.Bischofite  , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM);
596
-		new WorldgenOresSmall("ore.small.datolite"          , MD.IHL    .mLoaded,  40,  80,   1, MT.Datolite            , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM);
597
-		new WorldgenOresSmall("ore.small.mica"              , MD.IHL    .mLoaded,  40,  80,   1, MT.OREMATS.Mica        , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM);
598
-		new WorldgenOresSmall("ore.small.gypsum"            , MD.IHL    .mLoaded,  40,  80,   1, MT.OREMATS.Gypsum      , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM);
599
-		new WorldgenOresSmall("ore.small.potassiumfeldspar" , MD.IHL    .mLoaded,  40,  80,   1, MT.PotassiumFeldspar   , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM);
600
-		new WorldgenOresSmall("ore.small.trona"             , MD.IHL    .mLoaded,  40,  80,   1, MT.OREMATS.Trona       , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM);
584
+		new WorldgenOresSmall("ore.small.blackquartz"       , MD.AA .mLoaded,  20,  40,   1, MT.BlackQuartz         , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM);
585
+		new WorldgenOresSmall("ore.small.certus"            , MD.AE .mLoaded,  20,  40,   1, MT.CertusQuartz        , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_MARS, GEN_PLANETS, GEN_ALFHEIM, GEN_ASTEROIDS, GEN_MOON);
586
+		new WorldgenOresSmall("ore.small.vinteum"           , MD.ARS.mLoaded,  30,  60,   8, MT.Vinteum             , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_MARS, GEN_PLANETS, GEN_ALFHEIM);
587
+		new WorldgenOresSmall("ore.small.perdito"           , MD.TC .mLoaded,  10,  60,   8, MT.InfusedEntropy      , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_MARS, GEN_PLANETS, GEN_ALFHEIM, GEN_NETHER, GEN_END);
588
+		new WorldgenOresSmall("ore.small.ignis"             , MD.TC .mLoaded,  10,  60,   8, MT.InfusedFire         , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_MARS, GEN_PLANETS, GEN_ALFHEIM, GEN_NETHER, GEN_END);
589
+		new WorldgenOresSmall("ore.small.aer"               , MD.TC .mLoaded,  10,  60,   8, MT.InfusedAir          , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_MARS, GEN_PLANETS, GEN_ALFHEIM, GEN_NETHER, GEN_END);
590
+		new WorldgenOresSmall("ore.small.aqua"              , MD.TC .mLoaded,  10,  60,   8, MT.InfusedWater        , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_MARS, GEN_PLANETS, GEN_ALFHEIM, GEN_NETHER, GEN_END);
591
+		new WorldgenOresSmall("ore.small.terra"             , MD.TC .mLoaded,  10,  60,   8, MT.InfusedEarth        , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_MARS, GEN_PLANETS, GEN_ALFHEIM, GEN_NETHER, GEN_END);
592
+		new WorldgenOresSmall("ore.small.ordo"              , MD.TC .mLoaded,  10,  60,   8, MT.InfusedOrder        , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_MARS, GEN_PLANETS, GEN_ALFHEIM, GEN_NETHER, GEN_END);
593
+		new WorldgenOresSmall("ore.small.nikolite"          , MD.RP .mLoaded,  10,  40,   4, MT.Nikolite            , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_MARS, GEN_PLANETS, GEN_ALFHEIM, GEN_NETHER, GEN_END);
594
+		new WorldgenOresSmall("ore.small.teslatite"         , MD.BP .mLoaded,  10,  40,   4, MT.Teslatite           , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_MARS, GEN_PLANETS, GEN_ALFHEIM, GEN_NETHER, GEN_END);
595
+		new WorldgenOresSmall("ore.small.electrotine"       , MD.PR .mLoaded,  10,  40,   4, MT.Electrotine         , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_MARS, GEN_PLANETS, GEN_ALFHEIM, GEN_NETHER, GEN_END);
596
+		new WorldgenOresSmall("ore.small.bischofite"        , MD.IHL.mLoaded,  40,  80,   1, MT.OREMATS.Bischofite  , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM);
597
+		new WorldgenOresSmall("ore.small.datolite"          , MD.IHL.mLoaded,  40,  80,   1, MT.Datolite            , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM);
598
+		new WorldgenOresSmall("ore.small.mica"              , MD.IHL.mLoaded,  40,  80,   1, MT.OREMATS.Mica        , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM);
599
+		new WorldgenOresSmall("ore.small.gypsum"            , MD.IHL.mLoaded,  40,  80,   1, MT.OREMATS.Gypsum      , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM);
600
+		new WorldgenOresSmall("ore.small.potassiumfeldspar" , MD.IHL.mLoaded,  40,  80,   1, MT.PotassiumFeldspar   , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM);
601
+		new WorldgenOresSmall("ore.small.trona"             , MD.IHL.mLoaded,  40,  80,   1, MT.OREMATS.Trona       , GEN_OVERWORLD, GEN_GT, GEN_PFAA, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM);
601 602
 		
602 603
 		
603 604
 		new WorldgenOresSmall("ore.small.diamond"           , T,   5,  10,   2, MT.Diamond                      , GEN_OVERWORLD, GEN_GT, GEN_ENVM, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS, GEN_ATUM, GEN_AETHER, GEN_PFAA, GEN_MARS, GEN_PLANETS, GEN_ASTEROIDS, GEN_MOON, GEN_NETHER);

+ 3
- 0
src/main/java/gregtech/loaders/c/Loader_Recipes_Other.java View File

@@ -363,7 +363,10 @@ public class Loader_Recipes_Other implements Runnable {
363 363
 		CR.remove(x, x, x, x, ST.make(Items.coal, 1, 1), x, x, x, x);
364 364
 		CR.remove(y = dust.mat(MT.KNO3, 1), y, x, dust.mat(MT.Charcoal, 1));
365 365
 		CR.remove(y, x, y, y, ST.make(Items.coal, 1, 1), y, y, y, y);
366
+		CR.remove(y, y, y, y, ST.make(Items.coal, 1, 1), y, y, y, y);
366 367
 		CR.remove(y, y, x, dust.mat(MT.Coal, 1));
368
+		CR.remove(ST.make(Items.quartz, 1, 0), ST.make(Items.coal, 1, 0));
369
+		CR.remove(ST.make(Items.quartz, 1, 0), ST.make(Items.coal, 1, 1));
367 370
 		CR.remove(NI, x = ST.make(Items.coal, 1, 0), NI, x, y = ST.make(Items.iron_ingot, 1, 0), x, NI, x, NI);
368 371
 		CR.remove(NI, NI, NI, NI, y, NI, NI, y, NI);
369 372
 		CR.remove(NI, NI, NI, NI, y = ingot.mat(MT.Al, 1), NI, NI, y, NI);

Loading…
Cancel
Save