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

Bugfixes 7

Browse source
This commit is contained in:
Muramasa 2016-08-14 07:19:03 +01:00
parent 19062e1d36
commit e85097319b
11 changed files with 403 additions and 551 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
View file

@ -252,10 +252,8 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
long tTime = System.currentTimeMillis(); long tTime = System.currentTimeMillis();
int tCode = 0; int tCode = 0;
try { for (tCode = 0; hasValidMetaTileEntity() && tCode >= 0; ) { try {
//replace switch in if for (tCode = 0; hasValidMetaTileEntity() && tCode >= 0; ) {
//switch (tCode) {
//case 0:
if (tCode == 0) { if (tCode == 0) {
tCode++; tCode++;
if (mTickTimer++ == 0) { if (mTickTimer++ == 0) {
@ -274,8 +272,8 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
mRunningThroughTick = false; mRunningThroughTick = false;
return; return;
} }
}} }
//case 1: }
if (tCode == 1) { if (tCode == 1) {
tCode++; tCode++;
if (isClientSide()) { if (isClientSide()) {
@ -302,13 +300,8 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
//worldObj.func_147479_m(xCoord, yCoord, zCoord); //worldObj.func_147479_m(xCoord, yCoord, zCoord);
mNeedsUpdate = false; mNeedsUpdate = false;
} }
}} }
/*case 2: }
case 3:
case 4:
case 5:
case 6:
case 7:*/
if (tCode >= 2 && tCode <= 7) { if (tCode >= 2 && tCode <= 7) {
if (isServerSide() && mTickTimer > 10) { if (isServerSide() && mTickTimer > 10) {
for (byte i = (byte) (tCode - 2); i < 6; i++) for (byte i = (byte) (tCode - 2); i < 6; i++)
@ -325,8 +318,8 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
} }
} }
}} }
//case 8: }
if (tCode == 8) { if (tCode == 8) {
tCode = 9; tCode = 9;
if (isServerSide()) { if (isServerSide()) {
@ -335,16 +328,16 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
mAverageEUInput[mAverageEUInputIndex] = 0; mAverageEUInput[mAverageEUInputIndex] = 0;
mAverageEUOutput[mAverageEUOutputIndex] = 0; mAverageEUOutput[mAverageEUOutputIndex] = 0;
}} }
//case 9: }
if (tCode == 9) { if (tCode == 9) {
tCode++; tCode++;
mMetaTileEntity.onPreTick(this, mTickTimer); mMetaTileEntity.onPreTick(this, mTickTimer);
if (!hasValidMetaTileEntity()) { if (!hasValidMetaTileEntity()) {
mRunningThroughTick = false; mRunningThroughTick = false;
return; return;
}} }
//case 10: }
if (tCode == 10) { if (tCode == 10) {
tCode++; tCode++;
if (isServerSide()) { if (isServerSide()) {
@ -420,10 +413,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
|| (getCoverIDAtSide((byte) 5) == 0 && worldObj.getPrecipitationHeight(xCoord + 1, zCoord) - 1 < yCoord)) { || (getCoverIDAtSide((byte) 5) == 0 && worldObj.getPrecipitationHeight(xCoord + 1, zCoord) - 1 < yCoord)) {
if (GregTech_API.sMachineRainExplosions && worldObj.isRaining() && getBiome().rainfall > 0) { if (GregTech_API.sMachineRainExplosions && worldObj.isRaining() && getBiome().rainfall > 0) {
if (getRandomNumber(10) == 0) { if (getRandomNumber(10) == 0) {
//try {
GT_Mod.instance.achievements.issueAchievement(this.getWorldObj().getPlayerEntityByName(mOwnerName), "badweather"); GT_Mod.instance.achievements.issueAchievement(this.getWorldObj().getPlayerEntityByName(mOwnerName), "badweather");
//} catch (Exception e) {
//}
doEnergyExplosion(); doEnergyExplosion();
} else setOnFire(); } else setOnFire();
} }
@ -448,7 +438,6 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
return; return;
} }
} }
//case 11:
if (tCode == 11) { if (tCode == 11) {
tCode++; tCode++;
if (isServerSide()) { if (isServerSide()) {
@ -462,8 +451,8 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
} }
} }
} }
}} }
//case 12: }
if (tCode == 12) { if (tCode == 12) {
tCode++; tCode++;
if (isServerSide()) { if (isServerSide()) {
@ -477,24 +466,24 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
} }
} }
} }
}} }
//case 13: }
if (tCode == 13) { if (tCode == 13) {
tCode++; tCode++;
updateStatus(); updateStatus();
if (!hasValidMetaTileEntity()) { if (!hasValidMetaTileEntity()) {
mRunningThroughTick = false; mRunningThroughTick = false;
return; return;
}} }
//case 14: }
if (tCode == 14) { if (tCode == 14) {
tCode++; tCode++;
mMetaTileEntity.onPostTick(this, mTickTimer); mMetaTileEntity.onPostTick(this, mTickTimer);
if (!hasValidMetaTileEntity()) { if (!hasValidMetaTileEntity()) {
mRunningThroughTick = false; mRunningThroughTick = false;
return; return;
}} }
//case 15: }
if (tCode == 15) { if (tCode == 15) {
tCode++; tCode++;
if (isServerSide()) { if (isServerSide()) {
@ -531,12 +520,14 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockOffset(0, 0, 0)); worldObj.notifyBlocksOfNeighborChange(xCoord, yCoord, zCoord, getBlockOffset(0, 0, 0));
mNeedsBlockUpdate = false; mNeedsBlockUpdate = false;
} }
}} }
//default: }
if (tCode > 15) { if (tCode > 15) {
tCode = -1; tCode = -1;
break;} break;
}} }
}
}
} catch (Throwable e) { } catch (Throwable e) {
gregtech.api.util.GT_Log.err.println("Encountered Exception while ticking MetaTileEntity in Step " + (tCode - 1) + ". The Game should've crashed now, but I prevented that. Please report immidietly to GregTech Intergalactical!!!"); gregtech.api.util.GT_Log.err.println("Encountered Exception while ticking MetaTileEntity in Step " + (tCode - 1) + ". The Game should've crashed now, but I prevented that. Please report immidietly to GregTech Intergalactical!!!");
e.printStackTrace(GT_Log.err); e.printStackTrace(GT_Log.err);

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

@ -259,7 +259,7 @@ public class GT_OreDictUnificator {
public static ItemStack getGem(Materials aMaterial, long aMaterialAmount) { public static ItemStack getGem(Materials aMaterial, long aMaterialAmount) {
ItemStack rStack = null; ItemStack rStack = null;
if (((aMaterialAmount >= M)/* || aMaterialAmount >= M * 32*/)) if (((aMaterialAmount >= M)))
rStack = get(OrePrefixes.gem, aMaterial, aMaterialAmount / M); rStack = get(OrePrefixes.gem, aMaterial, aMaterialAmount / M);
if (rStack == null) { if (rStack == null) {
if ((((aMaterialAmount * 2) % M == 0) || aMaterialAmount >= M * 16)) if ((((aMaterialAmount * 2) % M == 0) || aMaterialAmount >= M * 16))

4
src/main/java/gregtech/api/util/GT_RecipeRegistrator.java
View file

@ -176,7 +176,7 @@ public class GT_RecipeRegistrator {
} }
public static void registerReverseArcSmelting(ItemStack aStack, Materials aMaterial, long aMaterialAmount, MaterialStack aByProduct01, MaterialStack aByProduct02, MaterialStack aByProduct03) { public static void registerReverseArcSmelting(ItemStack aStack, Materials aMaterial, long aMaterialAmount, MaterialStack aByProduct01, MaterialStack aByProduct02, MaterialStack aByProduct03) {
registerReverseArcSmelting(aStack, new ItemData(/*aMaterial == null ? null : */new MaterialStack(aMaterial, aMaterialAmount), aByProduct01, aByProduct02, aByProduct03)); registerReverseArcSmelting(aStack, new ItemData(new MaterialStack(aMaterial, aMaterialAmount), aByProduct01, aByProduct02, aByProduct03));
} }
public static void registerReverseArcSmelting(ItemStack aStack, ItemData aData) { public static void registerReverseArcSmelting(ItemStack aStack, ItemData aData) {
@ -234,7 +234,7 @@ public class GT_RecipeRegistrator {
} }
public static void registerReverseMacerating(ItemStack aStack, Materials aMaterial, long aMaterialAmount, MaterialStack aByProduct01, MaterialStack aByProduct02, MaterialStack aByProduct03, boolean aAllowHammer) { public static void registerReverseMacerating(ItemStack aStack, Materials aMaterial, long aMaterialAmount, MaterialStack aByProduct01, MaterialStack aByProduct02, MaterialStack aByProduct03, boolean aAllowHammer) {
registerReverseMacerating(aStack, new ItemData(/*aMaterial == null ? null : */new MaterialStack(aMaterial, aMaterialAmount), aByProduct01, aByProduct02, aByProduct03), aAllowHammer); registerReverseMacerating(aStack, new ItemData(new MaterialStack(aMaterial, aMaterialAmount), aByProduct01, aByProduct02, aByProduct03), aAllowHammer);
} }
public static void registerReverseMacerating(ItemStack aStack, ItemData aData, boolean aAllowHammer) { public static void registerReverseMacerating(ItemStack aStack, ItemData aData, boolean aAllowHammer) {

7
src/main/java/gregtech/common/GT_Client.java
View file

@ -325,13 +325,6 @@ public class GT_Client extends GT_Proxy
} }
} }
//dead event
/*@*//*SubscribeEvent*/
/*@SubscribeEvent
public void receiveRenderSpecialsEvent(net.minecraftforge.client.event.RenderPlayerEvent.Specials.Pre aEvent) {
mCapeRenderer.receiveRenderSpecialsEvent(aEvent);
}*/
@SubscribeEvent @SubscribeEvent
public void onClientTickEvent(cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent aEvent) { public void onClientTickEvent(cpw.mods.fml.common.gameevent.TickEvent.ClientTickEvent aEvent) {
if (aEvent.phase == cpw.mods.fml.common.gameevent.TickEvent.Phase.END) { if (aEvent.phase == cpw.mods.fml.common.gameevent.TickEvent.Phase.END) {

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

@ -987,79 +987,64 @@ 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 ((aEvent.Name.startsWith("item")) && (this.mIgnoredItems.contains(aEvent.Name))) { if ((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);
} } else if (aEvent.Name.equals("itemRubber")) {
if (aEvent.Name.equals("itemRubber")) {
GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Rubber, aEvent.Ore); GT_OreDictUnificator.registerOre(OrePrefixes.ingot, Materials.Rubber, aEvent.Ore);
} }
return; 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.Endium, aEvent.Ore); GT_OreDictUnificator.registerOre(OrePrefixes.ore, Materials.Endium, 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;
} } else if (aEvent.Name.equals("shardWater")) {
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;
} } else if (aEvent.Name.equals("shardFire")) {
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;
} } else if (aEvent.Name.equals("shardEarth")) {
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;
} } else if (aEvent.Name.equals("shardOrder")) {
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;
} } else if (aEvent.Name.equals("shardEntropy")) {
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;
} }
@ -1083,12 +1068,10 @@ 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 {
@ -1142,48 +1125,32 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
} }
break; break;
case gem: case gem:
switch (aMaterial) { if (aMaterial == Materials.Lapis || aMaterial == Materials.Sodalite) {
case Lapis:
case Sodalite:
GT_OreDictUnificator.registerOre(Dyes.dyeBlue, aEvent.Ore); GT_OreDictUnificator.registerOre(Dyes.dyeBlue, aEvent.Ore);
break; } else if (aMaterial == Materials.Lazurite) {
case Lazurite:
GT_OreDictUnificator.registerOre(Dyes.dyeCyan, aEvent.Ore); GT_OreDictUnificator.registerOre(Dyes.dyeCyan, aEvent.Ore);
break; } else if (aMaterial == Materials.InfusedAir || aMaterial == Materials.InfusedWater || aMaterial == Materials.InfusedFire || aMaterial == Materials.InfusedEarth || aMaterial == Materials.InfusedOrder || aMaterial == Materials.InfusedEntropy) {
case InfusedAir:
case InfusedWater:
case InfusedFire:
case InfusedEarth:
case InfusedOrder:
case InfusedEntropy:
GT_OreDictUnificator.registerOre(aMaterial.name().replaceFirst("Infused", "shard"), aEvent.Ore); GT_OreDictUnificator.registerOre(aMaterial.name().replaceFirst("Infused", "shard"), aEvent.Ore);
break; } else if (aMaterial == Materials.Chocolate) {
case Chocolate:
GT_OreDictUnificator.registerOre(Dyes.dyeBrown, aEvent.Ore); GT_OreDictUnificator.registerOre(Dyes.dyeBrown, aEvent.Ore);
break; } else if (aMaterial == Materials.CertusQuartz || aMaterial == Materials.NetherQuartz) {
case CertusQuartz:
case NetherQuartz:
GT_OreDictUnificator.registerOre(OrePrefixes.item.get(aMaterial), aEvent.Ore); GT_OreDictUnificator.registerOre(OrePrefixes.item.get(aMaterial), aEvent.Ore);
case Fluix: //Java (?) logic, redundant code
case Quartz: GT_OreDictUnificator.registerOre(OrePrefixes.crystal, aMaterial, aEvent.Ore);
case Quartzite: GT_OreDictUnificator.registerOre(OreDictNames.craftingQuartz, aEvent.Ore);
} else if (aMaterial == Materials.Fluix || aMaterial == Materials.Quartz || aMaterial == Materials.Quartzite) {
GT_OreDictUnificator.registerOre(OrePrefixes.crystal, aMaterial, aEvent.Ore); GT_OreDictUnificator.registerOre(OrePrefixes.crystal, aMaterial, aEvent.Ore);
GT_OreDictUnificator.registerOre(OreDictNames.craftingQuartz, 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;
@ -1195,11 +1162,9 @@ 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);
} }
@ -1215,64 +1180,48 @@ 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));
@ -1304,6 +1253,7 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
} }
// System.out.println("Material Name: "+aEvent.Name+ " !!!Unknown Material detected!!! Please report to GregTech Intergalactical for additional compatiblity. This is not an Error, an Issue nor a Lag Source, it is just an Information, which you should pass to me."); // System.out.println("Material Name: "+aEvent.Name+ " !!!Unknown Material detected!!! Please report to GregTech Intergalactical for additional compatiblity. This is not an Error, an Issue nor a Lag Source, it is just an Information, which you should pass to me.");
// GT_Log.ore.println(tModToName + " uses an unknown Material. Report this to GregTech."); // GT_Log.ore.println(tModToName + " uses an unknown Material. Report this to GregTech.");
GT_Log.ore.println(tModToName + " uses an unknown Material.");
return; return;
} }
} else { } else {
@ -1350,11 +1300,9 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
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;
@ -1455,7 +1403,7 @@ 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.player.isDead) && (aEvent.phase == TickEvent.Phase.END) && (aEvent.side.isServer())) { if ((aEvent.side.isServer()) && (aEvent.phase == TickEvent.Phase.END) && (!aEvent.player.isDead)) {
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);
@ -1615,149 +1563,101 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
} }
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);
} } else 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);
} }
return rFuelValue; return rFuelValue;
} }

2
src/main/java/gregtech/common/covers/GT_Cover_RedstoneWirelessBase.java
View file

@ -26,7 +26,7 @@ public abstract class GT_Cover_RedstoneWirelessBase
} }
public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) { public int onCoverScrewdriverclick(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
if (((aX > 0.375D) && (aX < 0.625D)) || ((aSide <= 3) || (((aY > 0.375D) && (aY < 0.625D)) || ((aSide >= 2) || (((aZ <= 0.375D) || (aZ >= 0.625D)) && (aSide != 2) && (aSide != 3)))))) { if (((aX > 0.375D) && (aX < 0.625D)) || ((aSide <= 3) || (((aY > 0.375D) && (aY < 0.625D)) || ((((aZ <= 0.375D) || (aZ >= 0.625D)) && (aSide != 2) && (aSide != 3)))))) {
GregTech_API.sWirelessRedstone.put(Integer.valueOf(aCoverVariable), Byte.valueOf((byte) 0)); GregTech_API.sWirelessRedstone.put(Integer.valueOf(aCoverVariable), Byte.valueOf((byte) 0));
float[] tCoords = GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ); float[] tCoords = GT_Utility.getClickedFacingCoords(aSide, aX, aY, aZ);
switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + 2 * (byte) (int) (tCoords[1] * 2.0F))) { switch ((byte) ((byte) (int) (tCoords[0] * 2.0F) + 2 * (byte) (int) (tCoords[1] * 2.0F))) {

2
src/main/java/gregtech/common/gui/GT_Container_Boiler.java
View file

@ -13,7 +13,7 @@ import java.util.Iterator;
public class GT_Container_Boiler public class GT_Container_Boiler
extends GT_ContainerMetaTile_Machine { extends GT_ContainerMetaTile_Machine {
private final int mSteamCapacity; private int mSteamCapacity = 0;//FB: UR - UR_UNINIT_READ_CALLED_FROM_SUPER_CONSTRUCTOR
public int mWaterAmount = 0; public int mWaterAmount = 0;
public int mSteamAmount = 0; public int mSteamAmount = 0;
public int mProcessingEnergy = 0; public int mProcessingEnergy = 0;

4
src/main/java/gregtech/common/gui/GT_Container_Regulator.java
View file

@ -77,7 +77,7 @@ public class GT_Container_Regulator
} }
return null; return null;
} }
if ((aSlotIndex >= 9) && (aSlotIndex < 18)) { if ((aSlotIndex > 8) && (aSlotIndex < 18)) {
ItemStack tStack = aPlayer.inventory.getItemStack(); ItemStack tStack = aPlayer.inventory.getItemStack();
if (tStack != null) { if (tStack != null) {
tSlot.putStack(GT_Utility.copy(new Object[]{tStack})); tSlot.putStack(GT_Utility.copy(new Object[]{tStack}));
@ -96,7 +96,7 @@ public class GT_Container_Regulator
} }
return null; return null;
} }
if ((aSlotIndex >= 18) && (aSlotIndex < 27)) { if ((aSlotIndex > 17) && (aSlotIndex < 27)) {
((GT_MetaTileEntity_Regulator) this.mTileEntity.getMetaTileEntity()).mTargetSlots[(aSlotIndex - 18)] = Math.min(99, Math.max(0, ((GT_MetaTileEntity_Regulator) this.mTileEntity.getMetaTileEntity()).mTargetSlots[(aSlotIndex - 18)] + (aMouseclick == 0 ? -1 : 1) * (aShifthold == 0 ? 1 : 16))); ((GT_MetaTileEntity_Regulator) this.mTileEntity.getMetaTileEntity()).mTargetSlots[(aSlotIndex - 18)] = Math.min(99, Math.max(0, ((GT_MetaTileEntity_Regulator) this.mTileEntity.getMetaTileEntity()).mTargetSlots[(aSlotIndex - 18)] + (aMouseclick == 0 ? -1 : 1) * (aShifthold == 0 ? 1 : 16)));
return null; return null;
} }

20
src/main/java/gregtech/common/render/GT_CapeRenderer.java
View file

@ -1,17 +1,8 @@
package gregtech.common.render; package gregtech.common.render;
import gregtech.api.enums.GT_Values;
import gregtech.api.util.GT_Log;
import gregtech.api.util.GT_Utility;
import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.model.ModelBiped;
import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.entity.RenderPlayer; import net.minecraft.client.renderer.entity.RenderPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.util.MathHelper;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.RenderPlayerEvent;
import org.lwjgl.opengl.GL11;
import java.util.Collection; import java.util.Collection;
@ -27,7 +18,8 @@ public class GT_CapeRenderer
setRenderManager(RenderManager.instance); setRenderManager(RenderManager.instance);
} }
public void receiveRenderSpecialsEvent(RenderPlayerEvent.Specials.Pre aEvent) { //always off in BMPL
/*public void receiveRenderSpecialsEvent(RenderPlayerEvent.Specials.Pre aEvent) {
AbstractClientPlayer aPlayer = (AbstractClientPlayer) aEvent.entityPlayer; AbstractClientPlayer aPlayer = (AbstractClientPlayer) aEvent.entityPlayer;
if (GT_Utility.getFullInvisibility(aPlayer)) { if (GT_Utility.getFullInvisibility(aPlayer)) {
aEvent.setCanceled(true); aEvent.setCanceled(true);
@ -66,9 +58,9 @@ public class GT_CapeRenderer
float var2f = f6 * 3.141593F / 180.0F; float var2f = f6 * 3.141593F / 180.0F;
float d3 = MathHelper.sin(var2f); float d3 = MathHelper.sin(var2f);
float d4 = -MathHelper.cos(var2f); float d4 = -MathHelper.cos(var2f);
float f7 = /*(float) */d1 * 10.0F; float f7 = d1 * 10.0F;
float f8 = /*(float) */(d0 * d3 + d2 * d4) * 100.0F; float f8 = (d0 * d3 + d2 * d4) * 100.0F;
float f9 = /*(float) */(d0 * d4 - d2 * d3) * 100.0F; float f9 = (d0 * d4 - d2 * d3) * 100.0F;
if (f7 < -6.0F) { if (f7 < -6.0F) {
f7 = -6.0F; f7 = -6.0F;
} }
@ -95,5 +87,5 @@ public class GT_CapeRenderer
e.printStackTrace(GT_Log.err); e.printStackTrace(GT_Log.err);
} }
} }
} }*/
} }

8
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java
View file

@ -103,24 +103,18 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity
&& (addIfInjector(xCenter - 6, yCenter - 1, zCenter + 1, aBaseMetaTileEntity)) && (addIfInjector(xCenter + 6, yCenter - 1, zCenter + 1, aBaseMetaTileEntity)) && (addIfInjector(xCenter - 6, yCenter - 1, zCenter + 1, aBaseMetaTileEntity)) && (addIfInjector(xCenter + 6, yCenter - 1, zCenter + 1, aBaseMetaTileEntity))
&& (addIfInjector(xCenter - 6, yCenter - 1, zCenter - 1, aBaseMetaTileEntity)) && (addIfInjector(xCenter + 6, yCenter - 1, zCenter - 1, aBaseMetaTileEntity)) && (addIfInjector(xCenter - 6, yCenter - 1, zCenter - 1, aBaseMetaTileEntity)) && (addIfInjector(xCenter + 6, yCenter - 1, zCenter - 1, aBaseMetaTileEntity))
&& (this.mEnergyHatches.size() >= 1) && (this.mOutputHatches.size() >= 1) && (this.mInputHatches.size() >= 2)) { && (this.mEnergyHatches.size() >= 1) && (this.mOutputHatches.size() >= 1) && (this.mInputHatches.size() >= 2)) {
if (this.mEnergyHatches != null) {
for (int i = 0; i < this.mEnergyHatches.size(); i++) { for (int i = 0; i < this.mEnergyHatches.size(); i++) {
if (this.mEnergyHatches.get(i).mTier < tier()) if (this.mEnergyHatches.get(i).mTier < tier())
return false; return false;
} }
}
if (this.mOutputHatches != null) {
for (int i = 0; i < this.mOutputHatches.size(); i++) { for (int i = 0; i < this.mOutputHatches.size(); i++) {
if (this.mOutputHatches.get(i).mTier < tier()) if (this.mOutputHatches.get(i).mTier < tier())
return false; return false;
} }
}
if (this.mInputHatches != null) {
for (int i = 0; i < this.mInputHatches.size(); i++) { for (int i = 0; i < this.mInputHatches.size(); i++) {
if (this.mInputHatches.get(i).mTier < tier()) if (this.mInputHatches.get(i).mTier < tier())
return false; return false;
} }
}
mWrench = true; mWrench = true;
mScrewdriver = true; mScrewdriver = true;
mSoftHammer = true; mSoftHammer = true;
@ -272,7 +266,6 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity
this.mLastRecipe = null; this.mLastRecipe = null;
return false; return false;
} }
if (mRunningOnLoad || tRecipe.isRecipeInputEqual(true, tFluids, new ItemStack[]{})) {
this.mLastRecipe = tRecipe; this.mLastRecipe = tRecipe;
this.mEUt = (this.mLastRecipe.mEUt * overclock(this.mLastRecipe.mSpecialValue)); this.mEUt = (this.mLastRecipe.mEUt * overclock(this.mLastRecipe.mSpecialValue));
this.mMaxProgresstime = this.mLastRecipe.mDuration / overclock(this.mLastRecipe.mSpecialValue); this.mMaxProgresstime = this.mLastRecipe.mDuration / overclock(this.mLastRecipe.mSpecialValue);
@ -282,7 +275,6 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity
mRunningOnLoad = false; mRunningOnLoad = false;
return true; return true;
} }
}
return false; return false;
} }

26
src/main/java/gregtech/loaders/oreprocessing/ProcessingOre.java
View file

@ -47,9 +47,6 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra
ItemStack tCleaned = GT_OreDictUnificator.get(OrePrefixes.crushedPurified, tMaterial, tDust, 1L); ItemStack tCleaned = GT_OreDictUnificator.get(OrePrefixes.crushedPurified, tMaterial, tDust, 1L);
ItemStack tCrushed = GT_OreDictUnificator.get(OrePrefixes.crushed, tMaterial, aMaterial.mOreMultiplier * aMultiplier); ItemStack tCrushed = GT_OreDictUnificator.get(OrePrefixes.crushed, tMaterial, aMaterial.mOreMultiplier * aMultiplier);
ItemStack tPrimaryByProduct = null; ItemStack tPrimaryByProduct = null;
ItemStack tPrimaryByProductSmall = null;
ItemStack tSecondaryByProduct = null;
ItemStack tSecondaryByProductSmall = null;
if (tCrushed == null) { if (tCrushed == null) {
tCrushed = GT_OreDictUnificator.get(OrePrefixes.dustImpure, tMaterial, GT_Utility.copyAmount(aMaterial.mOreMultiplier * aMultiplier, new Object[]{tCleaned, tDust, tGem}), aMaterial.mOreMultiplier * aMultiplier); tCrushed = GT_OreDictUnificator.get(OrePrefixes.dustImpure, tMaterial, GT_Utility.copyAmount(aMaterial.mOreMultiplier * aMultiplier, new Object[]{tCleaned, tDust, tGem}), aMaterial.mOreMultiplier * aMultiplier);
@ -63,17 +60,12 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra
if (tPrimaryByProduct == null) { if (tPrimaryByProduct == null) {
tPrimaryByMaterial = tMat; tPrimaryByMaterial = tMat;
tPrimaryByProduct = GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L); tPrimaryByProduct = GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L);
tPrimaryByProductSmall = GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L); if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null)
if (tPrimaryByProductSmall == null) GT_OreDictUnificator.get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L);
tPrimaryByProductSmall = GT_OreDictUnificator.get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L);
}
if ((tSecondaryByProduct == null) || (tSecondaryByMaterial == tPrimaryByMaterial)) {
tSecondaryByMaterial = tMat;
tSecondaryByProduct = GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L);
tSecondaryByProductSmall = GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L);
if (tSecondaryByProductSmall == null) {
tSecondaryByProductSmall = GT_OreDictUnificator.get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L);
} }
GT_OreDictUnificator.get(OrePrefixes.dust, tMat, 1L);
if (GT_OreDictUnificator.get(OrePrefixes.dustSmall, tMat, 1L) == null) {
GT_OreDictUnificator.get(OrePrefixes.dustTiny, tMat, GT_OreDictUnificator.get(OrePrefixes.nugget, tMat, 2L), 2L);
} }
} }
if ((!tByProductStacks.isEmpty()) && (!this.mAlreadyListedOres.contains(aMaterial))) { if ((!tByProductStacks.isEmpty()) && (!this.mAlreadyListedOres.contains(aMaterial))) {
@ -83,14 +75,6 @@ public class ProcessingOre implements gregtech.api.interfaces.IOreRecipeRegistra
if (tPrimaryByMaterial == null) tPrimaryByMaterial = tMaterial; if (tPrimaryByMaterial == null) tPrimaryByMaterial = tMaterial;
if (tPrimaryByProduct == null) tPrimaryByProduct = tDust; if (tPrimaryByProduct == null) tPrimaryByProduct = tDust;
if (tPrimaryByProductSmall == null) {
tPrimaryByProductSmall = tSmall;
}
//if (tSecondaryByMaterial == null) tSecondaryByMaterial = tPrimaryByMaterial;//dead code?
//if (tSecondaryByProduct == null) tSecondaryByProduct = tPrimaryByProduct;//dead code?
//if (tSecondaryByProductSmall == null) {
//tSecondaryByProductSmall = tPrimaryByProductSmall;//dead code?
//}
boolean tHasSmelting = false; boolean tHasSmelting = false;
if (tSmeltInto != null) { if (tSmeltInto != null) {