aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2017-05-28 15:58:23 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2017-05-28 15:58:23 +1000
commit6d0ac5984482e24d20b1928f7bb61f29b55bc62c (patch)
treed647382cfaa07566c104fc309fe86553d9306acc /src
parent8866af1647dca9846dc33ec59792cf845904e8eb (diff)
downloadGT5-Unofficial-6d0ac5984482e24d20b1928f7bb61f29b55bc62c.tar.gz
GT5-Unofficial-6d0ac5984482e24d20b1928f7bb61f29b55bc62c.tar.bz2
GT5-Unofficial-6d0ac5984482e24d20b1928f7bb61f29b55bc62c.zip
- Removed DimensionA.
+ Added Dark World. + Added New Blocks and Items for Dark World.
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/GTplusplus.java298
-rw-r--r--src/Java/gtPlusPlus/GTplusplus_Secondary.java81
-rw-r--r--src/Java/gtPlusPlus/core/block/ModBlocks.java9
-rw-r--r--src/Java/gtPlusPlus/core/world/DimensionIDs.java7
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java1363
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java112
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortal.java356
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/block/blockDarkWorldPortalFrame.java24
-rw-r--r--src/Java/gtPlusPlus/core/world/darkworld/item/itemDarkWorldPortalTrigger.java75
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/block/BlockModBush.java156
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/block/BlockModPortal.java455
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/particle/EntityTreeFX.java103
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/util/Dimension_A_Teleporter.java531
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/util/Names.java10
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/util/ReadFile.java91
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/world/ChunkProviderForest.java489
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/world/Dimension.java22
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/world/WorldChunkManagerForest.java288
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/world/WorldProviderForest.java217
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/world/WorldTypesTutorial.java59
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/world/biomes/BiomeDarkForest.java48
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/world/biomes/BiomeIDs.java8
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/world/biomes/BiomeLightForest.java47
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/world/biomes/ModBiomes.java165
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/world/biomes/decorators/BiomeDecoratorHelper.java102
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/world/biomes/decorators/BiomeDecoratorMod.java74
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/world/gen/WorldGenEffectTree.java212
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/world/gen/WorldGenForestAbstractTree.java33
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/world/gen/WorldGenForestBigTree.java526
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/world/gen/WorldGenForestGrass.java51
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/world/gen/WorldGenForestTrees.java252
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/world/gen/WorldGenModMinable.java109
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/world/genlayer/LightForestGenLayer.java30
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/world/genlayer/LightForestGenLayerBiomes.java33
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/world/renderers/CloudRenderer.java13
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/world/renderers/SkyRenderer.java201
-rw-r--r--src/Java/gtPlusPlus/core/world/dimensionA/world/renderers/WeatherRenderer.java227
37 files changed, 2150 insertions, 4727 deletions
diff --git a/src/Java/gtPlusPlus/GTplusplus.java b/src/Java/gtPlusPlus/GTplusplus.java
index 62b2e6ee23..497ba445c6 100644
--- a/src/Java/gtPlusPlus/GTplusplus.java
+++ b/src/Java/gtPlusPlus/GTplusplus.java
@@ -24,217 +24,211 @@ import gtPlusPlus.core.item.general.RF2EU_Battery;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.item.ItemUtils;
-import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.core.world.dimensionA.world.Dimension;
-import gtPlusPlus.core.world.dimensionA.world.WorldTypesTutorial;
-import gtPlusPlus.core.world.dimensionA.world.biomes.ModBiomes;
import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtTools;
import net.minecraft.launchwrapper.Launch;
import net.minecraftforge.common.config.Configuration;
-@Mod(modid=CORE.MODID, name=CORE.name, version=CORE.VERSION, dependencies="required-after:Forge; after:PlayerAPI; after:dreamcraft; after:IC2; after:ihl; after:psychedelicraft; after:gregtech; after:Forestry; after:MagicBees; after:CoFHCore; after:Growthcraft; after:Railcraft; after:CompactWindmills; after:ForbiddenMagic; after:MorePlanet; after:PneumaticCraft; after:ExtraUtilities; after:Thaumcraft; after:rftools; after:simplyjetpacks; after:BigReactors; after:EnderIO;")
-public class GTplusplus
-implements ActionListener
-{
+@Mod(modid = CORE.MODID, name = CORE.name, version = CORE.VERSION, dependencies = "required-after:Forge; after:PlayerAPI; after:dreamcraft; after:IC2; after:ihl; after:psychedelicraft; after:gregtech; after:Forestry; after:MagicBees; after:CoFHCore; after:Growthcraft; after:Railcraft; after:CompactWindmills; after:ForbiddenMagic; after:MorePlanet; after:PneumaticCraft; after:ExtraUtilities; after:Thaumcraft; after:rftools; after:simplyjetpacks; after:BigReactors; after:EnderIO;")
+public class GTplusplus implements ActionListener {
@Mod.Instance(CORE.MODID)
public static GTplusplus instance;
protected static Meta_GT_Proxy gregtechproxy;
- @SidedProxy(clientSide="gtPlusPlus.core.proxy.ClientProxy", serverSide="gtPlusPlus.core.proxy.ServerProxy")
+ @SidedProxy(clientSide = "gtPlusPlus.core.proxy.ClientProxy", serverSide = "gtPlusPlus.core.proxy.ServerProxy")
public static CommonProxy proxy;
-
-
public static void handleConfigFile(final FMLPreInitializationEvent event) {
- final Configuration config = new Configuration(new File(event.getModConfigurationDirectory(), "GTplusplus/GTplusplus.cfg"));
+ final Configuration config = new Configuration(
+ new File(event.getModConfigurationDirectory(), "GTplusplus/GTplusplus.cfg"));
config.load();
-
- //Debug
- DEBUG = config.getBoolean("debugMode", "debug", false, "Enables all sorts of debug logging. (Don't use unless told to, breaks other things.)");
- disableEnderIOIntegration = config.getBoolean("disableEnderIO", "debug", false, "Disables EnderIO Integration.");
-
-
- //Machines
- enableThaumcraftShardUnification = config.getBoolean("enableThaumcraftShardUnification", "machines", false, "Allows the use of TC shards across many recipes by oreDicting them into a common group.");
- enableAlternativeBatteryAlloy = config.getBoolean("enableAlternativeBatteryAlloy", "machines", false, "Adds a non-Antimony using Battery Alloy. Not Balanced at all..");
- disableIC2Recipes = config.getBoolean("disableIC2Recipes", "machines", false, "Alkaluscraft Related - Removes IC2 Cables Except glass fibre. Few other Misc Tweaks.");
- enableAlternativeDivisionSigilRecipe = config.getBoolean("enableAlternativeDivisionSigilRecipe", "machines", false, "Utilizes Neutronium instead.");
-
- //Tools
- CORE.configSwitches.enableSkookumChoochers = config.getBoolean("enableSkookumChoochers", "gregtech", true, "Adds Custom GT Tools, called Skookum Choochers, functioning as a hard hammer and a wrench.");
- CORE.configSwitches.enableMultiSizeTools = config.getBoolean("enableMultiSizeTools", "gregtech", true, "Adds Custom GT Shovels and Pickaxes which mine in a 3x3 style. One of each whill be generated for each Gregtech Material which has Dense Plates and Long Rods available.");
-
- //Pipes & Cables
- CORE.configSwitches.enableCustom_Pipes = config.getBoolean("enableCustom_Pipes", "gregtech", true, "Adds Custom GT Fluid Pipes.");
- CORE.configSwitches.enableCustom_Cables = config.getBoolean("enableCustom_Cables", "gregtech", true, "Adds Custom GT Cables.");
-
- //Block Drops
- CORE.configSwitches.chanceToDropDrainedShard = config.getInt("chanceToDropDrainedShard", "blockdrops", 196, 0, 10000, "Drained shards have a 1 in X chance to drop.");
- CORE.configSwitches.chanceToDropFluoriteOre = config.getInt("chanceToDropFluoriteOre", "blockdrops", 32, 0, 10000, "Fluorite Ore has a 1 in X chance to drop from Limestone and a 1 in X*20 from Sandstone..");
-
-
- //Single machines
- CORE.configSwitches.enableMachine_SolarGenerators = config.getBoolean("enableSolarGenerators", "gregtech", false, "These may be overpowered, Consult a local electrician.");
- CORE.configSwitches.enableMachine_Safes = config.getBoolean("enableMachineSafes", "gregtech", true, "These protect your goodies/rare stuff.");
- CORE.configSwitches.enableMachine_Dehydrators = config.getBoolean("enableMachineDehydrators", "gregtech", true, "These dehydrate stuff.");
- CORE.configSwitches.enableMachine_SteamConverter = config.getBoolean("enableMachineSteamConverter", "gregtech", true, "Converts IC2 steam -> Railcraft steam.");
- CORE.configSwitches.enableMachine_FluidTanks = config.getBoolean("enableMachineFluidTanks", "gregtech", true, "Portable fluid tanks.");
- CORE.configSwitches.enableMachine_RocketEngines = config.getBoolean("enableMachineRocketEngines", "gregtech", true, "Diesel egines with different internals, they consume less fuel overall.");
- CORE.configSwitches.enableMachine_GeothermalEngines = config.getBoolean("enableMachineGeothermalEngines", "gregtech", true, "These may be overpowered, Consult a local geologist.");
-
-
- //Multi machines
- CORE.configSwitches.enableMultiblock_AlloyBlastSmelter = config.getBoolean("enableMultiblockAlloyBlastSmelter", "gregtech", true, "Required to smelt most high tier materials from GT++. Also smelts everything else to molten metal.");
- CORE.configSwitches.enableMultiblock_IndustrialCentrifuge = config.getBoolean("enableMultiblockIndustrialCentrifuge", "gregtech", true, "Spin, Spin, Spiiiin.");
- CORE.configSwitches.enableMultiblock_IndustrialCokeOven = config.getBoolean("enableMultiblockIndustrialCokeOven", "gregtech", true, "Pyro Oven Alternative, older, more realistic, better.");
- CORE.configSwitches.enableMultiblock_IndustrialElectrolyzer = config.getBoolean("enableMultiblockIndustrialElectrolyzer", "gregtech", true, "Electrolyzes things with extra bling factor.");
- CORE.configSwitches.enableMultiblock_IndustrialMacerationStack = config.getBoolean("enableMultiblockIndustrialMacerationStack", "gregtech", true, "A hyper efficient maceration tower, nets more bonus outputs.");
- CORE.configSwitches.enableMultiblock_IndustrialPlatePress = config.getBoolean("enableMultiblockIndustrialPlatePress", "gregtech", true, "Industrial bendering machine thingo.");
- CORE.configSwitches.enableMultiblock_IndustrialWireMill = config.getBoolean("enableMultiblockIndustrialWireMill", "gregtech", true, "Produces fine wire and exotic cables.");
- CORE.configSwitches.enableMultiblock_IronBlastFurnace = config.getBoolean("enableMultiblockIronBlastFurnace", "gregtech", true, "Skip the Bronze age, very slowly.");
- CORE.configSwitches.enableMultiblock_MatterFabricator = config.getBoolean("enableMultiblockMatterFabricator", "gregtech", true, "?FAB?RIC?ATE MA?TT?ER.");
- CORE.configSwitches.enableMultiblock_MultiTank = config.getBoolean("enableMultiblockMultiTank", "gregtech", true, "Tall tanks, each layer adds extra fluid storage.");
- CORE.configSwitches.enableMultiblock_PowerSubstation = config.getBoolean("enableMultiblockPowerSubstation", "gregtech", true, "For managing large power grids.");
- CORE.configSwitches.enableMultiblock_LiquidFluorideThoriumReactor = config.getBoolean("enableMultiblockLiquidFluorideThoriumReactor", "gregtech", true, "For supplying large power grids.");
- CORE.configSwitches.enableMultiblock_NuclearFuelRefinery = config.getBoolean("enableMultiblock_NuclearFuelRefinery", "gregtech", true, "Refines molten chemicals into nuclear fuels.");
- CORE.configSwitches.enableMultiblock_IndustrialSifter = config.getBoolean("enableMultiblock_IndustrialSifter", "gregtech", true, "Large scale sifting.");
-
-
- //Options
- RF2EU_Battery.rfPerEU = config.getInt("rfUsedPerEUForUniversalBatteries", "configurables", 4, 1, 1000, "How much RF is a single unit of EU worth? (Most mods use 4:1 ratio)");
-
- //Features
- enableCustomAlvearyBlocks = config.getBoolean("enableCustomAlvearyBlocks", "features", false, "Enables Custom Alveary Blocks.");
+ // Debug
+ DEBUG = config.getBoolean("debugMode", "debug", false,
+ "Enables all sorts of debug logging. (Don't use unless told to, breaks other things.)");
+ disableEnderIOIntegration = config.getBoolean("disableEnderIO", "debug", false,
+ "Disables EnderIO Integration.");
+
+ // Machines
+ enableThaumcraftShardUnification = config.getBoolean("enableThaumcraftShardUnification", "machines", false,
+ "Allows the use of TC shards across many recipes by oreDicting them into a common group.");
+ enableAlternativeBatteryAlloy = config.getBoolean("enableAlternativeBatteryAlloy", "machines", false,
+ "Adds a non-Antimony using Battery Alloy. Not Balanced at all..");
+ disableIC2Recipes = config.getBoolean("disableIC2Recipes", "machines", false,
+ "Alkaluscraft Related - Removes IC2 Cables Except glass fibre. Few other Misc Tweaks.");
+ enableAlternativeDivisionSigilRecipe = config.getBoolean("enableAlternativeDivisionSigilRecipe", "machines",
+ false, "Utilizes Neutronium instead.");
+
+ // Tools
+ CORE.configSwitches.enableSkookumChoochers = config.getBoolean("enableSkookumChoochers", "gregtech", true,
+ "Adds Custom GT Tools, called Skookum Choochers, functioning as a hard hammer and a wrench.");
+ CORE.configSwitches.enableMultiSizeTools = config.getBoolean("enableMultiSizeTools", "gregtech", true,
+ "Adds Custom GT Shovels and Pickaxes which mine in a 3x3 style. One of each whill be generated for each Gregtech Material which has Dense Plates and Long Rods available.");
+
+ // Pipes & Cables
+ CORE.configSwitches.enableCustom_Pipes = config.getBoolean("enableCustom_Pipes", "gregtech", true,
+ "Adds Custom GT Fluid Pipes.");
+ CORE.configSwitches.enableCustom_Cables = config.getBoolean("enableCustom_Cables", "gregtech", true,
+ "Adds Custom GT Cables.");
+
+ // Block Drops
+ CORE.configSwitches.chanceToDropDrainedShard = config.getInt("chanceToDropDrainedShard", "blockdrops", 196, 0,
+ 10000, "Drained shards have a 1 in X chance to drop.");
+ CORE.configSwitches.chanceToDropFluoriteOre = config.getInt("chanceToDropFluoriteOre", "blockdrops", 32, 0,
+ 10000, "Fluorite Ore has a 1 in X chance to drop from Limestone and a 1 in X*20 from Sandstone..");
+
+ // Single machines
+ CORE.configSwitches.enableMachine_SolarGenerators = config.getBoolean("enableSolarGenerators", "gregtech",
+ false, "These may be overpowered, Consult a local electrician.");
+ CORE.configSwitches.enableMachine_Safes = config.getBoolean("enableMachineSafes", "gregtech", true,
+ "These protect your goodies/rare stuff.");
+ CORE.configSwitches.enableMachine_Dehydrators = config.getBoolean("enableMachineDehydrators", "gregtech", true,
+ "These dehydrate stuff.");
+ CORE.configSwitches.enableMachine_SteamConverter = config.getBoolean("enableMachineSteamConverter", "gregtech",
+ true, "Converts IC2 steam -> Railcraft steam.");
+ CORE.configSwitches.enableMachine_FluidTanks = config.getBoolean("enableMachineFluidTanks", "gregtech", true,
+ "Portable fluid tanks.");
+ CORE.configSwitches.enableMachine_RocketEngines = config.getBoolean("enableMachineRocketEngines", "gregtech",
+ true, "Diesel egines with different internals, they consume less fuel overall.");
+ CORE.configSwitches.enableMachine_GeothermalEngines = config.getBoolean("enableMachineGeothermalEngines",
+ "gregtech", true, "These may be overpowered, Consult a local geologist.");
+
+ // Multi machines
+ CORE.configSwitches.enableMultiblock_AlloyBlastSmelter = config.getBoolean("enableMultiblockAlloyBlastSmelter",
+ "gregtech", true,
+ "Required to smelt most high tier materials from GT++. Also smelts everything else to molten metal.");
+ CORE.configSwitches.enableMultiblock_IndustrialCentrifuge = config
+ .getBoolean("enableMultiblockIndustrialCentrifuge", "gregtech", true, "Spin, Spin, Spiiiin.");
+ CORE.configSwitches.enableMultiblock_IndustrialCokeOven = config.getBoolean(
+ "enableMultiblockIndustrialCokeOven", "gregtech", true,
+ "Pyro Oven Alternative, older, more realistic, better.");
+ CORE.configSwitches.enableMultiblock_IndustrialElectrolyzer = config.getBoolean(
+ "enableMultiblockIndustrialElectrolyzer", "gregtech", true,
+ "Electrolyzes things with extra bling factor.");
+ CORE.configSwitches.enableMultiblock_IndustrialMacerationStack = config.getBoolean(
+ "enableMultiblockIndustrialMacerationStack", "gregtech", true,
+ "A hyper efficient maceration tower, nets more bonus outputs.");
+ CORE.configSwitches.enableMultiblock_IndustrialPlatePress = config.getBoolean(
+ "enableMultiblockIndustrialPlatePress", "gregtech", true, "Industrial bendering machine thingo.");
+ CORE.configSwitches.enableMultiblock_IndustrialWireMill = config.getBoolean(
+ "enableMultiblockIndustrialWireMill", "gregtech", true, "Produces fine wire and exotic cables.");
+ CORE.configSwitches.enableMultiblock_IronBlastFurnace = config.getBoolean("enableMultiblockIronBlastFurnace",
+ "gregtech", true, "Skip the Bronze age, very slowly.");
+ CORE.configSwitches.enableMultiblock_MatterFabricator = config.getBoolean("enableMultiblockMatterFabricator",
+ "gregtech", true, "?FAB?RIC?ATE MA?TT?ER.");
+ CORE.configSwitches.enableMultiblock_MultiTank = config.getBoolean("enableMultiblockMultiTank", "gregtech",
+ true, "Tall tanks, each layer adds extra fluid storage.");
+ CORE.configSwitches.enableMultiblock_PowerSubstation = config.getBoolean("enableMultiblockPowerSubstation",
+ "gregtech", true, "For managing large power grids.");
+ CORE.configSwitches.enableMultiblock_LiquidFluorideThoriumReactor = config.getBoolean(
+ "enableMultiblockLiquidFluorideThoriumReactor", "gregtech", true, "For supplying large power grids.");
+ CORE.configSwitches.enableMultiblock_NuclearFuelRefinery = config.getBoolean(
+ "enableMultiblock_NuclearFuelRefinery", "gregtech", true,
+ "Refines molten chemicals into nuclear fuels.");
+ CORE.configSwitches.enableMultiblock_IndustrialSifter = config.getBoolean("enableMultiblock_IndustrialSifter",
+ "gregtech", true, "Large scale sifting.");
+
+ // Options
+ RF2EU_Battery.rfPerEU = config.getInt("rfUsedPerEUForUniversalBatteries", "configurables", 4, 1, 1000,
+ "How much RF is a single unit of EU worth? (Most mods use 4:1 ratio)");
+
+ // Features
+ enableCustomAlvearyBlocks = config.getBoolean("enableCustomAlvearyBlocks", "features", false,
+ "Enables Custom Alveary Blocks.");
config.save();
}
- public static String randomDust_A;
- public static String randomDust_B;
- public static String randomDust_C;
- public static String randomDust_D;
-
- protected void FirstCall(){
- Utils.LOG_WARNING("Summoning up mystic powers.");
- final String[] infusedDusts = {"Fire", "Water", "Earth", "Air", "Order", "Entropy"};
- final int a = MathUtils.randInt(0, 5);
- final int b = MathUtils.randInt(0, 5);
- final int c = MathUtils.randInt(0, 5);
- final int d = MathUtils.randInt(0, 5);
- final String infusedDust1 = "dustInfused"+infusedDusts[a];
- final String infusedDust2 = "dustInfused"+infusedDusts[b];
- final String infusedDust3 = "dustInfused"+infusedDusts[c];
- final String infusedDust4 = "dustInfused"+infusedDusts[d];
- Utils.LOG_INFO("Found the aspect of "+infusedDusts[a]+" to embody into energy crystals.");
- Utils.LOG_INFO("Found the aspect of "+infusedDusts[b]+" to embody into energy crystals.");
- Utils.LOG_INFO("Found the aspect of "+infusedDusts[c]+" to embody into energy crystals.");
- Utils.LOG_INFO("Found the aspect of "+infusedDusts[d]+" to embody into energy crystals.");
- randomDust_A = infusedDust1;
- randomDust_B = infusedDust2;
- randomDust_C = infusedDust3;
- randomDust_D = infusedDust4;
- //ItemStack a1 = UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[a], 8);
- //ItemStack b1 = UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[b], 8);
- //ItemStack c1 = UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[c], 8);
- //ItemStack d1 = UtilsItems.getItemStackOfAmountFromOreDict("dustInfused"+infusedDusts[d], 8);
-
-
- }
-
- @SideOnly(value=Side.CLIENT)
- public static void loadTextures(){
+ // Loads Textures
+ @SideOnly(value = Side.CLIENT)
+ public static void loadTextures() {
Utils.LOG_INFO("Loading some textures on the client.");
- //Tools
- Utils.LOG_WARNING("Processing texture: "+TexturesGtTools.SKOOKUM_CHOOCHER.getTextureFile().getResourcePath());
+ // Tools
+ Utils.LOG_WARNING("Processing texture: " + TexturesGtTools.SKOOKUM_CHOOCHER.getTextureFile().getResourcePath());
- //Blocks
- Utils.LOG_WARNING("Processing texture: "+TexturesGtBlock.Casing_Machine_Dimensional.getTextureFile().getResourcePath());
+ // Blocks
+ Utils.LOG_WARNING(
+ "Processing texture: " + TexturesGtBlock.Casing_Machine_Dimensional.getTextureFile().getResourcePath());
}
-
-
-
- //Pre-Init
+ // Pre-Init
@Mod.EventHandler
- public void preInit(final FMLPreInitializationEvent event)
- {
- Utils.LOG_INFO("Loading "+CORE.name+" V"+CORE.VERSION);
+ public void preInit(final FMLPreInitializationEvent event) {
+ Utils.LOG_INFO("Loading " + CORE.name + " V" + CORE.VERSION);
CORE.DEVENV = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
- Utils.LOG_INFO("Latest is "+CORE.MASTER_VERSION+". Updated? "+Utils.isModUpToDate());
- Utils.LOG_INFO("User's Country: "+CORE.USER_COUNTRY);
-
- //FirstCall();
+ Utils.LOG_INFO("Latest is " + CORE.MASTER_VERSION + ". Updated? " + Utils.isModUpToDate());
+ Utils.LOG_INFO("User's Country: " + CORE.USER_COUNTRY);
+
+ // FirstCall();
FMLCommonHandler.instance().bus().register(new LoginEventHandler());
Utils.LOG_INFO("Login Handler Initialized");
+ // Handle GT++ Config
handleConfigFile(event);
-
- //HANDLER_GT.mMaterialProperties = new GT_Config(new Configuration(new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "MaterialProperties.cfg")));
+
+ // HANDLER_GT.mMaterialProperties = new GT_Config(new Configuration(new
+ // File(new File(event.getModConfigurationDirectory(), "GTplusplus"),
+ // "MaterialProperties.cfg")));
proxy.preInit(event);
}
- //Init
+ // Init
@Mod.EventHandler
- public void init(final FMLInitializationEvent event)
- {
+ public void init(final FMLInitializationEvent event) {
proxy.init(event);
-
+
Utils.LOG_INFO("[Proxy] Calling Entity registrator.");
proxy.registerEntities();
Utils.LOG_INFO("[Proxy] Calling Tile Entity registrator.");
proxy.registerTileEntities();
Utils.LOG_INFO("[Proxy] Calling Render registrator.");
proxy.registerRenderThings();
-
+
proxy.registerNetworkStuff();
-
- //Register Dimension A
- ModBiomes.registerWithBiomeDictionary();
- Dimension.registerWorldProvider();
- Dimension.registerDimensions();
- WorldTypesTutorial.addCustomWorldTypes();
-
-
+
}
- //Post-Init
+ // Post-Init
@Mod.EventHandler
public void postInit(final FMLPostInitializationEvent event) {
proxy.postInit(event);
- if (DEBUG){
+ if (DEBUG) {
this.dumpGtRecipeMap(Gregtech_Recipe_Map.sChemicalDehydratorRecipes);
this.dumpGtRecipeMap(Gregtech_Recipe_Map.sCokeOvenRecipes);
this.dumpGtRecipeMap(Gregtech_Recipe_Map.sMatterFab2Recipes);
this.dumpGtRecipeMap(Gregtech_Recipe_Map.sAlloyBlastSmelterRecipes);
}
- //~
+ // ~
ReflectionUtils.becauseIWorkHard();
- //Utils.LOG_INFO("Activating GT OreDictionary Handler, this can take some time.");
+ // Utils.LOG_INFO("Activating GT OreDictionary Handler, this can take
+ // some time.");
Utils.LOG_INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
- Utils.LOG_INFO("| Recipes succesfully Loaded: "+RegistrationHandler.recipesSuccess+" | Failed: "+RegistrationHandler.recipesFailed + " |");
+ Utils.LOG_INFO("| Recipes succesfully Loaded: " + RegistrationHandler.recipesSuccess + " | Failed: "
+ + RegistrationHandler.recipesFailed + " |");
Utils.LOG_INFO("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~");
- //Meta_GT_Proxy.activateOreDictHandler();
+ // Meta_GT_Proxy.activateOreDictHandler();
Utils.LOG_INFO("Finally, we are finished. Have some cripsy bacon as a reward.");
}
@EventHandler
- public void serverStarting(final FMLServerStartingEvent event)
- {
+ public void load(FMLInitializationEvent event) {
+
+ }
+
+ @EventHandler
+ public void serverStarting(final FMLServerStartingEvent event) {
event.registerServerCommand(new CommandMath());
}
@Mod.EventHandler
- public void serverStopping(final FMLServerStoppingEvent event)
- {
+ public void serverStopping(final FMLServerStoppingEvent event) {
}
@@ -243,17 +237,17 @@ implements ActionListener
}
- protected void dumpGtRecipeMap(final GT_Recipe_Map r){
+ protected void dumpGtRecipeMap(final GT_Recipe_Map r) {
final Collection<GT_Recipe> x = r.mRecipeList;
- Utils.LOG_INFO("Dumping "+r.mUnlocalizedName+" Recipes for Debug.");
- for(final GT_Recipe newBo : x){
+ Utils.LOG_INFO("Dumping " + r.mUnlocalizedName + " Recipes for Debug.");
+ for (final GT_Recipe newBo : x) {
Utils.LOG_INFO("========================");
- Utils.LOG_INFO("Dumping Input: "+ItemUtils.getArrayStackNames(newBo.mInputs));
- Utils.LOG_INFO("Dumping Inputs "+ItemUtils.getFluidArrayStackNames(newBo.mFluidInputs));
- Utils.LOG_INFO("Dumping Duration: "+newBo.mDuration);
- Utils.LOG_INFO("Dumping EU/t: "+newBo.mEUt);
- Utils.LOG_INFO("Dumping Output: "+ItemUtils.getArrayStackNames(newBo.mOutputs));
- Utils.LOG_INFO("Dumping Output: "+ItemUtils.getFluidArrayStackNames(newBo.mFluidOutputs));
+ Utils.LOG_INFO("Dumping Input: " + ItemUtils.getArrayStackNames(newBo.mInputs));
+ Utils.LOG_INFO("Dumping Inputs " + ItemUtils.getFluidArrayStackNames(newBo.mFluidInputs));
+ Utils.LOG_INFO("Dumping Duration: " + newBo.mDuration);
+ Utils.LOG_INFO("Dumping EU/t: " + newBo.mEUt);
+ Utils.LOG_INFO("Dumping Output: " + ItemUtils.getArrayStackNames(newBo.mOutputs));
+ Utils.LOG_INFO("Dumping Output: " + ItemUtils.getFluidArrayStackNames(newBo.mFluidOutputs));
Utils.LOG_INFO("========================");
}
}
diff --git a/src/Java/gtPlusPlus/GTplusplus_Secondary.java b/src/Java/gtPlusPlus/GTplusplus_Secondary.java
index 5311f0f6c1..259c959590 100644
--- a/src/Java/gtPlusPlus/GTplusplus_Secondary.java
+++ b/src/Java/gtPlusPlus/GTplusplus_Secondary.java
@@ -1,5 +1,7 @@
package gtPlusPlus;
+import java.util.Random;
+
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
@@ -7,27 +9,92 @@ import cofh.mod.ChildMod;
import cpw.mods.fml.common.*;
import cpw.mods.fml.common.Mod.CustomProperty;
import cpw.mods.fml.common.Mod.EventHandler;
-import cpw.mods.fml.common.event.FMLInitializationEvent;
-import cpw.mods.fml.common.event.FMLPostInitializationEvent;
+import cpw.mods.fml.common.event.*;
+import cpw.mods.fml.common.registry.GameRegistry;
import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
+import gtPlusPlus.core.world.darkworld.biome.Biome_DarkWorld;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.IChunkProvider;
-@ChildMod(parent = CORE.MODID, mod = @Mod(modid = "Gregtech++",
-name = "GT++",
+@ChildMod(parent = CORE.MODID, mod = @Mod(modid = "GT++DarkWorld",
+name = "GT++ Dark World",
version = CORE.VERSION,
dependencies = "after:Miscutils;after:Gregtech",
customProperties = @CustomProperty(k = "cofhversion", v = "true")))
-public class GTplusplus_Secondary {
+public class GTplusplus_Secondary implements IFuelHandler, IWorldGenerator{
+
+ public static final String MODID2 = "GT++ Dark World";
+ public static final String VERSION2 = "0.1";
- private static final String name = "Gregtech++";
+ // Dark World Handler
+ Biome_DarkWorld DarkWorld_Biome = new Biome_DarkWorld();
+ Dimension_DarkWorld DarkWorld_Dimension = new Dimension_DarkWorld();
@EventHandler
public void load(final FMLInitializationEvent e) {
+ Utils.LOG_INFO("Begin resource allocation for " + MODID2 + " V" + VERSION2);
try {
initMod();
} catch (final Throwable $) {
final ModContainer This = FMLCommonHandler.instance().findContainerFor(this);
LogManager.getLogger(This.getModId()).log(Level.ERROR, "There was a problem loading " + This.getName(), $);
}
+
+ //Load Dark World and Biome
+ GameRegistry.registerFuelHandler(this);
+ GameRegistry.registerWorldGenerator(this, 1);
+ DarkWorld_Biome.load();
+ DarkWorld_Dimension.load();
+
+ }
+
+ // Pre-Init
+ @Mod.EventHandler
+ public void preInit(final FMLPreInitializationEvent event) {
+ Utils.LOG_INFO("Loading " + MODID2 + " V" + VERSION2);
+
+ // Load Dark World
+ DarkWorld_Biome.instance = GTplusplus.instance;
+ DarkWorld_Dimension.instance = GTplusplus.instance;
+ DarkWorld_Biome.preInit(event);
+ DarkWorld_Dimension.preInit(event);
+ }
+
+ @EventHandler
+ public void serverLoad(FMLServerStartingEvent event) {
+ DarkWorld_Biome.serverLoad(event);
+ DarkWorld_Dimension.serverLoad(event);
+ }
+
+ @Override
+ public int getBurnTime(ItemStack fuel) {
+ if (DarkWorld_Biome.addFuel(fuel) != 0)
+ return DarkWorld_Biome.addFuel(fuel);
+ if (DarkWorld_Dimension.addFuel(fuel) != 0)
+ return DarkWorld_Dimension.addFuel(fuel);
+ return 0;
+ }
+
+ @Override
+ public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) {
+ chunkX = chunkX * 16;
+ chunkZ = chunkZ * 16;
+ if (world.provider.dimensionId == -1) {
+ DarkWorld_Biome.generateNether(world, random, chunkX, chunkZ);
+ }
+ if (world.provider.dimensionId == 0) {
+ DarkWorld_Biome.generateSurface(world, random, chunkX, chunkZ);
+ }
+ if (world.provider.dimensionId == -1) {
+ DarkWorld_Dimension.generateNether(world, random, chunkX, chunkZ);
+ }
+ if (world.provider.dimensionId == 0) {
+
+ }
+
}
private static void initMod() {
@@ -36,7 +103,7 @@ public class GTplusplus_Secondary {
@EventHandler
public static void postInit(final FMLPostInitializationEvent e) {
-
+ Utils.LOG_INFO("Finished loading Dark World plugin for GT++.");
}
}
diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
index 370690c1be..e5f5de3436 100644
--- a/src/Java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -8,7 +8,6 @@ import gtPlusPlus.core.block.machine.*;
import gtPlusPlus.core.fluids.FluidRegistryHandler;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.core.world.dimensionA.block.BlockModPortal;
import net.minecraft.block.