Skip to content

Commit

Permalink
Update to 1.9.4.
Browse files Browse the repository at this point in the history
  • Loading branch information
@Lunatrius
Lunatrius committed Jun 2, 2016
1 parent 2f34dc3 commit c01f06d
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 23 deletions.
2 changes: 1 addition & 1 deletion build.gradle
View file
Expand Up @@ -12,7 +12,7 @@ buildscript {
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.1-SNAPSHOT'
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
classpath 'com.matthewprenger:CurseGradle:1.0-SNAPSHOT'
}
}
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
View file
@@ -1,11 +1,11 @@
version_major=2
version_minor=8
version_micro=1
version_minecraft=1.9
version_forge=12.16.0.1864-1.9
version_minforge=12.16.0.1850
version_mappings=snapshot_20160414
version_lunatriuscore=1.1.2.34
version_minecraft=1.9.4
version_forge=12.17.0.1937
version_minforge=12.17.0.1908
version_mappings=snapshot_20160601
version_lunatriuscore=1.1.2.35

extra_modsio_id=1022
extra_curseforge_id=225604
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/github/lunatrius/ingameinfo/tag/TagMisc.java
View file
Expand Up @@ -88,7 +88,7 @@ public String getValue() {
public static class Server extends TagMisc {
@Override
public String getValue() {
final String str = player.sendQueue.getNetworkManager().getRemoteAddress().toString();
final String str = player.connection.getNetworkManager().getRemoteAddress().toString();
final int i = str.indexOf("/");
final int j = str.indexOf(":");
if (i < 0) {
Expand All @@ -104,7 +104,7 @@ public String getValue() {
public static class ServerName extends TagMisc {
@Override
public String getValue() {
final String str = player.sendQueue.getNetworkManager().getRemoteAddress().toString();
final String str = player.connection.getNetworkManager().getRemoteAddress().toString();
final int i = str.indexOf("/");
if (i < 0) {
return "localhost";
Expand All @@ -118,7 +118,7 @@ public String getValue() {
public static class ServerIP extends TagMisc {
@Override
public String getValue() {
final String str = player.sendQueue.getNetworkManager().getRemoteAddress().toString();
final String str = player.connection.getNetworkManager().getRemoteAddress().toString();
final int i = str.indexOf("/");
if (i < 0) {
return "127.0.0.1";
Expand All @@ -130,7 +130,7 @@ public String getValue() {
public static class ServerPort extends TagMisc {
@Override
public String getValue() {
final String str = player.sendQueue.getNetworkManager().getRemoteAddress().toString();
final String str = player.connection.getNetworkManager().getRemoteAddress().toString();
final int i = str.indexOf("/");
if (i < 0) {
return "-1";
Expand All @@ -143,7 +143,7 @@ public static class Ping extends TagMisc {
@Override
public String getValue() {
try {
final NetworkPlayerInfo playerInfo = minecraft.getNetHandler().getPlayerInfo(player.getUniqueID());
final NetworkPlayerInfo playerInfo = minecraft.getConnection().getPlayerInfo(player.getUniqueID());
return String.valueOf(playerInfo.getResponseTime());
} catch (final Exception e) {
}
Expand All @@ -155,7 +155,7 @@ public static class PingIcon extends TagMisc {
@Override
public String getValue() {
try {
final NetworkPlayerInfo playerInfo = minecraft.getNetHandler().getPlayerInfo(player.getUniqueID());
final NetworkPlayerInfo playerInfo = minecraft.getConnection().getPlayerInfo(player.getUniqueID());
final int responseTime = playerInfo.getResponseTime();
int pingIndex = 4;
if (responseTime < 0) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/github/lunatrius/ingameinfo/tag/TagNearbyPlayer.java
View file
Expand Up @@ -121,7 +121,7 @@ public Icon(final int index) {
public String getValue() {
updateNearbyPlayers();
if (nearbyPlayers.length > this.index) {
final NetworkPlayerInfo playerInfo = minecraft.getNetHandler().getPlayerInfo(nearbyPlayers[this.index].getUniqueID());
final NetworkPlayerInfo playerInfo = minecraft.getConnection().getPlayerInfo(nearbyPlayers[this.index].getUniqueID());
final InfoIcon icon = new InfoIcon(playerInfo.getLocationSkin());
icon.setTextureData(8, 8, 8, 8, 64, 64);
icon.setDisplayDimensions(0, 0, 8, 8);
Expand Down
19 changes: 9 additions & 10 deletions src/main/java/com/github/lunatrius/ingameinfo/tag/TagWorld.java
View file
Expand Up @@ -8,7 +8,6 @@
import net.minecraft.world.DifficultyInstance;
import net.minecraft.world.DimensionType;
import net.minecraft.world.WorldServer;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.storage.WorldInfo;
import net.minecraftforge.common.DimensionManager;

Expand Down Expand Up @@ -125,14 +124,14 @@ public String getValue() {
public static class Biome extends TagWorld {
@Override
public String getValue() {
return world.getBiomeGenForCoords(playerPosition).getBiomeName();
return world.getBiome(playerPosition).getBiomeName();
}
}

public static class BiomeId extends TagWorld {
@Override
public String getValue() {
return String.valueOf(BiomeGenBase.getIdForBiome(world.getBiomeGenForCoords(playerPosition)));
return String.valueOf(net.minecraft.world.biome.Biome.getIdForBiome(world.getBiome(playerPosition)));
}
}

Expand All @@ -153,21 +152,21 @@ public String getValue() {
public static class Raining extends TagWorld {
@Override
public String getValue() {
return String.valueOf(world.isRaining() && world.getBiomeGenForCoords(playerPosition).canRain());
return String.valueOf(world.isRaining() && world.getBiome(playerPosition).canRain());
}
}

public static class Thundering extends TagWorld {
@Override
public String getValue() {
return String.valueOf(world.isThundering() && world.getBiomeGenForCoords(playerPosition).canRain());
return String.valueOf(world.isThundering() && world.getBiome(playerPosition).canRain());
}
}

public static class Snowing extends TagWorld {
@Override
public String getValue() {
return String.valueOf(world.isRaining() && world.getBiomeGenForCoords(playerPosition).getEnableSnow());
return String.valueOf(world.isRaining() && world.getBiome(playerPosition).getEnableSnow());
}
}

Expand All @@ -193,7 +192,7 @@ public String getValue() {
public static class Slimes extends TagWorld {
@Override
public String getValue() {
return String.valueOf(hasSeed && ChunkHelper.isSlimeChunk(seed, playerPosition) || world.getBiomeGenForCoords(playerPosition) == Biomes.SWAMPLAND);
return String.valueOf(hasSeed && ChunkHelper.isSlimeChunk(seed, playerPosition) || world.getBiome(playerPosition) == Biomes.SWAMPLAND);
}
}

Expand All @@ -207,21 +206,21 @@ public String getValue() {
public static class Temperature extends TagWorld {
@Override
public String getValue() {
return String.format(Locale.ENGLISH, "%.0f", world.getBiomeGenForCoords(playerPosition).getTemperature() * 100);
return String.format(Locale.ENGLISH, "%.0f", world.getBiome(playerPosition).getTemperature() * 100);
}
}

public static class LocalTemperature extends TagWorld {
@Override
public String getValue() {
return String.format(Locale.ENGLISH, "%.2f", world.getBiomeGenForCoords(playerPosition).getFloatTemperature(playerPosition) * 100);
return String.format(Locale.ENGLISH, "%.2f", world.getBiome(playerPosition).getFloatTemperature(playerPosition) * 100);
}
}

public static class Humidity extends TagWorld {
@Override
public String getValue() {
return String.format(Locale.ENGLISH, "%.0f", world.getBiomeGenForCoords(playerPosition).getRainfall() * 100);
return String.format(Locale.ENGLISH, "%.0f", world.getBiome(playerPosition).getRainfall() * 100);
}
}

Expand Down

0 comments on commit c01f06d

Please sign in to comment.