aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/everglades
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gtPlusPlus/everglades')
-rw-r--r--src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java5
-rw-r--r--src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java9
2 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java
index 6fafb08a31..6567e75cfb 100644
--- a/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java
+++ b/src/main/java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java
@@ -212,13 +212,14 @@ public class ChunkProviderModded implements IChunkProvider {
public void replaceBlocksForBiome(int p_147422_1_, int p_147422_2_, Block[] p_147422_3_, byte[] p_147422_4_,
BiomeGenBase[] p_147422_5_) {
- @SuppressWarnings("deprecation")
ChunkProviderEvent.ReplaceBiomeBlocks event = new ChunkProviderEvent.ReplaceBiomeBlocks(
this,
p_147422_1_,
p_147422_2_,
p_147422_3_,
- p_147422_5_);
+ new byte[256],
+ p_147422_5_,
+ null);
MinecraftForge.EVENT_BUS.post(event);
if (event.getResult() == cpw.mods.fml.common.eventhandler.Event.Result.DENY) return;
diff --git a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java
index fa34803054..b8e53047af 100644
--- a/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java
+++ b/src/main/java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java
@@ -444,7 +444,6 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
ore4String = "unset";
Map<Materials, String> gtOreMap = new HashMap<Materials, String>();
- @SuppressWarnings("deprecation")
public boolean setOreBlock(World aWorld, int aX, int aY, int aZ, Block aMetaData, boolean isSmallOre, boolean air) {
if (!air) {
aY = Math.min(aWorld.getActualHeight(), Math.max(aY, 1));
@@ -468,7 +467,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
if (this.mPrimaryMeta == aMetaData) {
for (Materials f : Materials.values()) {
if (!gtOreMap.containsKey(f)) {
- gtOreMap.put(f, Utils.sanitizeString(f.name().toLowerCase()));
+ gtOreMap.put(f, Utils.sanitizeString(f.mName.toLowerCase()));
}
fString = gtOreMap.get(f);
if (fString.contains(ore1String)) {
@@ -490,7 +489,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
if (this.mSecondaryMeta == aMetaData) {
for (Materials f : Materials.values()) {
if (!gtOreMap.containsKey(f)) {
- gtOreMap.put(f, Utils.sanitizeString(f.name().toLowerCase()));
+ gtOreMap.put(f, Utils.sanitizeString(f.mName.toLowerCase()));
}
fString = gtOreMap.get(f);
if (fString.contains(ore2String)) {
@@ -512,7 +511,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
if (this.mBetweenMeta == aMetaData) {
for (Materials f : Materials.values()) {
if (!gtOreMap.containsKey(f)) {
- gtOreMap.put(f, Utils.sanitizeString(f.name().toLowerCase()));
+ gtOreMap.put(f, Utils.sanitizeString(f.mName.toLowerCase()));
}
fString = gtOreMap.get(f);
if (fString.contains(ore3String)) {
@@ -534,7 +533,7 @@ public class WorldGen_GT_Ore_Layer extends WorldGen_GT {
if (this.mSporadicMeta == aMetaData) {
for (Materials f : Materials.values()) {
if (!gtOreMap.containsKey(f)) {
- gtOreMap.put(f, Utils.sanitizeString(f.name().toLowerCase()));
+ gtOreMap.put(f, Utils.sanitizeString(f.mName.toLowerCase()));
}
fString = gtOreMap.get(f);
if (fString.contains(ore4String)) {