Fix charged quartz generation.
This commit is contained in:
@@ -127,11 +127,6 @@ public final class AEConfig implements IConfigurableObject, IConfigManagerHost {
|
|||||||
private int colorApplicatorBattery;
|
private int colorApplicatorBattery;
|
||||||
private int chargedStaffBattery;
|
private int chargedStaffBattery;
|
||||||
|
|
||||||
// Certus quartz
|
|
||||||
private float spawnChargedChance;
|
|
||||||
private int quartzOresPerCluster;
|
|
||||||
private int quartzOresClusterAmount;
|
|
||||||
|
|
||||||
// Meteors
|
// Meteors
|
||||||
private int minMeteoriteDistance;
|
private int minMeteoriteDistance;
|
||||||
private int minMeteoriteDistanceSq;
|
private int minMeteoriteDistanceSq;
|
||||||
@@ -215,16 +210,12 @@ public final class AEConfig implements IConfigurableObject, IConfigManagerHost {
|
|||||||
|
|
||||||
this.oreDoublePercentage = config.oreDoublePercentage.get().floatValue();
|
this.oreDoublePercentage = config.oreDoublePercentage.get().floatValue();
|
||||||
|
|
||||||
this.spawnChargedChance = config.spawnChargedChance.get().floatValue();
|
|
||||||
this.minMeteoriteDistance = config.minMeteoriteDistance.get();
|
this.minMeteoriteDistance = config.minMeteoriteDistance.get();
|
||||||
this.minMeteoriteDistanceSq = this.minMeteoriteDistance * this.minMeteoriteDistance;
|
this.minMeteoriteDistanceSq = this.minMeteoriteDistance * this.minMeteoriteDistance;
|
||||||
this.meteoriteClusterChance = config.meteoriteClusterChance.get();
|
this.meteoriteClusterChance = config.meteoriteClusterChance.get();
|
||||||
this.meteoriteMaximumSpawnHeight = config.meteoriteMaximumSpawnHeight.get();
|
this.meteoriteMaximumSpawnHeight = config.meteoriteMaximumSpawnHeight.get();
|
||||||
this.meteoriteDimensionWhitelist = new HashSet<>(config.meteoriteDimensionWhitelist.get());
|
this.meteoriteDimensionWhitelist = new HashSet<>(config.meteoriteDimensionWhitelist.get());
|
||||||
|
|
||||||
this.quartzOresPerCluster = config.quartzOresPerCluster.get();
|
|
||||||
this.quartzOresClusterAmount = config.quartzOresPerCluster.get();
|
|
||||||
|
|
||||||
this.wirelessBaseCost = config.wirelessBaseCost.get();
|
this.wirelessBaseCost = config.wirelessBaseCost.get();
|
||||||
this.wirelessCostMultiplier = config.wirelessCostMultiplier.get();
|
this.wirelessCostMultiplier = config.wirelessCostMultiplier.get();
|
||||||
this.wirelessBaseRange = config.wirelessBaseRange.get();
|
this.wirelessBaseRange = config.wirelessBaseRange.get();
|
||||||
@@ -492,15 +483,15 @@ public final class AEConfig implements IConfigurableObject, IConfigManagerHost {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public float getSpawnChargedChance() {
|
public float getSpawnChargedChance() {
|
||||||
return this.spawnChargedChance;
|
return COMMON.spawnChargedChance.get().floatValue();
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getQuartzOresPerCluster() {
|
public int getQuartzOresPerCluster() {
|
||||||
return this.quartzOresPerCluster;
|
return COMMON.quartzOresPerCluster.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getQuartzOresClusterAmount() {
|
public int getQuartzOresClusterAmount() {
|
||||||
return this.quartzOresClusterAmount;
|
return COMMON.quartzOresClusterAmount.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getMinMeteoriteDistance() {
|
public int getMinMeteoriteDistance() {
|
||||||
@@ -727,7 +718,7 @@ public final class AEConfig implements IConfigurableObject, IConfigManagerHost {
|
|||||||
defaultDimensionWhitelist, obj -> true);
|
defaultDimensionWhitelist, obj -> true);
|
||||||
|
|
||||||
this.quartzOresPerCluster = builder.define("quartzOresPerCluster", 4);
|
this.quartzOresPerCluster = builder.define("quartzOresPerCluster", 4);
|
||||||
this.quartzOresClusterAmount = builder.define("quartzOresClusterAmount", 15);
|
this.quartzOresClusterAmount = builder.define("quartzOresClusterAmount", 20);
|
||||||
|
|
||||||
builder.pop();
|
builder.pop();
|
||||||
|
|
||||||
|
|||||||
@@ -666,7 +666,7 @@ final class Registration {
|
|||||||
|
|
||||||
if (AEConfig.instance().isFeatureEnabled(AEFeature.CHARGED_CERTUS_ORE)) {
|
if (AEConfig.instance().isFeatureEnabled(AEFeature.CHARGED_CERTUS_ORE)) {
|
||||||
|
|
||||||
BlockState chargedQuartzOre = AEApi.instance().definitions().blocks().quartzOre().block()
|
BlockState chargedQuartzOre = AEApi.instance().definitions().blocks().quartzOreCharged().block()
|
||||||
.getDefaultState();
|
.getDefaultState();
|
||||||
b.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION,
|
b.addFeature(GenerationStage.Decoration.UNDERGROUND_DECORATION,
|
||||||
ChargedQuartzOreFeature.INSTANCE
|
ChargedQuartzOreFeature.INSTANCE
|
||||||
|
|||||||
Reference in New Issue
Block a user