Browse Source

Forgot Config for the DoubleLayer Ores

Gregorius Techneticies 2 months ago
parent
commit
201727ebcd
Signed by: Gregorius Techneticies <gregoriustech@gmail.com> GPG Key ID: 1B693EA14F2FD70F
1 changed files with 11 additions and 11 deletions
  1. 11
    11
      src/main/java/gregapi/worldgen/StoneLayer.java

+ 11
- 11
src/main/java/gregapi/worldgen/StoneLayer.java View File

@@ -50,19 +50,19 @@ public class StoneLayer {
50 50
 	public final List<StoneLayerOres> mOres;
51 51
 	public IBlockPlacable mOre, mOreSmall, mOreBroken;
52 52
 	
53
-	public StoneLayer(BlockBase aStone, StoneLayerOres... aOres) {
54
-		this(aStone, 0, aStone, 1, aStone, 2, ((BlockStones)aStone).mMaterial, aOres);
53
+	public StoneLayer(BlockBase aStone, StoneLayerOres... aOreChances) {
54
+		this(aStone, 0, aStone, 1, aStone, 2, ((BlockStones)aStone).mMaterial, aOreChances);
55 55
 	}
56
-	public StoneLayer(Block aStone, OreDictMaterial aMaterial, StoneLayerOres... aOres) {
57
-		this(aStone, 0, Blocks.cobblestone, 0, Blocks.mossy_cobblestone, 0, aMaterial, aOres);
56
+	public StoneLayer(Block aStone, OreDictMaterial aMaterial, StoneLayerOres... aOreChances) {
57
+		this(aStone, 0, Blocks.cobblestone, 0, Blocks.mossy_cobblestone, 0, aMaterial, aOreChances);
58 58
 	}
59
-	public StoneLayer(Block aStone, long aMetaStone, OreDictMaterial aMaterial, StoneLayerOres... aOres) {
60
-		this(aStone, aMetaStone, Blocks.cobblestone, 0, Blocks.mossy_cobblestone, 0, aMaterial, aOres);
59
+	public StoneLayer(Block aStone, long aMetaStone, OreDictMaterial aMaterial, StoneLayerOres... aOreChances) {
60
+		this(aStone, aMetaStone, Blocks.cobblestone, 0, Blocks.mossy_cobblestone, 0, aMaterial, aOreChances);
61 61
 	}
62
-	public StoneLayer(Block aStone, long aMetaStone, Block aCobble, long aMetaCobble, OreDictMaterial aMaterial, StoneLayerOres... aOres) {
63
-		this(aStone, aMetaStone, aCobble, aMetaCobble, aCobble, aMetaCobble, aMaterial, aOres);
62
+	public StoneLayer(Block aStone, long aMetaStone, Block aCobble, long aMetaCobble, OreDictMaterial aMaterial, StoneLayerOres... aOreChances) {
63
+		this(aStone, aMetaStone, aCobble, aMetaCobble, aCobble, aMetaCobble, aMaterial, aOreChances);
64 64
 	}
65
-	public StoneLayer(Block aStone, long aMetaStone, Block aCobble, long aMetaCobble, Block aMossy, long aMetaMossy, OreDictMaterial aMaterial, StoneLayerOres... aOres) {
65
+	public StoneLayer(Block aStone, long aMetaStone, Block aCobble, long aMetaCobble, Block aMossy, long aMetaMossy, OreDictMaterial aMaterial, StoneLayerOres... aOreChances) {
66 66
 		mStone      = (aStone  == null || aStone  == NB ?                                 Blocks.stone                       : aStone );
67 67
 		mCobble     = (aCobble == null || aCobble == NB ? Blocks.stone       == mStone  ? Blocks.cobblestone       : mStone  : aCobble);
68 68
 		mMossy      = (aMossy  == null || aMossy  == NB ? Blocks.cobblestone == mCobble ? Blocks.mossy_cobblestone : mCobble : aMossy );
@@ -75,7 +75,7 @@ public class StoneLayer {
75 75
 		mOreBroken  = BlocksGT.stoneToBrokenOres.get(mStack);
76 76
 		mOreSmall   = BlocksGT.stoneToSmallOres .get(mStack);
77 77
 		mOres       = new ArrayListNoNulls<>(8);
78
-		for (StoneLayerOres tOre : aOres) if (tOre != null && tOre.mMaterial != MT.Empty && ConfigsGT.WORLDGEN.get("stonelayers."+mMaterial.mNameInternal, tOre.mMaterial.mNameInternal, T)) mOres.add(tOre);
78
+		for (StoneLayerOres tOre : aOreChances) if (tOre != null && tOre.mMaterial != MT.Empty && ConfigsGT.WORLDGEN.get("stonelayers."+mMaterial.mNameInternal, tOre.mMaterial.mNameInternal, T)) mOres.add(tOre);
79 79
 	}
80 80
 	
81 81
 	/** List of Stone and Ore Blocks, that can simply be replaced by the Stone Layers. */
@@ -94,7 +94,7 @@ public class StoneLayer {
94 94
 		if (tMap == null) MAP.put(aTop, tMap = new HashMap<>());
95 95
 		List<StoneLayerOres> tList = tMap.get(aBottom);
96 96
 		if (tList == null) tMap.put(aBottom, tList = new ArrayList<>(aOreChances.length));
97
-		for (StoneLayerOres tMat : aOreChances) if (tMat != null) tList.add(tMat);
97
+		for (StoneLayerOres tOre : aOreChances) if (tOre != null && tOre.mMaterial != MT.Empty && ConfigsGT.WORLDGEN.get("doublelayers."+aTop.mNameInternal+"."+aBottom.mNameInternal, tOre.mMaterial.mNameInternal, T)) tList.add(tOre);
98 98
 		return T;
99 99
 	}
100 100
 	

Loading…
Cancel
Save