Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues6 Pull requests Projects Releases Packages Wiki Activity Actions

Add new flexible configuration undeground oil

Browse source
This commit is contained in:
Maxime Legkiy 2017-02-13 04:24:48 +03:00
parent 772ec04bf3
commit 901a7d66c1
6 changed files with 240 additions and 114 deletions
src/main/java/gregtech/common
GT_Proxy.java

58
src/main/java/gregtech/common/GT_Proxy.java
View file

@ -24,6 +24,7 @@ import gregtech.api.items.GT_MetaGenerated_Item;
import gregtech.api.items.GT_MetaGenerated_Tool;
import gregtech.api.objects.GT_Fluid;
import gregtech.api.objects.GT_FluidStack;
import gregtech.api.objects.GT_UO_DimensionList;
import gregtech.api.objects.ItemData;
import gregtech.api.objects.MaterialStack;
import gregtech.api.util.*;
@ -165,11 +166,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
public boolean mHideUnusedOres = true;
public boolean mHideRecyclingRecipes = true;
public boolean mPollution = true;
public boolean mUndergroundOilOverworld = true; //in DIM 0
public boolean mUndergroundOilInRealDimension = true; //in other
public boolean mUndergroundOilNether = true; //in DIM -1
public boolean mUndergroundOilMoon = true; //in Galacticraft Moon
public boolean mUndergroundOilMars = false; //in Galacticraft Mars
public boolean mExplosionItemDrop = false;
public int mSkeletonsShootGTArrows = 16;
public int mMaxEqualEntitiesAtOneSpot = 3;
@ -184,14 +180,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
public int mPollutionPoisonLimit = 750000;
public int mPollutionVegetationLimit = 1000000;
public int mPollutionSourRainLimit = 2000000;
public int mUndergroundOilMaxAmount = 625; //mb in step
public int mUndergroundOilNetherMaxAmount = 625; //mb in step
public int mUndergroundOilNetherResType = 1; //0 - Oil; 1 - basalt lava; 3 - He3
public int mUndergroundOilMoonMaxAmount = 625; //mb in step
public int mUndergroundOilMoonResType = 2; //0 - Oil; 1 - basalt lava; 3 - He3
public final GT_UO_DimensionList mUndergroundOil = new GT_UO_DimensionList();
public int mTicksUntilNextCraftSound = 0;
public int[] mUndergroundOilBlackList;
public int[] mUndergroundOilWhiteList;
public double mMagneticraftBonusOutputPercent = 100.0d;
private World mUniverse = null;
private final String aTextThermalExpansion = "ThermalExpansion";
@ -1710,52 +1700,44 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
@SubscribeEvent
public void handleChunkSaveEvent(ChunkDataEvent.Save event)
{
{
ChunkPosition tPos = new ChunkPosition(event.getChunk().xPosition,event.getChunk().worldObj.provider.dimensionId+1,event.getChunk().zPosition);
if(chunkData.containsKey(tPos)){
int[] tInts = chunkData.get(tPos);
if(tInts.length>0){event.getData().setInteger("GTOIL", tInts[0]);}
if(tInts.length>1){event.getData().setInteger("GTPOLLUTION", tInts[1]);}}
if(tInts.length>1){event.getData().setInteger("GTPOLLUTION", tInts[1]);}
if(tInts.length>2){event.getData().setInteger("GTOILFLUID", tInts[2]);}
}
}
@SubscribeEvent
public void handleChunkLoadEvent(ChunkDataEvent.Load event)
{
int tOil = 0;
int tOilFluid = 0;
int tPollution = 0;
ChunkPosition tPos = new ChunkPosition(event.getChunk().xPosition,event.getChunk().worldObj.provider.dimensionId+1,event.getChunk().zPosition);
int[] tData = new int[2];
int[] tData = new int[0];
if(chunkData.containsKey(tPos)){
tData = chunkData.get(tPos);
chunkData.remove(tPos);
}
if(event.getData().hasKey("GTOIL")){
if(tData.length>2){
if(tData.length>0)
tOil = tData[0];
}else{
tOil += event.getData().getInteger("GTOIL");
}
}else{
if(tData[0]!=0){
tOil = tData[0];
}
if(tData.length>1)
tPollution = tData[1];
if(tData.length>2)
tOilFluid = tData[2];
}
if(event.getData().hasKey("GTPOLLUTION")){
if(tData.length>2){
tPollution = tData[1];
}else{
tPollution += event.getData().getInteger("GTPOLLUTION");
}
}else{
if(tData[1]!=0){
tPollution = tData[1];
}
}
if(tOil==0&&event.getData().hasKey("GTOIL"))
tOil = event.getData().getInteger("GTOIL");
if(tPollution==0&&event.getData().hasKey("GTPOLLUTION"))
tPollution = event.getData().getInteger("GTPOLLUTION");
if(tOilFluid==0&&event.getData().hasKey("GTOILFLUID"))
tOilFluid = event.getData().getInteger("GTOILFLUID");
chunkData.put(tPos, new int[]{ tOil,tPollution,-1});
chunkData.put(tPos, new int[]{tOil,tPollution,tOilFluid});
}
public static class OreDictEventContainer {