Browse Source

Made Enderpearls and Netherstars obtainable in Peaceful by adding complicated Recipes that require Ancient Debris

parent
commit
318f52a5f5
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 4C7DC365E9F99806

+ 3
- 0
CHANGELOG.md View File

@@ -41,6 +41,9 @@ Nothing (I tend to only add finished Stuff to the Changelog).
41 41
 [CHANGED] NEI Fuel Lists are now no longer listing the confusing and irrelevant EU/t Value.
42 42
 [CHANGED] More Reactor Test Stuffs from Erik3003.
43 43
 [ADDED] Netherite things, such as Crucibles, Burning Boxes and all the Shelf Stuff. The Crucible Tier is same as Meteoric Steel. The good Netherite Tools are made by bathing Diamond in molten Netherite. The bad Netherite Tools are, well, not that good. Ancient Debris does generate in the Nether now as rare small Ore.
44
+[ADDED] Infinite Bedrock Veins for Ancient Debris in the Nether. Relatively high Probability compared to all other Bedrock Veins.
45
+[ADDED] Ancient Debris aka "Netherite Scraps" can now be used in the Massfabricator to make liquid Enderpearl. Which then can be used in a Replicator to make it into an actual Enderpearl. Dont ask me what sense it makes, the Massfabricator does it, not me.
46
+[ADDED] The HV Lightning Processor can be used to turn Blocks of Solid Netherite combined with a few other Ingredients into Netherstars.
44 47
 [ADDED] Uranium Hexaflouride Processing Chain by Erik3003. And fixed by Greg, because the Maths of the Recipes were "Perfectly Balanced without Exploits", except for the obvious dupes of every single Recipe added.
45 48
 [ADDED] Ownership Reset Config for people who locked themselves out of Stuff like Mechanical Safes in SinglePlayer.
46 49
 [ADDED] Small Cinnabar Ore to the Nether.

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

@@ -1117,7 +1117,7 @@ public class MT {
1117 1117
 	
1118 1118
 	
1119 1119
 	Sand                    = create        ( 8100, "Sand"                  , SET_SAND              , 250, 250, 200, 255).put(FURNACE, UNRECYCLABLE)                                                                                                                                                                                                                                                                                .setSmelting(Glass, U),
1120
-	SoulSand                = create        ( 8101, "Soulsand"              , SET_SAND              , 100, 100,  80, 255)                                                                                                                                                                                                                                                                                                           ,
1120
+	SoulSand                = dust          ( 8101, "Soulsand"              , SET_SAND              , 100, 100,  80, 255)                                                                                                                                                                                                                                                                                                           ,
1121 1121
 	SluiceSand              = oredust       ( 8102, "Sluice Sand"           , SET_SAND              , 165, 165, 120, 255)                                                                                                                                                                                                                                                                                                           .aspects(TC.TERRA, 1),
1122 1122
 	PlatinumGroupSludge     = oredust       ( 8103, "Platinum Group Sludge" , SET_SAND              ,  50,  50,  80, 255)                                                                                                                                                                                                                                                                                                           .aspects(TC.LUCRUM, 2),
1123 1123
 	
@@ -2486,6 +2486,7 @@ public class MT {
2486 2486
 			Nq                              .addOreByProducts(Nq_528                );
2487 2487
 			Ad                              .addOreByProducts(OREMATS.Magnetite     , Adamantine                );
2488 2488
 			Adamantine                      .addOreByProducts(OREMATS.Magnetite     , Ad                        );
2489
+			AncientDebris                   .addOreByProducts(SoulSand              , NetherQuartz              );
2489 2490
 			OREMATS.Stibnite                .addOreByProducts(Sb                    );
2490 2491
 			Diamond                         .addOreByProducts(Graphite              );
2491 2492
 			Pyrope                          .addOreByProducts(Mg                    );

+ 3
- 0
src/main/java/gregapi/lang/LanguageHandler.java View File

@@ -153,6 +153,9 @@ public class LanguageHandler {
153 153
 			if (aPrefix.mNameInternal.startsWith("crushed"))                return aPrefix.mMaterialPre + "Ancient Debris";
154 154
 			if (aPrefix.mNameInternal.startsWith("dust"))                   return aPrefix.mMaterialPre + "Netherite Scrap";
155 155
 		} else
156
+		if (aMaterial == MT.SoulSand) {
157
+			if (aPrefix.mNameInternal.startsWith("dust"))                   return aPrefix.mMaterialPre + "Fine Soulsand";
158
+		} else
156 159
 		if (aMaterial == MT.Netherrack) {
157 160
 			if (aPrefix == OP.rockGt)                                       return "Nether Rock";
158 161
 		} else

+ 1
- 0
src/main/java/gregapi/load/LoaderOreDictReRegistrations.java View File

@@ -561,6 +561,7 @@ public class LoaderOreDictReRegistrations implements Runnable {
561 561
 		OreDictManager.INSTANCE.addReRegistration("ingotDuranium"                   , OD.craftingPistonIngot);
562 562
 		OreDictManager.INSTANCE.addReRegistration("ingotTritanium"                  , OD.craftingPistonIngot);
563 563
 		OreDictManager.INSTANCE.addReRegistration("ingotSyrmorite"                  , OD.craftingPistonIngot);
564
+		OreDictManager.INSTANCE.addReRegistration("dustSoulSand"                    , OD.soulsand);
564 565
 		OreDictManager.INSTANCE.addReRegistration("ingotTarPitch"                   , OD.itemTar);
565 566
 		OreDictManager.INSTANCE.addReRegistration("nuggetTarPitch"                  , OD.itemTar);
566 567
 		OreDictManager.INSTANCE.addReRegistration("stoneBowl"                       , "bowlStone");

+ 1
- 0
src/main/java/gregtech/loaders/b/Loader_Worldgen.java View File

@@ -533,6 +533,7 @@ public class Loader_Worldgen implements Runnable {
533 533
 		new WorldgenOresBedrock("ore.bedrock.bauxite"           , T, T,   2000, MT.OREMATS.Bauxite              , (Block)BlocksGT.FlowersA,  7, GEN_FLOOR); // TODO Flower
534 534
 		new WorldgenOresBedrock("ore.bedrock.cassiterite"       , T, T,   2000, MT.OREMATS.Cassiterite          , (Block)BlocksGT.FlowersA,  7, GEN_FLOOR); // TODO Flower
535 535
 		new WorldgenOresBedrock("ore.bedrock.chalcopyrite"      , T, T,   2000, MT.OREMATS.Chalcopyrite         , (Block)BlocksGT.FlowersA,  2, GEN_FLOOR);
536
+		new WorldgenOresBedrock("ore.bedrock.ancientdebris"     , T, T,   1000, MT.AncientDebris                , (Block)BlocksGT.FlowersA,  2, GEN_NETHER);
536 537
 		new WorldgenOresBedrock("ore.bedrock.naquadah"          , T, T,  10000, MT.Nq                           , (Block)BlocksGT.FlowersA,  7, GEN_MARS); // TODO Flower
537 538
 		new WorldgenOresBedrock("ore.bedrock.adamantine"        , T, T,  10000, MT.Adamantine                   , (Block)BlocksGT.FlowersA,  7, GEN_MARS, GEN_TWILIGHT, GEN_EREBUS, GEN_BETWEENLANDS); // TODO Flower
538 539
 		

+ 8
- 6
src/main/java/gregtech/loaders/c/Loader_Recipes_Ores.java View File

@@ -86,13 +86,14 @@ public class Loader_Recipes_Ores implements Runnable {
86 86
 		RM.Centrifuge           .addRecipe0(T, 64,  192, new long[] {9000,  300,  300,  300,  300,  300}, FL.Lava_Pahoehoe  .make(100), NF, dustTiny.mat(MT.Basalt, 1), nugget.mat(MT.Cu, 8), nugget.mat(MT.Sn, 4), nugget.mat(MT.Fe, 4), nugget.mat(MT.Au, 1), nugget.mat(MT.Ag, 1));
87 87
 		RM.Centrifuge           .addRecipe1(T, 64,   16, new long[] {9000,10000, 1000                  }, ST.make(Blocks.sand, 1, 1), ST.make(Blocks.sand, 1, 0), dustTiny.mat(MT.Fe, 1), dustDiv72.mat(MT.Diamond, 1));
88 88
 		if (IL.NePl_SoulSoil.exists())
89
-		RM.Centrifuge           .addRecipe1(T, 64,  128, new long[] {9000, 8000, 2000, 2000            }, IL.NePl_SoulSoil.get(1)        , NF, FL.Oil_Soulsand.make(50), ST.make(Blocks.sand, 1, 0), dustSmall.mat(MT.Niter, 1), dustTiny.mat(MT.Coal, 1), dustTiny.mat(MT.Bone, 1));
89
+		RM.Centrifuge           .addRecipe1(T, 64,  128, new long[] {9000, 8000, 2000, 2000            }, IL.NePl_SoulSoil.get(        1), NF, FL.Oil_Soulsand.make(50), ST.make(Blocks.sand, 1, 0), dustSmall.mat(MT.Niter, 1), dustTiny.mat(MT.Coal, 1), dustTiny.mat(MT.Bone, 1));
90 90
 		RM.Centrifuge           .addRecipe1(T, 64,  128, new long[] {9000, 8000, 2000, 2000            }, ST.make(Blocks.soul_sand, 1, W), NF, FL.Oil_Soulsand.make(50), ST.make(Blocks.sand, 1, 0), dustSmall.mat(MT.Niter, 1), dustTiny.mat(MT.Coal, 1), dustTiny.mat(MT.Bone, 1));
91
-		RM.Centrifuge           .addRecipe1(T, 64,   64, new long[] {5625, 9900, 5625,  625            }, OM.dust(MT.Netherrack ), dustTiny.mat(MT.Redstone, 1), dustSmall.mat(MT.S, 1), dustTiny.mat(MT.Coal, 1), dustTiny.mat(MT.Au, 1));
92
-		RM.Centrifuge           .addRecipe1(T, 64,  128, new long[] {9000,  625, 2500                  }, OM.dust(MT.Endstone   ), ZL_FS, FL.array(MT.He.gas(U8, F), MT.He_3.gas(U20, F), MT.NO2.gas(U4, F), MT.CO2.gas(U4, F), MT.H.gas(U8, F), MT.D.gas(U8, F)), ST.make(Blocks.sand, 1, 0), dustTiny.mat(MT.Pt, 1), dustTiny.mat(MT.WO3, 1));
93
-		RM.Centrifuge           .addRecipe1(T, 64,  128, new long[] {9000,  625,  625                  }, OM.dust(MT.SpaceRock  ), ZL_FS, FL.array(MT.He.gas(U8, F), MT.He_3.gas(U20, F), MT.NO2.gas(U4, F), MT.CO2.gas(U4, F), MT.H.gas(U8, F), MT.D.gas(U8, F)), ST.make(Blocks.sand, 1, 0), dustTiny.mat(MT.Pt, 1), dustTiny.mat(MT.MeteoricIron, 1));
94
-		RM.Centrifuge           .addRecipe1(T, 64,  256, new long[] {9000, 9000, 9000, 9000, 9000, 1000}, OM.dust(MT.MoonTurf   ), ZL_FS, FL.array(MT.He.gas(U8, F), MT.He_3.gas(U20, F), MT.NO2.gas(U4, F), MT.CO2.gas(U4, F), MT.H.gas(U8, F), MT.D.gas(U8, F)), dustTiny.mat(MT.SiO2, 2), dustTiny.mat(MT.Basalt, 2), dustTiny.mat(MT.Al2O3, 1), dustTiny.mat(MT.OREMATS.Ilmenite, 1), dustTiny.mat(MT.MnO2, 1), dustTiny.mat(MT.MeteoricIron, 1));
95
-		RM.Centrifuge           .addRecipe1(T, 64,  128, new long[] {9000, 5000, 4000, 3000, 1000,  500}, OM.dust(MT.MoonRock   ), NF, NF, dustSmall.mat(MT.Basalt, 3), dustTiny.mat(MT.SiO2, 1), dustTiny.mat(MT.Al2O3, 1), dustTiny.mat(OREMATS.Ilmenite, 1), dustTiny.mat(MT.RareEarth, 1), dustTiny.mat(MT.Pt, 1));
91
+		RM.Centrifuge           .addRecipe1(T, 64,  128, new long[] {9000, 8000, 2000, 2000            }, OM.dust(MT.SoulSand           ), NF, FL.Oil_Soulsand.make(50), ST.make(Blocks.sand, 1, 0), dustSmall.mat(MT.Niter, 1), dustTiny.mat(MT.Coal, 1), dustTiny.mat(MT.Bone, 1));
92
+		RM.Centrifuge           .addRecipe1(T, 64,   64, new long[] {5625, 9900, 5625,  625            }, OM.dust(MT.Netherrack         ), dustTiny.mat(MT.Redstone, 1), dustSmall.mat(MT.S, 1), dustTiny.mat(MT.Coal, 1), dustTiny.mat(MT.Au, 1));
93
+		RM.Centrifuge           .addRecipe1(T, 64,  128, new long[] {9000,  625, 2500                  }, OM.dust(MT.Endstone           ), ZL_FS, FL.array(MT.He.gas(U8, F), MT.He_3.gas(U20, F), MT.NO2.gas(U4, F), MT.CO2.gas(U4, F), MT.H.gas(U8, F), MT.D.gas(U8, F)), ST.make(Blocks.sand, 1, 0), dustTiny.mat(MT.Pt, 1), dustTiny.mat(MT.WO3, 1));
94
+		RM.Centrifuge           .addRecipe1(T, 64,  128, new long[] {9000,  625,  625                  }, OM.dust(MT.SpaceRock          ), ZL_FS, FL.array(MT.He.gas(U8, F), MT.He_3.gas(U20, F), MT.NO2.gas(U4, F), MT.CO2.gas(U4, F), MT.H.gas(U8, F), MT.D.gas(U8, F)), ST.make(Blocks.sand, 1, 0), dustTiny.mat(MT.Pt, 1), dustTiny.mat(MT.MeteoricIron, 1));
95
+		RM.Centrifuge           .addRecipe1(T, 64,  256, new long[] {9000, 9000, 9000, 9000, 9000, 1000}, OM.dust(MT.MoonTurf           ), ZL_FS, FL.array(MT.He.gas(U8, F), MT.He_3.gas(U20, F), MT.NO2.gas(U4, F), MT.CO2.gas(U4, F), MT.H.gas(U8, F), MT.D.gas(U8, F)), dustTiny.mat(MT.SiO2, 2), dustTiny.mat(MT.Basalt, 2), dustTiny.mat(MT.Al2O3, 1), dustTiny.mat(MT.OREMATS.Ilmenite, 1), dustTiny.mat(MT.MnO2, 1), dustTiny.mat(MT.MeteoricIron, 1));
96
+		RM.Centrifuge           .addRecipe1(T, 64,  128, new long[] {9000, 5000, 4000, 3000, 1000,  500}, OM.dust(MT.MoonRock           ), NF, NF, dustSmall.mat(MT.Basalt, 3), dustTiny.mat(MT.SiO2, 1), dustTiny.mat(MT.Al2O3, 1), dustTiny.mat(OREMATS.Ilmenite, 1), dustTiny.mat(MT.RareEarth, 1), dustTiny.mat(MT.Pt, 1));
96 97
 		// TODO MARS ROCKS AND SAND => Ice
97 98
 		
98 99
 		for (OreDictMaterial tMat : new OreDictMaterial[] {MT.Mg, MT.Pyrope, MT.Olivine, MT.OREMATS.Magnesite}) {
@@ -193,6 +194,7 @@ public class Loader_Recipes_Ores implements Runnable {
193 194
 		if (IL.BoP_Mud              .exists())  RM.Sifting.addRecipe1(T, 16, 100, new long[] { 9000,  2000                                                                      }, IL.BoP_Mud                    .get(1)/*|*/, ST.make(Blocks.dirt, 1, 0), IL.MaCu_Bait_Worm.get(2));
194 195
 		/* Misc                             */  RM.Sifting.addRecipe1(T, 16, 200, new long[] { 8000,  1000,   500,   500,   500                                                 }, ST.make(Blocks.dirt          ,  1, 2)/*|*/, ST.make(Blocks.dirt, 1, 1), OM.dust(MT.Ash, U4), IL.MaCu_Bait_Ant.get(2), IL.MaCu_Bait_Maggot.get(1), IL.MaCu_Bait_Worm.get(1));
195 196
 												RM.Sifting.addRecipe1(T, 16, 200, new long[] { 8000,  1000,  1000                                                               }, ST.make(Blocks.mycelium      ,  1, W)/*|*/, ST.make(Blocks.dirt, 1, 1), ST.make(Blocks.brown_mushroom, 1, 0), ST.make(Blocks.red_mushroom, 1, 0));
197
+												RM.Sifting.addRecipe1(T, 16, 300, new long[] { 9000,  4000,  2000,  4000,   500,   400,   200                                   }, OM.dust(MT.SoulSand                 )/*|*/, OM.dust(MT.Netherrack, U4), rockGt.mat(MT.Netherrack, 1), OM.dust(MT.Niter, U4), OM.dust(MT.NetherQuartz, U4), OM.gem(MT.NetherQuartz, U), ST.make(Items.bone, 1, 0), ST.make(Items.nether_wart, 1, 0));
196 198
 												RM.Sifting.addRecipe1(T, 16, 300, new long[] { 9000,  4000,  2000,  4000,   500,   400,   200                                   }, ST.make(Blocks.soul_sand     ,  1, W)/*|*/, OM.dust(MT.Netherrack, U4), rockGt.mat(MT.Netherrack, 1), OM.dust(MT.Niter, U4), OM.dust(MT.NetherQuartz, U4), OM.gem(MT.NetherQuartz, U), ST.make(Items.bone, 1, 0), ST.make(Items.nether_wart, 1, 0));
197 199
 		if (IL.NePl_SoulSoil        .exists())  RM.Sifting.addRecipe1(T, 16, 300, new long[] { 9000,  4000,  2000,  4000,   500,   400,   200                                   }, IL.NePl_SoulSoil              .get(1)/*|*/, OM.dust(MT.Netherrack, U4), rockGt.mat(MT.Netherrack, 1), OM.dust(MT.Niter, U4), OM.dust(MT.NetherQuartz, U4), OM.gem(MT.NetherQuartz, U), ST.make(Items.bone, 1, 0), ST.make(Items.nether_wart, 1, 0));
198 200
 		if (IL.BoP_Quicksand        .exists())  RM.Sifting.addRecipe1(T, 16, 100, new long[] { 9000,  2000                                                                      }, IL.BoP_Quicksand              .get(1)/*|*/, ST.make(Blocks.sand, 1, 0), IL.MaCu_Bait_Ant.get(1));

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

@@ -50,6 +50,8 @@ public class Loader_Recipes_Other implements Runnable {
50 50
 	@Override public void run() {
51 51
 		dust.addListener(new IOreDictListenerEvent() {@Override public void onOreRegistration(OreDictRegistrationContainer aEvent) {if (aEvent.mMaterial.mReRegistrations.contains(ANY.Wax) && !ST.isGT_(aEvent.mStack)) CR.remove(aEvent.mStack);}});
52 52
 		
53
+		RM.Compressor.addRecipe1(T, 16, 16, OM.dust(MT.SoulSand, U), ST.make(Blocks.soul_sand, 1, 0));
54
+		
53 55
 		for (OreDictMaterial tWax : ANY.Wax.mToThis) {
54 56
 		RM.Compressor.addRecipe1(T, 16, 16, OM.dust(tWax, U ), plate.mat(tWax, 1));
55 57
 		RM.Compressor.addRecipe1(T, 16, 16, OM.dust(tWax, U4), foil .mat(tWax, 1));
@@ -823,6 +825,25 @@ public class Loader_Recipes_Other implements Runnable {
823 825
 		RM.Nanofab.addRecipe2(T, 16,3072, ST.tag(17), dust     .mat(MT.C,12), pipeHuge.mat(MT.C, 1));
824 826
 		
825 827
 		
828
+		if (FL.Ender_TE.exists()) {
829
+		RM.Massfab   .addRecipe2(T,  16, 144    , ST.tag(1), OP.dustDiv72.mat(MT.AncientDebris, 1), FL.Ender_TE.make(250    ));
830
+		RM.Massfab   .addRecipe2(T,  16, 144*  8, ST.tag(1), OP.dustTiny .mat(MT.AncientDebris, 1), FL.Ender_TE.make(250*  8));
831
+		RM.Massfab   .addRecipe2(T,  16, 144* 18, ST.tag(1), OP.dustSmall.mat(MT.AncientDebris, 1), FL.Ender_TE.make(250* 18));
832
+		RM.Massfab   .addRecipe2(T,  16, 144* 72, ST.tag(1), OP.dust     .mat(MT.AncientDebris, 1), FL.Ender_TE.make(250* 72));
833
+		RM.Massfab   .addRecipe2(T,  16, 144*648, ST.tag(1), OP.blockDust.mat(MT.AncientDebris, 1), FL.Ender_TE.make(250*648));
834
+		RM.Replicator.addRecipe1(T,  16, 144    , ST.tag(0), FL.Ender_TE.make(250), NF, OP.gem.mat(MT.EnderPearl, 1));
835
+		}
836
+		RM.Massfab   .addRecipe2(T,  16, 144    , ST.tag(0), OP.dustDiv72.mat(MT.AncientDebris, 1), FL.Ender.make(L    ));
837
+		RM.Massfab   .addRecipe2(T,  16, 144*  8, ST.tag(0), OP.dustTiny .mat(MT.AncientDebris, 1), FL.Ender.make(L*  8));
838
+		RM.Massfab   .addRecipe2(T,  16, 144* 18, ST.tag(0), OP.dustSmall.mat(MT.AncientDebris, 1), FL.Ender.make(L* 18));
839
+		RM.Massfab   .addRecipe2(T,  16, 144* 72, ST.tag(0), OP.dust     .mat(MT.AncientDebris, 1), FL.Ender.make(L* 72));
840
+		RM.Massfab   .addRecipe2(T,  16, 144*648, ST.tag(0), OP.blockDust.mat(MT.AncientDebris, 1), FL.Ender.make(L*648));
841
+		RM.Replicator.addRecipe1(T,  16, 144    , ST.tag(0), FL.Ender.make(L), NF, OP.gem.mat(MT.EnderPearl, 1));
842
+		
843
+		
844
+		RM.Lightning .addRecipe1(T, 512, 512, OP.blockSolid.mat(MT.Netherite, 1), FL.array(FL.Ender_TE.make(1000), FL.Oil_Soulsand.make(5000)), ZL_FS, OP.gem.mat(MT.NetherStar, 1));
845
+		
846
+		
826 847
 		RM.Fusion.addRecipe1(F, -8192,  730, ST.tag(1), FL.array(MT.D     .gas   (U*2, T)                        ), FL.array(MT.He_3  .gas   (  U2, F), MT.T     .gas   (  U2, F)                                                      ), ZL_IS                ).setSpecialNumber(  730L*8192L*16L);
827 848
 		RM.Fusion.addRecipe1(F, -8192, 1130, ST.tag(1), FL.array(MT.T     .gas   (U*2, T)                        ), FL.array(MT.He    .gas   (  U , F)                                                                                 ), ZL_IS                ).setSpecialNumber( 1130L*8192L*16L);
828 849
 		RM.Fusion.addRecipe1(F, -8192, 1290, ST.tag(1), FL.array(MT.He_3  .gas   (U*2, T)                        ), FL.array(MT.He    .gas   (  U , F)                                                                                 ), ZL_IS                ).setSpecialNumber( 1290L*8192L*16L);

Loading…
Cancel
Save