From e4b5d3378a570b54816f75c897b2265fbed9c2e1 Mon Sep 17 00:00:00 2001 From: alexpic57 Date: Thu, 7 Sep 2017 23:59:46 +0200 Subject: [PATCH 1/5] update Implosion Compressor to GuiBase --- .../client/gui/GuiImplosionCompressor.java | 126 ++++++++++++------ .../ImplosionCompressorRecipeCategory.java | 23 ++-- .../ImplosionCompressorRecipeWrapper.java | 9 +- .../multiblock/TileImplosionCompressor.java | 17 ++- 4 files changed, 116 insertions(+), 59 deletions(-) diff --git a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java index 01e16cedf..39024db07 100644 --- a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java @@ -24,69 +24,119 @@ package techreborn.client.gui; +import net.minecraft.block.state.IBlockState; +import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.EnumFacing; import net.minecraft.util.ResourceLocation; -import net.minecraft.client.resources.I18n; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.text.translation.I18n; +import reborncore.client.multiblock.Multiblock; +import reborncore.client.multiblock.MultiblockRenderEvent; +import reborncore.client.multiblock.MultiblockSet; +import reborncore.common.misc.Location; +import techreborn.Core; +import techreborn.client.gui.widget.GuiButtonHologram; +import techreborn.init.ModBlocks; +import techreborn.proxies.ClientProxy; import techreborn.tiles.multiblock.TileImplosionCompressor; -public class GuiImplosionCompressor extends GuiContainer { +import java.io.IOException; - public static final ResourceLocation texture = new ResourceLocation("techreborn", - "textures/gui/implosion_compressor.png"); +public class GuiImplosionCompressor extends GuiBase { - TileImplosionCompressor compressor; + TileImplosionCompressor tile; - public GuiImplosionCompressor(final EntityPlayer player, final TileImplosionCompressor compressor) { - super(compressor.createContainer(player)); - this.xSize = 176; - this.ySize = 167; - this.compressor = compressor; + public GuiImplosionCompressor(final EntityPlayer player, final TileImplosionCompressor tile) { + super(player, tile, tile.createContainer(player)); + this.tile = tile; } @Override public void initGui() { super.initGui(); + ClientProxy.multiblockRenderEvent.setMultiblock(null); } @Override - protected void drawGuiContainerBackgroundLayer(final float p_146976_1_, final int p_146976_2_, final int p_146976_3_) { - this.drawDefaultBackground(); + protected void drawGuiContainerBackgroundLayer(final float f, final int mouseX, final int mouseY) { + super.drawGuiContainerBackgroundLayer(f, mouseX, mouseY); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(GuiImplosionCompressor.texture); - final int k = (this.width - this.xSize) / 2; - final int l = (this.height - this.ySize) / 2; - this.drawTexturedModalRect(k, l, 0, 0, this.xSize, this.ySize); + final GuiBase.Layer layer = Layer.BACKGROUND; - if (!this.compressor.getMutliBlock()) { - // GuiDraw.drawTooltipBox(k + 30, l + 50 + 12 - 0, 114, 10); - this.fontRenderer.drawString(I18n.format("techreborn.message.missingmultiblock"), k + 38, l + 52 + 12, -1); - } + drawSlot(50, 27, layer); + drawSlot(50,47,layer); + drawSlot(92,36,layer); + drawSlot(110,36,layer); - this.mc.getTextureManager().bindTexture(GuiImplosionCompressor.texture); - int j = this.compressor.getProgressScaled(24); - if (j > 0) { - this.drawTexturedModalRect(k + 61, l + 37, 176, 14, j + 1, 16); - } + if(tile.getMutliBlock()) { + builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); + } - j = this.compressor.getEnergyScaled(12); - if (j > 0) { - this.drawTexturedModalRect(k + 14, l + 36 + 12 - j, 176, 12 - j, 14, j + 2); - } + this.builder.drawJEIButton(this, 150, 4, layer); } @Override - protected void drawGuiContainerForegroundLayer(final int p_146979_1_, final int p_146979_2_) { - final String name = I18n.format("tile.techreborn:implosion_compressor.name"); - this.fontRenderer.drawString(name, this.xSize / 2 - this.fontRenderer.getStringWidth(name) / 2, 6, 4210752); - this.fontRenderer.drawString(I18n.format("container.inventory", new Object[0]), 8, this.ySize - 96 + 2, 4210752); + protected void drawGuiContainerForegroundLayer(final int mouseX, final int mouseY) { + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + final GuiBase.Layer layer = Layer.FOREGROUND; + + this.builder.drawProgressBar(this, this.tile.getProgressScaled(100), 100, 71, 40, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); + this.builder.drawMultiEnergyBar(this, 9, 19, (int) this.tile.getEnergy(), (int) this.tile.getMaxPower(), mouseX, mouseY, 0, layer); + if(tile.getMutliBlock()){ + addHologramButton(6, 4, 212, layer); + } else { + builder.drawMultiblockMissingBar(this, layer); + addHologramButton(76, 56, 212, layer); + builder.drawHologramButton(this, 76, 56, mouseX, mouseY, layer); + } } - @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) { - super.drawScreen(mouseX, mouseY, partialTicks); - this.renderHoveredToolTip(mouseX, mouseY); - } + public void addHologramButton(int x, int y, int id, Layer layer) { + if (id == 0) + buttonList.clear(); + int factorX = 0; + int factorY = 0; + if (layer == Layer.BACKGROUND) { + factorX = guiLeft; + factorY = guiTop; + } + buttonList.add(new GuiButtonHologram(id, x + factorX, y + factorY, this, layer)); + } + @Override + public void actionPerformed(final GuiButton button) throws IOException { + super.actionPerformed(button); + if (button.id == 212) { + if (ClientProxy.multiblockRenderEvent.currentMultiblock == null) { + { + // This code here makes a basic multiblock and then sets to the selected one. + final Multiblock multiblock = new Multiblock(); + for(int x = -1; x <= 1; x++) { + for(int y = -4; y <= -2; y++) { + for(int z = -1; z <= 1; z++) { + if(!((x == 0) && (y == -3) && (z == 0))) { + this.addComponent(x, y, z, ModBlocks.MACHINE_CASINGS.getStateFromMeta(1), multiblock); + } + } + } + } + + final MultiblockSet set = new MultiblockSet(multiblock); + ClientProxy.multiblockRenderEvent.setMultiblock(set); + ClientProxy.multiblockRenderEvent.parent = new Location(this.tile.getPos().getX(), this.tile.getPos().getY(), this.tile.getPos().getZ(), this.tile.getWorld()); + MultiblockRenderEvent.anchor = new BlockPos(this.tile.getPos().getX(), this.tile.getPos().getY(), this.tile.getPos().getZ()); + } + } else { + ClientProxy.multiblockRenderEvent.setMultiblock(null); + } + } + } + + public void addComponent(final int x, final int y, final int z, final IBlockState blockState, final Multiblock multiblock) { + multiblock.addComponent(new BlockPos(x, y, z), blockState); + } } diff --git a/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java index 00189da4c..f27fa08a0 100644 --- a/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java @@ -29,6 +29,8 @@ import mezz.jei.api.gui.*; import mezz.jei.api.ingredients.IIngredients; import mezz.jei.api.recipe.BlankRecipeCategory; import net.minecraft.client.Minecraft; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; import net.minecraft.util.text.translation.I18n; import techreborn.client.gui.GuiImplosionCompressor; import techreborn.compat.jei.RecipeCategoryUids; @@ -38,18 +40,15 @@ import techreborn.lib.ModInfo; import javax.annotation.Nonnull; public class ImplosionCompressorRecipeCategory extends BlankRecipeCategory { + public static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/jei.png"); private static final int[] INPUT_SLOTS = { 0, 1 }; private static final int[] OUTPUT_SLOTS = { 2, 3 }; private final IDrawable background; - private final IDrawable electricity; private final String title; public ImplosionCompressorRecipeCategory(IGuiHelper guiHelper) { - background = guiHelper.createDrawable(GuiImplosionCompressor.texture, 16, 25, 116, 36); - IDrawableStatic electricityDrawable = guiHelper.createDrawable(GuiImplosionCompressor.texture, 176, 0, 14, 14); - electricity = guiHelper.createAnimatedDrawable(electricityDrawable, 300, IDrawableAnimated.StartDirection.TOP, - true); + background = guiHelper.createDrawable(texture, 0, 95, 120, 42); title = I18n.translateToLocal("tile.techreborn:implosion_compressor.name"); } @@ -76,12 +75,6 @@ public class ImplosionCompressorRecipeCategory extends BlankRecipeCategory Date: Fri, 8 Sep 2017 13:58:27 +0200 Subject: [PATCH 2/5] fix identation + remove unused import + fix jei button on ImplosionCompressor --- .../client/gui/GuiImplosionCompressor.java | 122 +++++++++--------- .../compat/jei/TechRebornJeiPlugin.java | 2 +- .../ImplosionCompressorRecipeCategory.java | 18 +-- .../ImplosionCompressorRecipeWrapper.java | 12 +- .../multiblock/TileImplosionCompressor.java | 13 -- 5 files changed, 77 insertions(+), 90 deletions(-) diff --git a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java index 39024db07..e9cf2723f 100644 --- a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java @@ -57,86 +57,86 @@ public class GuiImplosionCompressor extends GuiBase { @Override public void initGui() { super.initGui(); - ClientProxy.multiblockRenderEvent.setMultiblock(null); + ClientProxy.multiblockRenderEvent.setMultiblock(null); } @Override protected void drawGuiContainerBackgroundLayer(final float f, final int mouseX, final int mouseY) { - super.drawGuiContainerBackgroundLayer(f, mouseX, mouseY); + super.drawGuiContainerBackgroundLayer(f, mouseX, mouseY); GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); final GuiBase.Layer layer = Layer.BACKGROUND; drawSlot(50, 27, layer); - drawSlot(50,47,layer); - drawSlot(92,36,layer); - drawSlot(110,36,layer); + drawSlot(50, 47, layer); + drawSlot(92, 36, layer); + drawSlot(110, 36, layer); - if(tile.getMutliBlock()) { - builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); - } + if (tile.getMutliBlock()) { + builder.drawHologramButton(this, 6, 4, mouseX, mouseY, layer); + } - this.builder.drawJEIButton(this, 150, 4, layer); + this.builder.drawJEIButton(this, 150, 4, layer); } @Override protected void drawGuiContainerForegroundLayer(final int mouseX, final int mouseY) { - super.drawGuiContainerForegroundLayer(mouseX, mouseY); - final GuiBase.Layer layer = Layer.FOREGROUND; + super.drawGuiContainerForegroundLayer(mouseX, mouseY); + final GuiBase.Layer layer = Layer.FOREGROUND; - this.builder.drawProgressBar(this, this.tile.getProgressScaled(100), 100, 71, 40, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); - this.builder.drawMultiEnergyBar(this, 9, 19, (int) this.tile.getEnergy(), (int) this.tile.getMaxPower(), mouseX, mouseY, 0, layer); - if(tile.getMutliBlock()){ - addHologramButton(6, 4, 212, layer); - } else { - builder.drawMultiblockMissingBar(this, layer); - addHologramButton(76, 56, 212, layer); - builder.drawHologramButton(this, 76, 56, mouseX, mouseY, layer); - } + this.builder.drawProgressBar(this, this.tile.getProgressScaled(100), 100, 71, 40, mouseX, mouseY, TRBuilder.ProgressDirection.RIGHT, layer); + this.builder.drawMultiEnergyBar(this, 9, 19, (int) this.tile.getEnergy(), (int) this.tile.getMaxPower(), mouseX, mouseY, 0, layer); + if (tile.getMutliBlock()) { + addHologramButton(6, 4, 212, layer); + } else { + builder.drawMultiblockMissingBar(this, layer); + addHologramButton(76, 56, 212, layer); + builder.drawHologramButton(this, 76, 56, mouseX, mouseY, layer); + } } - public void addHologramButton(int x, int y, int id, Layer layer) { - if (id == 0) - buttonList.clear(); - int factorX = 0; - int factorY = 0; - if (layer == Layer.BACKGROUND) { - factorX = guiLeft; - factorY = guiTop; - } - buttonList.add(new GuiButtonHologram(id, x + factorX, y + factorY, this, layer)); - } + public void addHologramButton(int x, int y, int id, Layer layer) { + if (id == 0) + buttonList.clear(); + int factorX = 0; + int factorY = 0; + if (layer == Layer.BACKGROUND) { + factorX = guiLeft; + factorY = guiTop; + } + buttonList.add(new GuiButtonHologram(id, x + factorX, y + factorY, this, layer)); + } - @Override - public void actionPerformed(final GuiButton button) throws IOException { - super.actionPerformed(button); - if (button.id == 212) { - if (ClientProxy.multiblockRenderEvent.currentMultiblock == null) { - { - // This code here makes a basic multiblock and then sets to the selected one. - final Multiblock multiblock = new Multiblock(); - for(int x = -1; x <= 1; x++) { - for(int y = -4; y <= -2; y++) { - for(int z = -1; z <= 1; z++) { - if(!((x == 0) && (y == -3) && (z == 0))) { - this.addComponent(x, y, z, ModBlocks.MACHINE_CASINGS.getStateFromMeta(1), multiblock); - } - } - } - } + @Override + public void actionPerformed(final GuiButton button) throws IOException { + super.actionPerformed(button); + if (button.id == 212) { + if (ClientProxy.multiblockRenderEvent.currentMultiblock == null) { + { + // This code here makes a basic multiblock and then sets to the selected one. + final Multiblock multiblock = new Multiblock(); + for (int x = -1; x <= 1; x++) { + for (int y = -4; y <= -2; y++) { + for (int z = -1; z <= 1; z++) { + if (!((x == 0) && (y == -3) && (z == 0))) { + this.addComponent(x, y, z, ModBlocks.MACHINE_CASINGS.getStateFromMeta(1), multiblock); + } + } + } + } - final MultiblockSet set = new MultiblockSet(multiblock); - ClientProxy.multiblockRenderEvent.setMultiblock(set); - ClientProxy.multiblockRenderEvent.parent = new Location(this.tile.getPos().getX(), this.tile.getPos().getY(), this.tile.getPos().getZ(), this.tile.getWorld()); - MultiblockRenderEvent.anchor = new BlockPos(this.tile.getPos().getX(), this.tile.getPos().getY(), this.tile.getPos().getZ()); - } - } else { - ClientProxy.multiblockRenderEvent.setMultiblock(null); - } - } - } + final MultiblockSet set = new MultiblockSet(multiblock); + ClientProxy.multiblockRenderEvent.setMultiblock(set); + ClientProxy.multiblockRenderEvent.parent = new Location(this.tile.getPos().getX(), this.tile.getPos().getY(), this.tile.getPos().getZ(), this.tile.getWorld()); + MultiblockRenderEvent.anchor = new BlockPos(this.tile.getPos().getX(), this.tile.getPos().getY(), this.tile.getPos().getZ()); + } + } else { + ClientProxy.multiblockRenderEvent.setMultiblock(null); + } + } + } - public void addComponent(final int x, final int y, final int z, final IBlockState blockState, final Multiblock multiblock) { - multiblock.addComponent(new BlockPos(x, y, z), blockState); - } + public void addComponent(final int x, final int y, final int z, final IBlockState blockState, final Multiblock multiblock) { + multiblock.addComponent(new BlockPos(x, y, z), blockState); + } } diff --git a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java index f8fa4b411..840941b03 100644 --- a/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java +++ b/src/main/java/techreborn/compat/jei/TechRebornJeiPlugin.java @@ -253,7 +253,7 @@ public class TechRebornJeiPlugin extends BlankModPlugin { registry.addRecipeClickArea(GuiAlloySmelter.class, 80, 35, 26, 20, RecipeCategoryUids.ALLOY_SMELTER); registry.addRecipeClickArea(GuiAssemblingMachine.class, 85, 34, 24, 20, RecipeCategoryUids.ASSEMBLING_MACHINE); registry.addRecipeClickArea(GuiFusionReactor.class, 111, 34, 27, 19, RecipeCategoryUids.FUSION_REACTOR); - registry.addRecipeClickArea(GuiImplosionCompressor.class, 60, 37, 24, 15, + registry.addRecipeClickArea(GuiImplosionCompressor.class, 150, 4, 20, 12, RecipeCategoryUids.IMPLOSION_COMPRESSOR); registry.addRecipeClickArea(GuiIndustrialElectrolyzer.class, 72, 37, 33, 14, RecipeCategoryUids.INDUSTRIAL_ELECTROLYZER); diff --git a/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java index f27fa08a0..17fa0b25c 100644 --- a/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java +++ b/src/main/java/techreborn/compat/jei/implosionCompressor/ImplosionCompressorRecipeCategory.java @@ -40,9 +40,9 @@ import techreborn.lib.ModInfo; import javax.annotation.Nonnull; public class ImplosionCompressorRecipeCategory extends BlankRecipeCategory { - public static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/jei.png"); - private static final int[] INPUT_SLOTS = { 0, 1 }; - private static final int[] OUTPUT_SLOTS = { 2, 3 }; + public static final ResourceLocation texture = new ResourceLocation("techreborn", "textures/gui/jei.png"); + private static final int[] INPUT_SLOTS = {0, 1}; + private static final int[] OUTPUT_SLOTS = {2, 3}; private final IDrawable background; private final String title; @@ -77,12 +77,12 @@ public class ImplosionCompressorRecipeCategory extends BlankRecipeCategory Date: Fri, 8 Sep 2017 21:18:57 +0200 Subject: [PATCH 3/5] fix bug duplication #1012 --- .../container/builder/BuiltContainer.java | 16 +++++++++--- .../container/builder/ContainerBuilder.java | 25 ++++++++++++++++++- .../TileFusionControlComputer.java | 2 +- 3 files changed, 38 insertions(+), 5 deletions(-) diff --git a/src/main/java/techreborn/client/container/builder/BuiltContainer.java b/src/main/java/techreborn/client/container/builder/BuiltContainer.java index a1d56bc73..375cf83e5 100644 --- a/src/main/java/techreborn/client/container/builder/BuiltContainer.java +++ b/src/main/java/techreborn/client/container/builder/BuiltContainer.java @@ -24,6 +24,7 @@ package techreborn.client.container.builder; +import ic2.core.energy.grid.Tile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; @@ -32,6 +33,7 @@ import net.minecraftforge.fml.relauncher.SideOnly; import org.apache.commons.lang3.Range; import org.apache.commons.lang3.tuple.MutableTriple; import org.apache.commons.lang3.tuple.Pair; +import reborncore.common.tile.TileLegacyMachineBase; import reborncore.common.util.ItemUtils; import techreborn.client.container.IRightClickHandler; @@ -55,9 +57,11 @@ public class BuiltContainer extends Container { private List> craftEvents; private Integer[] integerParts; + private final TileLegacyMachineBase tile; + public BuiltContainer(final String name, final Predicate canInteract, - final List> playerSlotRange, - final List> tileSlotRange) { + final List> playerSlotRange, + final List> tileSlotRange, TileLegacyMachineBase tile) { this.name = name; this.canInteract = canInteract; @@ -67,6 +71,8 @@ public class BuiltContainer extends Container { this.shortValues = new ArrayList<>(); this.integerValues = new ArrayList<>(); + + this.tile = tile; } public void addShortSync(final List> syncables) { @@ -94,7 +100,11 @@ public class BuiltContainer extends Container { @Override public boolean canInteractWith(final EntityPlayer playerIn) { - return this.canInteract.test(playerIn); + if(this.tile != null) { + return tile.isUsableByPlayer(playerIn); + } else { + return this.canInteract.test(playerIn); // <- What does this thing do ? + } } @Override diff --git a/src/main/java/techreborn/client/container/builder/ContainerBuilder.java b/src/main/java/techreborn/client/container/builder/ContainerBuilder.java index b30e9d23e..1baebec56 100644 --- a/src/main/java/techreborn/client/container/builder/ContainerBuilder.java +++ b/src/main/java/techreborn/client/container/builder/ContainerBuilder.java @@ -31,6 +31,7 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.inventory.Slot; import org.apache.commons.lang3.Range; import org.apache.commons.lang3.tuple.Pair; +import reborncore.common.tile.TileLegacyMachineBase; import java.util.ArrayList; import java.util.List; @@ -88,10 +89,32 @@ public class ContainerBuilder { this.tileInventoryRanges.add(range); } + @Deprecated + /** + * The container have to know if the tile is still available (the block was not destroyed) + * and if the player is not to far from him to close the GUI if necessary + */ public BuiltContainer create() { final BuiltContainer built = new BuiltContainer(this.name, this.canInteract, this.playerInventoryRanges, - this.tileInventoryRanges); + this.tileInventoryRanges, null); + if (!this.shortValues.isEmpty()) + built.addShortSync(this.shortValues); + if (!this.integerValues.isEmpty()) + built.addIntegerSync(this.integerValues); + if (!this.craftEvents.isEmpty()) + built.addCraftEvents(this.craftEvents); + + this.slots.forEach(built::addSlot); + + this.slots.clear(); + return built; + } + + public BuiltContainer create(final TileLegacyMachineBase tile) { + final BuiltContainer built = new BuiltContainer(this.name, this.canInteract, + this.playerInventoryRanges, + this.tileInventoryRanges, tile); if (!this.shortValues.isEmpty()) built.addShortSync(this.shortValues); if (!this.integerValues.isEmpty()) diff --git a/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java b/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java index d9cbd1137..b0f65e9f1 100644 --- a/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java +++ b/src/main/java/techreborn/tiles/fusionReactor/TileFusionControlComputer.java @@ -365,6 +365,6 @@ public class TileFusionControlComputer extends TilePowerAcceptor implements IInv .syncIntegerValue(this::getCoilStatus, this::setCoilStatus) .syncIntegerValue(this::getCrafingTickTime, this::setCrafingTickTime) .syncIntegerValue(this::getFinalTickTime, this::setFinalTickTime) - .syncIntegerValue(this::getNeededPower, this::setNeededPower).addInventory().create(); + .syncIntegerValue(this::getNeededPower, this::setNeededPower).addInventory().create(this); } } From 53adc8142ec6ab2e131cd921b6e11b3211e56da0 Mon Sep 17 00:00:00 2001 From: alexpic57 Date: Fri, 8 Sep 2017 21:25:13 +0200 Subject: [PATCH 4/5] remove wrong import --- .../techreborn/client/container/builder/BuiltContainer.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/techreborn/client/container/builder/BuiltContainer.java b/src/main/java/techreborn/client/container/builder/BuiltContainer.java index 375cf83e5..81f4efbc0 100644 --- a/src/main/java/techreborn/client/container/builder/BuiltContainer.java +++ b/src/main/java/techreborn/client/container/builder/BuiltContainer.java @@ -24,7 +24,6 @@ package techreborn.client.container.builder; -import ic2.core.energy.grid.Tile; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.*; import net.minecraft.item.ItemStack; @@ -103,7 +102,7 @@ public class BuiltContainer extends Container { if(this.tile != null) { return tile.isUsableByPlayer(playerIn); } else { - return this.canInteract.test(playerIn); // <- What does this thing do ? + return this.canInteract.test(playerIn); // < } } From c1dd9d9192e4e264c2aca55c418eb620c01d61eb Mon Sep 17 00:00:00 2001 From: alexpic57 Date: Fri, 8 Sep 2017 21:39:46 +0200 Subject: [PATCH 5/5] fix all? the tile to prevent bug duplication --- src/main/java/techreborn/tiles/TileAssemblingMachine.java | 2 +- src/main/java/techreborn/tiles/TileAutoCraftingTable.java | 2 +- src/main/java/techreborn/tiles/TileChargeOMat.java | 2 +- src/main/java/techreborn/tiles/TileChemicalReactor.java | 2 +- src/main/java/techreborn/tiles/TileChunkLoader.java | 2 +- src/main/java/techreborn/tiles/TileDigitalChest.java | 2 +- src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java | 2 +- src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java | 2 +- src/main/java/techreborn/tiles/TileIronAlloyFurnace.java | 2 +- src/main/java/techreborn/tiles/TileIronFurnace.java | 2 +- src/main/java/techreborn/tiles/TileMatterFabricator.java | 2 +- src/main/java/techreborn/tiles/TileQuantumChest.java | 2 +- src/main/java/techreborn/tiles/TileQuantumTank.java | 2 +- src/main/java/techreborn/tiles/TileRollingMachine.java | 2 +- src/main/java/techreborn/tiles/TileScrapboxinator.java | 2 +- .../java/techreborn/tiles/generator/TileDieselGenerator.java | 2 +- src/main/java/techreborn/tiles/generator/TileGasTurbine.java | 2 +- .../java/techreborn/tiles/generator/TileSemiFluidGenerator.java | 2 +- .../java/techreborn/tiles/generator/TileSolidFuelGenerator.java | 2 +- .../java/techreborn/tiles/generator/TileThermalGenerator.java | 2 +- src/main/java/techreborn/tiles/idsu/TileInterdimensionalSU.java | 2 +- .../techreborn/tiles/multiblock/TileImplosionCompressor.java | 2 +- .../techreborn/tiles/multiblock/TileIndustrialBlastFurnace.java | 2 +- .../java/techreborn/tiles/multiblock/TileIndustrialGrinder.java | 2 +- .../java/techreborn/tiles/multiblock/TileIndustrialSawmill.java | 2 +- .../java/techreborn/tiles/multiblock/TileVacuumFreezer.java | 2 +- src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java | 2 +- src/main/java/techreborn/tiles/storage/TileLowVoltageSU.java | 2 +- src/main/java/techreborn/tiles/storage/TileMediumVoltageSU.java | 2 +- src/main/java/techreborn/tiles/teir1/TileAlloySmelter.java | 2 +- src/main/java/techreborn/tiles/teir1/TileCompressor.java | 2 +- src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java | 2 +- src/main/java/techreborn/tiles/teir1/TileExtractor.java | 2 +- src/main/java/techreborn/tiles/teir1/TileGrinder.java | 2 +- src/main/java/techreborn/tiles/teir1/TileRecycler.java | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/main/java/techreborn/tiles/TileAssemblingMachine.java b/src/main/java/techreborn/tiles/TileAssemblingMachine.java index 0d934a7ac..e81d6821a 100644 --- a/src/main/java/techreborn/tiles/TileAssemblingMachine.java +++ b/src/main/java/techreborn/tiles/TileAssemblingMachine.java @@ -156,6 +156,6 @@ public class TileAssemblingMachine extends TilePowerAcceptor return new ContainerBuilder("assemblingmachine").player(player.inventory).inventory(8, 84).hotbar(8, 142) .addInventory().tile(this).slot(0, 47, 17).slot(1, 65, 17).outputSlot(2, 116, 35).energySlot(3, 56, 53) .upgradeSlot(4, 152, 8).upgradeSlot(5, 152, 26).upgradeSlot(6, 152, 44).upgradeSlot(7, 152, 62) - .syncEnergyValue().syncCrafterValue().addInventory().create(); + .syncEnergyValue().syncCrafterValue().addInventory().create(this); } } diff --git a/src/main/java/techreborn/tiles/TileAutoCraftingTable.java b/src/main/java/techreborn/tiles/TileAutoCraftingTable.java index 459a16d41..8bf703eca 100644 --- a/src/main/java/techreborn/tiles/TileAutoCraftingTable.java +++ b/src/main/java/techreborn/tiles/TileAutoCraftingTable.java @@ -296,7 +296,7 @@ public class TileAutoCraftingTable extends TilePowerAcceptor implements IContain .outputSlot(9, 145, 42).syncEnergyValue() .syncIntegerValue(this::getProgress, this::setProgress) .syncIntegerValue(this::getMaxProgress, this::setMaxProgress) - .addInventory().create(); + .addInventory().create(this); } @Override diff --git a/src/main/java/techreborn/tiles/TileChargeOMat.java b/src/main/java/techreborn/tiles/TileChargeOMat.java index ac38af402..875074870 100644 --- a/src/main/java/techreborn/tiles/TileChargeOMat.java +++ b/src/main/java/techreborn/tiles/TileChargeOMat.java @@ -144,7 +144,7 @@ public class TileChargeOMat extends TilePowerAcceptor public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("chargebench").player(player.inventory).inventory().hotbar().addInventory() .tile(this).energySlot(0, 62, 25).energySlot(1, 98, 25).energySlot(2, 62, 45).energySlot(3, 98, 45) - .energySlot(4, 62, 65).energySlot(5, 98, 65).syncEnergyValue().addInventory().create(); + .energySlot(4, 62, 65).energySlot(5, 98, 65).syncEnergyValue().addInventory().create(this); } @Override diff --git a/src/main/java/techreborn/tiles/TileChemicalReactor.java b/src/main/java/techreborn/tiles/TileChemicalReactor.java index affc3052f..69e5e614c 100644 --- a/src/main/java/techreborn/tiles/TileChemicalReactor.java +++ b/src/main/java/techreborn/tiles/TileChemicalReactor.java @@ -170,6 +170,6 @@ public class TileChemicalReactor extends TilePowerAcceptor public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("chemicalreactor").player(player.inventory).inventory().hotbar() .addInventory().tile(this).slot(0, 34, 47).slot(1, 126, 47).outputSlot(2, 80, 47).energySlot(3, 8, 72) - .syncEnergyValue().syncCrafterValue().addInventory().create(); + .syncEnergyValue().syncCrafterValue().addInventory().create(this); } } diff --git a/src/main/java/techreborn/tiles/TileChunkLoader.java b/src/main/java/techreborn/tiles/TileChunkLoader.java index 7a2b20088..bc24df016 100644 --- a/src/main/java/techreborn/tiles/TileChunkLoader.java +++ b/src/main/java/techreborn/tiles/TileChunkLoader.java @@ -100,6 +100,6 @@ public class TileChunkLoader extends TilePowerAcceptor implements IToolDrop, IIn @Override public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("chunkloader").player(player.inventory).inventory(8,84).hotbar(8,142).addInventory() - .create(); + .create(this); } } diff --git a/src/main/java/techreborn/tiles/TileDigitalChest.java b/src/main/java/techreborn/tiles/TileDigitalChest.java index 71eeac372..c5520a36b 100644 --- a/src/main/java/techreborn/tiles/TileDigitalChest.java +++ b/src/main/java/techreborn/tiles/TileDigitalChest.java @@ -45,7 +45,7 @@ public class TileDigitalChest extends TileTechStorageBase implements IContainerP @Override public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("digitalchest").player(player.inventory).inventory().hotbar().addInventory() - .tile(this).slot(0, 80, 24).outputSlot(1, 80, 64).addInventory().create(); + .tile(this).slot(0, 80, 24).outputSlot(1, 80, 64).addInventory().create(this); } @Override diff --git a/src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java b/src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java index af539efbd..9a119fa99 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java +++ b/src/main/java/techreborn/tiles/TileIndustrialCentrifuge.java @@ -188,7 +188,7 @@ public class TileIndustrialCentrifuge extends TilePowerAcceptor return new ContainerBuilder("centrifuge").player(player.inventory).inventory().hotbar() .addInventory().tile(this).slot(0, 40, 34).slot(1, 40, 54).outputSlot(2, 82, 44).outputSlot(3, 101, 25) .outputSlot(4, 120, 44).outputSlot(5, 101, 63).energySlot(6, 8, 72).syncEnergyValue() - .syncCrafterValue().addInventory().create(); + .syncCrafterValue().addInventory().create(this); } } diff --git a/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java b/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java index 651f2d491..fb222f7fd 100644 --- a/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java +++ b/src/main/java/techreborn/tiles/TileIndustrialElectrolyzer.java @@ -183,6 +183,6 @@ public class TileIndustrialElectrolyzer extends TilePowerAcceptor .filterSlot(1, 50, 51, stack -> ItemUtils.isItemEqual(stack, DynamicCell.getEmptyCell(1), true, true)) .filterSlot(0, 80, 51, stack -> !ItemUtils.isItemEqual(stack, DynamicCell.getEmptyCell(1), true, true)) .outputSlot(2, 50, 19).outputSlot(3, 70, 19).outputSlot(4, 90, 19).outputSlot(5, 110, 19) - .energySlot(6, 18, 51).syncEnergyValue().syncCrafterValue().addInventory().create(); + .energySlot(6, 18, 51).syncEnergyValue().syncCrafterValue().addInventory().create(this); } } diff --git a/src/main/java/techreborn/tiles/TileIronAlloyFurnace.java b/src/main/java/techreborn/tiles/TileIronAlloyFurnace.java index 4fac26395..caea2a356 100644 --- a/src/main/java/techreborn/tiles/TileIronAlloyFurnace.java +++ b/src/main/java/techreborn/tiles/TileIronAlloyFurnace.java @@ -352,6 +352,6 @@ public class TileIronAlloyFurnace extends TileLegacyMachineBase && ItemUtils.isInputEqual(recipe.getInputs().get(1), stack, true, true, true))) .outputSlot(2, 116, 35).fuelSlot(3, 56, 53).syncIntegerValue(this::getBurnTime, this::setBurnTime) .syncIntegerValue(this::getCookTime, this::setCookTime) - .syncIntegerValue(this::getCurrentItemBurnTime, this::setCurrentItemBurnTime).addInventory().create(); + .syncIntegerValue(this::getCurrentItemBurnTime, this::setCurrentItemBurnTime).addInventory().create(this); } } diff --git a/src/main/java/techreborn/tiles/TileIronFurnace.java b/src/main/java/techreborn/tiles/TileIronFurnace.java index dec8b61fe..fa69bb700 100644 --- a/src/main/java/techreborn/tiles/TileIronFurnace.java +++ b/src/main/java/techreborn/tiles/TileIronFurnace.java @@ -207,6 +207,6 @@ public class TileIronFurnace extends TileLegacyMachineBase return new ContainerBuilder("ironfurnace").player(player.inventory).inventory(8, 84).hotbar(8, 142) .addInventory().tile(this).slot(0, 56, 17).outputSlot(1, 116, 35).fuelSlot(2, 56, 53) .syncIntegerValue(this::getBurnTime, this::setBurnTime) - .syncIntegerValue(this::getTotalBurnTime, this::setTotalBurnTime).addInventory().create(); + .syncIntegerValue(this::getTotalBurnTime, this::setTotalBurnTime).addInventory().create(this); } } diff --git a/src/main/java/techreborn/tiles/TileMatterFabricator.java b/src/main/java/techreborn/tiles/TileMatterFabricator.java index 2b0336017..5475381ff 100644 --- a/src/main/java/techreborn/tiles/TileMatterFabricator.java +++ b/src/main/java/techreborn/tiles/TileMatterFabricator.java @@ -233,7 +233,7 @@ public class TileMatterFabricator extends TilePowerAcceptor .addInventory().tile(this).slot(0, 30, 20).slot(1, 50, 20).slot(2, 70, 20).slot(3, 90, 20) .slot(4, 110, 20).slot(5, 130, 20).outputSlot(6, 40, 66).outputSlot(7, 60, 66).outputSlot(8, 80, 66) .outputSlot(9, 100, 66).outputSlot(10, 120, 66).syncEnergyValue() - .syncIntegerValue(this::getProgress, this::setProgress).addInventory().create(); + .syncIntegerValue(this::getProgress, this::setProgress).addInventory().create(this); } @Override diff --git a/src/main/java/techreborn/tiles/TileQuantumChest.java b/src/main/java/techreborn/tiles/TileQuantumChest.java index b7ed69c82..ffae75b1c 100644 --- a/src/main/java/techreborn/tiles/TileQuantumChest.java +++ b/src/main/java/techreborn/tiles/TileQuantumChest.java @@ -45,7 +45,7 @@ public class TileQuantumChest extends TileTechStorageBase implements IContainerP @Override public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("quantumchest").player(player.inventory).inventory().hotbar().addInventory() - .tile(this).slot(0, 80, 24).outputSlot(1, 80, 64).addInventory().create(); + .tile(this).slot(0, 80, 24).outputSlot(1, 80, 64).addInventory().create(this); } @Override diff --git a/src/main/java/techreborn/tiles/TileQuantumTank.java b/src/main/java/techreborn/tiles/TileQuantumTank.java index 8e4dbc8c0..a6488fafd 100644 --- a/src/main/java/techreborn/tiles/TileQuantumTank.java +++ b/src/main/java/techreborn/tiles/TileQuantumTank.java @@ -158,6 +158,6 @@ public class TileQuantumTank extends TileLegacyMachineBase public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("quantumtank").player(player.inventory).inventory(8, 84).hotbar(8, 142) .addInventory().tile(this).fluidSlot(0, 80, 17).outputSlot(1, 80, 53).fakeSlot(2, 59, 42).addInventory() - .create(); + .create(this); } } diff --git a/src/main/java/techreborn/tiles/TileRollingMachine.java b/src/main/java/techreborn/tiles/TileRollingMachine.java index 6d3c60b9e..c932e7101 100644 --- a/src/main/java/techreborn/tiles/TileRollingMachine.java +++ b/src/main/java/techreborn/tiles/TileRollingMachine.java @@ -239,7 +239,7 @@ public class TileRollingMachine extends TilePowerAcceptor .onCraft(inv -> this.inventory.setInventorySlotContents(1, RollingMachineRecipe.instance.findMatchingRecipe(inv, this.world))) .addInventory().tile(this).outputSlot(0, 124, 35).energySlot(2, 8, 51).syncEnergyValue() - .syncIntegerValue(this::getBurnTime, this::setBurnTime).addInventory().create(); + .syncIntegerValue(this::getBurnTime, this::setBurnTime).addInventory().create(this); } private static class RollingTileContainer extends Container { diff --git a/src/main/java/techreborn/tiles/TileScrapboxinator.java b/src/main/java/techreborn/tiles/TileScrapboxinator.java index 6a796a682..fe0635e8c 100644 --- a/src/main/java/techreborn/tiles/TileScrapboxinator.java +++ b/src/main/java/techreborn/tiles/TileScrapboxinator.java @@ -217,6 +217,6 @@ public class TileScrapboxinator extends TilePowerAcceptor .addInventory().tile(this).filterSlot(0, 56, 34, stack -> stack.getItem() == ModItems.SCRAP_BOX) .outputSlot(1, 116, 35).upgradeSlot(2, 152, 8).upgradeSlot(3, 152, 26).upgradeSlot(4, 152, 44) .upgradeSlot(5, 152, 62).syncEnergyValue().syncIntegerValue(this::getProgress, this::setProgress) - .addInventory().create(); + .addInventory().create(this); } } diff --git a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java index f9f9dcd37..eeed54736 100644 --- a/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileDieselGenerator.java @@ -70,6 +70,6 @@ public class TileDieselGenerator extends TileBaseFluidGenerator implements ICont public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("dieselgenerator").player(player.inventory).inventory().hotbar() .addInventory().tile(this).slot(0, 25, 35).outputSlot(1, 25, 55).syncEnergyValue() - .addInventory().create(); + .addInventory().create(this); } } diff --git a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java index f3a3b2423..c12cbadbc 100644 --- a/src/main/java/techreborn/tiles/generator/TileGasTurbine.java +++ b/src/main/java/techreborn/tiles/generator/TileGasTurbine.java @@ -70,6 +70,6 @@ public class TileGasTurbine extends TileBaseFluidGenerator implements IContainer public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("gasturbine").player(player.inventory).inventory().hotbar() .addInventory().tile(this).slot(0, 25, 35).outputSlot(1, 25, 55).syncEnergyValue() - .addInventory().create(); + .addInventory().create(this); } } diff --git a/src/main/java/techreborn/tiles/generator/TileSemiFluidGenerator.java b/src/main/java/techreborn/tiles/generator/TileSemiFluidGenerator.java index 9438ccb80..98d289cbb 100644 --- a/src/main/java/techreborn/tiles/generator/TileSemiFluidGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileSemiFluidGenerator.java @@ -70,6 +70,6 @@ public class TileSemiFluidGenerator extends TileBaseFluidGenerator implements IC public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("semifluidgenerator").player(player.inventory).inventory().hotbar() .addInventory().tile(this).slot(0, 25, 35).outputSlot(1, 25, 55).syncEnergyValue() - .addInventory().create(); + .addInventory().create(this); } } diff --git a/src/main/java/techreborn/tiles/generator/TileSolidFuelGenerator.java b/src/main/java/techreborn/tiles/generator/TileSolidFuelGenerator.java index de3a9d67d..24dc449f9 100644 --- a/src/main/java/techreborn/tiles/generator/TileSolidFuelGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileSolidFuelGenerator.java @@ -179,7 +179,7 @@ public class TileSolidFuelGenerator extends TilePowerAcceptor implements IToolDr return new ContainerBuilder("generator").player(player.inventory).inventory().hotbar().addInventory() .tile(this).fuelSlot(0, 80, 54).energySlot(1, 8, 72).syncEnergyValue() .syncIntegerValue(this::getBurnTime, this::setBurnTime) - .syncIntegerValue(this::getTotalBurnTime, this::setTotalBurnTime).addInventory().create(); + .syncIntegerValue(this::getTotalBurnTime, this::setTotalBurnTime).addInventory().create(this); } @Override diff --git a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java index d51a0ece3..4c2e784f0 100644 --- a/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java +++ b/src/main/java/techreborn/tiles/generator/TileThermalGenerator.java @@ -75,6 +75,6 @@ public class TileThermalGenerator extends TileBaseFluidGenerator implements ICon public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("thermalgenerator").player(player.inventory).inventory().hotbar() .addInventory().tile(this).slot(0, 25, 35).outputSlot(1, 25, 55).syncEnergyValue() - .addInventory().create(); + .addInventory().create(this); } } diff --git a/src/main/java/techreborn/tiles/idsu/TileInterdimensionalSU.java b/src/main/java/techreborn/tiles/idsu/TileInterdimensionalSU.java index 214199f89..c0e5cf184 100644 --- a/src/main/java/techreborn/tiles/idsu/TileInterdimensionalSU.java +++ b/src/main/java/techreborn/tiles/idsu/TileInterdimensionalSU.java @@ -87,7 +87,7 @@ public class TileInterdimensionalSU extends TileEnergyStorage implements IContai public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("mfsu").player(player.inventory).inventory().hotbar().armor() .complete(8, 18).addArmor().addInventory().tile(this).energySlot(0, 62, 45).energySlot(1, 98, 45) - .syncEnergyValue().addInventory().create(); + .syncEnergyValue().addInventory().create(this); } @Override diff --git a/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java b/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java index 1ea64427c..5a19d672d 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java +++ b/src/main/java/techreborn/tiles/multiblock/TileImplosionCompressor.java @@ -155,7 +155,7 @@ public class TileImplosionCompressor extends TilePowerAcceptor public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("implosioncompressor").player(player.inventory).inventory().hotbar() .addInventory().tile(this).slot(0, 50, 27).slot(1, 50, 47).outputSlot(2, 92, 36).outputSlot(3, 110, 36) - .syncEnergyValue().syncCrafterValue().addInventory().create(); + .syncEnergyValue().syncCrafterValue().addInventory().create(this); } } diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialBlastFurnace.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialBlastFurnace.java index 906a8fc82..53251f4a5 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialBlastFurnace.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialBlastFurnace.java @@ -234,6 +234,6 @@ public class TileIndustrialBlastFurnace extends TilePowerAcceptor implements ITo return new ContainerBuilder("blastfurnace").player(player.inventory).inventory().hotbar() .addInventory().tile(this).slot(0, 50, 27).slot(1, 50, 47).outputSlot(2, 92, 36).outputSlot(3, 110, 36) .syncEnergyValue().syncCrafterValue().syncIntegerValue(this::getHeat, this::setHeat).addInventory() - .create(); + .create(this); } } diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java index a073afeda..807a41170 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialGrinder.java @@ -278,7 +278,7 @@ public class TileIndustrialGrinder extends TilePowerAcceptor implements IToolDro return new ContainerBuilder("industrialgrinder").player(player.inventory).inventory().hotbar() .addInventory().tile(this).slot(1, 34, 35).slot(0, 84, 43).outputSlot(2, 126, 18).outputSlot(3, 126, 36) .outputSlot(4, 126, 54).outputSlot(5, 126, 72).outputSlot(6, 34, 55).syncEnergyValue().syncCrafterValue().addInventory() - .create(); + .create(this); } } diff --git a/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java b/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java index b1e9aaf2c..fce4971b7 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java +++ b/src/main/java/techreborn/tiles/multiblock/TileIndustrialSawmill.java @@ -267,6 +267,6 @@ public class TileIndustrialSawmill extends TilePowerAcceptor public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("industrialsawmill").player(player.inventory).inventory(8, 84).hotbar(8, 142) .addInventory().tile(this).slot(0, 32, 26).slot(1, 32, 44).outputSlot(2, 84, 35).outputSlot(3, 102, 35) - .outputSlot(4, 120, 35).syncEnergyValue().syncIntegerValue(this::getTickTime, this::setTickTime).addInventory().create(); + .outputSlot(4, 120, 35).syncEnergyValue().syncIntegerValue(this::getTickTime, this::setTickTime).addInventory().create(this); } } diff --git a/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java b/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java index c23e79364..562722fba 100644 --- a/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java +++ b/src/main/java/techreborn/tiles/multiblock/TileVacuumFreezer.java @@ -150,7 +150,7 @@ public class TileVacuumFreezer extends TilePowerAcceptor public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("vacuumfreezer").player(player.inventory).inventory().hotbar().addInventory() .tile(this).slot(0, 55, 45).outputSlot(1, 101, 45).syncEnergyValue().syncCrafterValue().addInventory() - .create(); + .create(this); } } diff --git a/src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java b/src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java index c0b561cc9..cbe0efabb 100644 --- a/src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java +++ b/src/main/java/techreborn/tiles/storage/TileHighVoltageSU.java @@ -48,6 +48,6 @@ public class TileHighVoltageSU extends TileEnergyStorage implements IContainerPr public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("mfsu").player(player.inventory).inventory().hotbar().armor() .complete(8, 18).addArmor().addInventory().tile(this).energySlot(0, 62, 45).energySlot(1, 98, 45) - .syncEnergyValue().addInventory().create(); + .syncEnergyValue().addInventory().create(this); } } \ No newline at end of file diff --git a/src/main/java/techreborn/tiles/storage/TileLowVoltageSU.java b/src/main/java/techreborn/tiles/storage/TileLowVoltageSU.java index eeddfdf2a..be1f4b5a2 100644 --- a/src/main/java/techreborn/tiles/storage/TileLowVoltageSU.java +++ b/src/main/java/techreborn/tiles/storage/TileLowVoltageSU.java @@ -43,6 +43,6 @@ public class TileLowVoltageSU extends TileEnergyStorage implements IContainerPro @Override public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("batbox").player(player.inventory).inventory().hotbar().addInventory() - .tile(this).energySlot(0, 62, 45).energySlot(1, 98, 45).syncEnergyValue().addInventory().create(); + .tile(this).energySlot(0, 62, 45).energySlot(1, 98, 45).syncEnergyValue().addInventory().create(this); } } diff --git a/src/main/java/techreborn/tiles/storage/TileMediumVoltageSU.java b/src/main/java/techreborn/tiles/storage/TileMediumVoltageSU.java index dbb1ecfaf..c6c7415ab 100644 --- a/src/main/java/techreborn/tiles/storage/TileMediumVoltageSU.java +++ b/src/main/java/techreborn/tiles/storage/TileMediumVoltageSU.java @@ -48,7 +48,7 @@ public class TileMediumVoltageSU extends TileEnergyStorage implements IContainer public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("mfe").player(player.inventory).inventory().hotbar().armor() .complete(8, 18).addArmor().addInventory().tile(this).energySlot(0, 62, 45).energySlot(1, 98, 45) - .syncEnergyValue().addInventory().create(); + .syncEnergyValue().addInventory().create(this); } } \ No newline at end of file diff --git a/src/main/java/techreborn/tiles/teir1/TileAlloySmelter.java b/src/main/java/techreborn/tiles/teir1/TileAlloySmelter.java index 4e5ad26aa..6f994eb47 100644 --- a/src/main/java/techreborn/tiles/teir1/TileAlloySmelter.java +++ b/src/main/java/techreborn/tiles/teir1/TileAlloySmelter.java @@ -187,6 +187,6 @@ public class TileAlloySmelter extends TilePowerAcceptor && ItemUtils.isInputEqual(recipe.getInputs().get(1), stack, true, true, true))) .outputSlot(2, 116, 35).energySlot(3, 56, 53).upgradeSlot(4, 152, 8).upgradeSlot(5, 152, 26) .upgradeSlot(6, 152, 44).upgradeSlot(7, 152, 62).syncEnergyValue().syncCrafterValue().addInventory() - .create(); + .create(this); } } diff --git a/src/main/java/techreborn/tiles/teir1/TileCompressor.java b/src/main/java/techreborn/tiles/teir1/TileCompressor.java index 96915ca95..987de4447 100644 --- a/src/main/java/techreborn/tiles/teir1/TileCompressor.java +++ b/src/main/java/techreborn/tiles/teir1/TileCompressor.java @@ -139,6 +139,6 @@ public class TileCompressor extends TilePowerAcceptor implements IToolDrop, IInv public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("compressor").player(player.inventory).inventory().hotbar().addInventory() .tile(this).slot(0, 55, 45).outputSlot(1, 101, 45).syncEnergyValue().syncCrafterValue().addInventory() - .create(); + .create(this); } } diff --git a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java index 9b5f5955d..69291591e 100644 --- a/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java +++ b/src/main/java/techreborn/tiles/teir1/TileElectricFurnace.java @@ -222,7 +222,7 @@ public class TileElectricFurnace extends TilePowerAcceptor public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("electricfurnace").player(player.inventory).inventory().hotbar().addInventory() .tile(this).slot(0, 55, 45).outputSlot(1, 101, 45).syncEnergyValue() - .syncIntegerValue(this::getBurnTime, this::setBurnTime).addInventory().create(); + .syncIntegerValue(this::getBurnTime, this::setBurnTime).addInventory().create(this); } @Override diff --git a/src/main/java/techreborn/tiles/teir1/TileExtractor.java b/src/main/java/techreborn/tiles/teir1/TileExtractor.java index a2e88d4d0..068f162aa 100644 --- a/src/main/java/techreborn/tiles/teir1/TileExtractor.java +++ b/src/main/java/techreborn/tiles/teir1/TileExtractor.java @@ -154,7 +154,7 @@ public class TileExtractor extends TilePowerAcceptor public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("extractor").player(player.inventory).inventory().hotbar().addInventory() .tile(this).slot(0, 55, 45).outputSlot(1, 101, 45).syncEnergyValue().syncCrafterValue().addInventory() - .create(); + .create(this); } } diff --git a/src/main/java/techreborn/tiles/teir1/TileGrinder.java b/src/main/java/techreborn/tiles/teir1/TileGrinder.java index 48b9e52e4..edac03dd4 100644 --- a/src/main/java/techreborn/tiles/teir1/TileGrinder.java +++ b/src/main/java/techreborn/tiles/teir1/TileGrinder.java @@ -155,7 +155,7 @@ public class TileGrinder extends TilePowerAcceptor public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("grinder").player(player.inventory).inventory().hotbar().addInventory() .tile(this).slot(0, 55, 45).outputSlot(1, 101, 45).syncEnergyValue().syncCrafterValue().addInventory() - .create(); + .create(this); } @Override diff --git a/src/main/java/techreborn/tiles/teir1/TileRecycler.java b/src/main/java/techreborn/tiles/teir1/TileRecycler.java index fa746617f..6173d2ac3 100644 --- a/src/main/java/techreborn/tiles/teir1/TileRecycler.java +++ b/src/main/java/techreborn/tiles/teir1/TileRecycler.java @@ -200,7 +200,7 @@ public class TileRecycler extends TilePowerAcceptor implements IToolDrop, IInven public BuiltContainer createContainer(final EntityPlayer player) { return new ContainerBuilder("recycler").player(player.inventory).inventory().hotbar().addInventory() .tile(this).slot(0, 55, 45).outputSlot(1, 101, 45).syncEnergyValue() - .syncIntegerValue(this::getProgress, this::setProgress).addInventory().create(); + .syncIntegerValue(this::getProgress, this::setProgress).addInventory().create(this); } //TODO make this so