diff options
| author | Technus <daniel112092@gmail.com> | 2016-10-02 16:48:08 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2016-10-02 16:48:08 +0200 |
| commit | 59631856e95b981dbf9ec39a88244c9abb0b1313 (patch) | |
| tree | 6f8c895e9ed83f1fcd74c66498bd35376c455143 | |
| parent | 52e01b866691ab635f6c9ad102455bbcdcfb01ce (diff) | |
| download | GT5-Unofficial-59631856e95b981dbf9ec39a88244c9abb0b1313.tar.gz GT5-Unofficial-59631856e95b981dbf9ec39a88244c9abb0b1313.tar.bz2 GT5-Unofficial-59631856e95b981dbf9ec39a88244c9abb0b1313.zip | |
Pollution buff, and another scanner change
3 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java index b2402bb699..cf7378e845 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java @@ -12,7 +12,7 @@ import net.minecraft.world.ChunkPosition; public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch { public GT_MetaTileEntity_Hatch_Muffler(int aID, String aName, String aNameRegional, int aTier) { - super(aID, aName, aNameRegional, aTier, 0, "Outputs the Pollution (Pollution might come later)"); + super(aID, aName, aNameRegional, aTier, 0, "Outputs the Pollution (Might cause acidic rains and poisoning.)"); } public GT_MetaTileEntity_Hatch_Muffler(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java index 6bca98728e..005991a05e 100644 --- a/src/main/java/gregtech/api/util/GT_Utility.java +++ b/src/main/java/gregtech/api/util/GT_Utility.java @@ -1677,7 +1677,7 @@ public class GT_Utility { rEUAmount += 400; int tValue = 0; if (0 < (tValue = ((IMachineProgress) tTileEntity).getMaxProgress())) - tList.add("Progress: " + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(((IMachineProgress) tTileEntity).getProgress()) +EnumChatFormatting.RESET+ " / " +EnumChatFormatting.YELLOW+GT_Utility.formatNumbers(tValue/20) +EnumChatFormatting.RESET); + tList.add("Progress: " + EnumChatFormatting.GREEN + GT_Utility.formatNumbers(((IMachineProgress) tTileEntity).getProgress()) +EnumChatFormatting.RESET+ " / " +EnumChatFormatting.YELLOW+GT_Utility.formatNumbers(tValue) +EnumChatFormatting.RESET); } } catch (Throwable e) { if (D1) e.printStackTrace(GT_Log.err); diff --git a/src/main/java/gregtech/common/GT_Pollution.java b/src/main/java/gregtech/common/GT_Pollution.java index 970f129c65..054d91cc83 100644 --- a/src/main/java/gregtech/common/GT_Pollution.java +++ b/src/main/java/gregtech/common/GT_Pollution.java @@ -41,7 +41,7 @@ public class GT_Pollution { // System.out.println("process: "+tPos.chunkPosX+" "+tPos.chunkPosZ+" "+tPollution); //Reduce pollution in chunk tPollution = (int)(0.99f*tPollution); - tPollution -= 2000; + tPollution -= 1000; if(tPollution<=0){tPollution = 0;}else{ //Spread Pollution if(tPollution>50000){ @@ -85,7 +85,7 @@ public class GT_Pollution { if(tPollution > GT_Mod.gregtechproxy.mPollutionVegetationLimit){ int f = 20; for(;f<(tPollution/25000);f++){ - int x =tPos.chunkPosX*16+(tRan.nextInt(16));; + int x =tPos.chunkPosX*16+(tRan.nextInt(16)); int y =60 +(-f+tRan.nextInt(f*2+1)); int z =tPos.chunkPosZ*16+(tRan.nextInt(16)); damageBlock(x, y, z, tPollution > GT_Mod.gregtechproxy.mPollutionSourRainLimit); |