Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Revert "random code changes"

Browse source 
This reverts commit 92e2c32df6.
This commit is contained in:
Technus 2016-09-23 19:26:20 +02:00
parent 92e2c32df6
commit cffe92cd21
3 changed files with 339 additions and 289 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/gregtech/GT_Mod.java
View file

@ -78,15 +78,15 @@ public class GT_Mod implements IGT_Mod {
public GT_Mod() { public GT_Mod() {
try { try {
Class.forName("ic2.core.IC2").getField("enableOreDictCircuit").set(null, Boolean.FALSE); Class.forName("ic2.core.IC2").getField("enableOreDictCircuit").set(null, Boolean.valueOf(true));
} catch (Throwable e) { } catch (Throwable e) {
} }
try { try {
Class.forName("ic2.core.IC2").getField("enableCraftingBucket").set(null, Boolean.FALSE); Class.forName("ic2.core.IC2").getField("enableCraftingBucket").set(null, Boolean.valueOf(false));
} catch (Throwable e) { } catch (Throwable e) {
} }
try { try {
Class.forName("ic2.core.IC2").getField("enableEnergyInStorageBlockItems").set(null, Boolean.FALSE); Class.forName("ic2.core.IC2").getField("enableEnergyInStorageBlockItems").set(null, Boolean.valueOf(false));
} catch (Throwable e) { } catch (Throwable e) {
} }
GT_Values.GT = this; GT_Values.GT = this;
@ -100,7 +100,6 @@ public class GT_Mod implements IGT_Mod {
@Mod.EventHandler @Mod.EventHandler
public void onPreLoad(FMLPreInitializationEvent aEvent) { public void onPreLoad(FMLPreInitializationEvent aEvent) {
Locale.setDefault(Locale.ENGLISH);
if (GregTech_API.sPreloadStarted) { if (GregTech_API.sPreloadStarted) {
return; return;
} }
@ -232,9 +231,6 @@ public class GT_Mod implements IGT_Mod {
gregtechproxy.mNerfedCombs = tMainConfig.get(aTextGeneral, "NerfCombs", true).getBoolean(true); gregtechproxy.mNerfedCombs = tMainConfig.get(aTextGeneral, "NerfCombs", true).getBoolean(true);
gregtechproxy.mHideUnusedOres = tMainConfig.get(aTextGeneral, "HideUnusedOres", true).getBoolean(true); gregtechproxy.mHideUnusedOres = tMainConfig.get(aTextGeneral, "HideUnusedOres", true).getBoolean(true);
gregtechproxy.mHideRecyclingRecipes = tMainConfig.get(aTextGeneral, "HideRecyclingRecipes", true).getBoolean(true); gregtechproxy.mHideRecyclingRecipes = tMainConfig.get(aTextGeneral, "HideRecyclingRecipes", true).getBoolean(true);
gregtechproxy.mArcSmeltIntoAnnealed = tMainConfig.get(aTextGeneral, "ArcSmeltIntoAnnealedWrought", true).getBoolean(true);
gregtechproxy.mMagneticraftRecipes = tMainConfig.get(aTextGeneral, "EnableMagneticraftSupport", true).getBoolean(true);
gregtechproxy.mMagneticraftBonusOutputPercent = tMainConfig.get(aTextGeneral, "MagneticraftBonusOutputPercent", 100.0f).getDouble();
GregTech_API.mOutputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "OutputRF", true); GregTech_API.mOutputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "OutputRF", true);
GregTech_API.mInputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "InputRF", false); GregTech_API.mInputRF = GregTech_API.sOPStuff.get(ConfigCategories.general, "InputRF", false);
@ -687,6 +683,7 @@ public class GT_Mod implements IGT_Mod {
} }
achievements = new GT_Achievements(); achievements = new GT_Achievements();
Map.Entry<IRecipeInput, RecipeOutput> tRecipe;
GT_Log.out.println("GT_Mod: Loading finished, deallocating temporary Init Variables."); GT_Log.out.println("GT_Mod: Loading finished, deallocating temporary Init Variables.");
GregTech_API.sBeforeGTPreload = null; GregTech_API.sBeforeGTPreload = null;
GregTech_API.sAfterGTPreload = null; GregTech_API.sAfterGTPreload = null;

2
src/main/java/gregtech/api/util/GT_ModHandler.java
View file

@ -1,9 +1,7 @@
package gregtech.api.util; package gregtech.api.util;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.GT_Mod;
import gregtech.api.GregTech_API; import gregtech.api.GregTech_API;
import gregtech.api.enums.*; import gregtech.api.enums.*;
import gregtech.api.interfaces.IDamagableItem; import gregtech.api.interfaces.IDamagableItem;

613
src/main/java/gregtech/common/GT_Proxy.java
View file

@ -1,5 +1,9 @@
package gregtech.common; package gregtech.common;
import java.io.File;
import java.text.DateFormat;
import java.util.*;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.IFuelHandler;
import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Loader;
@ -71,10 +75,6 @@ import net.minecraftforge.oredict.RecipeSorter;
import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe;
import java.io.File;
import java.text.DateFormat;
import java.util.*;
public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler { public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
private static final EnumSet<OreGenEvent.GenerateMinable.EventType> PREVENTED_ORES = EnumSet.of(OreGenEvent.GenerateMinable.EventType.COAL, private static final EnumSet<OreGenEvent.GenerateMinable.EventType> PREVENTED_ORES = EnumSet.of(OreGenEvent.GenerateMinable.EventType.COAL,
new OreGenEvent.GenerateMinable.EventType[]{OreGenEvent.GenerateMinable.EventType.IRON, OreGenEvent.GenerateMinable.EventType.GOLD, new OreGenEvent.GenerateMinable.EventType[]{OreGenEvent.GenerateMinable.EventType.IRON, OreGenEvent.GenerateMinable.EventType.GOLD,
@ -147,8 +147,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
public boolean mDisableIC2Cables = false; public boolean mDisableIC2Cables = false;
public boolean mAchievements = true; public boolean mAchievements = true;
public boolean mAE2Integration = true; public boolean mAE2Integration = true;
public boolean mArcSmeltIntoAnnealed = true;
public boolean mMagneticraftRecipes = true;
public int mSkeletonsShootGTArrows = 16; public int mSkeletonsShootGTArrows = 16;
public int mMaxEqualEntitiesAtOneSpot = 3; public int mMaxEqualEntitiesAtOneSpot = 3;
public int mFlintChance = 30; public int mFlintChance = 30;
@ -166,7 +164,6 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
public int mWireHeatingTicks = 4; public int mWireHeatingTicks = 4;
public boolean mHideUnusedOres = true; public boolean mHideUnusedOres = true;
public boolean mHideRecyclingRecipes = true; public boolean mHideRecyclingRecipes = true;
public double mMagneticraftBonusOutputPercent = 100.0d;
private final String aTextThermalExpansion = "ThermalExpansion"; private final String aTextThermalExpansion = "ThermalExpansion";
private final String aTextRailcraft = "Railcraft"; private final String aTextRailcraft = "Railcraft";
private final String aTextTwilightForest = "TwilightForest"; private final String aTextTwilightForest = "TwilightForest";
@ -183,14 +180,12 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) { for (FluidContainerRegistry.FluidContainerData tData : FluidContainerRegistry.getRegisteredFluidContainerData()) {
onFluidContainerRegistration(new FluidContainerRegistry.FluidContainerRegisterEvent(tData)); onFluidContainerRegistration(new FluidContainerRegistry.FluidContainerRegisterEvent(tData));
} }
try { for (String tOreName : OreDictionary.getOreNames()) {
for (String tOreName : OreDictionary.getOreNames()) { ItemStack tOreStack;
ItemStack tOreStack; for (Iterator i$ = OreDictionary.getOres(tOreName).iterator(); i$.hasNext(); registerOre(new OreDictionary.OreRegisterEvent(tOreName, tOreStack))) {
for (Iterator i$ = OreDictionary.getOres(tOreName).iterator(); i$.hasNext(); registerOre(new OreDictionary.OreRegisterEvent(tOreName, tOreStack))) { tOreStack = (ItemStack) i$.next();
tOreStack = (ItemStack) i$.next();
}
} }
} catch (Throwable e) {e.printStackTrace(GT_Log.err);} }
} }
private static final void registerRecipes(OreDictEventContainer aOre) { private static final void registerRecipes(OreDictEventContainer aOre) {
@ -841,7 +836,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
} }
aEvent.bow.damageItem(1, aEvent.entityPlayer); aEvent.bow.damageItem(1, aEvent.entityPlayer);
aEvent.bow.getItem(); aEvent.bow.getItem();
aEvent.entityPlayer.worldObj.playSoundAtEntity(aEvent.entityPlayer, "random.bow", 1.0F, 0.64893958288F + tSpeed aEvent.entityPlayer.worldObj.playSoundAtEntity(aEvent.entityPlayer, "random.bow", 1.0F, 1.0F / (new Random().nextFloat() * 0.4F + 1.2F) + tSpeed
* 0.5F); * 0.5F);
tArrowEntity.canBePickedUp = 1; tArrowEntity.canBePickedUp = 1;
@ -897,7 +892,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
if ((aEvent.entityPlayer == null) || (aEvent.entityPlayer.worldObj == null) || (aEvent.action == null) || (aEvent.world.provider == null)) { if ((aEvent.entityPlayer == null) || (aEvent.entityPlayer.worldObj == null) || (aEvent.action == null) || (aEvent.world.provider == null)) {
return; return;
} }
if ((!aEvent.entityPlayer.worldObj.isRemote) && (aEvent.action != PlayerInteractEvent.Action.RIGHT_CLICK_AIR) if ((!aEvent.entityPlayer.worldObj.isRemote) && (aEvent.action != null) && (aEvent.action != PlayerInteractEvent.Action.RIGHT_CLICK_AIR)
&& (GT_Log.pal != null)) { && (GT_Log.pal != null)) {
this.mBufferedPlayerActivity.add(getDataAndTime() + ";" + aEvent.action.name() + ";" + aEvent.entityPlayer.getDisplayName() + ";DIM:" this.mBufferedPlayerActivity.add(getDataAndTime() + ";" + aEvent.action.name() + ";" + aEvent.entityPlayer.getDisplayName() + ";DIM:"
+ aEvent.world.provider.dimensionId + ";" + aEvent.x + ";" + aEvent.y + ";" + aEvent.z + ";|;" + aEvent.x / 10 + ";" + aEvent.y / 10 + ";" + aEvent.world.provider.dimensionId + ";" + aEvent.x + ";" + aEvent.y + ";" + aEvent.z + ";|;" + aEvent.x / 10 + ";" + aEvent.y / 10 + ";"
@ -934,16 +929,14 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
aEvent.z, (byte) aEvent.blockMetadata, aEvent.fortuneLevel, aEvent.isSilkTouching, aEvent); aEvent.z, (byte) aEvent.blockMetadata, aEvent.fortuneLevel, aEvent.isSilkTouching, aEvent);
} }
if (EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, aStack) > 2) { if (EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, aStack) > 2) {
try { for (ItemStack tDrop : aEvent.drops) {
for (ItemStack tDrop : aEvent.drops) { ItemStack tSmeltingOutput = GT_ModHandler.getSmeltingOutput(tDrop, false, null);
ItemStack tSmeltingOutput = GT_ModHandler.getSmeltingOutput(tDrop, false, null); if (tSmeltingOutput != null) {
if (tSmeltingOutput != null) { tDrop.stackSize *= tSmeltingOutput.stackSize;
tDrop.stackSize *= tSmeltingOutput.stackSize; tSmeltingOutput.stackSize = tDrop.stackSize;
tSmeltingOutput.stackSize = tDrop.stackSize; GT_Utility.setStack(tDrop, tSmeltingOutput);
GT_Utility.setStack(tDrop, tSmeltingOutput);
}
} }
} catch (Throwable e) {e.printStackTrace(GT_Log.err);} }
} }
} }
} }
@ -974,8 +967,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
try { try {
aEvent.Ore.stackSize = 1; aEvent.Ore.stackSize = 1;
if (this.mIgnoreTcon || aEvent.Ore.getUnlocalizedName().startsWith("item.oreberry")) { if (this.mIgnoreTcon || aEvent.Ore.getUnlocalizedName().startsWith("item.oreberry")) {
if ((aOriginalMod.toLowerCase(Locale.ENGLISH).contains("xycraft")) || (aOriginalMod.toLowerCase(Locale.ENGLISH).contains("tconstruct")) if ((aOriginalMod.toLowerCase().contains("xycraft")) || (aOriginalMod.toLowerCase().contains("tconstruct"))
|| ((aOriginalMod.toLowerCase(Locale.ENGLISH).contains("natura")) && (!aOriginalMod.toLowerCase(Locale.ENGLISH).contains("natural")))) { || ((aOriginalMod.toLowerCase().contains("natura")) && (!aOriginalMod.toLowerCase().contains("natural")))) {
if (GT_Values.D1) { if (GT_Values.D1) {
GT_Log.ore.println(aMod + " -> " + aEvent.Name + " is getting ignored, because of racism. :P"); GT_Log.ore.println(aMod + " -> " + aEvent.Name + " is getting ignored, because of racism. :P");
} }
@ -990,90 +983,89 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
GT_OreDictUnificator.addToBlacklist(aEvent.Ore); GT_OreDictUnificator.addToBlacklist(aEvent.Ore);
} }
this.mRegisteredOres.add(aEvent.Ore); this.mRegisteredOres.add(aEvent.Ore);
if (this.mIgnoredItems.contains(aEvent.Name)) { if ((aEvent.Name.startsWith("item")) && (this.mIgnoredItems.contains(aEvent.Name))) {
if ((aEvent.Name.startsWith("item"))) { GT_Log.ore.println(tModToName);
GT_Log.ore.println(tModToName); if (aEvent.Name.equals("itemCopperWire")) {
if (aEvent.Name.equals("itemCopperWire")) { GT_OreDictUnificator.registerOre(OreDictNames.craftingWireCopper, aEvent.Ore);
GT_OreDictUnificator.registerOre(OreDictNames.craftingWireCopper, aEvent.Ore);
}
if (aEvent.Name.equals("itemRubber")) {
GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Rubber, aEvent.Ore);
}
return;
} }
if (aEvent.Name.equals("itemRubber")) {
GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Rubber, aEvent.Ore);
}
return;
}
if (this.mIgnoredNames.contains(aEvent.Name)) {
GT_Log.ore.println(tModToName + " is getting ignored via hardcode."); GT_Log.ore.println(tModToName + " is getting ignored via hardcode.");
return; return;
} }
else if (aEvent.Name.equals("stone")) { if (aEvent.Name.equals("stone")) {
GT_OreDictUnificator.registerOre("stoneSmooth", aEvent.Ore); GT_OreDictUnificator.registerOre("stoneSmooth", aEvent.Ore);
return; return;
} }
else if (aEvent.Name.equals("cobblestone")) { if (aEvent.Name.equals("cobblestone")) {
GT_OreDictUnificator.registerOre("stoneCobble", aEvent.Ore); GT_OreDictUnificator.registerOre("stoneCobble", aEvent.Ore);
return; return;
} }
else if ((aEvent.Name.contains("|")) || (aEvent.Name.contains("*")) || (aEvent.Name.contains(":")) || (aEvent.Name.contains(".")) if ((aEvent.Name.contains("|")) || (aEvent.Name.contains("*")) || (aEvent.Name.contains(":")) || (aEvent.Name.contains("."))
|| (aEvent.Name.contains("$"))) { || (aEvent.Name.contains("$"))) {
GT_Log.ore.println(tModToName + " is using a private Prefix and is therefor getting ignored properly."); GT_Log.ore.println(tModToName + " is using a private Prefix and is therefor getting ignored properly.");
return; return;
} }
else if (aEvent.Name.equals("copperWire")) { if (aEvent.Name.equals("copperWire")) {
GT_OreDictUnificator.registerOre(OreDictNames.craftingWireCopper, aEvent.Ore); GT_OreDictUnificator.registerOre(OreDictNames.craftingWireCopper, aEvent.Ore);
} }
else if (aEvent.Name.equals("oreHeeEndrium")) { if (aEvent.Name.equals("oreHeeEndrium")) {
GT_OreDictUnificator.registerOre(OrePrefixes.ore, Materials.HeeEndium, aEvent.Ore); GT_OreDictUnificator.registerOre(OrePrefixes.ore, Materials.HeeEndium, aEvent.Ore);
} }
else if (aEvent.Name.equals("sheetPlastic")) { if (aEvent.Name.equals("sheetPlastic")) {
GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.Plastic, aEvent.Ore); GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.Plastic, aEvent.Ore);
} }
else if (aEvent.Name.startsWith("shard")) { if (aEvent.Name.equals("shardAir")) {
if (aEvent.Name.equals("shardAir")) { GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedAir, aEvent.Ore);
GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedAir, aEvent.Ore); return;
return; }
} if (aEvent.Name.equals("shardWater")) {
else if (aEvent.Name.equals("shardWater")) { GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedWater, aEvent.Ore);
GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedWater, aEvent.Ore); return;
return; }
} if (aEvent.Name.equals("shardFire")) {
else if (aEvent.Name.equals("shardFire")) { GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedFire, aEvent.Ore);
GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedFire, aEvent.Ore); return;
return; }
} if (aEvent.Name.equals("shardEarth")) {
else if (aEvent.Name.equals("shardEarth")) { GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedEarth, aEvent.Ore);
GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedEarth, aEvent.Ore); return;
return; }
} if (aEvent.Name.equals("shardOrder")) {
else if (aEvent.Name.equals("shardOrder")) { GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedOrder, aEvent.Ore);
GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedOrder, aEvent.Ore); return;
return; }
} if (aEvent.Name.equals("shardEntropy")) {
else if (aEvent.Name.equals("shardEntropy")) { GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedEntropy, aEvent.Ore);
GT_OreDictUnificator.registerOre(OrePrefixes.gem, Materials.InfusedEntropy, aEvent.Ore); return;
return; }
} if (aEvent.Name.equals("fieryIngot")) {
} else if (aEvent.Name.equals("fieryIngot")) {
GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.FierySteel, aEvent.Ore); GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.FierySteel, aEvent.Ore);
return; return;
} }
else if (aEvent.Name.equals("ironwood")) { if (aEvent.Name.equals("ironwood")) {
GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.IronWood, aEvent.Ore); GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.IronWood, aEvent.Ore);
return; return;
} }
else if (aEvent.Name.equals("steeleaf")) { if (aEvent.Name.equals("steeleaf")) {
GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Steeleaf, aEvent.Ore); GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Steeleaf, aEvent.Ore);
return; return;
} }
else if (aEvent.Name.equals("knightmetal")) { if (aEvent.Name.equals("knightmetal")) {
GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Knightmetal, aEvent.Ore); GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Knightmetal, aEvent.Ore);
return; return;
} }
else if (aEvent.Name.contains(" ")) { if (aEvent.Name.contains(" ")) {
GT_Log.ore.println(tModToName + " is getting re-registered because the OreDict Name containing invalid spaces."); GT_Log.ore.println(tModToName + " is getting re-registered because the OreDict Name containing invalid spaces.");
GT_OreDictUnificator.registerOre(aEvent.Name.replaceAll(" ", ""), GT_Utility.copyAmount(1L, new Object[]{aEvent.Ore})); GT_OreDictUnificator.registerOre(aEvent.Name.replaceAll(" ", ""), GT_Utility.copyAmount(1L, new Object[]{aEvent.Ore}));
aEvent.Ore.setStackDisplayName("Invalid OreDictionary Tag"); aEvent.Ore.setStackDisplayName("Invalid OreDictionary Tag");
return; return;
} }
else if (this.mInvalidNames.contains(aEvent.Name)) { if (this.mInvalidNames.contains(aEvent.Name)) {
GT_Log.ore.println(tModToName + " is wrongly registered and therefor getting ignored."); GT_Log.ore.println(tModToName + " is wrongly registered and therefor getting ignored.");
return; return;
@ -1087,10 +1079,12 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
if (aEvent.Name.toLowerCase().equals(aEvent.Name)) { if (aEvent.Name.toLowerCase().equals(aEvent.Name)) {
GT_Log.ore.println(tModToName + " is invalid due to being solely lowercased."); GT_Log.ore.println(tModToName + " is invalid due to being solely lowercased.");
return; return;
}else if (aEvent.Name.toUpperCase().equals(aEvent.Name)) { }
if (aEvent.Name.toUpperCase().equals(aEvent.Name)) {
GT_Log.ore.println(tModToName + " is invalid due to being solely uppercased."); GT_Log.ore.println(tModToName + " is invalid due to being solely uppercased.");
return; return;
} else if (Character.isUpperCase(aEvent.Name.charAt(0))) { }
if (Character.isUpperCase(aEvent.Name.charAt(0))) {
GT_Log.ore.println(tModToName + " is invalid due to the first character being uppercased."); GT_Log.ore.println(tModToName + " is invalid due to the first character being uppercased.");
} }
} else { } else {
@ -1130,12 +1124,12 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
} }
aMaterial.add(GT_Utility.copyAmount(1L, new Object[]{aEvent.Ore})); aMaterial.add(GT_Utility.copyAmount(1L, new Object[]{aEvent.Ore}));
if (GregTech_API.sThaumcraftCompat != null && aPrefix.doGenerateItem(aMaterial) && !aPrefix.isIgnored(aMaterial)) { if (GregTech_API.sThaumcraftCompat != null && aPrefix.doGenerateItem(aMaterial) && !aPrefix.isIgnored(aMaterial)) {
List<TC_AspectStack> tAspects = new ArrayList<TC_AspectStack>(); List<TC_AspectStack> tAspects = new ArrayList<TC_AspectStack>();
for (TC_AspectStack tAspect : aPrefix.mAspects) tAspect.addToAspectList(tAspects); for (TC_AspectStack tAspect : aPrefix.mAspects) tAspect.addToAspectList(tAspects);
if (aPrefix.mMaterialAmount >= 3628800 || aPrefix.mMaterialAmount < 0) for (TC_AspectStack tAspect : aMaterial.mAspects) tAspect.addToAspectList(tAspects); if (aPrefix.mMaterialAmount >= 3628800 || aPrefix.mMaterialAmount < 0) for (TC_AspectStack tAspect : aMaterial.mAspects) tAspect.addToAspectList(tAspects);
GregTech_API.sThaumcraftCompat.registerThaumcraftAspectsToItem(GT_Utility.copyAmount(1, aEvent.Ore), tAspects, aEvent.Name); GregTech_API.sThaumcraftCompat.registerThaumcraftAspectsToItem(GT_Utility.copyAmount(1, aEvent.Ore), tAspects, aEvent.Name);
} }
switch (aPrefix) { switch (aPrefix) {
case crystal: case crystal:
@ -1144,31 +1138,48 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
} }
break; break;
case gem: case gem:
if (aMaterial == Materials.Lapis || aMaterial == Materials.Sodalite) { switch (aMaterial) {
GT_OreDictUnificator.registerOre(Dyes.dyeBlue, aEvent.Ore); case Lapis:
} else if (aMaterial == Materials.Lazurite) { case Sodalite:
GT_OreDictUnificator.registerOre(Dyes.dyeCyan, aEvent.Ore); GT_OreDictUnificator.registerOre(Dyes.dyeBlue, aEvent.Ore);
} else if (aMaterial == Materials.InfusedAir || aMaterial == Materials.InfusedWater || aMaterial == Materials.InfusedFire || aMaterial == Materials.InfusedEarth || aMaterial == Materials.InfusedOrder || aMaterial == Materials.InfusedEntropy) { break;
GT_OreDictUnificator.registerOre(aMaterial.name().replaceFirst("Infused", "shard"), aEvent.Ore); case Lazurite:
} else if (aMaterial == Materials.Chocolate) { GT_OreDictUnificator.registerOre(Dyes.dyeCyan, aEvent.Ore);
GT_OreDictUnificator.registerOre(Dyes.dyeBrown, aEvent.Ore); break;
} else if (aMaterial == Materials.CertusQuartz || aMaterial == Materials.NetherQuartz) { case InfusedAir:
GT_OreDictUnificator.registerOre(OrePrefixes.item.get(aMaterial), aEvent.Ore); case InfusedWater:
GT_OreDictUnificator.registerOre(OrePrefixes.crystal, aMaterial, aEvent.Ore); case InfusedFire:
GT_OreDictUnificator.registerOre(OreDictNames.craftingQuartz, aEvent.Ore); case InfusedEarth:
} else if (aMaterial == Materials.Fluix || aMaterial == Materials.Quartz || aMaterial == Materials.Quartzite) { case InfusedOrder:
GT_OreDictUnificator.registerOre(OrePrefixes.crystal, aMaterial, aEvent.Ore); case InfusedEntropy:
GT_OreDictUnificator.registerOre(OreDictNames.craftingQuartz, aEvent.Ore); GT_OreDictUnificator.registerOre(aMaterial.name().replaceFirst("Infused", "shard"), aEvent.Ore);
break;
case Chocolate:
GT_OreDictUnificator.registerOre(Dyes.dyeBrown, aEvent.Ore);
break;
case CertusQuartz:
case NetherQuartz:
GT_OreDictUnificator.registerOre(OrePrefixes.item.get(aMaterial), aEvent.Ore);
case Fluix:
case Quartz:
case Quartzite:
GT_OreDictUnificator.registerOre(OrePrefixes.crystal, aMaterial, aEvent.Ore);
GT_OreDictUnificator.registerOre(OreDictNames.craftingQuartz, aEvent.Ore);
default:
break;
} }
break; break;
case cableGt01: case cableGt01:
if (aMaterial == Materials.Tin) { if (aMaterial == Materials.Tin) {
GT_OreDictUnificator.registerOre(OreDictNames.craftingWireTin, aEvent.Ore); GT_OreDictUnificator.registerOre(OreDictNames.craftingWireTin, aEvent.Ore);
} else if (aMaterial == Materials.AnyCopper) { }
if (aMaterial == Materials.AnyCopper) {
GT_OreDictUnificator.registerOre(OreDictNames.craftingWireCopper, aEvent.Ore); GT_OreDictUnificator.registerOre(OreDictNames.craftingWireCopper, aEvent.Ore);
} else if (aMaterial == Materials.Gold) { }
if (aMaterial == Materials.Gold) {
GT_OreDictUnificator.registerOre(OreDictNames.craftingWireGold, aEvent.Ore); GT_OreDictUnificator.registerOre(OreDictNames.craftingWireGold, aEvent.Ore);
} else if (aMaterial == Materials.AnyIron) { }
if (aMaterial == Materials.AnyIron) {
GT_OreDictUnificator.registerOre(OreDictNames.craftingWireIron, aEvent.Ore); GT_OreDictUnificator.registerOre(OreDictNames.craftingWireIron, aEvent.Ore);
} }
break; break;
@ -1180,9 +1191,11 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
case plate: case plate:
if ((aMaterial == Materials.Plastic) || (aMaterial == Materials.Rubber)) { if ((aMaterial == Materials.Plastic) || (aMaterial == Materials.Rubber)) {
GT_OreDictUnificator.registerOre(OrePrefixes.sheet, aMaterial, aEvent.Ore); GT_OreDictUnificator.registerOre(OrePrefixes.sheet, aMaterial, aEvent.Ore);
} else if (aMaterial == Materials.Silicon) { }
if (aMaterial == Materials.Silicon) {
GT_OreDictUnificator.registerOre(OrePrefixes.item, aMaterial, aEvent.Ore); GT_OreDictUnificator.registerOre(OrePrefixes.item, aMaterial, aEvent.Ore);
} else if (aMaterial == Materials.Wood) { }
if (aMaterial == Materials.Wood) {
GT_OreDictUnificator.addToBlacklist(aEvent.Ore); GT_OreDictUnificator.addToBlacklist(aEvent.Ore);
GT_OreDictUnificator.registerOre(OrePrefixes.plank, aMaterial, aEvent.Ore); GT_OreDictUnificator.registerOre(OrePrefixes.plank, aMaterial, aEvent.Ore);
} }
@ -1198,48 +1211,64 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
case stick: case stick:
if (!GT_RecipeRegistrator.sRodMaterialList.contains(aMaterial)) { if (!GT_RecipeRegistrator.sRodMaterialList.contains(aMaterial)) {
GT_RecipeRegistrator.sRodMaterialList.add(aMaterial); GT_RecipeRegistrator.sRodMaterialList.add(aMaterial);
} else if (aMaterial == Materials.Wood) { }
if (aMaterial == Materials.Wood) {
GT_OreDictUnificator.addToBlacklist(aEvent.Ore); GT_OreDictUnificator.addToBlacklist(aEvent.Ore);
} else if ((aMaterial == Materials.Tin) || (aMaterial == Materials.Lead) || (aMaterial == Materials.SolderingAlloy)) { }
if ((aMaterial == Materials.Tin) || (aMaterial == Materials.Lead) || (aMaterial == Materials.SolderingAlloy)) {
GT_OreDictUnificator.registerOre(ToolDictNames.craftingToolSolderingMetal, aEvent.Ore); GT_OreDictUnificator.registerOre(ToolDictNames.craftingToolSolderingMetal, aEvent.Ore);
} }
break; break;
case dust: case dust:
if (aMaterial == Materials.Salt) { if (aMaterial == Materials.Salt) {
GT_OreDictUnificator.registerOre("itemSalt", aEvent.Ore); GT_OreDictUnificator.registerOre("itemSalt", aEvent.Ore);
} else if (aMaterial == Materials.Wood) { }
if (aMaterial == Materials.Wood) {
GT_OreDictUnificator.registerOre("pulpWood", aEvent.Ore); GT_OreDictUnificator.registerOre("pulpWood", aEvent.Ore);
} else if (aMaterial == Materials.Wheat) { }
if (aMaterial == Materials.Wheat) {
GT_OreDictUnificator.registerOre("foodFlour", aEvent.Ore); GT_OreDictUnificator.registerOre("foodFlour", aEvent.Ore);
} else if (aMaterial == Materials.Lapis) { }
if (aMaterial == Materials.Lapis) {
GT_OreDictUnificator.registerOre(Dyes.dyeBlue, aEvent.Ore); GT_OreDictUnificator.registerOre(Dyes.dyeBlue, aEvent.Ore);
} else if (aMaterial == Materials.Lazurite) { }
if (aMaterial == Materials.Lazurite) {
GT_OreDictUnificator.registerOre(Dyes.dyeCyan, aEvent.Ore); GT_OreDictUnificator.registerOre(Dyes.dyeCyan, aEvent.Ore);
} else if (aMaterial == Materials.Sodalite) { }
if (aMaterial == Materials.Sodalite) {
GT_OreDictUnificator.registerOre(Dyes.dyeBlue, aEvent.Ore); GT_OreDictUnificator.registerOre(Dyes.dyeBlue, aEvent.Ore);
} else if (aMaterial == Materials.Cocoa) { }
if (aMaterial == Materials.Cocoa) {
GT_OreDictUnificator.registerOre(Dyes.dyeBrown, aEvent.Ore); GT_OreDictUnificator.registerOre(Dyes.dyeBrown, aEvent.Ore);
GT_OreDictUnificator.registerOre("foodCocoapowder", aEvent.Ore); GT_OreDictUnificator.registerOre("foodCocoapowder", aEvent.Ore);
} else if (aMaterial == Materials.Coffee) { }
if (aMaterial == Materials.Coffee) {
GT_OreDictUnificator.registerOre(Dyes.dyeBrown, aEvent.Ore); GT_OreDictUnificator.registerOre(Dyes.dyeBrown, aEvent.Ore);
} else if (aMaterial == Materials.BrownLimonite) { }
if (aMaterial == Materials.BrownLimonite) {
GT_OreDictUnificator.registerOre(Dyes.dyeBrown, aEvent.Ore); GT_OreDictUnificator.registerOre(Dyes.dyeBrown, aEvent.Ore);
} else if (aMaterial == Materials.YellowLimonite) { }
if (aMaterial == Materials.YellowLimonite) {
GT_OreDictUnificator.registerOre(Dyes.dyeYellow, aEvent.Ore); GT_OreDictUnificator.registerOre(Dyes.dyeYellow, aEvent.Ore);
} }
break; break;
case ingot: case ingot:
if (aMaterial == Materials.Rubber) { if (aMaterial == Materials.Rubber) {
GT_OreDictUnificator.registerOre("itemRubber", aEvent.Ore); GT_OreDictUnificator.registerOre("itemRubber", aEvent.Ore);
} else if (aMaterial == Materials.FierySteel) { }
if (aMaterial == Materials.FierySteel) {
GT_OreDictUnificator.registerOre("fieryIngot", aEvent.Ore); GT_OreDictUnificator.registerOre("fieryIngot", aEvent.Ore);
} else if (aMaterial == Materials.IronWood) { }
if (aMaterial == Materials.IronWood) {
GT_OreDictUnificator.registerOre("ironwood", aEvent.Ore); GT_OreDictUnificator.registerOre("ironwood", aEvent.Ore);
} else if (aMaterial == Materials.Steeleaf) { }
if (aMaterial == Materials.Steeleaf) {
GT_OreDictUnificator.registerOre("steeleaf", aEvent.Ore); GT_OreDictUnificator.registerOre("steeleaf", aEvent.Ore);
} else if (aMaterial == Materials.Knightmetal) { }
if (aMaterial == Materials.Knightmetal) {
GT_OreDictUnificator.registerOre("knightmetal", aEvent.Ore); GT_OreDictUnificator.registerOre("knightmetal", aEvent.Ore);
} else if ((aMaterial == Materials.Brass) && (aEvent.Ore.getItemDamage() == 2) }
if ((aMaterial == Materials.Brass) && (aEvent.Ore.getItemDamage() == 2)
&& (aEvent.Ore.getUnlocalizedName().equals("item.ingotBrass")) && (aEvent.Ore.getUnlocalizedName().equals("item.ingotBrass"))
&& (new ItemStack(aEvent.Ore.getItem(), 1, 0).getUnlocalizedName().contains("red"))) { && (new ItemStack(aEvent.Ore.getItem(), 1, 0).getUnlocalizedName().contains("red"))) {
GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.RedAlloy, new ItemStack(aEvent.Ore.getItem(), 1, 0)); GT_OreDictUnificator.set(OrePrefixes.ingot, Materials.RedAlloy, new ItemStack(aEvent.Ore.getItem(), 1, 0));
@ -1309,16 +1338,19 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
case sheet: case sheet:
if (tName.equals("Plastic")) { if (tName.equals("Plastic")) {
GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.Plastic, aEvent.Ore); GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.Plastic, aEvent.Ore);
} else if (tName.equals("Rubber")) { }
if (tName.equals("Rubber")) {
GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.Rubber, aEvent.Ore); GT_OreDictUnificator.registerOre(OrePrefixes.plate, Materials.Rubber, aEvent.Ore);
} }
break; break;
case crafting: case crafting:
if (tName.equals("ToolSolderingMetal")) { if (tName.equals("ToolSolderingMetal")) {
GregTech_API.registerSolderingMetal(aEvent.Ore); GregTech_API.registerSolderingMetal(aEvent.Ore);
} else if (tName.equals("IndustrialDiamond")) { }
if (tName.equals("IndustrialDiamond")) {
GT_OreDictUnificator.addToBlacklist(aEvent.Ore); GT_OreDictUnificator.addToBlacklist(aEvent.Ore);
} else if (tName.equals("WireCopper")) { }
if (tName.equals("WireCopper")) {
GT_OreDictUnificator.registerOre(OrePrefixes.wire, Materials.Copper, aEvent.Ore); GT_OreDictUnificator.registerOre(OrePrefixes.wire, Materials.Copper, aEvent.Ore);
} }
break; break;
@ -1411,13 +1443,12 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
} }
} }
} }
} }
} }
@SubscribeEvent @SubscribeEvent
public void onPlayerTickEventServer(TickEvent.PlayerTickEvent aEvent) { public void onPlayerTickEventServer(TickEvent.PlayerTickEvent aEvent) {
if ((aEvent.side.isServer()) && (aEvent.phase == TickEvent.Phase.END) && (!aEvent.player.isDead)) { if ((!aEvent.player.isDead) && (aEvent.phase == TickEvent.Phase.END) && (aEvent.side.isServer())) {
if ((aEvent.player.ticksExisted % 200 == 0) && (aEvent.player.capabilities.allowEdit) && (!aEvent.player.capabilities.isCreativeMode) if ((aEvent.player.ticksExisted % 200 == 0) && (aEvent.player.capabilities.allowEdit) && (!aEvent.player.capabilities.isCreativeMode)
&& (this.mSurvivalIntoAdventure)) { && (this.mSurvivalIntoAdventure)) {
aEvent.player.setGameType(GameType.ADVENTURE); aEvent.player.setGameType(GameType.ADVENTURE);
@ -1480,19 +1511,19 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
} }
public Object getServerGuiElement(int aID, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ) { public Object getServerGuiElement(int aID, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ) {
if(aID>=1000){ if(aID>=1000){
int ID = aID-1000; int ID = aID-1000;
switch(ID){ switch(ID){
case 0: case 0:
return new ContainerBasicArmor(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getCurrentEquippedItem())); return new ContainerBasicArmor(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getCurrentEquippedItem()));
case 1: case 1:
return new ContainerElectricArmor1(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getCurrentEquippedItem())); return new ContainerElectricArmor1(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getCurrentEquippedItem()));
case 2: case 2:
return new ContainerElectricArmor1(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getCurrentEquippedItem())); return new ContainerElectricArmor1(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getCurrentEquippedItem()));
default: default:
return getRightItem(aPlayer, ID); return getRightItem(aPlayer, ID);
} }
} }
TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
if ((tTileEntity instanceof IGregTechTileEntity)) { if ((tTileEntity instanceof IGregTechTileEntity)) {
IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity(); IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity();
@ -1503,36 +1534,36 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
return null; return null;
} }
public Object getRightItem(EntityPlayer player, int ID){ public Object getRightItem(EntityPlayer player, int ID){
ItemStack mStack = player.getEquipmentInSlot(ID/100); ItemStack mStack = player.getEquipmentInSlot(ID/100);
if(mStack==null||!(mStack.getItem() instanceof ModularArmor_Item))return null; if(mStack==null||!(mStack.getItem() instanceof ModularArmor_Item))return null;
switch(ID % 100){ switch(ID % 100){
case 0: case 0:
return new ContainerBasicArmor(player, new InventoryArmor(ModularArmor_Item.class, mStack)); return new ContainerBasicArmor(player, new InventoryArmor(ModularArmor_Item.class, mStack));
case 1: case 1:
return new ContainerElectricArmor1(player, new InventoryArmor(ModularArmor_Item.class, mStack)); return new ContainerElectricArmor1(player, new InventoryArmor(ModularArmor_Item.class, mStack));
case 2: case 2:
return new ContainerElectricArmor1(player, new InventoryArmor(ModularArmor_Item.class, mStack)); return new ContainerElectricArmor1(player, new InventoryArmor(ModularArmor_Item.class, mStack));
} }
return null; return null;
} }
public Object getClientGuiElement(int aID, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ) { public Object getClientGuiElement(int aID, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ) {
if(aID>=1000){ if(aID>=1000){
int ID = aID-1000; int ID = aID-1000;
switch(ID){ switch(ID){
case 0: case 0:
return new GuiModularArmor(new ContainerBasicArmor(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getCurrentEquippedItem())), aPlayer); return new GuiModularArmor(new ContainerBasicArmor(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getCurrentEquippedItem())), aPlayer);
case 1: case 1:
return new GuiElectricArmor1(new ContainerElectricArmor1(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getCurrentEquippedItem())), aPlayer); return new GuiElectricArmor1(new ContainerElectricArmor1(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getCurrentEquippedItem())), aPlayer);
case 2: case 2:
return new GuiElectricArmor1(new ContainerElectricArmor1(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getCurrentEquippedItem())), aPlayer); return new GuiElectricArmor1(new ContainerElectricArmor1(aPlayer, new InventoryArmor(ModularArmor_Item.class, aPlayer.getCurrentEquippedItem())), aPlayer);
default: default:
return getRightItemGui(aPlayer, ID); return getRightItemGui(aPlayer, ID);
} }
} }
TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
if ((tTileEntity instanceof IGregTechTileEntity)) { if ((tTileEntity instanceof IGregTechTileEntity)) {
IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity(); IMetaTileEntity tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity();
@ -1543,21 +1574,21 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
return null; return null;
} }
public Object getRightItemGui(EntityPlayer player, int ID){ public Object getRightItemGui(EntityPlayer player, int ID){
ItemStack mStack = player.getEquipmentInSlot(ID/100); ItemStack mStack = player.getEquipmentInSlot(ID/100);
if(mStack==null||!(mStack.getItem() instanceof ModularArmor_Item))return null; if(mStack==null||!(mStack.getItem() instanceof ModularArmor_Item))return null;
switch(ID % 100){ switch(ID % 100){
case 0: case 0:
return new GuiModularArmor(new ContainerBasicArmor(player, new InventoryArmor(ModularArmor_Item.class, mStack)),player); return new GuiModularArmor(new ContainerBasicArmor(player, new InventoryArmor(ModularArmor_Item.class, mStack)),player);
case 1: case 1:
return new GuiElectricArmor1(new ContainerElectricArmor1(player, new InventoryArmor(ModularArmor_Item.class, mStack)), player); return new GuiElectricArmor1(new ContainerElectricArmor1(player, new InventoryArmor(ModularArmor_Item.class, mStack)), player);
case 2: case 2:
return new GuiElectricArmor1(new ContainerElectricArmor1(player, new InventoryArmor(ModularArmor_Item.class, mStack)), player); return new GuiElectricArmor1(new ContainerElectricArmor1(player, new InventoryArmor(ModularArmor_Item.class, mStack)), player);
} }
return null; return null;
} }
public int getBurnTime(ItemStack aFuel) { public int getBurnTime(ItemStack aFuel) {
if ((aFuel == null) || (aFuel.getItem() == null)) { if ((aFuel == null) || (aFuel.getItem() == null)) {
@ -1574,101 +1605,149 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
if (tNBT != null) { if (tNBT != null) {
short tValue = tNBT.getShort("GT.ItemFuelValue"); short tValue = tNBT.getShort("GT.ItemFuelValue");
rFuelValue = (short) Math.max(rFuelValue, tValue); rFuelValue = (short) Math.max(rFuelValue, tValue);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "gemSodium")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "gemSodium")) {
rFuelValue = (short) Math.max(rFuelValue, 4000); rFuelValue = (short) Math.max(rFuelValue, 4000);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "crushedSodium")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "crushedSodium")) {
rFuelValue = (short) Math.max(rFuelValue, 4000); rFuelValue = (short) Math.max(rFuelValue, 4000);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustImpureSodium")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustImpureSodium")) {
rFuelValue = (short) Math.max(rFuelValue, 4000); rFuelValue = (short) Math.max(rFuelValue, 4000);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSodium")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSodium")) {
rFuelValue = (short) Math.max(rFuelValue, 4000); rFuelValue = (short) Math.max(rFuelValue, 4000);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSmallSodium")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSmallSodium")) {
rFuelValue = (short) Math.max(rFuelValue, 1000); rFuelValue = (short) Math.max(rFuelValue, 1000);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinySodium")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinySodium")) {
rFuelValue = (short) Math.max(rFuelValue, 444); rFuelValue = (short) Math.max(rFuelValue, 444);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "gemLithium")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "gemLithium")) {
rFuelValue = (short) Math.max(rFuelValue, 6000); rFuelValue = (short) Math.max(rFuelValue, 6000);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "crushedLithium")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "crushedLithium")) {
rFuelValue = (short) Math.max(rFuelValue, 6000); rFuelValue = (short) Math.max(rFuelValue, 6000);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustImpureLithium")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustImpureLithium")) {
rFuelValue = (short) Math.max(rFuelValue, 6000); rFuelValue = (short) Math.max(rFuelValue, 6000);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustLithium")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustLithium")) {
rFuelValue = (short) Math.max(rFuelValue, 6000); rFuelValue = (short) Math.max(rFuelValue, 6000);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSmallLithium")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSmallLithium")) {
rFuelValue = (short) Math.max(rFuelValue, 2000); rFuelValue = (short) Math.max(rFuelValue, 2000);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinyLithium")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinyLithium")) {
rFuelValue = (short) Math.max(rFuelValue, 888); rFuelValue = (short) Math.max(rFuelValue, 888);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "gemCaesium")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "gemCaesium")) {
rFuelValue = (short) Math.max(rFuelValue, 6000); rFuelValue = (short) Math.max(rFuelValue, 6000);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "crushedCaesium")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "crushedCaesium")) {
rFuelValue = (short) Math.max(rFuelValue, 6000); rFuelValue = (short) Math.max(rFuelValue, 6000);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustImpureCaesium")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustImpureCaesium")) {
rFuelValue = (short) Math.max(rFuelValue, 6000); rFuelValue = (short) Math.max(rFuelValue, 6000);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustCaesium")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustCaesium")) {
rFuelValue = (short) Math.max(rFuelValue, 6000); rFuelValue = (short) Math.max(rFuelValue, 6000);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSmallCaesium")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSmallCaesium")) {
rFuelValue = (short) Math.max(rFuelValue, 2000); rFuelValue = (short) Math.max(rFuelValue, 2000);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinyCaesium")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinyCaesium")) {
rFuelValue = (short) Math.max(rFuelValue, 888); rFuelValue = (short) Math.max(rFuelValue, 888);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "gemLignite")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "gemLignite")) {
rFuelValue = (short) Math.max(rFuelValue, 1200); rFuelValue = (short) Math.max(rFuelValue, 1200);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "crushedLignite")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "crushedLignite")) {
rFuelValue = (short) Math.max(rFuelValue, 1200); rFuelValue = (short) Math.max(rFuelValue, 1200);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustImpureLignite")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustImpureLignite")) {
rFuelValue = (short) Math.max(rFuelValue, 1200); rFuelValue = (short) Math.max(rFuelValue, 1200);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustLignite")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustLignite")) {
rFuelValue = (short) Math.max(rFuelValue, 1200); rFuelValue = (short) Math.max(rFuelValue, 1200);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSmallLignite")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSmallLignite")) {
rFuelValue = (short) Math.max(rFuelValue, 375); rFuelValue = (short) Math.max(rFuelValue, 375);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinyLignite")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinyLignite")) {
rFuelValue = (short) Math.max(rFuelValue, 166); rFuelValue = (short) Math.max(rFuelValue, 166);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "gemCoal")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "gemCoal")) {
rFuelValue = (short) Math.max(rFuelValue, 1600); rFuelValue = (short) Math.max(rFuelValue, 1600);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "crushedCoal")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "crushedCoal")) {
rFuelValue = (short) Math.max(rFuelValue, 1600); rFuelValue = (short) Math.max(rFuelValue, 1600);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustImpureCoal")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustImpureCoal")) {
rFuelValue = (short) Math.max(rFuelValue, 1600); rFuelValue = (short) Math.max(rFuelValue, 1600);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustCoal")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustCoal")) {
rFuelValue = (short) Math.max(rFuelValue, 1600); rFuelValue = (short) Math.max(rFuelValue, 1600);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSmallCoal")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSmallCoal")) {
rFuelValue = (short) Math.max(rFuelValue, 400); rFuelValue = (short) Math.max(rFuelValue, 400);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinyCoal")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinyCoal")) {
rFuelValue = (short) Math.max(rFuelValue, 177); rFuelValue = (short) Math.max(rFuelValue, 177);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "gemCharcoal")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "gemCharcoal")) {
rFuelValue = (short) Math.max(rFuelValue, 1600); rFuelValue = (short) Math.max(rFuelValue, 1600);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "crushedCharcoal")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "crushedCharcoal")) {
rFuelValue = (short) Math.max(rFuelValue, 1600); rFuelValue = (short) Math.max(rFuelValue, 1600);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustImpureCharcoal")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustImpureCharcoal")) {
rFuelValue = (short) Math.max(rFuelValue, 1600); rFuelValue = (short) Math.max(rFuelValue, 1600);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustCharcoal")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustCharcoal")) {
rFuelValue = (short) Math.max(rFuelValue, 1600); rFuelValue = (short) Math.max(rFuelValue, 1600);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSmallCharcoal")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSmallCharcoal")) {
rFuelValue = (short) Math.max(rFuelValue, 400); rFuelValue = (short) Math.max(rFuelValue, 400);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinyCharcoal")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinyCharcoal")) {
rFuelValue = (short) Math.max(rFuelValue, 177); rFuelValue = (short) Math.max(rFuelValue, 177);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustWood")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustWood")) {
rFuelValue = (short) Math.max(rFuelValue, 100); rFuelValue = (short) Math.max(rFuelValue, 100);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSmallWood")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustSmallWood")) {
rFuelValue = (short) Math.max(rFuelValue, 25); rFuelValue = (short) Math.max(rFuelValue, 25);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinyWood")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "dustTinyWood")) {
rFuelValue = (short) Math.max(rFuelValue, 11); rFuelValue = (short) Math.max(rFuelValue, 11);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "plateWood")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "plateWood")) {
rFuelValue = (short) Math.min(rFuelValue, 300); rFuelValue = (short) Math.min(rFuelValue, 300);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "blockLignite")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "blockLignite")) {
rFuelValue = (short) Math.max(rFuelValue, 12000); rFuelValue = (short) Math.max(rFuelValue, 12000);
} else if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "blockCharcoal")) { }
if (GT_OreDictUnificator.isItemStackInstanceOf(aFuel, "blockCharcoal")) {
rFuelValue = (short) Math.max(rFuelValue, 16000); rFuelValue = (short) Math.max(rFuelValue, 16000);
} else if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Blocks.wooden_button, 1))) { }
if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Blocks.wooden_button, 1))) {
rFuelValue = (short) Math.max(rFuelValue, 150); rFuelValue = (short) Math.max(rFuelValue, 150);
} else if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Blocks.ladder, 1))) { }
if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Blocks.ladder, 1))) {
rFuelValue = (short) Math.max(rFuelValue, 100); rFuelValue = (short) Math.max(rFuelValue, 100);
} else if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Items.sign, 1))) { }
if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Items.sign, 1))) {
rFuelValue = (short) Math.max(rFuelValue, 600); rFuelValue = (short) Math.max(rFuelValue, 600);
} else if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Items.wooden_door, 1))) { }
if (GT_Utility.areStacksEqual(aFuel, new ItemStack(Items.wooden_door, 1))) {
rFuelValue = (short) Math.max(rFuelValue, 600); rFuelValue = (short) Math.max(rFuelValue, 600);
} else if (GT_Utility.areStacksEqual(aFuel, ItemList.Block_MSSFUEL.get(1, new Object[0]))) { }
if (GT_Utility.areStacksEqual(aFuel, ItemList.Block_MSSFUEL.get(1, new Object[0]))) {
rFuelValue = Math.max(rFuelValue, 150000); rFuelValue = Math.max(rFuelValue, 150000);
}if (GT_Utility.areStacksEqual(aFuel, ItemList.Block_SSFUEL.get(1, new Object[0]))) { }
if (GT_Utility.areStacksEqual(aFuel, ItemList.Block_SSFUEL.get(1, new Object[0]))) {
rFuelValue = Math.max(rFuelValue, 100000); rFuelValue = Math.max(rFuelValue, 100000);
} }
@ -1676,12 +1755,17 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
} }
public Fluid addAutogeneratedMoltenFluid(Materials aMaterial) { public Fluid addAutogeneratedMoltenFluid(Materials aMaterial) {
return addFluid("molten." + aMaterial.name().toLowerCase(Locale.ENGLISH), "molten.autogenerated", "Molten " + aMaterial.mDefaultLocalName, aMaterial, return addFluid("molten." + aMaterial.name().toLowerCase(), "molten.autogenerated", "Molten " + aMaterial.mDefaultLocalName, aMaterial,
aMaterial.mMoltenRGBa, 4, aMaterial.mMeltingPoint <= 0 ? 1000 : aMaterial.mMeltingPoint, null, null, 0); aMaterial.mMoltenRGBa, 4, aMaterial.mMeltingPoint <= 0 ? 1000 : aMaterial.mMeltingPoint, null, null, 0);
} }
public Fluid addAutogeneratedWetFluid(Materials aMaterial) {
return addFluid("wet." + aMaterial.name().toLowerCase(), "wet.autogenerated", "Wet " + aMaterial.mDefaultLocalName, aMaterial,
aMaterial.mMoltenRGBa, 4, aMaterial.mMeltingPoint <= 0 ? 1000 : aMaterial.mMeltingPoint, GT_OreDictUnificator.get(OrePrefixes.cell, aMaterial, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), 1000);
}
public Fluid addAutogeneratedPlasmaFluid(Materials aMaterial) { public Fluid addAutogeneratedPlasmaFluid(Materials aMaterial) {
return addFluid("plasma." + aMaterial.name().toLowerCase(Locale.ENGLISH), "plasma.autogenerated", aMaterial.mDefaultLocalName + " Plasma", aMaterial, return addFluid("plasma." + aMaterial.name().toLowerCase(), "plasma.autogenerated", aMaterial.mDefaultLocalName + " Plasma", aMaterial,
aMaterial.mMoltenRGBa, 3, 10000, GT_OreDictUnificator.get(OrePrefixes.cellPlasma, aMaterial, 1L), ItemList.Cell_Empty.get(1L, new Object[0]), aMaterial.mMoltenRGBa, 3, 10000, GT_OreDictUnificator.get(OrePrefixes.cellPlasma, aMaterial, 1L), ItemList.Cell_Empty.get(1L, new Object[0]),
1000); 1000);
} }
@ -1692,12 +1776,12 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
public Fluid addFluid(String aName, String aLocalized, Materials aMaterial, int aState, int aTemperatureK, ItemStack aFullContainer, public Fluid addFluid(String aName, String aLocalized, Materials aMaterial, int aState, int aTemperatureK, ItemStack aFullContainer,
ItemStack aEmptyContainer, int aFluidAmount) { ItemStack aEmptyContainer, int aFluidAmount) {
return addFluid(aName, aName.toLowerCase(Locale.ENGLISH), aLocalized, aMaterial, null, aState, aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount); return addFluid(aName, aName.toLowerCase(), aLocalized, aMaterial, null, aState, aTemperatureK, aFullContainer, aEmptyContainer, aFluidAmount);
} }
public Fluid addFluid(String aName, String aTexture, String aLocalized, Materials aMaterial, short[] aRGBa, int aState, int aTemperatureK, public Fluid addFluid(String aName, String aTexture, String aLocalized, Materials aMaterial, short[] aRGBa, int aState, int aTemperatureK,
ItemStack aFullContainer, ItemStack aEmptyContainer, int aFluidAmount) { ItemStack aFullContainer, ItemStack aEmptyContainer, int aFluidAmount) {
aName = aName.toLowerCase(Locale.ENGLISH); aName = aName.toLowerCase();
Fluid rFluid = new GT_Fluid(aName, aTexture, aRGBa != null ? aRGBa : Dyes._NULL.getRGBA()); Fluid rFluid = new GT_Fluid(aName, aTexture, aRGBa != null ? aRGBa : Dyes._NULL.getRGBA());
GT_LanguageManager.addStringLocalization(rFluid.getUnlocalizedName(), aLocalized == null ? aName : aLocalized); GT_LanguageManager.addStringLocalization(rFluid.getUnlocalizedName(), aLocalized == null ? aName : aLocalized);
if (FluidRegistry.registerFluid(rFluid)) { if (FluidRegistry.registerFluid(rFluid)) {
@ -1763,41 +1847,41 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
GT_OreDictUnificator.resetUnificationEntries(); GT_OreDictUnificator.resetUnificationEntries();
for (OreDictEventContainer tOre : this.mEvents) { for (OreDictEventContainer tOre : this.mEvents) {
if ((!(tOre.mEvent.Ore.getItem() instanceof GT_MetaGenerated_Item)) && (tOre.mPrefix != null) && (tOre.mPrefix.mIsUnificatable) && (tOre.mMaterial != null)) { if ((!(tOre.mEvent.Ore.getItem() instanceof GT_MetaGenerated_Item)) && (tOre.mPrefix != null) && (tOre.mPrefix.mIsUnificatable) && (tOre.mMaterial != null)) {
boolean chkmi = tOre.mModID != null; boolean chkmi = tOre.mModID != null ? true : false;
if (chkmi) { if (chkmi) {
if (tOre.mModID.equalsIgnoreCase("enderio") && tOre.mPrefix == OrePrefixes.ingot && tOre.mMaterial == Materials.DarkSteel) { if (tOre.mModID.equalsIgnoreCase("enderio") && tOre.mPrefix == OrePrefixes.ingot && tOre.mMaterial == Materials.DarkSteel) {
GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue; GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (chkmi) && (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue;
} else if (tOre.mModID.equalsIgnoreCase("thermalfoundation") && tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.Blizz) { } else if (tOre.mModID.equalsIgnoreCase("thermalfoundation") && tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.Blizz) {
GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue; GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (chkmi) && (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue;
} else if (tOre.mModID.equalsIgnoreCase("thermalfoundation") && tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.Pyrotheum) { } else if (tOre.mModID.equalsIgnoreCase("thermalfoundation") && tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.Pyrotheum) {
GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue; GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (chkmi) && (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue;
} else if (tOre.mModID.equalsIgnoreCase(aTextArsmagica2) && tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.Vinteum) { } else if (tOre.mModID.equalsIgnoreCase(aTextArsmagica2) && tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.Vinteum) {
GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue; GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (chkmi) && (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue;
} else if (tOre.mModID.equalsIgnoreCase(aTextArsmagica2) && tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.BlueTopaz) { } else if (tOre.mModID.equalsIgnoreCase(aTextArsmagica2) && tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.BlueTopaz) {
GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue; GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (chkmi) && (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue;
} else if (tOre.mModID.equalsIgnoreCase(aTextArsmagica2) && tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.Chimerite) { } else if (tOre.mModID.equalsIgnoreCase(aTextArsmagica2) && tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.Chimerite) {
GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue; GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (chkmi) && (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue;
} else if (tOre.mModID.equalsIgnoreCase(aTextArsmagica2) && tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.Moonstone) { } else if (tOre.mModID.equalsIgnoreCase(aTextArsmagica2) && tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.Moonstone) {
GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue; GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (chkmi) && (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue;
} else if (tOre.mModID.equalsIgnoreCase(aTextArsmagica2) && tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.Sunstone) { } else if (tOre.mModID.equalsIgnoreCase(aTextArsmagica2) && tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.Sunstone) {
GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue; GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (chkmi) && (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue;
} else if (tOre.mModID.equalsIgnoreCase("rotarycraft") && tOre.mPrefix == OrePrefixes.ingot && tOre.mMaterial == Materials.HSLA) { } else if (tOre.mModID.equalsIgnoreCase("rotarycraft") && tOre.mPrefix == OrePrefixes.ingot && tOre.mMaterial == Materials.HSLA) {
GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue; GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (chkmi) && (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue;
} else if (tOre.mModID.equalsIgnoreCase("appliedenergistics2") && tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.CertusQuartz) { } else if (tOre.mModID.equalsIgnoreCase("appliedenergistics2") && tOre.mPrefix == OrePrefixes.gem && tOre.mMaterial == Materials.CertusQuartz) {
GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue; GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (chkmi) && (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue;
} else if (tOre.mModID.equalsIgnoreCase("appliedenergistics2") && tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.CertusQuartz) { } else if (tOre.mModID.equalsIgnoreCase("appliedenergistics2") && tOre.mPrefix == OrePrefixes.dust && tOre.mMaterial == Materials.CertusQuartz) {
GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false); GT_OreDictUnificator.addAssociation(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, false);
GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue; GT_OreDictUnificator.set(tOre.mPrefix, tOre.mMaterial, tOre.mEvent.Ore, (chkmi) && (GregTech_API.sUnification.get(new StringBuilder().append(ConfigCategories.specialunificationtargets).append(".").append(tOre.mModID).toString(), tOre.mEvent.Name, true)), true);continue;
} }
} }
if (GT_OreDictUnificator.isBlacklisted(tOre.mEvent.Ore)) { if (GT_OreDictUnificator.isBlacklisted(tOre.mEvent.Ore)) {
@ -1838,51 +1922,22 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
@SubscribeEvent @SubscribeEvent
public void handleChunkSaveEvent(ChunkDataEvent.Save event) public void handleChunkSaveEvent(ChunkDataEvent.Save event)
{ {
ChunkPosition tPos = new ChunkPosition(event.getChunk().xPosition,1,event.getChunk().zPosition); ChunkPosition tPos = new ChunkPosition(event.getChunk().xPosition,1,event.getChunk().zPosition);
if(chunkData.containsKey(tPos)){ if(chunkData.containsKey(tPos)){
int[] tInts = chunkData.get(tPos); int[] tInts = chunkData.get(tPos);
if(tInts.length>0){event.getData().setInteger("GTOIL", tInts[0]);} if(tInts.length>0){event.getData().setInteger("GTOIL", tInts[0]);}}
if(tInts.length>1){event.getData().setInteger("GTPOLLUTION", tInts[1]);}}
} }
@SubscribeEvent @SubscribeEvent
public void handleChunkLoadEvent(ChunkDataEvent.Load event) public void handleChunkLoadEvent(ChunkDataEvent.Load event)
{ {
int tOil = 0; int tOil = -1;
int tPollution = 0; if(event.getData().hasKey("GTOIL")){
tOil = event.getData().getInteger("GTOIL");}
ChunkPosition tPos = new ChunkPosition(event.getChunk().xPosition,1,event.getChunk().zPosition); ChunkPosition tPos = new ChunkPosition(event.getChunk().xPosition,1,event.getChunk().zPosition);
int[] tData = new int[2]; if(chunkData.containsKey(tPos)){
if(chunkData.containsKey(tPos)){ chunkData.remove(tPos);}
tData = chunkData.get(tPos); chunkData.put(tPos, new int[]{ tOil});
chunkData.remove(tPos);
}
if(event.getData().hasKey("GTOIL")){
if(tData.length>2){
tOil = tData[0];
}else{
tOil += event.getData().getInteger("GTOIL");
}
}else{
if(tData[0]!=0){
tOil = tData[0];
}
}
if(event.getData().hasKey("GTPOLLUTION")){
if(tData.length>2){
tPollution = tData[1];
}else{
tPollution += event.getData().getInteger("GTPOLLUTION");
}
}else{
if(tData[1]!=0){
tPollution = tData[1];
}
}
chunkData.put(tPos, new int[]{ tOil,tPollution,-1});
} }
public static class OreDictEventContainer { public static class OreDictEventContainer {