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

Fix Assembly line work without energy(Muramasa)

Browse source 
Assembly line dont work on Z coordinates.(Muramasa)
This commit is contained in:
Dream-Master 2016-08-22 21:41:44 +02:00
parent 7a5d9b73d9
commit aa33e48c88
2 changed files with 57 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.properties
View file

@ -1,7 +1,7 @@
minecraft.version=1.7.10
forge.version=10.13.4.1566-1.7.10
gt.version=5.09.22.42
gt.version=5.09.22.43
ae2.version=rv2-beta-33
applecore.version=1.7.10-1.2.1+107.59407

110
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
View file

@ -67,58 +67,58 @@ public class GT_MetaTileEntity_AssemblyLine
}
public boolean checkRecipe(ItemStack aStack) {
if(!GT_Utility.isStackValid(mInventory[1]) && !ItemList.Tool_DataStick.isStackEqual(mInventory[1], false, true))return false;
NBTTagCompound tTag = mInventory[1].getTagCompound();
if(tTag==null)return false;
ItemStack tStack[] = new ItemStack[15];
for(int i = 0;i<15;i++){
if(tTag.hasKey(""+i)){
tStack[i] = GT_Utility.loadItem(tTag, ""+i);
if(tStack[i]!=null){
if(mInputBusses.get(i)==null)return false;
if(GT_Utility.areStacksEqual(tStack[i],mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0),true) && tStack[i].stackSize <= mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0).stackSize){
}else{return false;}
}}
}
FluidStack[] tFluids = new FluidStack[4];
for(int i = 0;i<4;i++){
if(tTag.hasKey("f"+i)){
tFluids[i] = GT_Utility.loadFluid(tTag, "f"+i);
if(tFluids[i]!=null){
if(mInputHatches.get(i)==null)return false;
if(mInputHatches.get(i).mFluid!=null && GT_Utility.areFluidsEqual(mInputHatches.get(i).mFluid, tFluids[i], true) && mInputHatches.get(i).mFluid.amount>=tFluids[i].amount){
}else{return false;}
}
}
}
if(tTag.hasKey("output")){
mOutputItems = new ItemStack[]{GT_Utility.loadItem(tTag, "output")};
if(mOutputItems==null||mOutputItems[0]==null||!GT_Utility.isStackValid(mOutputItems[0]))return false;
}else{return false;}
if(tTag.hasKey("time")){
mMaxProgresstime = tTag.getInteger("time");
if(mMaxProgresstime<=0)return false;
}else{return false;}
if(tTag.hasKey("eu")){
mEUt = tTag.getInteger("eu");
}else{return false;}
for(int i = 0;i<15;i++){
if(tStack[i]!=null){
mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0).stackSize -= tStack[i].stackSize;
if(mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0).stackSize <= 0){
}
}
}
for(int i = 0;i<4;i++){
if(tFluids[i]!=null){
mInputHatches.get(i).mFluid.amount -= tFluids[i].amount;
if(mInputHatches.get(i).mFluid.amount<=0){
mInputHatches.get(i).mFluid = null;
}
}
}
byte tTier = (byte) Math.max(1, GT_Utility.getTier(getMaxInputVoltage()));
if(!GT_Utility.isStackValid(mInventory[1]) && !ItemList.Tool_DataStick.isStackEqual(mInventory[1], false, true))return false;
NBTTagCompound tTag = mInventory[1].getTagCompound();
if(tTag==null)return false;
ItemStack tStack[] = new ItemStack[15];
for(int i = 0;i<15;i++){
if(tTag.hasKey(""+i)){
tStack[i] = GT_Utility.loadItem(tTag, ""+i);
if(tStack[i]!=null){
if(mInputBusses.get(i)==null)return false;
if(GT_Utility.areStacksEqual(tStack[i],mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0),true) && tStack[i].stackSize <= mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0).stackSize){
}else{return false;}
}}
}
FluidStack[] tFluids = new FluidStack[4];
for(int i = 0;i<4;i++){
if(tTag.hasKey("f"+i)){
tFluids[i] = GT_Utility.loadFluid(tTag, "f"+i);
if(tFluids[i]!=null){
if(mInputHatches.get(i)==null)return false;
if(mInputHatches.get(i).mFluid!=null && GT_Utility.areFluidsEqual(mInputHatches.get(i).mFluid, tFluids[i], true) && mInputHatches.get(i).mFluid.amount>=tFluids[i].amount){
}else{return false;}
}
}
}
if(tTag.hasKey("output")){
mOutputItems = new ItemStack[]{GT_Utility.loadItem(tTag, "output")};
if(mOutputItems==null||mOutputItems[0]==null||!GT_Utility.isStackValid(mOutputItems[0]))return false;
}else{return false;}
if(tTag.hasKey("time")){
mMaxProgresstime = tTag.getInteger("time");
if(mMaxProgresstime<=0)return false;
}else{return false;}
if(tTag.hasKey("eu")){
mEUt = tTag.getInteger("eu");
}else{return false;}
for(int i = 0;i<15;i++){
if(tStack[i]!=null){
mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0).stackSize -= tStack[i].stackSize;
if(mInputBusses.get(i).getBaseMetaTileEntity().getStackInSlot(0).stackSize <= 0){
}
}
}
for(int i = 0;i<4;i++){
if(tFluids[i]!=null){
mInputHatches.get(i).mFluid.amount -= tFluids[i].amount;
if(mInputHatches.get(i).mFluid.amount<=0){
mInputHatches.get(i).mFluid = null;
}
}
}
byte tTier = (byte) Math.max(1, GT_Utility.getTier(getMaxInputVoltage()));
this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
this.mEfficiencyIncrease = 10000;
if (mEUt <= 16) {
@ -159,6 +159,7 @@ public class GT_MetaTileEntity_AssemblyLine
tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, 1, i);
if (!addEnergyInputToMachineList(tTileEntity, 16)){
if (i==0) return false;
if (aBaseMetaTileEntity.getBlockOffset(xDir, 1, i) != GregTech_API.sBlockCasings2) {return false;}
if (aBaseMetaTileEntity.getMetaIDOffset(xDir, 1, i) != 0) {return false;}
}
@ -174,7 +175,7 @@ public class GT_MetaTileEntity_AssemblyLine
if (aBaseMetaTileEntity.getMetaIDOffset(xDir*2, -2, i) != 0) {return false;}
}
tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir, -2, i);
if (!addInputToMachineList(tTileEntity, 16)){
if (!addOutputToMachineList(tTileEntity, 16)){
if (!addOutputToMachineList(tTileEntity, 16)){;return false;
}else{if(r>0){return true;}else{return false;}}
}
@ -193,6 +194,7 @@ public class GT_MetaTileEntity_AssemblyLine
tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(i, 1, zDir);
if (!addEnergyInputToMachineList(tTileEntity, 16)){
if (i==0) return false;
if (aBaseMetaTileEntity.getBlockOffset(i, 1, zDir) != GregTech_API.sBlockCasings2) {return false;}
if (aBaseMetaTileEntity.getMetaIDOffset(i, 1, zDir) != 0) {return false;}
}
@ -236,4 +238,4 @@ public class GT_MetaTileEntity_AssemblyLine
public boolean explodesOnComponentBreak(ItemStack aStack) {
return false;
}
}
}