Browse Source

Added Small Cinnabar Ore to the Nether, fixed some typo and did whatever I did to that Loader_Blocks.java

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

+ 1
- 1
.meta/format_source_file.sh View File

@@ -17,7 +17,7 @@ else
17 17
 	echo "$(tput bold)Formatting: $1$(tput sgr0)"
18 18
 	# Start with license
19 19
 	cp "$SOURCE_DIR/LICENSE.header" "$1.tmp"
20
-	# Add a newlin
20
+	# Add a newline
21 21
 	echo "" >> "$1.tmp"
22 22
 	# Remove anything above the `^package` line and append rest to tmp
23 23
 	awk '/^package/{i++}i' "$1" >> "$1.tmp"

+ 1
- 0
CHANGELOG.md View File

@@ -24,6 +24,7 @@ Nothing (I tend to only add finished Stuff to the Changelog).
24 24
 [CHANGED] NEI Fuel Lists are now no longer listing the confusing and irrelevant EU/t Value.
25 25
 [CHANGED] More Reactor Test Stuffs from Erik3003.
26 26
 [ADDED] Ownership Reset Config for people who locked themselves out of Stuff like Mechanical Safes in SinglePlayer.
27
+[ADDED] Small Cinnabar Ore to the Nether.
27 28
 
28 29
 
29 30
 6.12.02:

+ 4
- 3
src/main/java/gregtech/loaders/a/Loader_Blocks.java View File

@@ -119,16 +119,17 @@ public class Loader_Blocks implements Runnable {
119 119
 		if (COMPAT_TC != null) COMPAT_TC.registerThaumcraftAspectsToItem(ST.make((Block)BlocksGT.FlowersB, 1, W), F, TC.stack(TC.HERBA, 2));
120 120
 		
121 121
 		BlocksGT.Glowtus                                                        = new BlockGlowtus              ("gt.block.lilypad.glowtus");
122
-		if (COMPAT_TC != null) COMPAT_TC.registerThaumcraftAspectsToItem(ST.make(BlocksGT.Glowtus, 1, W), F, TC.stack(TC.HERBA, 2), TC.stack(TC.LUX, 2));
122
+		if (COMPAT_TC != null) COMPAT_TC.registerThaumcraftAspectsToItem(ST.make(BlocksGT.Glowtus       , 1, W), F, TC.stack(TC.HERBA, 2), TC.stack(TC.LUX, 2));
123 123
 		
124 124
 		VISUALLY_OPAQUE_BLOCKS.add(BlocksGT.BalesGrass                          = new BlockBaleGrass            ("gt.block.bale.grass"));
125 125
 		VISUALLY_OPAQUE_BLOCKS.add(BlocksGT.BalesCrop                           = new BlockBaleCrop             ("gt.block.bale.crop"));
126
-		if (COMPAT_TC != null) COMPAT_TC.registerThaumcraftAspectsToItem(ST.make(BlocksGT.BalesGrass, 1, W), F, TC.stack(TC.MESSIS, 4));
127
-		if (COMPAT_TC != null) COMPAT_TC.registerThaumcraftAspectsToItem(ST.make(BlocksGT.BalesCrop , 1, W), F, TC.stack(TC.MESSIS, 4));
126
+		if (COMPAT_TC != null) COMPAT_TC.registerThaumcraftAspectsToItem(ST.make(BlocksGT.BalesGrass    , 1, W), F, TC.stack(TC.MESSIS, 4));
127
+		if (COMPAT_TC != null) COMPAT_TC.registerThaumcraftAspectsToItem(ST.make(BlocksGT.BalesCrop     , 1, W), F, TC.stack(TC.MESSIS, 4));
128 128
 		
129 129
 		BlocksGT.River                                                          = new BlockRiver                ("gt.block.river", FL.River_Water.fluid());
130 130
 		BlocksGT.Ocean                                                          = new BlockOcean                ("gt.block.ocean", FL.Ocean      .fluid());
131 131
 		BlocksGT.Swamp                                                          = new BlockSwamp                ("gt.block.swamp", FL.Dirty_Water.fluid()).addEffect(Potion.hunger.id, 300, 0).addEffect(Potion.confusion.id, 120, 0);
132
+		if (COMPAT_TC != null) COMPAT_TC.registerThaumcraftAspectsToItem(ST.make(BlocksGT.River         , 1, W), F, TC.stack(TC.AQUA, 3), TC.stack(TC.MOTUS, 3));
132 133
 		if (COMPAT_TC != null) COMPAT_TC.registerThaumcraftAspectsToItem(ST.make(BlocksGT.Ocean         , 1, W), F, TC.stack(TC.AQUA, 3), TC.stack(TC.TEMPESTAS, 3));
133 134
 		if (COMPAT_TC != null) COMPAT_TC.registerThaumcraftAspectsToItem(ST.make(BlocksGT.Swamp         , 1, W), F, TC.stack(TC.AQUA, 3), TC.stack(TC.VENENUM, 1));
134 135
 		NBTTagList tNBTList = new NBTTagList();

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

@@ -576,6 +576,7 @@ public class Loader_Worldgen implements Runnable {
576 576
 		new WorldgenOresSmall("ore.small.ambrosium"         , T,  30, 120,  64, MT.Ambrosium                    , GEN_AETHER);
577 577
 		new WorldgenOresSmall("ore.small.zanite"            , T,  30, 120,  16, MT.Zanite                       , GEN_AETHER);
578 578
 		new WorldgenOresSmall("ore.small.netherquartz"      , T,  30, 120,  64, MT.NetherQuartz                 , GEN_NETHER);
579
+		new WorldgenOresSmall("ore.small.cinnabar"          , T,  30,  90,  32, MT.OREMATS.Cinnabar             , GEN_NETHER);
579 580
 		new WorldgenOresSmall("ore.small.niter"             , T,  10,  60,  16, MT.Niter                        , GEN_NETHER);
580 581
 		new WorldgenOresSmall("ore.small.sulfur_n"          , T,  10,  60,  32, MT.S                            , GEN_NETHER);
581 582
 		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);

Loading…
Cancel
Save