aboutsummaryrefslogtreecommitdiff
path: root/src/Java
diff options
context:
space:
mode:
authorAlkalus <draknyte1@hotmail.com>2017-07-12 15:46:08 +1000
committerAlkalus <draknyte1@hotmail.com>2017-07-12 15:46:08 +1000
commit28a0de1c20652e51b14668b3c16ea425bb92d901 (patch)
tree2e26e8cb8fbb8353aa0ae0884ba9a723d31d1fb1 /src/Java
parent424a591a404ccc0983796b2d1d4514130d57d65b (diff)
downloadGT5-Unofficial-28a0de1c20652e51b14668b3c16ea425bb92d901.tar.gz
GT5-Unofficial-28a0de1c20652e51b14668b3c16ea425bb92d901.tar.bz2
GT5-Unofficial-28a0de1c20652e51b14668b3c16ea425bb92d901.zip
- Stopped the Multitank storing it's contents.
% Changed Jack Daniels into Sludge. % Dark World Generation tweaks. $ Fixed 255 height biome/world. $ Fixed lighting issues. + Failed to add my own world type.
Diffstat (limited to 'src/Java')
-rw-r--r--src/Java/gtPlusPlus/core/block/ModBlocks.java4
-rw-r--r--src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java (renamed from src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidJackDaniels.java)4
-rw-r--r--src/Java/gtPlusPlus/core/fluids/FluidRegistryHandler.java31
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java27
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java42
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java17
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/chunk/ChunkProviderModded.java36
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/world/CustomWorldType.java59
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/world/WorldProviderMod.java12
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MultiTank.java23
10 files changed, 185 insertions, 70 deletions
diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
index e5f5de3436..efc5a3b08a 100644
--- a/src/Java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -30,8 +30,8 @@ public final class ModBlocks {
public static Block MatterFabricatorEffectBlock;
- public static Fluid fluidJackDaniels = new Fluid("fluidJackDaniels");
- public static Block blockFluidJackDaniels;
+ public static Fluid fluidSludge = new Fluid("fluid.sludge");
+ public static Block blockFluidSludge;
public static Block blockCasings2Misc;
public static Block blockFirePit;
diff --git a/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidJackDaniels.java b/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java
index 9d80072b61..f40c1dbe7d 100644
--- a/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidJackDaniels.java
+++ b/src/Java/gtPlusPlus/core/block/general/fluids/BlockFluidSludge.java
@@ -12,14 +12,14 @@ import net.minecraft.world.World;
import net.minecraftforge.fluids.BlockFluidClassic;
import net.minecraftforge.fluids.Fluid;
-public class BlockFluidJackDaniels extends BlockFluidClassic {
+public class BlockFluidSludge extends BlockFluidClassic {
@SideOnly(Side.CLIENT)
protected IIcon stillIcon;
@SideOnly(Side.CLIENT)
protected IIcon flowingIcon;
- public BlockFluidJackDaniels(final Fluid fluid, final Material material) {
+ public BlockFluidSludge(final Fluid fluid, final Material material) {
super(fluid, material);
this.setCreativeTab(AddToCreativeTab.tabMisc);
}
diff --git a/src/Java/gtPlusPlus/core/fluids/FluidRegistryHandler.java b/src/Java/gtPlusPlus/core/fluids/FluidRegistryHandler.java
index b98e333564..4fb6f14f92 100644
--- a/src/Java/gtPlusPlus/core/fluids/FluidRegistryHandler.java
+++ b/src/Java/gtPlusPlus/core/fluids/FluidRegistryHandler.java
@@ -1,10 +1,10 @@
package gtPlusPlus.core.fluids;
-import static gtPlusPlus.core.block.ModBlocks.blockFluidJackDaniels;
-import static gtPlusPlus.core.block.ModBlocks.fluidJackDaniels;
+import static gtPlusPlus.core.block.ModBlocks.blockFluidSludge;
+import static gtPlusPlus.core.block.ModBlocks.fluidSludge;
import cpw.mods.fml.common.registry.GameRegistry;
-import gtPlusPlus.core.block.general.fluids.BlockFluidJackDaniels;
+import gtPlusPlus.core.block.general.fluids.BlockFluidSludge;
import gtPlusPlus.core.lib.CORE;
import net.minecraft.block.material.Material;
import net.minecraftforge.fluids.FluidRegistry;
@@ -31,23 +31,22 @@ public class FluidRegistryHandler {
run();
}
- @SuppressWarnings("unused")
private static void run(){
- fluidJackDaniels();
+ fluidSludge();
}
- private static void fluidJackDaniels(){
+ private static void fluidSludge(){
//testFluid
- fluidJackDaniels.setLuminosity(12);
- fluidJackDaniels.setDensity(1200);
- fluidJackDaniels.setTemperature(420);
- fluidJackDaniels.setViscosity(750);
- fluidJackDaniels.setGaseous(true);
- fluidJackDaniels.setUnlocalizedName("fluidJackDaniels");
- FluidRegistry.registerFluid(fluidJackDaniels);
- blockFluidJackDaniels = new BlockFluidJackDaniels(fluidJackDaniels, Material.water).setBlockName("fluidBlockJackDaniels");
- GameRegistry.registerBlock(blockFluidJackDaniels, CORE.MODID + "_" + blockFluidJackDaniels.getUnlocalizedName().substring(5));
- fluidJackDaniels.setUnlocalizedName(blockFluidJackDaniels.getUnlocalizedName());
+ fluidSludge.setLuminosity(8);
+ fluidSludge.setDensity(8196);
+ fluidSludge.setTemperature(295);
+ fluidSludge.setViscosity(3000);
+ fluidSludge.setGaseous(false);
+ fluidSludge.setUnlocalizedName("fluid.sludge");
+ FluidRegistry.registerFluid(fluidSludge);
+ blockFluidSludge = new BlockFluidSludge(fluidSludge, Material.cactus).setBlockName("fluidBlockSludge");
+ GameRegistry.registerBlock(blockFluidSludge, CORE.MODID + "_" + blockFluidSludge.getUnlocalizedName().substring(5));
+ fluidSludge.setUnlocalizedName(blockFluidSludge.getUnlocalizedName());
}
}
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java b/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java
index 0222b8738f..93d8e2898e 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java
@@ -5,14 +5,18 @@ import java.util.Random;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.event.FMLServerStartingEvent;
import cpw.mods.fml.common.registry.GameRegistry;
+import gtPlusPlus.core.block.ModBlocks;
+import gtPlusPlus.core.lib.LoadedMods;
import gtPlusPlus.core.world.darkworld.block.*;
import gtPlusPlus.core.world.darkworld.item.itemDarkWorldPortalTrigger;
+import gtPlusPlus.core.world.darkworld.world.CustomWorldType;
import gtPlusPlus.core.world.darkworld.world.WorldProviderMod;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
+import net.minecraft.world.WorldType;
import net.minecraftforge.common.DimensionManager;
@SuppressWarnings("unchecked")
@@ -27,28 +31,41 @@ public class Dimension_DarkWorld {
public static Block blockSecondLayer = Blocks.dirt;
public static Block blockMainFiller = Blocks.stone;
public static Block blockSecondaryFiller;
- public static Block blockFluidLakes = Blocks.lava;
+ public static Block blockFluidLakes = ModBlocks.blockFluidSludge;
public static Block blockPortalFrame;
+
+ /** Default (1.1) world type. */
+ //public static final WorldType TestType = (new CustomWorldType(12, "TEST", 0));
static {
DIMID = DimensionManager.getNextFreeDimId();
portalBlock = new blockDarkWorldPortal();
portalItem = (itemDarkWorldPortalTrigger) (new itemDarkWorldPortalTrigger().setUnlocalizedName("dimensionDarkWorld_trigger"));
- Item.itemRegistry.addObject(423, "dimensionDarkWorld_trigger", portalItem);
blockTopLayer = new blockDarkWorldGround();
- GameRegistry.registerBlock(blockTopLayer, "blockDarkWorldGround");
+ blockSecondLayer = new blockDarkWorldPollutedDirt();
Blocks.fire.setFireInfo(blockTopLayer, 30, 20);
blockPortalFrame = new blockDarkWorldPortalFrame();
+
+ //Registration
+ GameRegistry.registerBlock(portalBlock, "dimensionDarkWorld_portal");
GameRegistry.registerBlock(blockPortalFrame, "blockDarkWorldPortalFrame");
+ GameRegistry.registerBlock(blockTopLayer, "blockDarkWorldGround");
+ GameRegistry.registerBlock(blockSecondLayer, "blockDarkWorldGround2");
+ Item.itemRegistry.addObject(423, "dimensionDarkWorld_trigger", portalItem);
+
+ //Use Oil for Things.
+ if (LoadedMods.BuildCraft){
+ //blockFluidLakes =
+ }
+
}
public Dimension_DarkWorld() {
}
- public void load() {
- GameRegistry.registerBlock(portalBlock, "dimensionDarkWorld_portal");
+ public void load() {
DimensionManager.registerProviderType(DIMID, WorldProviderMod.class, false);
DimensionManager.registerDimension(DIMID, DIMID);
// GameRegistry.addSmelting(Items.record_11, new ItemStack(block),
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java b/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
index 964da5d38d..aace191cbb 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java
@@ -27,7 +27,7 @@ public class Biome_DarkWorld {
}
public void load() {
- BiomeDictionary.registerBiomeType(biome, BiomeDictionary.Type.SPOOKY);
+ BiomeDictionary.registerBiomeType(biome, BiomeDictionary.Type.DEAD);
BiomeManager.addSpawnBiome(biome);
// BiomeManager.desertBiomes.add(new BiomeManager.BiomeEntry(biome,
// 10));
@@ -57,24 +57,24 @@ public class Biome_DarkWorld {
public BiomeGenbiomeDarkWorld() {
super(CORE.DARKBIOME_ID);
Utils.LOG_INFO("Dark World Temperature Category: "+getTempCategory());
- setBiomeName("Dark World");
- topBlock = Dimension_DarkWorld.blockTopLayer;
- fillerBlock = Dimension_DarkWorld.blockSecondLayer;
- theBiomeDecorator.generateLakes = true;
- theBiomeDecorator.treesPerChunk = 50;
- theBiomeDecorator.flowersPerChunk = 4;
- theBiomeDecorator.grassPerChunk = 10;
- theBiomeDecorator.deadBushPerChunk = 25;
- theBiomeDecorator.mushroomsPerChunk = 5;
- theBiomeDecorator.reedsPerChunk = 1;
- theBiomeDecorator.cactiPerChunk = 1;
- theBiomeDecorator.sandPerChunk = 8;
- enableRain = true;
- enableSnow = false;
- rainfall = 0.7F;
- setHeight(new BiomeGenBase.Height(0.15F, 0.65F));
- waterColorMultiplier = 0x2d0b2d;
- rootHeight = 48; //Ground level
+ this.setBiomeName("Dark World");
+ this.topBlock = Dimension_DarkWorld.blockTopLayer;
+ this.fillerBlock = Dimension_DarkWorld.blockSecondLayer;
+ this.theBiomeDecorator.generateLakes = true;
+ this.theBiomeDecorator.treesPerChunk = 50;
+ this.theBiomeDecorator.flowersPerChunk = 4;
+ this.theBiomeDecorator.grassPerChunk = 10;
+ this.theBiomeDecorator.deadBushPerChunk = 25;
+ this.theBiomeDecorator.mushroomsPerChunk = 5;
+ this.theBiomeDecorator.reedsPerChunk = 1;
+ this.theBiomeDecorator.cactiPerChunk = 1;
+ this.theBiomeDecorator.sandPerChunk = 8;
+ this.enableRain = true;
+ this.enableSnow = false;
+ this.rainfall = 0.7F;
+ this.setHeight(new BiomeGenBase.Height(0.25F, 0.65F));
+ this.waterColorMultiplier = 0x2d0b2d;
+ this.rootHeight = -0.25f; //Ground level
this.spawnableMonsterList.clear();
this.spawnableCreatureList.clear();
@@ -86,7 +86,7 @@ public class Biome_DarkWorld {
this.spawnableMonsterList.add(new SpawnListEntry(EntityCreeper.class, 5, 1, 5));
this.spawnableMonsterList.add(new SpawnListEntry(EntityEnderman.class, 5, 1, 5));
this.spawnableMonsterList.add(new SpawnListEntry(EntityGhast.class, 5, 1, 5));
- this.spawnableMonsterList.add(new SpawnListEntry(EntityGiantZombie.class, 5, 1, 5));
+ this.spawnableMonsterList.add(new SpawnListEntry(EntityGiantZombie.class, 15, 1, 5));
this.spawnableMonsterList.add(new SpawnListEntry(EntityMagmaCube.class, 5, 1, 5));
this.spawnableMonsterList.add(new SpawnListEntry(EntityPigZombie.class, 5, 1, 5));
this.spawnableMonsterList.add(new SpawnListEntry(EntitySkeleton.class, 5, 1, 5));
@@ -95,6 +95,8 @@ public class Biome_DarkWorld {
this.spawnableMonsterList.add(new SpawnListEntry(EntityWolf.class, 5, 1, 5));
this.spawnableMonsterList.add(new SpawnListEntry(EntityZombie.class, 5, 1, 5));
+ this.spawnableCreatureList.add(new SpawnListEntry(EntityCow.class, 5, 5, 10));
+
}
@SideOnly(Side.CLIENT)
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java
new file mode 100644
index 0000000000..821e59be7d
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPollutedDirt.java
@@ -0,0 +1,17 @@
+package gtPlusPlus.core.world.darkworld.block;
+
+import cpw.mods.fml.common.registry.LanguageRegistry;
+import gtPlusPlus.core.creative.AddToCreativeTab;
+import net.minecraft.block.BlockGrass;
+
+public class blockDarkWorldPollutedDirt extends BlockGrass {
+
+ public blockDarkWorldPollutedDirt() {
+ this.setCreativeTab(AddToCreativeTab.tabBOP);
+ this.setBlockName("blockDarkWorldGround2");
+ this.setHardness(0.5F);
+ this.setBlockTextureName("minecraft" + ":" + "dirt");
+ LanguageRegistry.addName(this, "Polluted Soil");
+ }
+
+}
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/chunk/ChunkProviderModded.java b/src/Java/gtPlusPlus/core/world/darkworld/chunk/ChunkProviderModded.java
index 6fb88631bf..0c46c7824c 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/chunk/ChunkProviderModded.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/chunk/ChunkProviderModded.java
@@ -3,10 +3,12 @@ package gtPlusPlus.core.world.darkworld.chunk;
import java.util.List;
import java.util.Random;
+import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
import net.minecraft.block.Block;
import net.minecraft.block.BlockFalling;
import net.minecraft.entity.EnumCreatureType;
+import net.minecraft.init.Blocks;
import net.minecraft.util.IProgressUpdate;
import net.minecraft.util.MathHelper;
import net.minecraft.world.*;
@@ -372,7 +374,7 @@ public class ChunkProviderModded implements IChunkProvider {
boolean flag = false;
MinecraftForge.EVENT_BUS
- .post(new PopulateChunkEvent.Pre(par1IChunkProvider, worldObj, rand, par2, par3, flag));
+ .post(new PopulateChunkEvent.Pre(par1IChunkProvider, worldObj, rand, par2, par3, flag));
int k1;
int l1;
@@ -384,7 +386,13 @@ public class ChunkProviderModded implements IChunkProvider {
k1 = k + this.rand.nextInt(16) + 8;
l1 = this.rand.nextInt(256);
i2 = l + this.rand.nextInt(16) + 8;
- (new WorldGenLakes(Dimension_DarkWorld.blockFluidLakes)).generate(this.worldObj, this.rand, k1, l1, i2);
+ try {
+ (new WorldGenLakes(Dimension_DarkWorld.blockFluidLakes)).generate(this.worldObj, this.rand, k1, l1, i2);
+ } catch (NullPointerException n){
+ n.getStackTrace();
+ (new WorldGenLakes(Blocks.lava)).generate(this.worldObj, this.rand, k1, l1, i2);
+ Utils.LOG_INFO("Error while generating DarkWorld Lake.");
+ }
}
if (TerrainGen.populate(par1IChunkProvider, worldObj, rand, par2, par3, flag,
@@ -394,8 +402,12 @@ public class ChunkProviderModded implements IChunkProvider {
l1 = this.rand.nextInt(this.rand.nextInt(248) + 8);
i2 = l + this.rand.nextInt(16) + 8;
- if (l1 < 63 || this.rand.nextInt(10) == 0) {
- (new WorldGenLakes(Dimension_DarkWorld.blockFluidLakes)).generate(this.worldObj, this.rand, k1, l1, i2);
+ if (l1 < 63 || this.rand.nextInt(10) == 0) { //Changes 63 -> 128
+ try{
+ (new WorldGenLakes(Blocks.lava)).generate(this.worldObj, this.rand, k1, l1, i2);
+ } catch (NullPointerException n){
+ Utils.LOG_INFO("Error while generating DarkWorld Lake. [2]");
+ }
}
}
biomegenbase.decorate(this.worldObj, this.rand, k, l);
@@ -404,7 +416,7 @@ public class ChunkProviderModded implements IChunkProvider {
l += 8;
MinecraftForge.EVENT_BUS
- .post(new PopulateChunkEvent.Post(par1IChunkProvider, worldObj, rand, par2, par3, flag));
+ .post(new PopulateChunkEvent.Post(par1IChunkProvider, worldObj, rand, par2, par3, flag));
BlockFalling.fallInstantly = false;
}
@@ -462,18 +474,18 @@ public class ChunkProviderModded implements IChunkProvider {
BiomeGenBase biomegenbase = this.worldObj.getBiomeGenForCoords(par2, par4);
return par1EnumCreatureType == EnumCreatureType.monster
&& this.scatteredFeatureGenerator.func_143030_a(par2, par3, par4)
- ? this.scatteredFeatureGenerator.getScatteredFeatureSpawnList()
+ ? this.scatteredFeatureGenerator.getScatteredFeatureSpawnList()
: biomegenbase.getSpawnableList(par1EnumCreatureType);
}
@Override
public ChunkPosition func_147416_a(World p_147416_1_, String p_147416_2_, int p_147416_3_, int p_147416_4_, int p_147416_5_) {
- return /*
- * "Stronghold".equals(p_147416_2_) &&
- * this.strongholdGenerator != null ?
- * this.strongholdGenerator.func_151545_a(p_147416_1_,
- * p_147416_3_, p_147416_4_, p_147416_5_) :
- */ null;
+ return
+ "Village".equals(p_147416_2_) &&
+ this.villageGenerator != null ?
+ this.villageGenerator.func_151545_a(p_147416_1_,
+ p_147416_3_, p_147416_4_, p_147416_5_) :
+ null;
}
@Override
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/world/CustomWorldType.java b/src/Java/gtPlusPlus/core/world/darkworld/world/CustomWorldType.java
new file mode 100644
index 0000000000..eb9c284543
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/world/darkworld/world/CustomWorldType.java
@@ -0,0 +1,59 @@
+package gtPlusPlus.core.world.darkworld.world;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import net.minecraft.world.WorldType;
+
+public class CustomWorldType extends WorldType{
+
+ public CustomWorldType(String name) {
+ super(name);
+ }
+
+ public CustomWorldType(int p_i1959_1_, String p_i1959_2_){
+ this("test");
+ try {
+ //System.out.println(Arrays.toString(getClass().getSuperclass().getMethods()));
+ Method m = getClass().getSuperclass().getDeclaredMethod("WorldType", new Class<?>[]{});
+ m.setAccessible(true);
+ m.invoke(this, p_i1959_1_, p_i1959_2_, 0);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ public CustomWorldType(int p_i1960_1_, String p_i1960_2_, int p_i1960_3_){
+ this("test2");
+ try {
+ //System.out.println(Arrays.toString(getClass().getSuperclass().getMethods()));
+ Method m = getClass().getSuperclass().getDeclaredMethod("WorldType", new Class<?>[]{});
+ m.setAccessible(true);
+ m.invoke(this, p_i1960_1_, p_i1960_2_, p_i1960_3_);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ private WorldType getMC(){
+ try {
+ Constructor<WorldType> c = WorldType.class.getDeclaredConstructor();
+ c.setAccessible(true); // solution
+ return c.newInstance();
+
+ // production code should handle these exceptions more gracefully
+ } catch (InvocationTargetException x) {
+ x.printStackTrace();
+ } catch (NoSuchMethodException x) {
+ x.printStackTrace();
+ } catch (InstantiationException x) {
+ x.printStackTrace();
+ } catch (IllegalAccessException x) {
+ x.printStackTrace();
+ }
+ return null;
+ }
+}
+
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/world/WorldProviderMod.java b/src/Java/gtPlusPlus/core/world/darkworld/world/WorldProviderMod.java
index eb9f439887..fd0f7a9b74 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/world/WorldProviderMod.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/world/WorldProviderMod.java
@@ -15,7 +15,7 @@ public class WorldProviderMod extends WorldProvider {
public void registerWorldChunkManager() {
this.worldChunkMgr = new WorldChunkManagerCustom(this.worldObj.getSeed(), WorldType.AMPLIFIED);
this.isHellWorld = false;
- this.hasNoSky = true;
+ this.hasNoSky = false;
this.dimensionId = Dimension_DarkWorld.DIMID;
}
@@ -46,6 +46,16 @@ public class WorldProviderMod extends WorldProvider {
}
@Override
+ public float getSunBrightness(float par1) {
+ return (par1*2F);
+ }
+
+ @Override
+ public float getStarBrightness(float par1) {
+ return (par1*5F);
+ }
+
+ @Override
@SideOnly(Side.CLIENT)
public boolean doesXZShowFog(int par1, int par2) {
return true;
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MultiTank.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MultiTank.java
index a25d1f2c96..b908e5439c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MultiTank.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MultiTank.java
@@ -40,7 +40,7 @@ extends GregtechMeta_MultiBlockBase {
private short multiblockCasingCount = 0;
private int mInternalSaveClock = 0;
private final short storageMultiplier = 1;
- private int maximumFluidStorage = 96000;
+ private int maximumFluidStorage = 128000;
private FluidStack internalStorageTank = null;
private final NBTTagCompound internalCraftingComponentsTag = new NBTTagCompound();
@@ -72,7 +72,7 @@ extends GregtechMeta_MultiBlockBase {
@Override
public void saveNBTData(final NBTTagCompound aNBT) {
super.saveNBTData(aNBT);
- final NBTTagCompound gtCraftingComponentsTag = aNBT.getCompoundTag("GT.CraftingComponents");
+ /*final NBTTagCompound gtCraftingComponentsTag = aNBT.getCompoundTag("GT.CraftingComponents");
if (gtCraftingComponentsTag != null){
Utils.LOG_WARNING("Got Crafting Tag");
@@ -96,13 +96,13 @@ extends GregtechMeta_MultiBlockBase {
aNBT.setTag("GT.CraftingComponents", gtCraftingComponentsTag);
}
- }
+ }*/
}
@Override
public void loadNBTData(final NBTTagCompound aNBT) {
super.loadNBTData(aNBT);
- final NBTTagCompound gtCraftingComponentsTag = aNBT.getCompoundTag("GT.CraftingComponents");
+ /*final NBTTagCompound gtCraftingComponentsTag = aNBT.getCompoundTag("GT.CraftingComponents");
String xFluid = null;
int xAmount = 0;
if (gtCraftingComponentsTag.hasNoTags()){
@@ -129,7 +129,7 @@ extends GregtechMeta_MultiBlockBase {
Utils.LOG_WARNING("Setting Internal Tank, loading "+xAmount+"L of "+xFluid);
this.setInternalTank(xFluid, xAmount);
}
- }
+ }*/
}
private boolean setInternalTank(final String fluidName, final int amount){
@@ -204,7 +204,7 @@ extends GregtechMeta_MultiBlockBase {
"Controller Block for the Multitank",
"Size: 3xHx3 (Block behind controller must be air)",
"Structure must be at least 4 blocks tall, maximum 20.",
- "Each casing within the structure adds 96000L storage.",
+ "Each casing within the structure adds 128000L storage.",
"Controller (front centered)",
"1x Input hatch (anywhere)",
"1x Output hatch (anywhere)",
@@ -522,9 +522,8 @@ extends GregtechMeta_MultiBlockBase {
return 10000;
}
- @Override
public int getPollutionPerTick(final ItemStack aStack) {
- return 0;
+ return 5;
}
@Override
@@ -547,13 +546,13 @@ extends GregtechMeta_MultiBlockBase {
private static int getMaximumTankStorage(final int casingCount){
final int multiplier = getStorageMultiplier(casingCount);
- final int tempTankStorageMax = 96000*multiplier;
- if (tempTankStorageMax <= 0){return 96000;}
+ final int tempTankStorageMax = 128000*multiplier;
+ if (tempTankStorageMax <= 0){return 128000;}
return tempTankStorageMax;
}
private boolean tryForceNBTUpdate(){
-
+/*
//Block is invalid.
if ((this == null) || (this.getBaseMetaTileEntity() == null)){
Utils.LOG_WARNING("Block was not valid for saving data.");
@@ -587,7 +586,7 @@ extends GregtechMeta_MultiBlockBase {
this.getBaseMetaTileEntity().getWorld().markBlockForUpdate(x, y, z);
//Mark block dirty, let chunk know it's data has changed and it must be saved to disk. (Albeit slowly)
- this.getBaseMetaTileEntity().markDirty();
+ this.getBaseMetaTileEntity().markDirty();*/
return true;
}
}