diff options
Diffstat (limited to 'src/Java/gtPlusPlus')
6 files changed, 41 insertions, 57 deletions
diff --git a/src/Java/gtPlusPlus/GTplusplus_Secondary.java b/src/Java/gtPlusPlus/GTplusplus_Secondary.java index bb9950af19..8b06a2371a 100644 --- a/src/Java/gtPlusPlus/GTplusplus_Secondary.java +++ b/src/Java/gtPlusPlus/GTplusplus_Secondary.java @@ -52,7 +52,6 @@ public class GTplusplus_Secondary implements ActionListener { getDarkBiome().instance = instance; DarkWorld_Dimension.instance = instance; getDarkBiome().preInit(event); - DarkWorld_Dimension.preInit(event); //Load/Set Custom Ore Gen HANDLER_GT.sCustomWorldgenFile = new GTPP_Config(new Configuration(new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg"))); @@ -128,7 +127,6 @@ public class GTplusplus_Secondary implements ActionListener { @EventHandler public void serverLoad(FMLServerStartingEvent event) { getDarkBiome().serverLoad(event); - DarkWorld_Dimension.serverLoad(event); } /*@Override diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 3f1b0b16ba..be94e0c67e 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -473,7 +473,7 @@ public class RECIPES_GREGTECH { }, //Output Array of Items - Upto 9 30*20, //Time in ticks 30); //EU - }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + }catch (final NullPointerException e){Logger.INFO("[cellSulfuricLithium] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} try { ItemStack cells = ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:itemCellEmpty", "Empty Fluid Cells", 0, 12); @@ -499,7 +499,7 @@ public class RECIPES_GREGTECH { 75*20, //Time in ticks 1000); //EU - }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + }catch (final NullPointerException e){Logger.INFO("[dustLepidolite] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} try { CORE.RA.addDehydratorRecipe( @@ -516,7 +516,7 @@ public class RECIPES_GREGTECH { 150*20, //Time in ticks 2000); //EU - }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + }catch (final NullPointerException e){Logger.INFO("[dustUraniumTetrafluoride] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} try { CORE.RA.addDehydratorRecipe( @@ -533,7 +533,7 @@ public class RECIPES_GREGTECH { 300*20, //Time in ticks 4000); //EU - }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + }catch (final NullPointerException e){Logger.INFO("[dustUraniumHexafluoride] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} //Raisins from Grapes try { @@ -551,7 +551,7 @@ public class RECIPES_GREGTECH { 10*20, //Time in ticks 8); //EU - }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + }catch (final NullPointerException e){Logger.INFO("[foodRaisins] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} //Calcium Hydroxide if ((ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1).getItem() != ModItems.AAA_Broken) || LoadedMods.IHL){ @@ -570,7 +570,7 @@ public class RECIPES_GREGTECH { 120*20, //Time in ticks 120); //EU - }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + }catch (final NullPointerException e){Logger.INFO("[dustCalciumHydroxide] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} //2 LiOH + CaCO3 try { @@ -589,7 +589,7 @@ public class RECIPES_GREGTECH { 120*20, //Time in ticks 1000); //EU - }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + }catch (final NullPointerException e){Logger.INFO("[dustLi2CO3CaOH2] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} //LiOH Liquid to Dust try { @@ -607,7 +607,7 @@ public class RECIPES_GREGTECH { 1*20, //Time in ticks 64); //EU - }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + }catch (final NullPointerException e){Logger.INFO("[dustLithiumHydroxide] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} //Zirconium Chloride -> TetraFluoride try { @@ -627,7 +627,7 @@ public class RECIPES_GREGTECH { 120*20, //Time in ticks 500); //EU - }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + }catch (final NullPointerException e){Logger.INFO("[dustZrF4] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} //CaF2 + H2SO4 → CaSO4(solid) + 2 HF try { @@ -651,7 +651,7 @@ public class RECIPES_GREGTECH { 10*60*20, //Time in ticks 230); //EU - }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + }catch (final NullPointerException e){Logger.INFO("[dustFluorite] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} //Be(OH)2 + 2 (NH4)HF2 → (NH4)2BeF4 + 2 H2O try { @@ -671,7 +671,7 @@ public class RECIPES_GREGTECH { 64); //EU - }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + }catch (final NullPointerException e){Logger.INFO("[ammoniumtetrafluoroberyllate] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} //(NH4)2BeF4 → 2 NH3 + 2 HF + BeF2 try { @@ -690,8 +690,33 @@ public class RECIPES_GREGTECH { 5*60*20, //Time in ticks 120); //EU - }catch (final NullPointerException e){Logger.INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + }catch (final NullPointerException e){Logger.INFO("[cellBerylliumFluoride] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + + //Process Waste Water + try { + + CORE.RA.addDehydratorRecipe( + null, //Item input (Array, up to 2) + FluidUtils.getFluidStack("sludge", 1000), //Fluid input (slot 1) + FluidUtils.getFluidStack("nitricacid", 10), //Fluid output (slot 2) + new ItemStack[]{ + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIron", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCopper", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyTin", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyNickel", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCobalt", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyAluminium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinySilver", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyGold", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIridium", 1) + }, //Output Array of Items - Upto 9, + new int[]{10, 5, 5, 4, 4, 3, 2, 2, 1}, + 2*20, //Time in ticks + 500); //EU + + }catch (final NullPointerException e){Logger.INFO("[sludge] FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");} + } } 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; } } |