Browse Source

Fix NullPointerException on using lava bucket in Aether; refactor AetherBiome a bit

1.7.10-rivoreo-fork
WHR 2 months ago
parent
commit
f12ede5739
5 changed files with 10 additions and 10 deletions
  1. +1
    -1
      build.gradle
  2. +1
    -1
      src/main/java/com/gildedgames/the_aether/Aether.java
  3. +1
    -1
      src/main/java/com/gildedgames/the_aether/AetherConfig.java
  4. +4
    -4
      src/main/java/com/gildedgames/the_aether/AetherEventHandler.java
  5. +3
    -3
      src/main/java/com/gildedgames/the_aether/world/biome/AetherBiome.java

+ 1
- 1
build.gradle View File

@@ -17,7 +17,7 @@ buildscript {

apply plugin: "forge"

version = "1.7.10-1.1.1-rivoreo-r4"
version = "1.7.10-1.1.1-rivoreo-r5"
group = "com.gildedgames.the-aether" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = "aether"



+ 1
- 1
src/main/java/com/gildedgames/the_aether/Aether.java View File

@@ -22,7 +22,7 @@ import cpw.mods.fml.common.SidedProxy;
import cpw.mods.fml.common.event.FMLInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;

@Mod(modid = Aether.MOD_ID, version = "1.1.1-rivoreo-r4")
@Mod(modid = Aether.MOD_ID, version = "1.1.1-rivoreo-r5")
public class Aether {

public static final String MOD_ID = "aether_legacy";


+ 1
- 1
src/main/java/com/gildedgames/the_aether/AetherConfig.java View File

@@ -215,7 +215,7 @@ public class AetherConfig {
return AetherConfig.aether_world_id.getInt();
}

public static int getAetherBiomeID() {
public static int get_aether_biome_id() {
return AetherConfig.aether_biome_id.getInt();
}



+ 4
- 4
src/main/java/com/gildedgames/the_aether/AetherEventHandler.java View File

@@ -161,6 +161,9 @@ public class AetherEventHandler {
case 4:
x--;
break;
case 5:
x++;
break;
}

EntityPlayer player = event.entityPlayer;
@@ -185,16 +188,13 @@ public class AetherEventHandler {
if (player.capabilities.isCreativeMode && player.isSneaking()) {
return;
}

if (world.isAirBlock(x, y, z)) {
world.setBlock(x, y, z, BlocksAether.aerogel);

if (!player.capabilities.isCreativeMode) {
event.result = new ItemStack(Items.bucket);
}
event.setResult(Event.Result.ALLOW);
}

event.setResult(Event.Result.ALLOW);
}
}



+ 3
- 3
src/main/java/com/gildedgames/the_aether/world/biome/AetherBiome.java View File

@@ -25,7 +25,7 @@ public class AetherBiome extends BiomeGenBase {

@SuppressWarnings("unchecked")
public AetherBiome() {
super(AetherConfig.getAetherBiomeID());
super(AetherConfig.get_aether_biome_id());

this.spawnableCaveCreatureList.clear();
this.spawnableCreatureList.clear();
@@ -73,7 +73,7 @@ public class AetherBiome extends BiomeGenBase {

@Override
public int getWaterColorMultiplier() {
return 16777215;
return 0xffffff;
}

@Override
@@ -98,7 +98,7 @@ public class AetherBiome extends BiomeGenBase {

@Override
public WorldGenAbstractTree func_150567_a(Random rand) {
return (WorldGenAbstractTree) (rand.nextInt(20) == 0 ? new AetherGenOakTree() : new AetherGenSkyrootTree(false));
return rand.nextInt(20) == 0 ? new AetherGenOakTree() : new AetherGenSkyrootTree(false);
}

}

Loading…
Cancel
Save