aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/world
diff options
context:
space:
mode:
authorJordan Byrne <draknyte1@hotmail.com>2018-01-30 04:40:04 +1000
committerJordan Byrne <draknyte1@hotmail.com>2018-01-30 04:40:04 +1000
commite19ee48a374aac9cfcd28ddfc2321ff731f07617 (patch)
treebf2760f64520493e8d901c3a2bc7a2b6e5637b92 /src/Java/gtPlusPlus/core/world
parentb5ba6067230047ba6ab797f977b1d7c2e77deb6d (diff)
downloadGT5-Unofficial-e19ee48a374aac9cfcd28ddfc2321ff731f07617.tar.gz
GT5-Unofficial-e19ee48a374aac9cfcd28ddfc2321ff731f07617.tar.bz2
GT5-Unofficial-e19ee48a374aac9cfcd28ddfc2321ff731f07617.zip
+ Added recipes for processing Sludge/Waste water.
- Disabled Toxic Everglade Ore generation. % Tweaked Sludge/Waste water textures to be less blurry.
Diffstat (limited to 'src/Java/gtPlusPlus/core/world')
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java38
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java6
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT.java1
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java2
4 files changed, 4 insertions, 43 deletions
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java b/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java
index 22b8973cdb..2c8bf88b68 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java
@@ -1,9 +1,5 @@
package gtPlusPlus.core.world.darkworld;
-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.lib.CORE;
import gtPlusPlus.core.world.darkworld.block.blockDarkWorldPortal;
@@ -11,8 +7,6 @@ import gtPlusPlus.core.world.darkworld.item.itemDarkWorldPortalTrigger;
import gtPlusPlus.core.world.darkworld.world.WorldProviderMod;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.World;
import net.minecraftforge.common.DimensionManager;
public class Dimension_DarkWorld {
@@ -30,44 +24,12 @@ public class Dimension_DarkWorld {
public static Block blockPortalFrame;
- static {
-
- }
-
- public Dimension_DarkWorld() {
- }
-
public void load() {
GameRegistry.registerBlock(portalBlock, "dimensionDarkWorld_portal");
DimensionManager.registerProviderType(DIMID, WorldProviderMod.class, false);
DimensionManager.registerDimension(DIMID, DIMID);
// GameRegistry.addSmelting(Items.record_11, new ItemStack(block),
// 1.0f);
-
- }
-
- public void registerRenderers() {
-
- }
-
- public void generateNether(World world, Random random, int chunkX, int chunkZ) {
-
- }
-
- public void generateSurface(World world, Random random, int chunkX, int chunkZ) {
-
- }
-
- public int addFuel(ItemStack fuel) {
- return 0;
- }
-
- public void serverLoad(FMLServerStartingEvent event) {
-
- }
-
- public void preInit(FMLPreInitializationEvent event) {
-
}
}
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java
index e89838e182..ec5e0482fa 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java
@@ -276,13 +276,13 @@ public class blockDarkWorldPortal extends BlockBreakable {
if ((par5Entity.ridingEntity == null) && (par5Entity.riddenByEntity == null) && ((par5Entity instanceof EntityPlayerMP))) {
EntityPlayerMP thePlayer = (EntityPlayerMP) par5Entity;
if (thePlayer.timeUntilPortal > 0) {
- thePlayer.timeUntilPortal = 10;
+ thePlayer.timeUntilPortal = 100;
} else if (thePlayer.dimension != Dimension_DarkWorld.DIMID) {
- thePlayer.timeUntilPortal = 10;
+ thePlayer.timeUntilPortal = 100;
thePlayer.mcServer.getConfigurationManager().transferPlayerToDimension(thePlayer, Dimension_DarkWorld.DIMID,
new TeleporterDimensionMod(thePlayer.mcServer.worldServerForDimension(Dimension_DarkWorld.DIMID)));
} else {
- thePlayer.timeUntilPortal = 10;
+ thePlayer.timeUntilPortal = 100;
thePlayer.mcServer.getConfigurationManager().transferPlayerToDimension(thePlayer, 0,
new TeleporterDimensionMod(thePlayer.mcServer.worldServerForDimension(0)));
}
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT.java b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT.java
index bbec200c8e..db926e7c6c 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT.java
@@ -1,6 +1,5 @@
package gtPlusPlus.core.world.darkworld.gen.gt;
-import gregtech.api.GregTech_API;
import gtPlusPlus.xmod.gregtech.HANDLER_GT;
import java.util.List;
diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java
index 65184b6f35..51685b8ad3 100644
--- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java
+++ b/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java
@@ -95,7 +95,7 @@ public class WorldGen_GT_Base implements IWorldGenerator {
break;
}
else {
- generateDarkWorld(random, chunkX, chunkZ, world, chunkGenerator, chunkProvider);
+ //generateDarkWorld(random, chunkX, chunkZ, world, chunkGenerator, chunkProvider);
break;
}
}