diff options
Diffstat (limited to 'src/Java/gtPlusPlus')
48 files changed, 707 insertions, 541 deletions
diff --git a/src/Java/gtPlusPlus/core/config/ConfigHandler.java b/src/Java/gtPlusPlus/core/config/ConfigHandler.java index 200e5a6bf4..cd6f13ffa6 100644 --- a/src/Java/gtPlusPlus/core/config/ConfigHandler.java +++ b/src/Java/gtPlusPlus/core/config/ConfigHandler.java @@ -165,8 +165,8 @@ public class ConfigHandler { "Disables Zombie Reinforcement on hard difficutly."); //Biomes - DARKWORLD_ID = config.getInt("darkworld_ID", "worldgen", 227, 1, 254, "The ID of the Dark Dimension."); - DARKBIOME_ID = config.getInt("darkbiome_ID", "worldgen", 238, 1, 254, "The biome within the Dark Dimension."); + EVERGLADES_ID = config.getInt("darkworld_ID", "worldgen", 227, 1, 254, "The ID of the Dark Dimension."); + EVERGLADESBIOME_ID = config.getInt("darkbiome_ID", "worldgen", 238, 1, 254, "The biome within the Dark Dimension."); //Blacklisted Accelerator TileEntities BlacklistedTileEntiyClassNames = new String[] { "com.rwtema.extrautils.tileentity.enderquarry.TileEntityEnderQuarry" }; diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 35b5f9597c..33215234b9 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -11,13 +11,10 @@ import net.minecraft.util.EnumChatFormatting; import gregtech.api.enums.Materials; import gregtech.api.util.GT_OreDictUnificator; -import gtPlusPlus.GTplusplus_Secondary; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.common.compat.COMPAT_Baubles; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.item.base.*; -import gtPlusPlus.core.item.base.dusts.decimal.BaseItemCentidust; -import gtPlusPlus.core.item.base.dusts.decimal.BaseItemDecidust; import gtPlusPlus.core.item.base.foil.BaseItemFoil; import gtPlusPlus.core.item.base.foods.BaseItemFood; import gtPlusPlus.core.item.base.foods.BaseItemHotFood; @@ -56,6 +53,7 @@ import gtPlusPlus.core.util.debug.DEBUG_INIT; import gtPlusPlus.core.util.minecraft.FluidUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.MaterialUtils; +import gtPlusPlus.everglades.GTplusplus_Everglades; import gtPlusPlus.xmod.eio.material.MaterialEIO; import net.minecraftforge.common.util.EnumHelper; import net.minecraftforge.fluids.Fluid; @@ -67,10 +65,10 @@ public final class ModItems { public static Item ZZZ_Empty; public static Item AAA_Broken; + + public static Item itemAlkalusDisk; - public static Item itemDebugShapeSpawner; - public static Item itemBaseSpawnEgg; //EnderIO @@ -141,9 +139,6 @@ public final class ModItems { public static MultiPickaxeBase MP_GTMATERIAL; public static MultiSpadeBase MS_GTMATERIAL; - public static BaseItemDecidust itemBaseDecidust; - public static BaseItemCentidust itemBaseCentidust; - public static ItemStack FluidCell; public static BaseItemBackpack backpack_Red; @@ -181,8 +176,6 @@ public final class ModItems { public static Item dustCalciumCarbonate; public static Item dustLi2CO3CaOH2; public static Item dustLi2BeF4; - - public static Item dustNeptunium238; public static Item dustAer; public static Item dustIgnis; @@ -197,7 +190,7 @@ public final class ModItems { public static Item shardAqua; //Tc Compat for energy crystal recipes - public static BaseItemTCShard shardDull; + public static Item shardDull; //Lighter public static Item itemBasicFireMaker; @@ -215,20 +208,20 @@ public final class ModItems { public static Item dustCalciumSulfate; - public static BaseItemPlate itemPlateClay; - public static BaseItemPlateDouble itemDoublePlateClay; - public static Item dustFertUN18; public static Item dustFertUN32; public static Fluid fluidFLiBeSalt; - + //Possibly missing base items that GT may be missing. + public static Item itemSmallWroughtIronGear; + public static Item itemPlateClay; public static Item itemPlateLithium; public static Item itemPlateEuropium; public static Item itemPlateVanadium; + public static Item itemDoublePlateClay; public static Item itemDoublePlateEuropium; public static Item itemFoilUranium235; @@ -253,13 +246,18 @@ public final class ModItems { public static Item itemModularBauble; public static Item itemCustomBook; - + public static Item itemGrindleTablet; public static Item itemRope; public static Item itemFiber; public static Item itemDragonJar; - + //Unstable Elements & Related Content + public static Item dustNeptunium238; + public static Item dustDecayedRadium226; + public static Item dustRadium226; + + static { Logger.INFO("Items!"); } @@ -406,7 +404,9 @@ public final class ModItems { //Plutonium-238 is a very powerful alpha emitter. This makes the plutonium-238 isotope suitable for usage in radioisotope thermoelectric generators (RTGs) //and radioisotope heater units - one gram of plutonium-238 generates approximately 0.5 W of thermal power. MaterialGenerator.generateNuclearMaterial(NUCLIDE.getInstance().PLUTONIUM238, false); - MaterialGenerator.generateNuclearMaterial(NUCLIDE.getInstance().PLUTONIUM239, false); + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dustPlutonium239", 1) == null || Utils.getGregtechVersionAsInt() < 50931) { + MaterialGenerator.generateNuclearMaterial(NUCLIDE.getInstance().PLUTONIUM239, false); + } //RTG Fuel Materials MaterialGenerator.generateNuclearMaterial(NUCLIDE.getInstance().STRONTIUM90, false); @@ -512,10 +512,9 @@ public final class ModItems { //Must be the final Alloy to Generate MaterialGenerator.generate(ALLOY.QUANTUM); - //Ores MaterialGenerator.generateOreMaterial(FLUORIDES.FLUORITE); - GTplusplus_Secondary.GenerateOreMaterials(); + GTplusplus_Everglades.GenerateOreMaterials(); } catch (final Throwable r){ @@ -574,7 +573,7 @@ public final class ModItems { fluidFLiBeSalt = FluidUtils.generateFluid("Li2BeF4", "Li2BeF4", 7430, new short[]{255, 255, 255, 100}); //LFTR Control Circuit - itemCircuitLFTR = new CoreItem("itemCircuitLFTR", ""+EnumChatFormatting.GREEN+"Thorium Reactor Control Circuit", AddToCreativeTab.tabMisc, 1, 0, "Helps your LFTR not explode", EnumRarity.epic, EnumChatFormatting.DARK_GREEN, false, null); + itemCircuitLFTR = new CoreItem("itemCircuitLFTR", ""+EnumChatFormatting.GREEN+"Thorium Reactor Control Circuit", AddToCreativeTab.tabMisc, 1, 0, new String[] {"Helps your LFTR not explode"}, EnumRarity.epic, EnumChatFormatting.DARK_GREEN, false, null); //Zirconium @@ -659,16 +658,22 @@ public final class ModItems { if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDoubleClay", 1) == null){ itemDoublePlateClay = new BaseItemPlateDouble(MaterialUtils.generateMaterialFromGtENUM(Materials.Clay)); } - + //Need this for Mutagenic Frames if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("foilUranium235", 1) == null){ itemFoilUranium235 = new BaseItemFoil(ELEMENT.getInstance().URANIUM235); } - + //A small gear needed for wizardry. if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("gearGtSmallWroughtIron", 1) == null){ itemSmallWroughtIronGear = new BaseItemSmallGear(MaterialUtils.generateMaterialFromGtENUM(Materials.WroughtIron)); } + + + // A plate of Vanadium. + if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateVanadium", 1) == null){ + itemPlateVanadium = new BaseItemPlate(ELEMENT.getInstance().VANADIUM); + } //A plate of Lithium. if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateLithium", 1) == null){ @@ -682,9 +687,11 @@ public final class ModItems { if ((ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateDoubleEuropium", 1) == null) && CORE.ConfigSwitches.enableCustom_Pipes){ itemDoublePlateEuropium = new BaseItemPlateDouble(MaterialUtils.generateMaterialFromGtENUM(Materials.Europium)); } - - dustNeptunium238 = new DustDecayable("dustNeptunium238", Utils.rgbtoHexValue(175, 240, 75), 50640, "Result: Plutonium 238 ("+StringUtils.superscript("238Pu")+")", CORE.GT_Tooltip_Radioactive, NUCLIDE.getInstance().PLUTONIUM238.getDust(1).getItem(), 5); + dustNeptunium238 = new DustDecayable("dustNeptunium238", Utils.rgbtoHexValue(175, 240, 75), 50640, new String[] {""+StringUtils.superscript("238Np"), "Result: Plutonium 238 ("+StringUtils.superscript("238Pu")+")"}, NUCLIDE.getInstance().PLUTONIUM238.getDust(1).getItem(), 5); + dustDecayedRadium226 = ItemUtils.generateSpecialUseDusts("DecayedRadium226", "Decayed Radium-226", ""+StringUtils.superscript("226Ra"), ELEMENT.getInstance().RADIUM.getRgbAsHex())[0]; + dustRadium226 = new DustDecayable("dustRadium226", ELEMENT.getInstance().RADIUM.getRgbAsHex(), 90000, new String[] {""+StringUtils.superscript("226Ra"), "Result: Radon 222 ("+StringUtils.superscript("222Rn")+")"}, ItemUtils.getSimpleStack(dustDecayedRadium226).getItem(), 5); + itemBoilerChassis = new ItemBoilerChassis(); itemDehydratorCoilWire = new ItemDehydratorCoilWire(); itemDehydratorCoil = new ItemDehydratorCoil(); @@ -693,7 +700,6 @@ public final class ModItems { itemLavaFilter = new ItemLavaFilter(); itemGrindleTablet = new BaseItemGrindle(); - itemDragonJar = new ItemEntityCatcher(); //Chemistry @@ -712,11 +718,6 @@ public final class ModItems { tI = new BaseItemMisc("Dull", new short[]{64,64,64}, 64, MiscTypes.GEM, null); tI = new BaseItemMisc("Forest", new short[]{130,164,96}, 64, MiscTypes.MUSHROOM, new String[]{"You Found this on the ground.", "Definitely not sure if it's worth eating."}); - //Vanadium - if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateVanadium", 1) == null){ - itemPlateVanadium = new BaseItemPlate(MaterialUtils.generateMaterialFromGtENUM(Materials.Vanadium)); - } - //Baubles if (LoadedMods.Baubles){ tI = new HealthBoostBauble(); @@ -775,9 +776,7 @@ public final class ModItems { ItemUtils.getItemForOreDict("Thaumcraft:ItemResource", "ingotVoidMetal", "Void Metal Ingot", 16); itemPlateVoidMetal = ItemUtils.generateSpecialUsePlate("Void", "Void", new short[]{82, 17, 82}, 0); GT_OreDictUnificator.registerOre("plateVoidMetal", new ItemStack(ModItems.itemPlateVoidMetal)); - } catch (final NullPointerException e){ - e.getClass(); - } + } catch (final NullPointerException e){} } else { diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java b/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java index 501b881f9f..d5b44db9f5 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemTickable.java @@ -18,33 +18,32 @@ import net.minecraft.world.World; import gtPlusPlus.core.creative.AddToCreativeTab; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.minecraft.NBTUtils; public class BaseItemTickable extends CoreItem { - public final String descriptionString; - public final String descriptionString2; + public final String[] descriptionString; public final int itemColour; public final int maxTicks; public final boolean twoRenderPasses; + public final boolean ticksInContainers; public IIcon[] mIcon = new IIcon[2]; public BaseItemTickable(boolean twoPass, final String unlocalName, final int colour, final int maxTicks) { - this(twoPass, unlocalName, colour, maxTicks, ""); + this(false, twoPass, unlocalName, colour, maxTicks, new String[] {}); } - - public BaseItemTickable(boolean twoPass, final String unlocalName, final int colour, final int maxTicks, final String Description) { - this(twoPass, unlocalName, colour, maxTicks, "", Description); + + public BaseItemTickable(boolean containerTick, boolean twoPass, final String unlocalName, final int colour, final int maxTicks) { + this(containerTick, twoPass, unlocalName, colour, maxTicks, new String[] {}); } - public BaseItemTickable(boolean twoPass, final String unlocalName, final int colour, final int maxTicks, final String Description, final String Description2) { + public BaseItemTickable(boolean containerTick, boolean twoPass, final String unlocalName, final int colour, final int maxTicks, final String[] Description) { super(unlocalName, AddToCreativeTab.tabMisc, 1, 999999999, Description, EnumRarity.epic, EnumChatFormatting.DARK_RED, true, null); this.itemColour = colour; this.descriptionString = Description; - this.descriptionString2 = Description2; this.maxTicks = maxTicks; this.twoRenderPasses = twoPass; + this.ticksInContainers = containerTick; //setGregtechItemList(); } @@ -53,7 +52,7 @@ public class BaseItemTickable extends CoreItem { if (world == null || iStack == null) { return; } - tickItemTag(iStack); + tickItemTag(world, iStack); } /*private final boolean setGregtechItemList() { @@ -106,18 +105,24 @@ public class BaseItemTickable extends CoreItem { } - private boolean createNBT(ItemStack rStack){ + private boolean createNBT(World world, ItemStack rStack){ final NBTTagCompound tagMain = new NBTTagCompound(); final NBTTagCompound tagNBT = new NBTTagCompound(); tagNBT.setLong("Tick", 0); tagNBT.setLong("maxTick", this.maxTicks); tagNBT.setBoolean("isActive", true); + + //Try set world time + if (world != null) { + tagNBT.setLong("CreationDate", world.getTotalWorldTime()); + } + tagMain.setTag("TickableItem", tagNBT); rStack.setTagCompound(tagMain); return true; } - public final long getFilterDamage(final ItemStack aStack) { + public final long getFilterDamage(World world, final ItemStack aStack) { NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT != null) { aNBT = aNBT.getCompoundTag("TickableItem"); @@ -126,12 +131,12 @@ public class BaseItemTickable extends CoreItem { } } else { - createNBT(aStack); + createNBT(world, aStack); } return 0L; } - public final boolean setFilterDamage(final ItemStack aStack, final long aDamage) { + public final boolean setFilterDamage(World world, final ItemStack aStack, final long aDamage) { NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT != null) { aNBT = aNBT.getCompoundTag("TickableItem"); @@ -141,12 +146,12 @@ public class BaseItemTickable extends CoreItem { } } else { - createNBT(aStack); + createNBT(world, aStack); } return false; } - public final boolean getIsActive(final ItemStack aStack) { + public final boolean getIsActive(World world, final ItemStack aStack) { NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT != null) { aNBT = aNBT.getCompoundTag("TickableItem"); @@ -155,12 +160,12 @@ public class BaseItemTickable extends CoreItem { } } else { - createNBT(aStack); + createNBT(world, aStack); } return true; } - public final boolean setIsActive(final ItemStack aStack, final boolean active) { + public final boolean setIsActive(World world, final ItemStack aStack, final boolean active) { NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT != null) { aNBT = aNBT.getCompoundTag("TickableItem"); @@ -170,28 +175,99 @@ public class BaseItemTickable extends CoreItem { } } else { - createNBT(aStack); + createNBT(world, aStack); + } + return false; + } + + public final boolean getTicksInContainer(World world, final ItemStack aStack) { + NBTTagCompound aNBT = aStack.getTagCompound(); + if (aNBT != null) { + aNBT = aNBT.getCompoundTag("TickableItem"); + if (aNBT != null) { + return aNBT.getBoolean("ticksInContainer"); + } + } + else { + createNBT(world, aStack); + } + return false; + } + + public final boolean setTicksInContainer(World world, final ItemStack aStack, final boolean active) { + NBTTagCompound aNBT = aStack.getTagCompound(); + if (aNBT != null) { + aNBT = aNBT.getCompoundTag("TickableItem"); + if (aNBT != null) { + aNBT.setBoolean("ticksInContainer", active); + return true; + } + } + else { + createNBT(world, aStack); + } + return false; + } + + public final long getDifferenceInWorldTimeToCreationTime(World world, final ItemStack aStack) { + NBTTagCompound aNBT = aStack.getTagCompound(); + if (aNBT != null) { + aNBT = aNBT.getCompoundTag("TickableItem"); + if (aNBT != null) { + return (world.getTotalWorldTime() - aNBT.getLong("CreationDate")); + } + } + else { + createNBT(world, aStack); + } + return 0L; + } + + public final boolean setItemStackCreationTime(final ItemStack aStack, World world) { + NBTTagCompound aNBT = aStack.getTagCompound(); + if (aNBT != null) { + aNBT = aNBT.getCompoundTag("TickableItem"); + if (aNBT != null) { + aNBT.setLong("CreationDate", world.getTotalWorldTime()); + return true; + } + } + else { + createNBT(world, aStack); } return false; } - public final boolean tickItemTag(ItemStack aStack) { + public final boolean tickItemTag(World world, ItemStack aStack) { NBTTagCompound aNBT = aStack.getTagCompound(); if (aNBT != null) { - //Done Ticking - if (maxTicks-getFilterDamage(aStack) <= 0) { - setIsActive(aStack, false); - } - if (getIsActive(aStack)) { + if (aNBT.hasKey("TickableItem")) { aNBT = aNBT.getCompoundTag("TickableItem"); - if (aNBT != null) { - aNBT.setLong("Tick", getFilterDamage(aStack)+1); - return true; + + if (!aNBT.hasKey("CreationDate") && world != null) { + aNBT.setLong("CreationDate", world.getTotalWorldTime()); } - } + + //Done Ticking + if (maxTicks-getFilterDamage(world, aStack) <= 0) { + setIsActive(world, aStack, false); + } + if (getIsActive(world, aStack)) { + if (aNBT != null) { + + //if ((world.getTotalWorldTime()-)) + + // Just tick once + aNBT.setLong("Tick", getFilterDamage(world, aStack)+1); + + + return true; + } + } + } } else { - createNBT(aStack); + createNBT(world, aStack); } return false; } @@ -199,9 +275,9 @@ public class BaseItemTickable extends CoreItem { @Override public double getDurabilityForDisplay(ItemStack stack) { if (stack.getTagCompound() == null){ - createNBT(stack); + createNBT(null, stack); } - double currentDamage = getFilterDamage(stack); + double currentDamage = getFilterDamage(null, stack); double durabilitypercent = currentDamage / maxTicks; return durabilitypercent; } @@ -209,29 +285,32 @@ public class BaseItemTickable extends CoreItem { @SuppressWarnings("unchecked") @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { + World world = player.getEntityWorld(); + if (this.descriptionString.length > 0) { + list.add(EnumChatFormatting.GRAY+this.descriptionString[0]); + } EnumChatFormatting durability = EnumChatFormatting.GRAY; - if (maxTicks-getFilterDamage(stack) > (maxTicks*0.8)){ + if (maxTicks-getFilterDamage(world, stack) > (maxTicks*0.8)){ durability = EnumChatFormatting.GRAY; } - else if (maxTicks-getFilterDamage(stack) > (maxTicks*0.6)){ + else if (maxTicks-getFilterDamage(world, stack) > (maxTicks*0.6)){ durability = EnumChatFormatting.GREEN; } - else if (maxTicks-getFilterDamage(stack) > (maxTicks*0.4)){ + else if (maxTicks-getFilterDamage(world, stack) > (maxTicks*0.4)){ durability = EnumChatFormatting.YELLOW; } - else if (maxTicks-getFilterDamage(stack) > (maxTicks*0.2)){ + else if (maxTicks-getFilterDamage(world, stack) > (maxTicks*0.2)){ durability = EnumChatFormatting.GOLD; } - else if (maxTicks-getFilterDamage(stack) > 0){ + else if (maxTicks-getFilterDamage(world, stack) > 0){ durability = EnumChatFormatting.RED; } - list.add(durability+""+((maxTicks-getFilterDamage(stack))/20)+EnumChatFormatting.GRAY+" seconds until decay"); + list.add(durability+""+((maxTicks-getFilterDamage(world, stack))/20)+EnumChatFormatting.GRAY+" seconds until decay"); - if ((this.descriptionString != "") || !this.descriptionString.equals("")){ - list.add(EnumChatFormatting.GRAY+this.descriptionString); - } - if ((this.descriptionString2 != "") || !this.descriptionString2.equals("")){ - list.add(EnumChatFormatting.GRAY+this.descriptionString2); + if (this.descriptionString.length > 1) { + for (int h=1;h<this.descriptionString.length;h++) { + list.add(EnumChatFormatting.GRAY+this.descriptionString[h]); + } } //super.addInformation(stack, player, list, bool); @@ -239,7 +318,7 @@ public class BaseItemTickable extends CoreItem { @Override public boolean showDurabilityBar(ItemStack stack) { - return true; + return false; } diff --git a/src/Java/gtPlusPlus/core/item/base/CoreItem.java b/src/Java/gtPlusPlus/core/item/base/CoreItem.java index 8aeab4cbd1..6c7f9cf6db 100644 --- a/src/Java/gtPlusPlus/core/item/base/CoreItem.java +++ b/src/Java/gtPlusPlus/core/item/base/CoreItem.java @@ -23,7 +23,7 @@ public class CoreItem extends Item private final EnumRarity rarity; private final EnumChatFormatting descColour; - private final String itemDescription; + private final String[] itemDescription; protected String itemName; private final boolean hasEffect; @@ -42,7 +42,7 @@ public class CoreItem extends Item //0 /* * Name, Tab - 64 Stack, 0 Dmg - */ + */ public CoreItem(final String unlocalizedName, final String displayName, final CreativeTabs creativeTab) { this(unlocalizedName, creativeTab, 64, 0); //Calls 3 @@ -55,7 +55,7 @@ public class CoreItem extends Item */ public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final ItemStack OverrideItem) { - this(unlocalizedName, creativeTab, 64, 0, "This item will be replaced by another when held by a player, it is old and should not be used in recipes.", EnumRarity.uncommon, EnumChatFormatting.UNDERLINE, false, OverrideItem); //Calls 5 + this(unlocalizedName, creativeTab, 64, 0, new String[] {"This item will be replaced by another when held by a player, it is old and should not be used in recipes."}, EnumRarity.uncommon, EnumChatFormatting.UNDERLINE, false, OverrideItem); //Calls 5 } //0.1 /* @@ -63,7 +63,7 @@ public class CoreItem extends Item */ public CoreItem(final String unlocalizedName, final String displayName, final CreativeTabs creativeTab, final ItemStack OverrideItem) { - this(unlocalizedName, creativeTab, 64, 0, "This item will be replaced by another when held by a player, it is old and should not be used in recipes.", EnumRarity.uncommon, EnumChatFormatting.UNDERLINE, false, OverrideItem); //Calls 5 + this(unlocalizedName, creativeTab, 64, 0, new String[] {"This item will be replaced by another when held by a player, it is old and should not be used in recipes."}, EnumRarity.uncommon, EnumChatFormatting.UNDERLINE, false, OverrideItem); //Calls 5 this.itemName = displayName; } @@ -79,7 +79,7 @@ public class CoreItem extends Item /* * Name, Tab, Stack, Description - 0 Dmg */ - public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final String description) + public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final String[] description) { this(unlocalizedName, creativeTab, stackSize, 0, description); //Calls 4 } @@ -87,15 +87,21 @@ public class CoreItem extends Item /* * Name, Tab, Stack, Dmg - Description */ + public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, String string) { + this(unlocalizedName, creativeTab, stackSize, new String[] {string}); + } public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg) { - this(unlocalizedName, creativeTab, stackSize, maxDmg, ""); //Calls 4 + this(unlocalizedName, creativeTab, stackSize, maxDmg, new String[] {}); //Calls 4 } //4 //Not Rare + basic tooltip /* * Name, Tab, Stack, Dmg, Description */ - public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String description) + public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg, String string) { + this(unlocalizedName, creativeTab, stackSize, maxDmg, new String[] {string}); + } + public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String[] description) { this(unlocalizedName, creativeTab, stackSize, maxDmg, description, EnumRarity.common, EnumChatFormatting.GRAY, false, null); //Calls 4.5 } @@ -103,7 +109,7 @@ public class CoreItem extends Item /* * Name, Tab, Stack, Dmg, Description, Text Colour - Common */ - public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String description, final EnumChatFormatting colour) + public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String[] description, final EnumChatFormatting colour) { this(unlocalizedName, creativeTab, stackSize, maxDmg, description, EnumRarity.common, colour, false, null); //Calls 5 } @@ -112,7 +118,10 @@ public class CoreItem extends Item /* * Name, Tab, Stack, Dmg, Description, Rarity - Gray text */ - public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String description, final EnumRarity rarity) + public CoreItem(String unlocalizedName, CreativeTabs creativeTab, int stackSize, int maxDmg, String string, EnumRarity uncommon) { + this(unlocalizedName, creativeTab, stackSize, maxDmg, new String[] {string}, uncommon); + } + public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String[] description, final EnumRarity rarity) { this(unlocalizedName, creativeTab, stackSize, maxDmg, description, rarity, EnumChatFormatting.GRAY, false, null); //Calls 5 } @@ -121,7 +130,7 @@ public class CoreItem extends Item /* * Name, Tab, Stack, Dmg, Description, Rarity, Text Colour, Effect */ - public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String description, final EnumRarity regRarity, final EnumChatFormatting colour, final boolean Effect, final ItemStack OverrideItem) + public CoreItem(final String unlocalizedName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String[] description, final EnumRarity regRarity, final EnumChatFormatting colour, final boolean Effect, final ItemStack OverrideItem) { this.setUnlocalizedName(unlocalizedName); this.setTextureName(CORE.MODID + ":" + unlocalizedName); @@ -140,7 +149,7 @@ public class CoreItem extends Item /* * Name, Tab, Stack, Dmg, Description, Rarity, Text Colour, Effect */ - public CoreItem(final String unlocalizedName, final String displayName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String description, final EnumRarity regRarity, final EnumChatFormatting colour, final boolean Effect, final ItemStack OverrideItem) + public CoreItem(final String unlocalizedName, final String displayName, final CreativeTabs creativeTab, final int stackSize, final int maxDmg, final String[] description, final EnumRarity regRarity, final EnumChatFormatting colour, final boolean Effect, final ItemStack OverrideItem) { this.setUnlocalizedName(unlocalizedName); this.itemName = displayName; @@ -154,11 +163,16 @@ public class CoreItem extends Item this.hasEffect = Effect; this.turnsInto = OverrideItem; GameRegistry.registerItem(this, unlocalizedName); - } + } @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { + if (this.itemDescription.length > 0) { + for (int u=0;u<this.itemDescription.length;u++) { + list.add(this.descColour+this.itemDescription[u]); + } + } //list.add(this.descColour+this.itemDescription); //super.addInformation(stack, aPlayer, list, bool); } diff --git a/src/Java/gtPlusPlus/core/item/general/ItemAreaClear.java b/src/Java/gtPlusPlus/core/item/general/ItemAreaClear.java index 5f03e407f3..23b0144231 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemAreaClear.java +++ b/src/Java/gtPlusPlus/core/item/general/ItemAreaClear.java @@ -28,7 +28,7 @@ public class ItemAreaClear extends CoreItem { public IIcon[] mIcon = new IIcon[1]; public ItemAreaClear() { - super("itemDebugClearing", AddToCreativeTab.tabMachines, 1, 100, EnumChatFormatting.OBFUSCATED+"F A M C Y N A M E", EnumRarity.rare, + super("itemDebugClearing", AddToCreativeTab.tabMachines, 1, 100, new String[] {EnumChatFormatting.OBFUSCATED+"F A M C Y N A M E"}, EnumRarity.rare, EnumChatFormatting.BOLD, false, null); } diff --git a/src/Java/gtPlusPlus/core/item/general/ItemLavaFilter.java b/src/Java/gtPlusPlus/core/item/general/ItemLavaFilter.java index a05412f2f7..c34ad9e8d3 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemLavaFilter.java +++ b/src/Java/gtPlusPlus/core/item/general/ItemLavaFilter.java @@ -21,7 +21,7 @@ public class ItemLavaFilter extends CoreItem { public IIcon[] mIcon = new IIcon[1]; public ItemLavaFilter() { - super("itemLavaFilter", AddToCreativeTab.tabMachines, 1, 100, "Lava Filter", EnumRarity.common, + super("itemLavaFilter", AddToCreativeTab.tabMachines, 1, 100, new String[] {"Lava Filter"}, EnumRarity.common, EnumChatFormatting.BLACK, false, null); setGregtechItemList(); } diff --git a/src/Java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java b/src/Java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java index a62592c42b..57cf8986fa 100644 --- a/src/Java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java +++ b/src/Java/gtPlusPlus/core/item/general/throwables/ItemHydrofluoricAcidPotion.java @@ -13,7 +13,7 @@ import gtPlusPlus.core.item.base.CoreItem; public class ItemHydrofluoricAcidPotion extends CoreItem { public ItemHydrofluoricAcidPotion(String unlocalizedName, String displayName, String description) { - super(unlocalizedName, displayName, AddToCreativeTab.tabMisc, 16, 0, description, EnumRarity.uncommon, EnumChatFormatting.GRAY, false, null); + super(unlocalizedName, displayName, AddToCreativeTab.tabMisc, 16, 0, new String[] {description}, EnumRarity.uncommon, EnumChatFormatting.GRAY, false, null); } @Override diff --git a/src/Java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java b/src/Java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java index 55b3e421e2..27b35e48d1 100644 --- a/src/Java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java +++ b/src/Java/gtPlusPlus/core/item/general/throwables/ItemSulfuricAcidPotion.java @@ -13,7 +13,7 @@ import gtPlusPlus.core.item.base.CoreItem; public class ItemSulfuricAcidPotion extends CoreItem { public ItemSulfuricAcidPotion(String unlocalizedName, String displayName, String description) { - super(unlocalizedName, displayName, AddToCreativeTab.tabMisc, 16, 0, description, EnumRarity.common, EnumChatFormatting.GRAY, false, null); + super(unlocalizedName, displayName, AddToCreativeTab.tabMisc, 16, 0, new String[] {description}, EnumRarity.common, EnumChatFormatting.GRAY, false, null); } @Override diff --git a/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java b/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java index 0fad3de66a..8e19896b92 100644 --- a/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java +++ b/src/Java/gtPlusPlus/core/item/materials/DustDecayable.java @@ -1,5 +1,7 @@ package gtPlusPlus.core.item.materials; +import java.util.List; + import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -10,6 +12,7 @@ import net.minecraft.world.World; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.item.base.BaseItemTickable; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.EntityUtils; import gtPlusPlus.core.util.minecraft.ItemUtils; @@ -18,8 +21,8 @@ public class DustDecayable extends BaseItemTickable { private final Item turnsIntoItem; private final int radLevel; - public DustDecayable(String unlocal, int colour, int maxTicks, String desc1, String desc2, Item turnsInto, int radLevel) { - super(true, unlocal, colour, maxTicks, desc1, desc2); + public DustDecayable(String unlocal, int colour, int maxTicks, String[] desc1, Item turnsInto, int radLevel) { + super(true, true, unlocal, colour, maxTicks, desc1); this.turnsIntoItem = turnsInto; this.radLevel = radLevel; GT_OreDictUnificator.registerOre(unlocal, ItemUtils.getSimpleStack(this)); @@ -33,6 +36,15 @@ public class DustDecayable extends BaseItemTickable { this.mIcon[1] = reg.registerIcon(gt2); } + @SuppressWarnings("unchecked") + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool) { + super.addInformation(stack, player, list, bool); + if (this.radLevel > 0) { + list.add(CORE.GT_Tooltip_Radioactive); + } + } + @Override public void onUpdate(final ItemStack iStack, final World world, final Entity entityHolding, final int p_77663_4_, final boolean p_77663_5_) { if (world == null || iStack == null) { @@ -45,7 +57,7 @@ public class DustDecayable extends BaseItemTickable { } } - if (!tickItemTag(iStack)) { + if (!tickItemTag(world, iStack)) { if (entityHolding instanceof EntityPlayer){ ItemStack replacement = ItemUtils.getSimpleStack(turnsIntoItem); //Logger.INFO("Replacing "+iStack.getDisplayName()+" with "+replacement.getDisplayName()+"."); diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index de3b7914f1..568d6badcc 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -54,8 +54,8 @@ public class CORE { public static boolean isModUpToDate = Utils.isModUpToDate(); //Tweakables - public static int DARKBIOME_ID = 238; - public static int DARKWORLD_ID = 227; + public static int EVERGLADESBIOME_ID = 238; + public static int EVERGLADES_ID = 227; //GT Vars; public static final int GREG_FIRST_ID = 760; diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java index 201235cc55..bba7175272 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java @@ -33,6 +33,7 @@ public class RECIPES_GREGTECH { private static void execute() { cokeOvenRecipes(); + electrolyzerRecipes(); // matterFabRecipes(); assemblerRecipes(); fluidcannerRecipes(); @@ -60,6 +61,23 @@ public class RECIPES_GREGTECH { addFuels(); } + private static void electrolyzerRecipes() { + GT_Values.RA.addElectrolyzerRecipe( + ItemUtils.getSimpleStack(ModItems.dustDecayedRadium226, 1), + null, + null, + FluidUtils.getFluidStack("radon", 500), + null, + null, + null, + null, + null, + null, + new int[]{}, + 20*90, + 240); + } + private static void extruderRecipes() { // Osmium Credits if (GT_Values.RA.addExtruderRecipe(ItemUtils.getItemStackOfAmountFromOreDict("blockOsmium", 1), @@ -231,7 +249,7 @@ public class RECIPES_GREGTECH { FluidUtils.getFluidStack("molten.tungstencarbide", 2 * 144), 0, MathUtils.findPercentageOfInt( (int) Math.max(Materials.get("TungstenCarbide").getMass() / 40L, 1L) - * Materials.get("TungstenCarbide").mBlastFurnaceTemp, + * Materials.get("TungstenCarbide").mBlastFurnaceTemp, 80), 480); } @@ -339,7 +357,7 @@ public class RECIPES_GREGTECH { try { CORE.RA.addMatterFabricatorRecipe(Materials.UUAmplifier.getFluid(1L), // Fluid - // Input + // Input Materials.UUMatter.getFluid(1L), // Fluid Output 800, // Time in ticks 32); // EU @@ -366,23 +384,23 @@ public class RECIPES_GREGTECH { try { // Makes Lithium Carbonate CORE.RA.addDehydratorRecipe(ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricLithium", 1), // Item - // Input + // Input FluidUtils.getFluidStack("sulfuriclithium", 440), // Fluid - // input - // (slot - // 1) + // input + // (slot + // 1) new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 3), ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 3) }, // Output - // Array - // of - // Items - // - - // Upto - // 9 + // Array + // of + // Items + // - + // Upto + // 9 30 * 20, // Time in ticks 30); // EU } @@ -402,19 +420,19 @@ public class RECIPES_GREGTECH { CORE.RA.addDehydratorRecipe(input, // Item input (Array, up to 2) FluidUtils.getFluidStack("sulfuricacid", 10000), // Fluid - // input - // (slot - // 1) + // input + // (slot + // 1) FluidUtils.getFluidStack("sulfuriclithium", 10000), // Fluid - // output - // (slot - // 2) + // output + // (slot + // 2) new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustPotassium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustAluminium", 4), ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 10), ItemUtils.getItemStackOfAmountFromOreDict("cellFluorine", 2), ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 3), // LithiumCarbonate - }, // Output Array of Items - Upto 9, + }, // Output Array of Items - Upto 9, new int[] { 0 }, 75 * 20, // Time in ticks 1000); // EU @@ -425,24 +443,24 @@ public class RECIPES_GREGTECH { try { CORE.RA.addDehydratorRecipe(new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10) }, // Item - // input - // (Array, - // up - // to - // 2) + // input + // (Array, + // up + // to + // 2) FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 1440), // Fluid - // input - // (slot - // 1) + // input + // (slot + // 1) null, // Fluid output (slot 2) new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumTetrafluoride", 10), ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, + // Array + // of + // Items + // - + // Upto + // 9, new int[] { 0 }, 150 * 20, // Time in ticks 2000); // EU @@ -453,24 +471,24 @@ public class RECIPES_GREGTECH { try { CORE.RA.addDehydratorRecipe(new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 10) }, // Item - // input - // (Array, - // up - // to - // 2) + // input + // (Array, + // up + // to + // 2) FluidUtils.getFluidStack("molten.uraniumhexafluoride", 1440), // Fluid - // input - // (slot - // 1) + // input + // (slot + // 1) null, // Fluid output (slot 2) new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustUraniumHexafluoride", 10), ItemUtils.getItemStackOfAmountFromOreDictNoBroken("cellEmpty", 10) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, + // Array + // of + // Items + // - + // Upto + // 9, new int[] { 0 }, 300 * 20, // Time in ticks 4000); // EU @@ -483,20 +501,20 @@ public class RECIPES_GREGTECH { try { CORE.RA.addDehydratorRecipe(new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cropGrape", 1) }, // Item - // input - // (Array, - // up - // to - // 2) + // input + // (Array, + // up + // to + // 2) null, // Fluid input (slot 1) null, // Fluid output (slot 2) new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("foodRaisins", 1) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, + // Array + // of + // Items + // - + // Upto + // 9, new int[] { 0 }, 10 * 20, // Time in ticks 8); // EU @@ -512,21 +530,21 @@ public class RECIPES_GREGTECH { CORE.RA.addDehydratorRecipe( new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 10) }, // Item - // input - // (Array, - // up - // to - // 2) + // input + // (Array, + // up + // to + // 2) FluidUtils.getFluidStack("water", 10000), // Fluid input - // (slot 1) + // (slot 1) null, // Fluid output (slot 2) new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 20) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, + // Array + // of + // Items + // - + // Upto + // 9, new int[] { 0 }, 120 * 20, // Time in ticks 120); // EU @@ -540,21 +558,21 @@ public class RECIPES_GREGTECH { CORE.RA.addDehydratorRecipe( new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 5) }, // Item - // input - // (Array, - // up - // to - // 2) + // input + // (Array, + // up + // to + // 2) null, // Fluid input (slot 1) null, // Fluid output (slot 2) new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 2), ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumCarbonate", 3) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, + // Array + // of + // Items + // - + // Upto + // 9, new int[] { 0 }, 120 * 20, // Time in ticks 1000); // EU @@ -567,23 +585,23 @@ public class RECIPES_GREGTECH { try { CORE.RA.addDehydratorRecipe(new ItemStack[] { ItemUtils.getGregtechCircuit(0) }, // Item - // input - // (Array, - // up - // to - // 2) + // input + // (Array, + // up + // to + // 2) FluidUtils.getFluidStack("lithiumhydroxide", 144), // Fluid - // input - // (slot - // 1) + // input + // (slot + // 1) null, // Fluid output (slot 2) new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 1) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, + // Array + // of + // Items + // - + // Upto + // 9, new int[] { 0 }, 1 * 20, // Time in ticks 64); // EU @@ -598,24 +616,24 @@ public class RECIPES_GREGTECH { CORE.RA.addDehydratorRecipe( new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCookedZrCl4", 9), ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 9) }, // Item - // input - // (Array, - // up - // to - // 2) + // input + // (Array, + // up + // to + // 2) FluidUtils.getFluidStack("hydrofluoricacid", 9 * 144), // Fluid - // input - // (slot - // 1) + // input + // (slot + // 1) null, // Fluid output (slot 2) new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellHydrogenChloride", 9), ItemUtils.getItemStackOfAmountFromOreDict("dustZrF4", 9) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, + // Array + // of + // Items + // - + // Upto + // 9, new int[] { 0 }, 120 * 20, // Time in ticks 500); // EU @@ -630,15 +648,15 @@ public class RECIPES_GREGTECH { CORE.RA.addDehydratorRecipe( new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustFluorite", 37), ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 16) }, // Item - // input - // (Array, - // up - // to - // 2) + // input + // (Array, + // up + // to + // 2) FluidUtils.getFluidStack("sulfuricacid", 56 * 144), // Fluid - // input - // (slot - // 1) + // input + // (slot + // 1) null, // Fluid output (slot 2) new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumSulfate", 30), ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 16), @@ -646,15 +664,15 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustGold", 2), ItemUtils.getItemStackOfAmountFromOreDict("dustTin", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 2) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, + // Array + // of + // Items + // - + // Upto + // 9, new int[] { 0, 0, 100, 100, 300, 200 }, 10 * 60 * 20, // Time - // in - // ticks + // in + // ticks 230); // EU } @@ -667,24 +685,24 @@ public class RECIPES_GREGTECH { CORE.RA.addDehydratorRecipe( new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumHydroxide", 2), ItemUtils.getItemStackOfAmountFromOreDict("cellAmmoniumBifluoride", 4) }, // Item - // input - // (Array, - // up - // to - // 2) + // input + // (Array, + // up + // to + // 2) null, // Fluid input (slot 1) FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 6000), // Fluid - // output - // (slot - // 2) + // output + // (slot + // 2) new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 4), ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 2) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, + // Array + // of + // Items + // - + // Upto + // 9, new int[] { 0, 0, 0 }, 32 * 20, // Time in ticks 64); // EU @@ -697,25 +715,25 @@ public class RECIPES_GREGTECH { try { CORE.RA.addDehydratorRecipe( new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 5) }, // Item - // input - // (Array, - // up - // to - // 2) + // input + // (Array, + // up + // to + // 2) FluidUtils.getFluidStack("ammoniumtetrafluoroberyllate", 5000), // Fluid - // input - // (slot - // 1) + // input + // (slot + // 1) null, // Fluid output (slot 2) new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("cellAmmonia", 2), ItemUtils.getItemStackOfAmountFromOreDict("cellHydrofluoricAcid", 2), ItemUtils.getItemStackOfAmountFromOreDict("cellBerylliumFluoride", 1) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, + // Array + // of + // Items + // - + // Upto + // 9, new int[] { 0, 0, 0 }, 5 * 60 * 20, // Time in ticks 120); // EU @@ -729,10 +747,10 @@ public class RECIPES_GREGTECH { CORE.RA.addDehydratorRecipe(null, // Item input (Array, up to 2) FluidUtils.getFluidStack("sludge", 1000), // Fluid input - // (slot 1) + // (slot 1) FluidUtils.getFluidStack("nitricacid", 10), // Fluid - // output - // (slot 2) + // output + // (slot 2) new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIron", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinyCopper", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinyTin", 1), @@ -742,15 +760,15 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustTinySilver", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinyGold", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustTinyIridium", 1) }, // Output - // Array - // of - // Items - // - - // Upto - // 9, + // Array + // of + // Items + // - + // Upto + // 9, new int[] { 10, 5, 5, 4, 4, 3, 2, 2, 1 }, 2 * 20, // Time - // in - // ticks + // in + // ticks 500); // EU } @@ -772,20 +790,20 @@ public class RECIPES_GREGTECH { try { // Fli2BeF4 + Thorium TetraFluoride = Uranium233 CORE.RA.addLFTRRecipe(FluidUtils.getFluidStack("molten.LiFBeF2ThF4UF4".toLowerCase(), 144 * 4), // Fluid - // input - // (slot - // 1) + // input + // (slot + // 1) FluidUtils.getFluidStack("molten.li2bef4", 1200), // Fluid - // output - // (slot - // 2) + // output + // (slot + // 2) FluidUtils.getFluidStack("molten.uraniumhexafluoride", (1200 + (144 * 4))), // Output - // Array - // of - // Items - // - - // Upto - // 9, + // Array + // of + // Items + // - + // Upto + // 9, 300 * 60 * 20, // Time in ticks 3500); // EU @@ -796,20 +814,20 @@ public class RECIPES_GREGTECH { try { // Fli2BeF4 + Uranium235 = 1x Uranium233 CORE.RA.addLFTRRecipe(FluidUtils.getFluidStack("molten.LiFBeF2ZrF4U235".toLowerCase(), 144 * 16), // Fluid - // input - // (slot - // 1) + // input + // (slot + // 1) FluidUtils.getFluidStack("molten.li2bef4", 144 * 12), // Fluid - // output - // (slot - // 2) + // output + // (slot + // 2) FluidUtils.getFluidStack("molten.uraniumhexafluoride", 3 * 144), // Output - // Array - // of - // Items - // - - // Upto - // 9, + // Array + // of + // Items + // - + // Upto + // 9, 120 * 60 * 20, // Time in ticks 8000); // EU } @@ -819,20 +837,20 @@ public class RECIPES_GREGTECH { try { // Fli2BeF4 + Uranium233 TetraFluoride = Uranium233 CORE.RA.addLFTRRecipe(FluidUtils.getFluidStack("molten.LiFBeF2ZrF4UF4".toLowerCase(), 144 * 2), // Fluid - // input - // (slot - // 1) + // input + // (slot + // 1) FluidUtils.getFluidStack("molten.li2bef4", 500), // Fluid - // output - // (slot - // 2) + // output + // (slot + // 2) FluidUtils.getFluidStack("molten.uraniumhexafluoride", 1288), // Output - // Array - // of - // Items - // - - // Upto - // 9, + // Array + // of + // Items + // - + // Upto + // 9, 420 * 60 * 20, // Time in ticks 4000); // EU @@ -850,68 +868,68 @@ public class RECIPES_GREGTECH { final String salt_LiFBeF2ZrF4UF4 = "LiFBeF2ZrF4UF4".toLowerCase(); final FluidStack LithiumFluoride = FluidUtils.getFluidStack("molten.lithiumfluoride", 100); // Re-usable - // FluidStacks + // FluidStacks final FluidStack BerylliumFluoride = FluidUtils.getFluidStack("molten.berylliumfluoride", 100); // Re-usable - // FluidStacks + // FluidStacks final FluidStack ThoriumFluoride = FluidUtils.getFluidStack("molten.thoriumtetrafluoride", 100); // Re-usable - // FluidStacks + // FluidStacks final FluidStack ZirconiumFluoride = FluidUtils.getFluidStack("molten.zirconiumtetrafluoride", 100); // Re-usable - // FluidStacks + // FluidStacks final FluidStack UraniumTetraFluoride = FluidUtils.getFluidStack("molten.uraniumtetrafluoride", 100); // Re-usable - // FluidStacks + // FluidStacks final FluidStack Uranium235 = FluidUtils.getFluidStack("molten.uranium235", 1000); // Re-usable - // FluidStacks + // FluidStacks final FluidStack LiFBeF2ThF4UF4 = FluidUtils.getFluidStack("molten." + salt_LiFBeF2ThF4UF4, 100); // Re-usable - // FluidStacks + // FluidStacks final FluidStack LiFBeF2ZrF4U235 = FluidUtils.getFluidStack("molten." + salt_LiFBeF2ZrF4U235, 100); // Re-usable - // FluidStacks + // FluidStacks final FluidStack LiFBeF2ZrF4UF4 = FluidUtils.getFluidStack("molten." + salt_LiFBeF2ZrF4UF4, 100); // Re-usable - // FluidStacks + // FluidStacks // 7LiF - BeF2 - ZrF4 - UF4 - 650C CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 6500), // Input - // A + // A FluidUtils.getFluidStack(BerylliumFluoride, 2500), // Input - // B + // B FluidUtils.getFluidStack(ZirconiumFluoride, 800), // Input C FluidUtils.getFluidStack(UraniumTetraFluoride, 700), // Input - // D + // D null, null, null, null, null, // Extra 5 inputs FluidUtils.getFluidStack(LiFBeF2ZrF4UF4, 10000), // Output - // Fluid - // 1 + // Fluid + // 1 null, // Output Fluid 2 60 * 60 * 20, // Duration 500); // 7LiF - BeF2 - ZrF4 - U235 - 590C CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 5500), // Input - // A + // A FluidUtils.getFluidStack(BerylliumFluoride, 1500), // Input - // B + // B FluidUtils.getFluidStack(ZirconiumFluoride, 600), // Input C FluidUtils.getFluidStack(Uranium235, 2400), // Input D null, null, null, null, null, // Extra 5 inputs FluidUtils.getFluidStack(LiFBeF2ZrF4U235, 10000), // Output - // Fluid - // 1 + // Fluid + // 1 null, // Output Fluid 2 45 * 60 * 20, // Duration 500); // 7liF - BeF2 - ThF4 - UF4 - 566C CORE.RA.addFissionFuel(FluidUtils.getFluidStack(LithiumFluoride, 6200), // Input - // A + // A FluidUtils.getFluidStack(BerylliumFluoride, 2800), // Input - // B + // B FluidUtils.getFluidStack(ThoriumFluoride, 700), // Input C FluidUtils.getFluidStack(UraniumTetraFluoride, 700), // Input - // D + // D null, null, null, null, null, // Extra 5 inputs FluidUtils.getFluidStack(LiFBeF2ThF4UF4, 10000), // Output - // Fluid - // 1 + // Fluid + // 1 null, // Output Fluid 2 60 * 60 * 20, // Duration 500); @@ -1085,26 +1103,26 @@ public class RECIPES_GREGTECH { private static void chemicalReactorRecipes() { GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumCarbonate", 5), // Input - // Stack - // 1 + // Stack + // 1 ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5), // Input - // Stack - // 2 + // Stack + // 2 null, // Fluid Input null, // Fluid Output ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 10), // Output - // Stack + // Stack 600 * 20); GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 5), // Input - // Stack - // 1 + // Stack + // 1 null, // Input Stack 2 FluidUtils.getFluidStack("hydrofluoricacid", 5 * 144), // Fluid - // Input + // Input FluidUtils.getFluidStack("water", 5 * 144), // Fluid Output ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumFluoride", 5), // Output - // Stack + // Stack 600 * 20); GT_Values.RA.addChemicalRecipe(ItemUtils.getItemStackOfAmountFromOreDict("dustApatite", 16), null, @@ -1237,7 +1255,7 @@ public class RECIPES_GREGTECH { } private static void cyclotronRecipes() { - + //Polonium CORE.RA.addCyclotronRecipe(CI.getNumberedCircuit(0), FluidUtils.getFluidStack("molten.bismuth", 1), new ItemStack[] { GregtechItemList.Pellet_RTG_PO210.get(1) }, null, new int[] { 100 }, 20 * 300, 2040, @@ -1247,7 +1265,7 @@ public class RECIPES_GREGTECH { CORE.RA.addCyclotronRecipe(CI.getNumberedCircuit(0), FluidUtils.getFluidStack("molten.americium", 1), new ItemStack[] { GregtechItemList.Pellet_RTG_AM241.get(4) }, null, new int[] { 2500 }, 20 * 300, 1020, 500 * 20); //PO Special Value - + //Strontium u235 CORE.RA.addCyclotronRecipe(CI.getNumberedCircuit(0), FluidUtils.getFluidStack("molten.uranium235", 10), new ItemStack[] { GregtechItemList.Pellet_RTG_SR90.get(1) }, null, new int[] { 570 }, 20 * 300, 1020, @@ -1257,24 +1275,24 @@ public class RECIPES_GREGTECH { CORE.RA.addCyclotronRecipe(CI.getNumberedCircuit(0), FluidUtils.getFluidStack("molten.uranium233", 10), new ItemStack[] { GregtechItemList.Pellet_RTG_SR90.get(1) }, null, new int[] { 660 }, 20 * 300, 1020, 500 * 20); //PO Special Value - + //Strontium pu239 CORE.RA.addCyclotronRecipe(CI.getNumberedCircuit(0), FluidUtils.getFluidStack("molten.plutonium239", 10), new ItemStack[] { GregtechItemList.Pellet_RTG_SR90.get(1) }, null, new int[] { 220 }, 20 * 300, 1020, 500 * 20); //PO Special Value - + //Plutonium CORE.RA.addCyclotronRecipe(CI.getNumberedCircuit(0), FluidUtils.getFluidStack("molten.plutonium238", 1), new ItemStack[] { GregtechItemList.Pellet_RTG_PU238.get(2) }, null, new int[] { 780 }, 20 * 300, 1020, 500 * 20); //PO Special Value - - + + //Neptunium CORE.RA.addCyclotronRecipe(new ItemStack[] {ELEMENT.getInstance().URANIUM238.getDust(1) }, FluidUtils.getFluidStack("deuterium", 400), ItemUtils.getSimpleStack(ModItems.dustNeptunium238), null, new int[] { 500 }, 20 * 5, 500, 500 * 20); //PO Special Value - - + + } private static void sifterRecipes() { @@ -1297,6 +1315,34 @@ public class RECIPES_GREGTECH { ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1), ItemUtils.getItemStackOfAmountFromOreDict("dustZirconium", 1) }, new int[] { 10000, 5000, 1500, 1000, 500, 500 }, 20 * 30, 60); + + // Radium + GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedUranium", 1), + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustUranium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyLead", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1) }, + new int[] { 10000, 5000, 1000, 500, 500, 500 }, 20 * 30, 60); + // Radium + GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedUraninite", 1), + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustUraninite", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyUranium", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1) }, + new int[] { 10000, 5000, 500, 250, 250, 250 }, 20 * 30, 60); + // Radium + GT_Values.RA.addSifterRecipe(ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedPitchblende", 1), + new ItemStack[] { ItemUtils.getItemStackOfAmountFromOreDict("dustPitchblende", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustTinyLead", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1), + ItemUtils.getItemStackOfAmountFromOreDict("dustRadium226", 1) }, + new int[] { 10000, 5000, 500, 250, 250, 250 }, 20 * 30, 60); } private static void electroMagneticSeperatorRecipes() { diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java index e56d1b57f9..2588a88143 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java @@ -23,7 +23,7 @@ import gtPlusPlus.core.material.nuclear.FLUORIDES; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; -import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld; +import gtPlusPlus.everglades.dimension.Dimension_Everglades; import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import net.minecraftforge.oredict.OreDictionary; @@ -114,7 +114,7 @@ public class RECIPES_General { if (ModBlocks.blockOreFluorite != null){ RecipeUtils.addShapelessGregtechRecipe(new ItemStack[]{ItemUtils.getSimpleStack(ModBlocks.blockOreFluorite)}, FLUORIDES.FLUORITE.getOre(1)); } - + //Iron bars final ItemStack ironBars; if (CORE.GTNH) { @@ -131,22 +131,23 @@ public class RECIPES_General { ItemUtils.getSimpleStack(ModBlocks.blockFishTrap))){ Logger.INFO("Added a recipe for the Fish Trap."); } - + //Small Gear Extruder Shape if (!CORE.GTNH) { GT_ModHandler.addCraftingRecipe(GregtechItemList.Shape_Extruder_SmallGear.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE | GT_ModHandler.RecipeBits.REVERSIBLE, new Object[]{"hXS", "XPX", "fXd", Character.valueOf('P'), ItemList.Shape_Extruder_Gear, Character.valueOf('X'), OrePrefixes.plate.get(Materials.Steel), Character.valueOf('S'), OrePrefixes.screw.get(Materials.Steel)}); - } - - String[] ironTypes = {"", "Wrought", "Pig", "Any"}; - for (int y=0;y<ironTypes.length;y++) { - //Iron bars - String ironRecipe = "stick"+ironTypes[y]+"Iron"; - if (RecipeUtils.recipeBuilder( - null, CI.craftingToolWrench, null, - ironRecipe, ironRecipe, ironRecipe, - ironRecipe, ironRecipe, ironRecipe, - ItemUtils.getItemStack("minecraft:iron_bars", 8))) { - Logger.INFO("Re-added old GT recipe for Iron Bars."); + + + String[] ironTypes = {"", "Wrought", "Pig", "Any"}; + for (int y=0;y<ironTypes.length;y++) { + //Iron bars + String ironRecipe = "stick"+ironTypes[y]+"Iron"; + if (RecipeUtils.recipeBuilder( + null, CI.craftingToolWrench, null, + ironRecipe, ironRecipe, ironRecipe, + ironRecipe, ironRecipe, ironRecipe, + ItemUtils.getItemStack("minecraft:iron_bars", 8))) { + Logger.INFO("Re-added old GT recipe for Iron Bars."); + } } } @@ -164,10 +165,10 @@ public class RECIPES_General { CI.sensor_HV, CI.fieldGenerator_MV, CI.sensor_HV, CI.craftingToolHammer_Hard, ItemList.Casing_SolidSteel.get(1), CI.craftingToolSolderingIron, CI.emitter_HV, CI.fieldGenerator_MV, CI.emitter_HV, - ItemUtils.getSimpleStack(Dimension_DarkWorld.blockPortalFrame, 2))){ + ItemUtils.getSimpleStack(Dimension_Everglades.blockPortalFrame, 2))){ Logger.INFO("Added a recipe for the Toxic Everglades Portal frame"); } - + //Alkalus Coin if (RecipeUtils.recipeBuilder( "gemExquisiteRuby", "gemFlawlessDiamond", "gemExquisiteDiamond", @@ -204,9 +205,9 @@ public class RECIPES_General { getSimpleStack(Items.experience_bottle), ItemUtils.simpleMetaStack(ModBlocks.blockCompressedObsidian, 2, 1), getSimpleStack(Items.experience_bottle), ItemUtils.getSimpleStack(ModBlocks.blockXpConverter, 1)); - - - + + + // Rope/Fiber/Net RecipeUtils.addShapelessGregtechRecipe( new ItemStack[]{ diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java index fa46b392e6..76182e61d9 100644 --- a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java +++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java @@ -11,7 +11,7 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld; +import gtPlusPlus.everglades.dimension.Dimension_Everglades; import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { @@ -126,7 +126,7 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator { } else if (aOreDictName.equals(OreDictNames.craftingLensOrange.toString())) { - GT_Values.RA.addLaserEngraverRecipe(ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemUtils.getSimpleStack(Dimension_DarkWorld.portalItem), 360*60*20, 4096); + GT_Values.RA.addLaserEngraverRecipe(ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemUtils.getSimpleStack(Dimension_Everglades.portalItem), 360*60*20, 4096); } diff --git a/src/Java/gtPlusPlus/core/world/darkworld/world/DarkWorldPortalPosition.java b/src/Java/gtPlusPlus/core/world/darkworld/world/DarkWorldPortalPosition.java deleted file mode 100644 index 9dcfb8cd2c..0000000000 --- a/src/Java/gtPlusPlus/core/world/darkworld/world/DarkWorldPortalPosition.java +++ /dev/null @@ -1,14 +0,0 @@ -package gtPlusPlus.core.world.darkworld.world; - -import net.minecraft.util.ChunkCoordinates; - -public class DarkWorldPortalPosition extends ChunkCoordinates { - public long field_85087_d; - final TeleporterDimensionMod field_85088_e; - - public DarkWorldPortalPosition(TeleporterDimensionMod darkworldTeleporter, int par2, int par3, int par4, long par5) { - super(par2, par3, par4); - this.field_85088_e = darkworldTeleporter; - this.field_85087_d = par5; - } -}
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/GTplusplus_Secondary.java b/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java index f29ae1afe0..9174442a43 100644 --- a/src/Java/gtPlusPlus/GTplusplus_Secondary.java +++ b/src/Java/gtPlusPlus/everglades/GTplusplus_Everglades.java @@ -1,4 +1,4 @@ -package gtPlusPlus; +package gtPlusPlus.everglades; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -17,11 +17,11 @@ import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.MaterialGenerator; import gtPlusPlus.core.material.ORES; -import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld; -import gtPlusPlus.core.world.darkworld.biome.Biome_DarkWorld; -import gtPlusPlus.core.world.darkworld.block.DarkWorldContentLoader; -import gtPlusPlus.core.world.darkworld.gen.gt.WorldGen_GT_Base; -import gtPlusPlus.core.world.darkworld.gen.gt.WorldGen_Ores; +import gtPlusPlus.everglades.biome.Biome_Everglades; +import gtPlusPlus.everglades.block.DarkWorldContentLoader; +import gtPlusPlus.everglades.dimension.Dimension_Everglades; +import gtPlusPlus.everglades.gen.gt.WorldGen_GT_Base; +import gtPlusPlus.everglades.gen.gt.WorldGen_Ores; import gtPlusPlus.xmod.gregtech.HANDLER_GT; import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config; import net.minecraftforge.common.DimensionManager; @@ -29,16 +29,16 @@ import net.minecraftforge.common.config.Configuration; @MCVersion(value = "1.7.10") @Mod(modid = Everglades.MODID, name = Everglades.NAME, version = Everglades.VERSION, dependencies = "required-after:Forge; after:dreamcraft; after:IC2; after:ihl; required-after:gregtech; after:miscutils;") -public class GTplusplus_Secondary implements ActionListener { +public class GTplusplus_Everglades implements ActionListener { //Mod Instance @Mod.Instance(Everglades.MODID) - public static GTplusplus_Secondary instance; + public static GTplusplus_Everglades instance; // Dark World Handler - protected static volatile Biome_DarkWorld DarkWorld_Biome; - protected static volatile Dimension_DarkWorld DarkWorld_Dimension; - public static int globalDarkWorldPortalSpawnTimer = 0; + protected static volatile Biome_Everglades Everglades_Biome; + protected static volatile Dimension_Everglades Everglades_Dimension; + public static int globalEvergladesPortalSpawnTimer = 0; // Pre-Init @Mod.EventHandler @@ -48,13 +48,13 @@ public class GTplusplus_Secondary implements ActionListener { //Setup setVars(event); - setDarkBiome(new Biome_DarkWorld()); - DarkWorld_Dimension = new Dimension_DarkWorld(); + setEvergladesBiome(new Biome_Everglades()); + Everglades_Dimension = new Dimension_Everglades(); // Load Dark World - getDarkBiome().instance = instance; - DarkWorld_Dimension.instance = instance; - getDarkBiome().preInit(event); + getEvergladesBiome().instance = instance; + Everglades_Dimension.instance = instance; + getEvergladesBiome().preInit(event); //Load/Set Custom Ore Gen HANDLER_GT.sCustomWorldgenFile = new GTPP_Config(new Configuration(new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg"))); @@ -65,14 +65,14 @@ public class GTplusplus_Secondary implements ActionListener { public void load(final FMLInitializationEvent e) { Logger.INFO("Begin resource allocation for " + Everglades.MODID + " V" +Everglades.VERSION); - //Load Dark World and Biome + //Load World and Biome GameRegistry.registerWorldGenerator(new WorldGen_GT_Base(), Short.MAX_VALUE); - getDarkBiome().load(); - DarkWorld_Dimension.load(); + getEvergladesBiome().load(); + Everglades_Dimension.load(); } - public static void GenerateOreMaterials() { + public static synchronized void GenerateOreMaterials() { MaterialGenerator.generateOreMaterial(ORES.CROCROITE); MaterialGenerator.generateOreMaterial(ORES.GEIKIELITE); MaterialGenerator.generateOreMaterial(ORES.NICHROMITE); @@ -111,12 +111,12 @@ public class GTplusplus_Secondary implements ActionListener { } } - void setVars(FMLPreInitializationEvent event){ + protected synchronized void setVars(FMLPreInitializationEvent event){ //Init WorldGen config. HANDLER_GT.sCustomWorldgenFile = new GTPP_Config(new Configuration(new File(new File(event.getModConfigurationDirectory(), "GTplusplus"), "WorldGeneration.cfg"))); - if (DimensionManager.isDimensionRegistered(Dimension_DarkWorld.DIMID)){ - Dimension_DarkWorld.DIMID = DimensionManager.getNextFreeDimId(); + if (DimensionManager.isDimensionRegistered(Dimension_Everglades.DIMID)){ + Dimension_Everglades.DIMID = DimensionManager.getNextFreeDimId(); } /* @@ -134,7 +134,7 @@ public class GTplusplus_Secondary implements ActionListener { @EventHandler public void serverLoad(FMLServerStartingEvent event) { - getDarkBiome().serverLoad(event); + getEvergladesBiome().serverLoad(event); } /*@Override @@ -167,15 +167,15 @@ public class GTplusplus_Secondary implements ActionListener { @EventHandler public static void postInit(final FMLPostInitializationEvent e) { - Logger.INFO("Finished loading Toxic Everglades plugin for GT++."); + Logger.INFO("Finished loading Everglades plugin for GT++."); } - public static synchronized Biome_DarkWorld getDarkBiome() { - return DarkWorld_Biome; + public static synchronized Biome_Everglades getEvergladesBiome() { + return Everglades_Biome; } - public static synchronized void setDarkBiome(Biome_DarkWorld darkWorld_Biome) { - DarkWorld_Biome = darkWorld_Biome; + public static synchronized void setEvergladesBiome(Biome_Everglades darkWorld_Biome) { + Everglades_Biome = darkWorld_Biome; } @Override diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/BiomeGenerator_Custom.java b/src/Java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java index 353eed083d..83dedc376a 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/biome/BiomeGenerator_Custom.java +++ b/src/Java/gtPlusPlus/everglades/biome/BiomeGenerator_Custom.java @@ -1,4 +1,4 @@ -package gtPlusPlus.core.world.darkworld.biome; +package gtPlusPlus.everglades.biome; import static net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate.EventType.*; import static net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable.EventType.*; @@ -13,8 +13,8 @@ import net.minecraft.world.biome.BiomeDecorator; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.feature.*; -import gtPlusPlus.core.world.darkworld.gen.WorldGenDeadLilly; -import gtPlusPlus.core.world.darkworld.gen.WorldGenMinable_Custom; +import gtPlusPlus.everglades.gen.WorldGenDeadLilly; +import gtPlusPlus.everglades.gen.WorldGenMinable_Custom; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.terraingen.DecorateBiomeEvent; import net.minecraftforge.event.terraingen.OreGenEvent; diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java b/src/Java/gtPlusPlus/everglades/biome/Biome_Everglades.java index e9669d9b50..aadbfeb495 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java +++ b/src/Java/gtPlusPlus/everglades/biome/Biome_Everglades.java @@ -1,4 +1,4 @@ -package gtPlusPlus.core.world.darkworld.biome; +package gtPlusPlus.everglades.biome; import java.lang.reflect.Field; import java.util.Random; @@ -20,17 +20,17 @@ import gtPlusPlus.core.entity.monster.EntitySickBlaze; import gtPlusPlus.core.entity.monster.EntityStaballoyConstruct; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld; +import gtPlusPlus.everglades.dimension.Dimension_Everglades; import net.minecraftforge.common.BiomeDictionary; import net.minecraftforge.common.BiomeManager; -public class Biome_DarkWorld { +public class Biome_Everglades { - public static BiomeGenDarkWorld biome = new BiomeGenDarkWorld(); + public static BiomeGenEverglades biome = new BiomeGenEverglades(); public Object instance; - public Biome_DarkWorld() { + public Biome_Everglades() { } public void load() { @@ -57,17 +57,17 @@ public class Biome_DarkWorld { public void preInit(FMLPreInitializationEvent event) { } - static class BiomeGenDarkWorld extends BiomeGenBase { + static class BiomeGenEverglades extends BiomeGenBase { @SuppressWarnings("unchecked") - public BiomeGenDarkWorld() { - super(CORE.DARKBIOME_ID); + public BiomeGenEverglades() { + super(CORE.EVERGLADESBIOME_ID); this.setBiomeID(); this.theBiomeDecorator = new BiomeGenerator_Custom(); this.theBiomeDecorator.treesPerChunk = 10; - Logger.INFO("Dark World Temperature Category: "+getTempCategory()); - this.setBiomeName("Dark World"); - this.topBlock = Dimension_DarkWorld.blockTopLayer; - this.fillerBlock = Dimension_DarkWorld.blockSecondLayer; + //Logger.INFO("Dark World Temperature Category: "+getTempCategory()); + this.setBiomeName("Toxic Everglades"); + this.topBlock = Dimension_Everglades.blockTopLayer; + this.fillerBlock = Dimension_Everglades.blockSecondLayer; this.enableRain = true; this.enableSnow = false; this.rainfall = 0.7F; @@ -99,7 +99,7 @@ public class Biome_DarkWorld { Field mClone = mInternalBiomeList; mTempList = (BiomeGenBase[]) mInternalBiomeList.get(null); if (mTempList != null){ - mTempList[CORE.DARKBIOME_ID] = this; + mTempList[CORE.EVERGLADESBIOME_ID] = this; mInternalBiomeList.set(null, mTempList); if (mTempList != mInternalBiomeList.get(null)){ ReflectionUtils.setFinalStatic(mInternalBiomeList, mTempList); diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/GenLayerBiomes.java b/src/Java/gtPlusPlus/everglades/biome/GenLayerBiomes.java index f7176f86fb..b69a8ea555 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/biome/GenLayerBiomes.java +++ b/src/Java/gtPlusPlus/everglades/biome/GenLayerBiomes.java @@ -1,4 +1,4 @@ -package gtPlusPlus.core.world.darkworld.biome; +package gtPlusPlus.everglades.biome; import net.minecraft.world.biome.BiomeGenBase; import net.minecraft.world.gen.layer.GenLayer; @@ -6,7 +6,7 @@ import net.minecraft.world.gen.layer.IntCache; public class GenLayerBiomes extends GenLayer { - protected BiomeGenBase[] allowedBiomes = { Biome_DarkWorld.biome, }; + protected BiomeGenBase[] allowedBiomes = { Biome_Everglades.biome, }; public GenLayerBiomes(long seed) { super(seed); diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/GenLayerDarkWorld.java b/src/Java/gtPlusPlus/everglades/biome/GenLayerEverglades.java index 4353c6d540..8034921dce 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/biome/GenLayerDarkWorld.java +++ b/src/Java/gtPlusPlus/everglades/biome/GenLayerEverglades.java @@ -1,13 +1,13 @@ -package gtPlusPlus.core.world.darkworld.biome; +package gtPlusPlus.everglades.biome; import net.minecraft.world.WorldType; import net.minecraft.world.gen.layer.GenLayer; import net.minecraft.world.gen.layer.GenLayerVoronoiZoom; import net.minecraft.world.gen.layer.GenLayerZoom; -public class GenLayerDarkWorld extends GenLayer { +public class GenLayerEverglades extends GenLayer { - public GenLayerDarkWorld(long seed) { + public GenLayerEverglades(long seed) { super(seed); } diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldGround.java b/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java index 95e21baa45..f68c97b3c5 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldGround.java +++ b/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldGround.java @@ -1,4 +1,4 @@ -package gtPlusPlus.core.world.darkworld.block; +package gtPlusPlus.everglades.block; import cpw.mods.fml.common.registry.LanguageRegistry; diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPollutedDirt.java b/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java index 82acaf1ff4..a1fcc588b5 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPollutedDirt.java +++ b/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldPollutedDirt.java @@ -1,4 +1,4 @@ -package gtPlusPlus.core.world.darkworld.block; +package gtPlusPlus.everglades.block; import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.relauncher.Side; diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortalFrame.java b/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java index 90c425d2d4..09dea46ab1 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortalFrame.java +++ b/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldPortalFrame.java @@ -1,4 +1,4 @@ -package gtPlusPlus.core.world.darkworld.block; +package gtPlusPlus.everglades.block; import cpw.mods.fml.common.registry.LanguageRegistry; diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldSludgeFluid.java b/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java index 8271713dfb..3c0445c86d 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldSludgeFluid.java +++ b/src/Java/gtPlusPlus/everglades/block/BlockDarkWorldSludgeFluid.java @@ -1,4 +1,4 @@ -package gtPlusPlus.core.world.darkworld.block; +package gtPlusPlus.everglades.block; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortal.java b/src/Java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java index 061e2c8dc3..e64968888d 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/block/BlockDarkWorldPortal.java +++ b/src/Java/gtPlusPlus/everglades/block/BlockEvergladesPortal.java @@ -1,4 +1,4 @@ -package gtPlusPlus.core.world.darkworld.block; +package gtPlusPlus.everglades.block; import java.util.Random; @@ -24,13 +24,13 @@ import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.minecraft.BlockPos; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld; -import gtPlusPlus.core.world.darkworld.world.TeleporterDimensionMod; +import gtPlusPlus.everglades.dimension.Dimension_Everglades; +import gtPlusPlus.everglades.world.TeleporterDimensionMod; -public class BlockDarkWorldPortal extends BlockBreakable implements ITileTooltip{ +public class BlockEvergladesPortal extends BlockBreakable implements ITileTooltip{ IIcon gor = null, dol = null, st1 = null, st2 = null, st3 = null, st4 = null; - public BlockDarkWorldPortal() { + public BlockEvergladesPortal() { super("portal", Material.portal, false); this.setTickRandomly(true); this.setHardness(-1.0F); @@ -90,7 +90,7 @@ public class BlockDarkWorldPortal extends BlockBreakable implements ITileTooltip for (BlockPos side : portal.getSurroundingBlocks()) { Block b = side.getBlockAtPos(); - if (b == Dimension_DarkWorld.blockPortalFrame || b == Dimension_DarkWorld.portalBlock) { + if (b == Dimension_Everglades.blockPortalFrame || b == Dimension_Everglades.portalBlock) { blockCount++; } } @@ -155,12 +155,12 @@ public class BlockDarkWorldPortal extends BlockBreakable implements ITileTooltip public boolean tryToCreatePortal(World par1World, int par2, int par3, int par4) { byte b0 = 0; byte b1 = 0; - if (par1World.getBlock(par2 - 1, par3, par4) == Dimension_DarkWorld.blockPortalFrame - || par1World.getBlock(par2 + 1, par3, par4) == Dimension_DarkWorld.blockPortalFrame) { + if (par1World.getBlock(par2 - 1, par3, par4) == Dimension_Everglades.blockPortalFrame + || par1World.getBlock(par2 + 1, par3, par4) == Dimension_Everglades.blockPortalFrame) { b0 = 1; } - if (par1World.getBlock(par2, par3, par4 - 1) == Dimension_DarkWorld.blockPortalFrame - || par1World.getBlock(par2, par3, par4 + 1) == Dimension_DarkWorld.blockPortalFrame) { + if (par1World.getBlock(par2, par3, par4 - 1) == Dimension_Everglades.blockPortalFrame + || par1World.getBlock(par2, par3, par4 + 1) == Dimension_Everglades.blockPortalFrame) { b1 = 1; } if (b0 == b1) { @@ -178,7 +178,7 @@ public class BlockDarkWorldPortal extends BlockBreakable implements ITileTooltip if (l != -1 && l != 2 || i1 != -1 && i1 != 3) { Block j1 = par1World.getBlock(par2 + b0 * l, par3 + i1, par4 + b1 * l); if (flag) { - if (j1 != Dimension_DarkWorld.blockPortalFrame) { + if (j1 != Dimension_Everglades.blockPortalFrame) { return false; } } @@ -211,7 +211,7 @@ public class BlockDarkWorldPortal extends BlockBreakable implements ITileTooltip World par1World = portal.world; for (BlockPos side : portal.getSurroundingBlocks()) { Block b = side.getBlockAtPos(); - if (b == Dimension_DarkWorld.blockPortalFrame || b == Dimension_DarkWorld.portalBlock) { + if (b == Dimension_Everglades.blockPortalFrame || b == Dimension_Everglades.portalBlock) { blockCount++; } } @@ -232,22 +232,22 @@ public class BlockDarkWorldPortal extends BlockBreakable implements ITileTooltip for (i1 = y; par1World.getBlock(x, i1 - 1, z) == this; --i1) { ; } - if (par1World.getBlock(x, i1 - 1, z) != Dimension_DarkWorld.blockPortalFrame) { + if (par1World.getBlock(x, i1 - 1, z) != Dimension_Everglades.blockPortalFrame) { par1World.setBlockToAir(x, y, z); } else { int j1; for (j1 = 1; j1 < 4 && par1World.getBlock(x, i1 + j1, z) == this; ++j1) { ; } - if (j1 == 3 && par1World.getBlock(x, i1 + j1, z) == Dimension_DarkWorld.blockPortalFrame) { + if (j1 == 3 && par1World.getBlock(x, i1 + j1, z) == Dimension_Everglades.blockPortalFrame) { boolean flag = par1World.getBlock(x - 1, y, z) == this || par1World.getBlock(x + 1, y, z) == this; boolean flag1 = par1World.getBlock(x, y, z - 1) == this || par1World.getBlock(x, y, z + 1) == this; if (flag && flag1) { par1World.setBlockToAir(x, y, z); } else { - if ((par1World.getBlock(x + b0, y, z + b1) != Dimension_DarkWorld.blockPortalFrame || par1World + if ((par1World.getBlock(x + b0, y, z + b1) != Dimension_Everglades.blockPortalFrame || par1World .getBlock(x - b0, y, z - b1) != this) - && (par1World.getBlock(x - b0, y, z - b1) != Dimension_DarkWorld.blockPortalFrame || par1World.getBlock(x + b0, y, + && (par1World.getBlock(x - b0, y, z - b1) != Dimension_Everglades.blockPortalFrame || par1World.getBlock(x + b0, y, z + b1) != this)) { par1World.setBlockToAir(x, y, z); } @@ -308,10 +308,10 @@ public class BlockDarkWorldPortal extends BlockBreakable implements ITileTooltip EntityPlayerMP thePlayer = (EntityPlayerMP) par5Entity; if (thePlayer.timeUntilPortal > 0) { thePlayer.timeUntilPortal = 100; - } else if (thePlayer.dimension != Dimension_DarkWorld.DIMID) { + } else if (thePlayer.dimension != Dimension_Everglades.DIMID) { thePlayer.timeUntilPortal = 100; - thePlayer.mcServer.getConfigurationManager().transferPlayerToDimension(thePlayer, Dimension_DarkWorld.DIMID, - new TeleporterDimensionMod(thePlayer.mcServer.worldServerForDimension(Dimension_DarkWorld.DIMID))); + thePlayer.mcServer.getConfigurationManager().transferPlayerToDimension(thePlayer, Dimension_Everglades.DIMID, + new TeleporterDimensionMod(thePlayer.mcServer.worldServerForDimension(Dimension_Everglades.DIMID))); } else { thePlayer.timeUntilPortal = 100; thePlayer.mcServer.getConfigurationManager().transferPlayerToDimension(thePlayer, 0, diff --git a/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java b/src/Java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java index b851e10343..9d0e425e3a 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/block/DarkWorldContentLoader.java +++ b/src/Java/gtPlusPlus/everglades/block/DarkWorldContentLoader.java @@ -1,6 +1,6 @@ -package gtPlusPlus.core.world.darkworld.block; +package gtPlusPlus.everglades.block; -import static gtPlusPlus.core.world.darkworld.Dimension_DarkWorld.*; +import static gtPlusPlus.everglades.dimension.Dimension_Everglades.*; import cpw.mods.fml.common.registry.GameRegistry; @@ -8,8 +8,8 @@ import net.minecraft.init.Blocks; import gtPlusPlus.core.block.base.BlockBaseFluid; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.world.darkworld.item.ItemBlockToxicEverglades; -import gtPlusPlus.core.world.darkworld.item.ItemDarkWorldPortalTrigger; +import gtPlusPlus.everglades.item.ItemBlockToxicEverglades; +import gtPlusPlus.everglades.item.ItemEvergladesPortalTrigger; import net.minecraftforge.fluids.FluidRegistry; public class DarkWorldContentLoader { @@ -41,7 +41,7 @@ public class DarkWorldContentLoader { } public synchronized static boolean initItems(){ - portalItem = (ItemDarkWorldPortalTrigger) (new ItemDarkWorldPortalTrigger().setUnlocalizedName("everglades.trigger")); + portalItem = (ItemEvergladesPortalTrigger) (new ItemEvergladesPortalTrigger().setUnlocalizedName("everglades.trigger")); GameRegistry.registerItem(portalItem, "everglades.trigger"); return true; } @@ -50,7 +50,7 @@ public class DarkWorldContentLoader { //Create Block Instances blockFluidLakes = new BlockBaseFluid("Sludge", SLUDGE, BlockDarkWorldSludgeFluid.SLUDGE).setLightLevel(2f).setLightOpacity(1).setBlockName("fluidSludge"); - portalBlock = new BlockDarkWorldPortal(); + portalBlock = new BlockEvergladesPortal(); blockTopLayer = new BlockDarkWorldGround(); blockSecondLayer = new BlockDarkWorldPollutedDirt(); blockPortalFrame = new BlockDarkWorldPortalFrame(); diff --git a/src/Java/gtPlusPlus/core/world/darkworld/chunk/ChunkProviderModded.java b/src/Java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java index b8c86821f4..0ff265a4ae 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/chunk/ChunkProviderModded.java +++ b/src/Java/gtPlusPlus/everglades/chunk/ChunkProviderModded.java @@ -1,4 +1,4 @@ -package gtPlusPlus.core.world.darkworld.chunk; +package gtPlusPlus.everglades.chunk; import java.util.List; import java.util.Random; @@ -20,7 +20,7 @@ import net.minecraft.world.gen.structure.MapGenScatteredFeature; import net.minecraft.world.gen.structure.MapGenVillage; import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld; +import gtPlusPlus.everglades.dimension.Dimension_Everglades; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.terraingen.ChunkProviderEvent; import net.minecraftforge.event.terraingen.PopulateChunkEvent; @@ -173,11 +173,11 @@ public class ChunkProviderModded implements IChunkProvider { for (int k3 = 0; k3 < 4; ++k3) { if ((d15 += d16) > 0.0D) { - p_147424_3_[j3 += short1] = Dimension_DarkWorld.blockMainFiller; + p_147424_3_[j3 += short1] = Dimension_Everglades.blockMainFiller; } else if (k2 * 8 + l2 < b0) { try { - p_147424_3_[j3 += short1] = Dimension_DarkWorld.blockFluidLakes; //River Fluid . + p_147424_3_[j3 += short1] = Dimension_Everglades.blockFluidLakes; //River Fluid . } catch (Throwable t){ p_147424_3_[j3 += short1] = Blocks.water; //River Fluid Fallback @@ -397,7 +397,7 @@ public class ChunkProviderModded implements IChunkProvider { l1 = this.rand.nextInt(256); i2 = l + this.rand.nextInt(16) + 8; try { - (new WorldGenLakes(Dimension_DarkWorld.blockFluidLakes)).generate(this.worldObj, this.rand, k1, l1, i2); + (new WorldGenLakes(Dimension_Everglades.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); diff --git a/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java b/src/Java/gtPlusPlus/everglades/dimension/Dimension_Everglades.java index 678d9b0c2b..33b36a9ae0 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/Dimension_DarkWorld.java +++ b/src/Java/gtPlusPlus/everglades/dimension/Dimension_Everglades.java @@ -1,20 +1,20 @@ -package gtPlusPlus.core.world.darkworld; +package gtPlusPlus.everglades.dimension; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.world.darkworld.block.BlockDarkWorldPortal; -import gtPlusPlus.core.world.darkworld.item.ItemDarkWorldPortalTrigger; -import gtPlusPlus.core.world.darkworld.world.WorldProviderMod; +import gtPlusPlus.everglades.block.BlockEvergladesPortal; +import gtPlusPlus.everglades.item.ItemEvergladesPortalTrigger; +import gtPlusPlus.everglades.world.WorldProviderMod; import net.minecraftforge.common.DimensionManager; -public class Dimension_DarkWorld { +public class Dimension_Everglades { public Object instance; - public static int DIMID = CORE.DARKWORLD_ID; - public static BlockDarkWorldPortal portalBlock; - public static ItemDarkWorldPortalTrigger portalItem; + public static int DIMID = CORE.EVERGLADES_ID; + public static BlockEvergladesPortal portalBlock; + public static ItemEvergladesPortalTrigger portalItem; public static Block blockTopLayer; public static Block blockSecondLayer; public static Block blockMainFiller = Blocks.stone; diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/WorldGenDeadLilly.java b/src/Java/gtPlusPlus/everglades/gen/WorldGenDeadLilly.java index 22c3b5a090..0314f71eec 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/gen/WorldGenDeadLilly.java +++ b/src/Java/gtPlusPlus/everglades/gen/WorldGenDeadLilly.java @@ -1,4 +1,4 @@ -package gtPlusPlus.core.world.darkworld.gen; +package gtPlusPlus.everglades.gen; import java.util.Random; diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/WorldGenMinable_Custom.java b/src/Java/gtPlusPlus/everglades/gen/WorldGenMinable_Custom.java index 2c9cda0017..303f7353f0 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/gen/WorldGenMinable_Custom.java +++ b/src/Java/gtPlusPlus/everglades/gen/WorldGenMinable_Custom.java @@ -1,4 +1,4 @@ -package gtPlusPlus.core.world.darkworld.gen; +package gtPlusPlus.everglades.gen; import static gtPlusPlus.core.lib.CORE.PI; diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT.java b/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java index e71e884fc7..2035cfe096 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT.java +++ b/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT.java @@ -1,4 +1,4 @@ -package gtPlusPlus.core.world.darkworld.gen.gt; +package gtPlusPlus.everglades.gen.gt; import java.util.List; import java.util.Map; diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java b/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java index f3dfb2cf08..5b7b34ae0f 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Base.java +++ b/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Base.java @@ -1,4 +1,4 @@ -package gtPlusPlus.core.world.darkworld.gen.gt; +package gtPlusPlus.everglades.gen.gt; import java.util.*; @@ -15,7 +15,7 @@ import gregtech.api.util.GT_Log; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.random.XSTR; import gtPlusPlus.core.material.ELEMENT; -import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld; +import gtPlusPlus.everglades.dimension.Dimension_Everglades; import gtPlusPlus.xmod.gregtech.HANDLER_GT; public class WorldGen_GT_Base implements IWorldGenerator { @@ -73,14 +73,14 @@ public class WorldGen_GT_Base implements IWorldGenerator { @Override public void generate(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) { - if (world.provider.dimensionId == Dimension_DarkWorld.DIMID) { + if (world.provider.dimensionId == Dimension_Everglades.DIMID) { generateSafely(random, chunkX, chunkZ, world, chunkGenerator, chunkProvider); } } public synchronized void generateSafely(Random random, int chunkX, int chunkZ, World world, IChunkProvider chunkGenerator, IChunkProvider chunkProvider) { - int xDim = Dimension_DarkWorld.DIMID; + int xDim = Dimension_Everglades.DIMID; switch (world.provider.dimensionId) { case -1: // Nether // generateNether(world, random, chunkX * 16, chunkZ * 16); @@ -96,19 +96,19 @@ public class WorldGen_GT_Base implements IWorldGenerator { break; } else { - generateDarkWorld(random, chunkX, chunkZ, world, chunkGenerator, chunkProvider); + generateEverglades(random, chunkX, chunkZ, world, chunkGenerator, chunkProvider); break; } } } - private synchronized void generateDarkWorld(Random aRandom, int aX, int aZ, World aWorld, + private synchronized void generateEverglades(Random aRandom, int aX, int aZ, World aWorld, IChunkProvider aChunkGenerator, IChunkProvider aChunkProvider) { Logger.WORLD("Trying to Generate Dimension."); synchronized (listLock) { Logger.WORLD("Locked List addition."); if (WorldGen_GT_Base.mList.add(new WorldGenContainer(new XSTR(Math.abs(aRandom.nextInt()) + 1), aX, aZ, - Dimension_DarkWorld.DIMID, + Dimension_Everglades.DIMID, aWorld, aChunkGenerator, aChunkProvider, aWorld.getBiomeGenForCoords(aX * 16 + 8, aZ * 16 + 8).biomeName))){ Logger.WORLD("Locked List addition. Success."); diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Ore_Layer.java b/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java index d34aa3604a..fe4897fd0d 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_GT_Ore_Layer.java +++ b/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_GT_Ore_Layer.java @@ -1,6 +1,6 @@ -package gtPlusPlus.core.world.darkworld.gen.gt; +package gtPlusPlus.everglades.gen.gt; -import static gtPlusPlus.core.world.darkworld.gen.gt.WorldGen_GT_Base.debugWorldGen; +import static gtPlusPlus.everglades.gen.gt.WorldGen_GT_Base.debugWorldGen; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; @@ -24,7 +24,7 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.material.Material; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld; +import gtPlusPlus.everglades.dimension.Dimension_Everglades; import gtPlusPlus.xmod.gregtech.HANDLER_GT; public class WorldGen_GT_Ore_Layer @@ -156,7 +156,7 @@ extends WorldGen_GT { Logger.WORLD("[World Generation Debug] Special Empty Vein placed."); return ORE_PLACED; } - if (aDimensionType != Dimension_DarkWorld.DIMID) { + if (aDimensionType != Dimension_Everglades.DIMID) { /* // Debug code, but spams log if (debugWorldGen) { GT_Log.out.println( @@ -182,9 +182,9 @@ extends WorldGen_GT { if (wX >= eX) { //No overlap between orevein and this chunk exists in X Block tBlock = aWorld.getBlock(aChunkX + 8, tMinY, aChunkZ + 8); if (tBlock.isReplaceableOreGen(aWorld, aChunkX+8, tMinY, aChunkZ + 8, Blocks.stone) || - tBlock.isReplaceableOreGen(aWorld, aChunkX+8, tMinY, aChunkZ + 8, Dimension_DarkWorld.blockSecondLayer) || - tBlock.isReplaceableOreGen(aWorld, aChunkX+8, tMinY, aChunkZ + 8, Dimension_DarkWorld.blockMainFiller) || - tBlock.isReplaceableOreGen(aWorld, aChunkX+8, tMinY, aChunkZ + 8, Dimension_DarkWorld.blockSecondaryFiller) || + tBlock.isReplaceableOreGen(aWorld, aChunkX+8, tMinY, aChunkZ + 8, Dimension_Everglades.blockSecondLayer) || + tBlock.isReplaceableOreGen(aWorld, aChunkX+8, tMinY, aChunkZ + 8, Dimension_Everglades.blockMainFiller) || + tBlock.isReplaceableOreGen(aWorld, aChunkX+8, tMinY, aChunkZ + 8, Dimension_Everglades.blockSecondaryFiller) || tBlock.isReplaceableOreGen(aWorld, aChunkX+8, tMinY, aChunkZ + 8, Blocks.netherrack) || tBlock.isReplaceableOreGen(aWorld, aChunkX+8, tMinY, aChunkZ + 8, Blocks.end_stone) || tBlock.isReplaceableOreGen(aWorld, aChunkX+8, tMinY, aChunkZ + 8, GregTech_API.sBlockGranites) || @@ -457,9 +457,9 @@ extends WorldGen_GT { tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.dirt) || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockGranites) || (mUpdated && tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, mStoneTypes)) || - tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_DarkWorld.blockSecondLayer) || - tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_DarkWorld.blockMainFiller) || - tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_DarkWorld.blockSecondaryFiller) || + tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_Everglades.blockSecondLayer) || + tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_Everglades.blockMainFiller) || + tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Dimension_Everglades.blockSecondaryFiller) || tBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.sandstone)) { if (aWorld.setBlock(aX, aY, aZ, tOreBlock, 0, 3)){ diff --git a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_Ores.java b/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java index 0dc6750904..3b9108149a 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/gen/gt/WorldGen_Ores.java +++ b/src/Java/gtPlusPlus/everglades/gen/gt/WorldGen_Ores.java @@ -1,4 +1,4 @@ -package gtPlusPlus.core.world.darkworld.gen.gt; +package gtPlusPlus.everglades.gen.gt; import java.util.Hashtable; @@ -12,7 +12,7 @@ import gtPlusPlus.core.material.Material; import gtPlusPlus.core.material.ORES; import gtPlusPlus.core.material.nuclear.FLUORIDES; import gtPlusPlus.core.util.minecraft.MaterialUtils; -import gtPlusPlus.core.world.darkworld.object.BoxedQuad; +import gtPlusPlus.everglades.object.BoxedQuad; public class WorldGen_Ores { diff --git a/src/Java/gtPlusPlus/core/world/darkworld/item/ItemBlockToxicEverglades.java b/src/Java/gtPlusPlus/everglades/item/ItemBlockToxicEverglades.java index 1021f1aa1f..ce4182c598 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/item/ItemBlockToxicEverglades.java +++ b/src/Java/gtPlusPlus/everglades/item/ItemBlockToxicEverglades.java @@ -1,4 +1,4 @@ -package gtPlusPlus.core.world.darkworld.item; +package gtPlusPlus.everglades.item; import java.util.List; diff --git a/src/Java/gtPlusPlus/core/world/darkworld/item/ItemDarkWorldPortalTrigger.java b/src/Java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java index 146f21de91..3119de19b9 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/item/ItemDarkWorldPortalTrigger.java +++ b/src/Java/gtPlusPlus/everglades/item/ItemEvergladesPortalTrigger.java @@ -1,4 +1,4 @@ -package gtPlusPlus.core.world.darkworld.item; +package gtPlusPlus.everglades.item; import java.util.List; @@ -15,10 +15,10 @@ import net.minecraft.world.World; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld; +import gtPlusPlus.everglades.dimension.Dimension_Everglades; -public class ItemDarkWorldPortalTrigger extends Item { - public ItemDarkWorldPortalTrigger() { +public class ItemEvergladesPortalTrigger extends Item { + public ItemEvergladesPortalTrigger() { super(); this.maxStackSize = 1; setMaxDamage(64); @@ -86,7 +86,7 @@ public class ItemDarkWorldPortalTrigger extends Item { Block i1 = par3World.getBlock(par4, par5, par6); if (i1 == Blocks.air) { par3World.playSoundEffect(par4 + 0.5D, par5 + 0.5D, par6 + 0.5D, "fire.ignite", 1.0F, itemRand.nextFloat() * 0.4F + 0.8F); - if (Dimension_DarkWorld.portalBlock.tryToCreatePortal(par3World, par4, par5, par6)){ + if (Dimension_Everglades.portalBlock.tryToCreatePortal(par3World, par4, par5, par6)){ //Make a Portal } else { diff --git a/src/Java/gtPlusPlus/core/world/darkworld/object/BoxedQuad.java b/src/Java/gtPlusPlus/everglades/object/BoxedQuad.java index 3437b0ebf1..d0fbc4247b 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/object/BoxedQuad.java +++ b/src/Java/gtPlusPlus/everglades/object/BoxedQuad.java @@ -1,4 +1,4 @@ -package gtPlusPlus.core.world.darkworld.object; +package gtPlusPlus.everglades.object; import net.minecraft.block.Block; diff --git a/src/Java/gtPlusPlus/core/world/darkworld/world/CustomWorldType.java b/src/Java/gtPlusPlus/everglades/world/CustomWorldType.java index eb9c284543..5a5344ca65 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/world/CustomWorldType.java +++ b/src/Java/gtPlusPlus/everglades/world/CustomWorldType.java @@ -1,4 +1,4 @@ -package gtPlusPlus.core.world.darkworld.world; +package gtPlusPlus.everglades.world; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/src/Java/gtPlusPlus/everglades/world/EvergladesPortalPosition.java b/src/Java/gtPlusPlus/everglades/world/EvergladesPortalPosition.java new file mode 100644 index 0000000000..227d32502b --- /dev/null +++ b/src/Java/gtPlusPlus/everglades/world/EvergladesPortalPosition.java @@ -0,0 +1,14 @@ +package gtPlusPlus.everglades.world; + +import net.minecraft.util.ChunkCoordinates; + +public class EvergladesPortalPosition extends ChunkCoordinates { + public long field_85087_d; + final TeleporterDimensionMod field_85088_e; + + public EvergladesPortalPosition(TeleporterDimensionMod gladesTeleporter, int par2, int par3, int par4, long par5) { + super(par2, par3, par4); + this.field_85088_e = gladesTeleporter; + this.field_85087_d = par5; + } +}
\ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/world/darkworld/world/TeleporterDimensionMod.java b/src/Java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java index 638f78d0c1..e67a882638 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/world/TeleporterDimensionMod.java +++ b/src/Java/gtPlusPlus/everglades/world/TeleporterDimensionMod.java @@ -1,4 +1,4 @@ -package gtPlusPlus.core.world.darkworld.world; +package gtPlusPlus.everglades.world; import java.util.*; @@ -9,7 +9,7 @@ import net.minecraft.world.ChunkCoordIntPair; import net.minecraft.world.Teleporter; import net.minecraft.world.WorldServer; -import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld; +import gtPlusPlus.everglades.dimension.Dimension_Everglades; public class TeleporterDimensionMod extends Teleporter { @@ -60,7 +60,7 @@ public class TeleporterDimensionMod extends Teleporter { int l1 = j + j1; int i2 = k + i1 * b1 - l * b0; boolean flag = j1 < 0; - this.worldServerInstance.setBlock(k1, l1, i2, flag ? Dimension_DarkWorld.blockPortalFrame : Blocks.air); + this.worldServerInstance.setBlock(k1, l1, i2, flag ? Dimension_Everglades.blockPortalFrame : Blocks.air); } } } @@ -105,8 +105,8 @@ public class TeleporterDimensionMod extends Teleporter { double d5 = l1 + 0.5D - par1Entity.posZ; for (int i2 = this.worldServerInstance.getActualHeight() - 1; i2 >= 0; --i2) { - if (this.worldServerInstance.getBlock(l3, i2, l1) == Dimension_DarkWorld.portalBlock) { - while (this.worldServerInstance.getBlock(l3, i2 - 1, l1) == Dimension_DarkWorld.portalBlock) { + if (this.worldServerInstance.getBlock(l3, i2, l1) == Dimension_Everglades.portalBlock) { + while (this.worldServerInstance.getBlock(l3, i2 - 1, l1) == Dimension_Everglades.portalBlock) { --i2; } @@ -137,19 +137,19 @@ public class TeleporterDimensionMod extends Teleporter { d7 = k + 0.5D; int i4 = -1; - if (this.worldServerInstance.getBlock(i - 1, j, k) == Dimension_DarkWorld.portalBlock) { + if (this.worldServerInstance.getBlock(i - 1, j, k) == Dimension_Everglades.portalBlock) { i4 = 2; } - if (this.worldServerInstance.getBlock(i + 1, j, k) == Dimension_DarkWorld.portalBlock) { + if (this.worldServerInstance.getBlock(i + 1, j, k) == Dimension_Everglades.portalBlock) { i4 = 0; } - if (this.worldServerInstance.getBlock(i, j, k - 1) == Dimension_DarkWorld.portalBlock) { + if (this.worldServerInstance.getBlock(i, j, k - 1) == Dimension_Everglades.portalBlock) { i4 = 3; } - if (this.worldServerInstance.getBlock(i, j, k + 1) == Dimension_DarkWorld.portalBlock) { + if (this.worldServerInstance.getBlock(i, j, k + 1) == Dimension_Everglades.portalBlock) { i4 = 1; } @@ -402,7 +402,7 @@ public class TeleporterDimensionMod extends Teleporter { i4 = j2 + k3; j4 = k2 + (j3 - 1) * l2 - i3 * l5; flag = k3 < 0; - this.worldServerInstance.setBlock(l3, i4, j4, flag ? Dimension_DarkWorld.blockPortalFrame : Blocks.air); + this.worldServerInstance.setBlock(l3, i4, j4, flag ? Dimension_Everglades.blockPortalFrame : Blocks.air); } } } @@ -415,7 +415,7 @@ public class TeleporterDimensionMod extends Teleporter { i4 = j2 + k3; j4 = k2 + (j3 - 1) * l2; flag = j3 == 0 || j3 == 3 || k3 == -1 || k3 == 3; - this.worldServerInstance.setBlock(l3, i4, j4, flag ? Dimension_DarkWorld.blockPortalFrame : Dimension_DarkWorld.portalBlock, 0, 2); + this.worldServerInstance.setBlock(l3, i4, j4, flag ? Dimension_Everglades.blockPortalFrame : Dimension_Everglades.portalBlock, 0, 2); } } diff --git a/src/Java/gtPlusPlus/core/world/darkworld/world/WorldChunkManagerCustom.java b/src/Java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java index 4977d1caf0..fc1b2ac425 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/world/WorldChunkManagerCustom.java +++ b/src/Java/gtPlusPlus/everglades/world/WorldChunkManagerCustom.java @@ -1,4 +1,4 @@ -package gtPlusPlus.core.world.darkworld.world; +package gtPlusPlus.everglades.world; import java.util.ArrayList; import java.util.List; @@ -19,7 +19,7 @@ import net.minecraft.world.biome.WorldChunkManager; import net.minecraft.world.gen.layer.GenLayer; import net.minecraft.world.gen.layer.IntCache; -import gtPlusPlus.core.world.darkworld.biome.GenLayerDarkWorld; +import gtPlusPlus.everglades.biome.GenLayerEverglades; public class WorldChunkManagerCustom extends WorldChunkManager { @@ -41,7 +41,7 @@ public class WorldChunkManagerCustom extends WorldChunkManager { public WorldChunkManagerCustom(long seed, WorldType worldType) { this(); // i changed this to my GenLayerDarkWorld - GenLayer[] agenlayer = GenLayerDarkWorld.makeTheWorld(seed, worldType); + GenLayer[] agenlayer = GenLayerEverglades.makeTheWorld(seed, worldType); agenlayer = getModdedBiomeGenerators(worldType, seed, agenlayer); this.genBiomes = agenlayer[0]; diff --git a/src/Java/gtPlusPlus/core/world/darkworld/world/WorldProviderMod.java b/src/Java/gtPlusPlus/everglades/world/WorldProviderMod.java index c01537e565..b5945bcd21 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/world/WorldProviderMod.java +++ b/src/Java/gtPlusPlus/everglades/world/WorldProviderMod.java @@ -1,4 +1,4 @@ -package gtPlusPlus.core.world.darkworld.world; +package gtPlusPlus.everglades.world; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -8,8 +8,8 @@ import net.minecraft.world.WorldProvider; import net.minecraft.world.WorldType; import net.minecraft.world.chunk.IChunkProvider; -import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld; -import gtPlusPlus.core.world.darkworld.chunk.ChunkProviderModded; +import gtPlusPlus.everglades.chunk.ChunkProviderModded; +import gtPlusPlus.everglades.dimension.Dimension_Everglades; public class WorldProviderMod extends WorldProvider { @@ -18,7 +18,7 @@ public class WorldProviderMod extends WorldProvider { this.worldChunkMgr = new WorldChunkManagerCustom(this.worldObj.getSeed(), WorldType.AMPLIFIED); this.isHellWorld = false; this.hasNoSky = false; - this.dimensionId = Dimension_DarkWorld.DIMID; + this.dimensionId = Dimension_Everglades.DIMID; } @Override diff --git a/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java b/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java index 667b5d2e51..1066bea75a 100644 --- a/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java +++ b/src/Java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java @@ -18,20 +18,20 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent; public class HandlerTooltip_EIO { - Item mIngot; - ItemStack mPulsatingIron; - ItemStack mConductiveIron; - ItemStack mRedstoneAlloy; - ItemStack mElectricalSteel; - ItemStack mEnergeticAlloy; - ItemStack mVibrantAlloy; - ItemStack mSoularium; - ItemStack mDarkIron; + private static volatile Item mIngot; + private static volatile ItemStack mPulsatingIron; + private static volatile ItemStack mConductiveIron; + private static volatile ItemStack mRedstoneAlloy; + private static volatile ItemStack mElectricalSteel; + private static volatile ItemStack mEnergeticAlloy; + private static volatile ItemStack mVibrantAlloy; + private static volatile ItemStack mSoularium; + private static volatile ItemStack mDarkIron; @SubscribeEvent public void onItemTooltip(ItemTooltipEvent event){ //Is EIO loaded? - if (disableEnderIOIngotTooltips && LoadedMods.EnderIO){ + if (!disableEnderIOIngotTooltips && LoadedMods.EnderIO){ //Is the EIO Ingot Item null? //If it is, reflect in. @@ -93,8 +93,8 @@ public class HandlerTooltip_EIO { //If stacks match, add a tooltip. - if (this.mIngot != null){ - if (event.itemStack.getItem() == this.mIngot){ + if (mIngot != null){ + if (event.itemStack.getItem() == mIngot){ if (event.itemStack.getItemDamage() == 0){ event.toolTip.add(MaterialEIO.ELECTRICAL_STEEL.vChemicalFormula); } diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java index e21852f2cf..5cab7d99b9 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java @@ -18,6 +18,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.WeightedRandomChestContent; import forestry.core.utils.StringUtil; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import net.minecraftforge.common.ChestGenHooks; @@ -52,8 +53,15 @@ public class FR_ItemRegistry { //frameProven = registerItem(new FR_ItemHiveFrame(720, 0.3f), "frameProven"); //Magic Bee like Frames + + if (!CORE.GTNH) { + hiveFrameVoid = new MB_ItemFrame(MB_FrameType.VOID, EnumRarity.rare, "Makes your bee die in the blink of an eye."); + } + else { + hiveFrameVoid = new MB_ItemFrame(MB_FrameType.USELESS, EnumRarity.common, "No more cheaty frames for GTNH players."); + } + hiveFrameAccelerated = new MB_ItemFrame(MB_FrameType.ACCELERATED, "Longevity for bees isn't very common, especially if they're working harder."); - hiveFrameVoid = new MB_ItemFrame(MB_FrameType.VOID, EnumRarity.rare, "Makes your bee die in the blink of an eye."); hiveFrameMutagenic = new MB_ItemFrame(MB_FrameType.MUTAGENIC, EnumRarity.epic, "Evolution of the fittest, finest and fastest."); hiveFrameBusy = new MB_ItemFrame(MB_FrameType.BUSY, "Your bee will work harder and longer than you expected."); ChestGenHooks.addItem(ChestGenHooks.STRONGHOLD_CORRIDOR, new WeightedRandomChestContent(new ItemStack(hiveFrameVoid), 1, 1, 14)); diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java b/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java index f49d9379a9..36d4073c50 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/MB_FrameType.java @@ -18,7 +18,8 @@ public enum MB_FrameType implements IBeeModifier ACCELERATED("Accelerated", 175, 1f, 1.2f, 0.9f, 1.8f, 1f), VOID("Void", 20, 1f, 1f, 0.0001f, 10f, 1f), MUTAGENIC("Mutagenic", 3, 1f, 5f, 0.0001f, 10f, 1f), - BUSY("Busy", 2000, 1f, 0f, 3f, 4f, 1f); + BUSY("Busy", 2000, 1f, 0f, 3f, 4f, 1f), + USELESS("Useless", 100, 1f, 0f, 1f, 1f, 1f); private final String frameName; public final int maxDamage; diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java b/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java index 2e0bcc9c2b..30b7099de8 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/recipe/FR_Gregtech_Recipes.java @@ -4,6 +4,7 @@ import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.ItemStack; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.minecraft.ItemUtils; import gtPlusPlus.core.util.minecraft.RecipeUtils; @@ -50,13 +51,18 @@ public class FR_Gregtech_Recipes { rod_LongUranium, foil_Uranium235, rod_LongUranium, rod_Uranium, rod_Uranium, rod_Uranium, hiveFrameMutagenic); - - RecipeUtils.addShapedGregtechRecipe( - "stickLongThaumium", "stickThaumium", "stickLongThaumium", - "stickLongThaumium", ItemUtils.getSimpleStack(Items.ender_pearl), "stickLongThaumium", - "stickThaumium", "stickThaumium", "stickThaumium", - hiveFrameVoid); - + if (!CORE.GTNH) { + RecipeUtils.addShapedGregtechRecipe( + "stickLongThaumium", "stickThaumium", "stickLongThaumium", + "stickLongThaumium", ItemUtils.getSimpleStack(Items.ender_pearl), "stickLongThaumium", + "stickThaumium", "stickThaumium", "stickThaumium", + hiveFrameVoid); + } + else { + if (LoadedMods.MagicBees) { + RecipeUtils.addShapelessGregtechRecipe(new ItemStack[] {hiveFrameVoid}, ItemUtils.getCorrectStacktype("MagicBees:frameOblivion", 1)); + } + } RecipeUtils.addShapedGregtechRecipe( "stickLongBlueSteel", "stickBlueSteel", "stickLongBlueSteel", "stickLongBlueSteel", ItemUtils.getSimpleStack(Items.nether_star), "stickLongBlueSteel", diff --git a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java index 1b3b682ea4..f510cd08ba 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/HANDLER_GT.java @@ -9,7 +9,7 @@ import gtPlusPlus.core.handler.COMPAT_HANDLER; import gtPlusPlus.core.handler.OldCircuitHandler; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.lib.CORE.ConfigSwitches; -import gtPlusPlus.core.world.darkworld.gen.gt.WorldGen_GT; +import gtPlusPlus.everglades.gen.gt.WorldGen_GT; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.util.GTPP_Config; import gtPlusPlus.xmod.gregtech.api.world.GTPP_Worldgen; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java index d60065b367..b47ae47574 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_IndustrialWashPlant.java @@ -20,7 +20,7 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.minecraft.FluidUtils; -import gtPlusPlus.core.world.darkworld.block.DarkWorldContentLoader; +import gtPlusPlus.everglades.block.DarkWorldContentLoader; import gtPlusPlus.xmod.gregtech.api.gui.GUI_MultiMachine; import gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase; import ic2.core.init.BlocksItems; diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java index 51c91ff816..eb08e372ea 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java @@ -184,7 +184,7 @@ public class GregtechMetaTileEntity_MassFabricator extends GregtechMeta_MultiBlo } } - return checkRecipeGeneric(tItemInputs, tFluidInputs, 1, 500, 75, 100); + return checkRecipeGeneric(tItemInputs, tFluidInputs, 1, 75, 500, 100); } |