diff options
Diffstat (limited to 'src/main/java/goodgenerator/blocks')
10 files changed, 27 insertions, 23 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java b/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java index 13f7919100..c3fe301db1 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/ExtremeHeatExchanger.java @@ -303,7 +303,7 @@ public class ExtremeHeatExchanger extends GT_MetaTileEntity_MultiblockBase_EM im @Override public void construct(ItemStack stackSize, boolean hintsOnly) { - structureBuild_EM(mName, 2, 5, 0, hintsOnly, stackSize); + structureBuild_EM(mName, 2, 5, 0, stackSize, hintsOnly); } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java b/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java index e68c92f8e8..647c3ac073 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/FuelRefineFactory.java @@ -68,7 +68,7 @@ public class FuelRefineFactory extends GT_MetaTileEntity_MultiblockBase_EM imple @Override public void construct(ItemStack itemStack, boolean hintsOnly) { - structureBuild_EM(mName, 7, 12, 1, hintsOnly, itemStack); + structureBuild_EM(mName, 7, 12, 1, itemStack, hintsOnly); } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java index b7195521a3..e8d425d1eb 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeEssentiaGenerator.java @@ -59,8 +59,8 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_MultiblockBase_EM } @Override - public void construct(ItemStack itemStack, boolean b) { - structureBuild_EM(mName, 4, 0, 4, b, itemStack); + public void construct(ItemStack itemStack, boolean hintsOnly) { + structureBuild_EM(mName, 4, 0, 4, itemStack, hintsOnly); } @Override @@ -505,8 +505,8 @@ public class LargeEssentiaGenerator extends GT_MetaTileEntity_MultiblockBase_EM .addInfo("Controller block for the Large Essentia Generator") .addInfo("Maybe some thaumaturages are upset by it. . .") .addInfo("Transform essentia into energy!") - .addInfo("The the Diffusion Cell determines the highest hatch tier that LEG can accept.") - .addInfo("You can find more information about this generator in Thaumonomicon.") + .addInfo("The Diffusion Cell determines the highest hatch tier that the LEG can accept.") + .addInfo("You can find more information about this generator in the Thaumonomicon.") .addInfo("The structure is too complex!") .addInfo(BLUE_PRINT_INFO) .addSeparator() diff --git a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer.java b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer.java index c6eda8c51d..807e0af620 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/LargeFusionComputer.java @@ -2,6 +2,7 @@ package goodgenerator.blocks.tileEntity; import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; +import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.objects.GT_ChunkManager; @@ -17,6 +18,11 @@ public class LargeFusionComputer extends GT_MetaTileEntity_MultiblockBase_EM imp super(name); } + @Override + public IStructureDefinition<? extends GT_MetaTileEntity_MultiblockBase_EM> getStructure_EM() { + return null; + } + public LargeFusionComputer(int id, String name, String nameRegional) { super(id,name,nameRegional); } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MegaPlasmaTurbine.java b/src/main/java/goodgenerator/blocks/tileEntity/MegaPlasmaTurbine.java index 0e2dda7389..4ac1d7af6a 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MegaPlasmaTurbine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MegaPlasmaTurbine.java @@ -2,10 +2,10 @@ package goodgenerator.blocks.tileEntity; import com.github.bartimaeusnek.crossmod.tectech.TecTechEnabledMulti; -import com.github.technus.tectech.mechanics.constructable.IConstructable; -import com.github.technus.tectech.mechanics.structure.IStructureDefinition; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyMulti; import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_EnergyTunnel; +import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; +import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; import gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_LargeTurbine_Plasma; import net.minecraft.item.ItemStack; diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java b/src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java index 64a8b38f3d..0aa342ecf3 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MultiNqGenerator.java @@ -72,7 +72,7 @@ public class MultiNqGenerator extends GT_MetaTileEntity_MultiblockBase_EM implem @Override public void construct(ItemStack itemStack, boolean hintsOnly) { - structureBuild_EM(mName, 3,7,0, hintsOnly, itemStack); + structureBuild_EM(mName, 3,7,0, itemStack, hintsOnly); } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java b/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java index f7d997e506..69b7173c36 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java @@ -399,11 +399,11 @@ public class NeutronActivator extends GT_MetaTileEntity_MultiblockBase_EM implem @Override public void construct(ItemStack stackSize, boolean hintsOnly) { - structureBuild_EM(NA_BOTTOM, 2, 0, 0, hintsOnly, stackSize); + structureBuild_EM(NA_BOTTOM, 2, 0, 0, stackSize, hintsOnly); int heights = stackSize.stackSize + 3; - structureBuild_EM(NA_TOP, 2, heights + 1, 0, hintsOnly, stackSize); + structureBuild_EM(NA_TOP, 2, heights + 1, 0, stackSize, hintsOnly); while (heights > 0) { - structureBuild_EM(NA_MID, 2, heights, 0, hintsOnly, stackSize); + structureBuild_EM(NA_MID, 2, heights, 0, stackSize, hintsOnly); heights --; } } diff --git a/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java b/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java index 188d31ff02..f0dc138305 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/PreciseAssembler.java @@ -308,7 +308,7 @@ public class PreciseAssembler extends GT_MetaTileEntity_MultiblockBase_EM implem @Override public void construct(ItemStack stackSize, boolean hintsOnly) { - structureBuild_EM(mName, 4, 4, 0, hintsOnly, stackSize); + structureBuild_EM(mName, 4, 4, 0, stackSize, hintsOnly); } @Override diff --git a/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java b/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java index 50db40e903..cb8ca6737e 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/UniversalChemicalFuelEngine.java @@ -179,8 +179,8 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_MultiblockBas } @Override - public void construct(ItemStack itemStack, boolean b) { - structureBuild_EM(mName, 2, 2, 0, b, itemStack); + public void construct(ItemStack stackSize, boolean hintsOnly) { + structureBuild_EM(mName, 2, 2, 0, stackSize, hintsOnly); } @Override @@ -249,7 +249,7 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_MultiblockBas consumeAllLiquid(getPromoter()); this.mEUt = (int)(FuelAmount * recipe.mSpecialValue / 20.0D); - this.lEUt = (long)(FuelAmount * recipe.mSpecialValue / 20.0D); + this.lEUt = (long)((long) FuelAmount * recipe.mSpecialValue / 20.0D); this.mMaxProgresstime = 20; this.updateSlots(); return true; @@ -266,7 +266,7 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_MultiblockBas consumeAllLiquid(getPromoter()); this.mEUt = (int)(FuelAmount * recipe.mSpecialValue / 20.0D); - this.lEUt = (long)(FuelAmount * recipe.mSpecialValue / 20.0D); + this.lEUt = (long)((long) FuelAmount * recipe.mSpecialValue / 20.0D); this.mMaxProgresstime = 20; this.updateSlots(); return true; @@ -285,7 +285,7 @@ public class UniversalChemicalFuelEngine extends GT_MetaTileEntity_MultiblockBas consumeAllLiquid(getPromoter()); this.mEUt = (int)(FuelAmount * recipe.mSpecialValue * 3 / 20.0D); - this.lEUt = (long)(FuelAmount * recipe.mSpecialValue * 3 / 20.0D); + this.lEUt = (long)((long) FuelAmount * recipe.mSpecialValue * 3 / 20.0D); this.mMaxProgresstime = 20; this.updateSlots(); return true; diff --git a/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java b/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java index de38e6b61b..d684738ecd 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/YottaFluidTank.java @@ -23,8 +23,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; -import gregtech.api.util.GT_Utility; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -410,12 +408,12 @@ public class YottaFluidTank extends GT_MetaTileEntity_MultiblockBase_EM implemen @Override public void construct(ItemStack stackSize, boolean hintsOnly) { - structureBuild_EM(YOTTANK_BOTTOM, 2, 0, 0, hintsOnly, stackSize); + structureBuild_EM(YOTTANK_BOTTOM, 2, 0, 0, stackSize, hintsOnly); int height = stackSize.stackSize; if (height > 15) height = 15; - structureBuild_EM(YOTTANK_TOP, 2, height + 2, 0, hintsOnly, stackSize); + structureBuild_EM(YOTTANK_TOP, 2, height + 2, 0, stackSize, hintsOnly); while (height > 0) { - structureBuild_EM(YOTTANK_MID, 2, height, 0, hintsOnly, stackSize); + structureBuild_EM(YOTTANK_MID, 2, height, 0, stackSize, hintsOnly); height --; } } |