Browse Source

Testing somethign that might be bugged

Gregorius Techneticies 2 months ago
parent
commit
7a806b3934
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 1B693EA14F2FD70F

+ 9
- 0
.defaultconfigs/config/etfuturum/etfuturum.cfg View File

@@ -0,0 +1,9 @@
1
+# Configuration file
2
+world {
3
+    # Max vein size for nether gold ore blocks in a cluster [range: 0 ~ 64, default: 10]
4
+    I:maxNetherGoldPerCluster=0
5
+    # Max vein size for Granite/Andesite/Diorite blocks in a cluster [range: 0 ~ 64, default: 33]
6
+    I:maxStonesPerCluster=0
7
+}
8
+
9
+

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

@@ -1242,7 +1242,7 @@ public class MT {
1242 1242
 	Amethyst                = valgemelec    ( 8313, "Amethyst"              , SET_RUBY              , 200,  50, 200, 127, RANDOM_SMALL_GEM_ORE)                        .lens(DYE_INDEX_Pink       )                                                                 .uumMcfg( 0, SiO2           , 4*U, Fe               , 1*U)                                                                                                  .aspects(TC.VITREUS, 4, TC.LUCRUM                   , 6).qual(3,  7.0,   256,  3),
1243 1243
 	Dioptase                = valgemelec    ( 8325, "Dioptase"              , SET_EMERALD           ,   0, 180, 180, 127, RANDOM_SMALL_GEM_ORE)                        .lens(DYE_INDEX_Cyan       )                                                                 .uumMcfg( 0, SiO2           , 3*U, Cu               , 1*U, O                , 1*U, H2O              , 3*U)                                                  .aspects(TC.VITREUS, 3, TC.LUCRUM, 3, TC.PERMUTATIO , 2).qual(3,  7.0,   256,  2),
1244 1244
 	Amber                   = valgem        ( 8310, "Amber"                 , SET_RUBY              , 255, 180,   0, 127                      , MORTAR, CRYSTALLISABLE).lens(DYE_INDEX_Orange     )                                                                                                                                                                                                                             .aspects(TC.VITREUS, 1, TC.VINCULUM                 , 2).qual(3,  4.0,   256,  3).heat(473),
1245
-	AmberDominican          = valgem        ( 8422, "Dominican Amber"       , SET_RUBY              ,  80,  80, 240, 127, RANDOM_SMALL_GEM_ORE, MORTAR, CRYSTALLISABLE).lens(DYE_INDEX_Blue       )                                                                                                                                                                                                                             .aspects(TC.VITREUS, 1, TC.VINCULUM                 , 2).qual(3,  5.0,   256,  3).heat(473),
1245
+	AmberDominican          = valgem        ( 8422, "Dominican Amber"       , SET_RUBY              ,  80,  80, 240, 127                      , MORTAR, CRYSTALLISABLE).lens(DYE_INDEX_Blue       )                                                                                                                                                                                                                             .aspects(TC.VITREUS, 1, TC.VINCULUM                 , 2).qual(3,  5.0,   256,  3).heat(473),
1246 1246
 	Craponite               = valgem        ( 8322, "Craponite"             , SET_FLINT             , 255, 170, 185, 127                      , MORTAR, CRYSTALLISABLE).lens(DYE_INDEX_Magenta    )                                                                                                                                                                                                                             .aspects(TC.VITREUS, 3, TC.LUCRUM, 3, TC.STRONTIO   , 2).qual(3,  7.0,   256,  2),
1247 1247
 	Jade                    = valgem        ( 8321, "Jade"                  , SET_LAPIS             , 100, 255, 125, 255, RANDOM_SMALL_GEM_ORE, MD.ERE)                .lens(DYE_INDEX_Green      )                                                                                                                                                                                                                             .aspects(TC.VITREUS, 3, TC.LUCRUM                   , 6).qual(3,  8.0,   512,  2),
1248 1248
 	

+ 1
- 1
src/main/java/gregtech/blocks/stone/BlockRockOres.java View File

@@ -36,7 +36,7 @@ import net.minecraft.world.World;
36 36
 
37 37
 public class BlockRockOres extends BlockBaseMeta {
38 38
 	public static byte[] HARVEST_LEVELS = {0, 0, 1, 1, 2, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0};
39
-	public static int[] BURN_LEVELS = {100, 100, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
39
+	public static int[] BURN_LEVELS = {30, 30, 0, 0, 0, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
40 40
 	public static float[] HARDNESS_LEVELS = {0.5F, 0.5F, 1.0F, 1.0F, 2.0F, 0.5F, 0.5F, 1.0F, 1.0F, 0.5F, 0.5F, 0.5F, 0.5F, 0.5F, 0.5F, 0.5F};
41 41
 	
42 42
 	public BlockRockOres(String aUnlocalised) {

+ 3
- 3
src/main/java/gregtech/blocks/stone/BlockVanillaOresA.java View File

@@ -1,5 +1,5 @@
1 1
 /**
2
- * Copyright (c) 2020 GregTech-6 Team
2
+ * Copyright (c) 2021 GregTech-6 Team
3 3
  *
4 4
  * This file is part of GregTech.
5 5
  *
@@ -41,7 +41,7 @@ import net.minecraft.world.World;
41 41
 
42 42
 public class BlockVanillaOresA extends BlockBaseMeta {
43 43
 	public static byte[] HARVEST_LEVELS = {0, 0, 2, 1, 2, 1, 1, 1, 2, 1, 2, 2, 2, 0, 3, 0};
44
-	public static int[] BURN_LEVELS = {100, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 100, 0, 0};
44
+	public static int[] BURN_LEVELS = {30, 30, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 30, 0, 0};
45 45
 	public static float[] HARDNESS_LEVELS = {0.5F, 0.5F, 1.5F, 1.0F, 1.0F, 1.0F, 1.0F, 1.0F, 1.5F, 1.0F, 1.5F, 1.5F, 1.5F, 0.5F, 2.0F, 0.5F};
46 46
 	public static OreDictMaterial[] ORE_MATERIALS = {MT.S, MT.Apatite, MT.Ruby, MT.Amber, MT.Amethyst, MT.OREMATS.Galena, MT.OREMATS.Tetrahedrite, MT.OREMATS.Cassiterite, MT.OREMATS.Cooperite, MT.OREMATS.Pentlandite, MT.OREMATS.Scheelite, MT.TiO2, MT.OREMATS.Bastnasite, MT.Graphite, MT.OREMATS.Pitchblende, MT.OREMATS.Borax};
47 47
 	
@@ -121,7 +121,7 @@ public class BlockVanillaOresA extends BlockBaseMeta {
121 121
 	@Override public String getHarvestTool(int aMeta) {return TOOL_pickaxe;}
122 122
 	@Override public int getHarvestLevel(int aMeta) {return HARVEST_LEVELS[aMeta];}
123 123
 	@Override public int getFlammability(byte aMeta) {return BURN_LEVELS[aMeta];}
124
-	@Override public int getFireSpreadSpeed(byte aMeta) {return BURN_LEVELS[aMeta];}
124
+	@Override public int getFireSpreadSpeed(byte aMeta) {return 0;}
125 125
 	@Override public float getBlockHardness(World aWorld, int aX, int aY, int aZ) {return Blocks.stone.getBlockHardness(aWorld, aX, aY, aZ) * HARDNESS_LEVELS[WD.meta(aWorld, aX, aY, aZ)];}
126 126
 	@Override public float getExplosionResistance(byte aMeta) {return Blocks.stone.getExplosionResistance(null);}
127 127
 }

+ 6
- 3
src/main/java/gregtech/loaders/b/Loader_Worldgen.java View File

@@ -455,13 +455,16 @@ public class Loader_Worldgen implements Runnable {
455 455
 		
456 456
 		
457 457
 		StoneLayer.bothsides(MT.Coal, MT.Stone
458
-		, new StoneLayerOres(MT.Amber                   , U4 , 30, 70, BIOMES_OCEAN_BEACH)
458
+		, new StoneLayerOres(MT.Amber                   , U  , 30, 70, BIOMES_OCEAN_BEACH)
459
+		, new StoneLayerOres(MT.AmberDominican          , U  , 30, 70, BIOMES_RIVER_LAKE)
459 460
 		);
460 461
 		StoneLayer.bothsides(MT.Lignite, MT.Stone
461
-		, new StoneLayerOres(MT.Amber                   , U4 , 30, 70, BIOMES_OCEAN_BEACH)
462
+		, new StoneLayerOres(MT.Amber                   , U  , 30, 70, BIOMES_OCEAN_BEACH)
463
+		, new StoneLayerOres(MT.AmberDominican          , U  , 30, 70, BIOMES_RIVER_LAKE)
462 464
 		);
463 465
 		StoneLayer.bothsides(MT.Oilshale, MT.Stone
464
-		, new StoneLayerOres(MT.Amber                   , U4 , 30, 70, BIOMES_OCEAN_BEACH)
466
+		, new StoneLayerOres(MT.Amber                   , U  , 30, 70, BIOMES_OCEAN_BEACH)
467
+		, new StoneLayerOres(MT.AmberDominican          , U  , 30, 70, BIOMES_RIVER_LAKE)
465 468
 		);
466 469
 		StoneLayer.bothsides(MT.Komatiite, MT.Stone
467 470
 		, new StoneLayerOres(MT.Redstone                , U8 ,  0, 30)

+ 2
- 2
src/main/java/gregtech/worldgen/WorldgenStoneLayers.java View File

@@ -110,7 +110,7 @@ public class WorldgenStoneLayers extends WorldgenObject {
110 110
 							break;
111 111
 						}
112 112
 					}
113
-					if (temp && tScan[4] != tScan[2] && tScan[3].mOreSmall != null && !StoneLayer.RANDOM_SMALL_GEM_ORES.isEmpty() && aRandom.nextInt(128) == 0) {
113
+					if (temp && tScan[4] != tScan[2] && tScan[3].mOreSmall != null && !StoneLayer.RANDOM_SMALL_GEM_ORES.isEmpty() && aRandom.nextInt(100) == 0) {
114 114
 						if (tScan[3].mOreSmall.placeBlock(aWorld, tX, tY, tZ, SIDE_UNKNOWN, UT.Code.select(MT.Emerald, StoneLayer.RANDOM_SMALL_GEM_ORES).mID, null, F, T)) {
115 115
 							temp = F;
116 116
 						}
@@ -159,7 +159,7 @@ public class WorldgenStoneLayers extends WorldgenObject {
159 159
 							break;
160 160
 						}
161 161
 					}
162
-					if (temp && tScan[4] != tScan[2] && tScan[3].mOreSmall != null && !StoneLayer.RANDOM_SMALL_GEM_ORES.isEmpty() && aRandom.nextInt(128) == 0) {
162
+					if (temp && tScan[4] != tScan[2] && tScan[3].mOreSmall != null && !StoneLayer.RANDOM_SMALL_GEM_ORES.isEmpty() && aRandom.nextInt(100) == 0) {
163 163
 						if (tScan[3].mOreSmall.placeBlock(aWorld, tX, tY, tZ, SIDE_UNKNOWN, UT.Code.select(MT.Emerald, StoneLayer.RANDOM_SMALL_GEM_ORES).mID, null, F, T)) {
164 164
 							temp = F;
165 165
 						}

Loading…
Cancel
Save