From fcb150ebaf16942fd05f080baab6cdb770949835 Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Mon, 1 Mar 2021 17:11:34 +0000 Subject: [PATCH] chore: containers ported mostly, gui's ported for comparability --- .../mod/ActuallyAdditions.java | 2 - .../mod/ActuallyAdditionsClient.java | 28 +- .../mod/blocks/BlockFurnaceDouble.java | 1 - .../mod/blocks/BlockGreenhouseGlass.java | 1 - .../mod/blocks/BlockGrinder.java | 1 - .../mod/blocks/BlockItemViewerHopping.java | 1 - .../mod/blocks/BlockLaserRelay.java | 2 +- .../blocks/BlockLavaFactoryController.java | 2 +- .../mod/blocks/BlockMiner.java | 2 +- .../mod/blocks/BlockOilGenerator.java | 1 - .../mod/blocks/BlockPhantom.java | 2 +- .../mod/blocks/BlockPlayerInterface.java | 2 +- .../mod/blocks/BlockSlabs.java | 2 +- .../mod/blocks/BlockTinyTorch.java | 1 - .../mod/blocks/BlockWallAA.java | 2 +- .../mod/blocks/render/RenderSmileyCloud.java | 4 +- .../mod/booklet/button/BookmarkButton.java | 2 +- .../mod/booklet/gui/GuiBooklet.java | 10 +- .../mod/booklet/gui/GuiEntry.java | 4 +- .../mod/booklet/gui/GuiMainPage.java | 8 +- .../mod/booklet/gui/GuiPage.java | 2 +- .../mod/booklet/misc/GuiAAAchievements.java | 2 +- .../mod/creative/CreativeTab.java | 2 +- .../mod/entity/InitEntities.java | 3 +- .../mod/entity/RenderWorm.java | 3 +- .../mod/inventory/ActuallyContainers.java | 18 ++ .../mod/inventory/ContainerBioReactor.java | 2 +- .../mod/inventory/ContainerCanolaPress.java | 2 +- .../mod/inventory/ContainerCoalGenerator.java | 2 +- .../ContainerDirectionalBreaker.java | 2 +- .../mod/inventory/ContainerDrill.java | 22 +- .../mod/inventory/ContainerDropper.java | 2 +- .../mod/inventory/ContainerEnergizer.java | 2 +- .../mod/inventory/ContainerEnervator.java | 4 +- .../mod/inventory/ContainerFarmer.java | 15 +- .../mod/inventory/ContainerFeeder.java | 27 +- .../inventory/ContainerFermentingBarrel.java | 23 +- .../mod/inventory/ContainerFilter.java | 22 +- .../mod/inventory/ContainerFireworkBox.java | 12 +- .../inventory/ContainerFluidCollector.java | 23 +- .../mod/inventory/ContainerFurnaceDouble.java | 33 ++- .../mod/inventory/ContainerGiantChest.java | 197 +++++++------- .../mod/inventory/ContainerGrinder.java | 32 ++- .../mod/inventory/ContainerInputter.java | 31 ++- .../ContainerLaserRelayItemWhitelist.java | 27 +- .../mod/inventory/ContainerMiner.java | 25 +- .../mod/inventory/ContainerOilGenerator.java | 23 +- .../mod/inventory/ContainerPhantomPlacer.java | 25 +- .../inventory/ContainerRangedCollector.java | 29 +- .../mod/inventory/ContainerRepairer.java | 195 +++++++------- .../mod/inventory/ContainerSmileyCloud.java | 57 ++-- .../mod/inventory/ContainerXPSolidifier.java | 27 +- .../mod/inventory/GuiHandler.java | 159 ++++++----- .../mod/inventory/gui/EnergyDisplay.java | 8 +- .../mod/inventory/gui/FilterSettingsGui.java | 2 - .../mod/inventory/gui/FluidDisplay.java | 6 +- .../mod/inventory/gui/GuiBag.java | 2 +- .../mod/inventory/gui/GuiBioReactor.java | 25 +- .../mod/inventory/gui/GuiCanolaPress.java | 25 +- .../mod/inventory/gui/GuiCoalGenerator.java | 24 +- .../mod/inventory/gui/GuiCoffeeMachine.java | 30 +-- .../inventory/gui/GuiDirectionalBreaker.java | 24 +- .../mod/inventory/gui/GuiDrill.java | 21 +- .../mod/inventory/gui/GuiDropper.java | 27 +- .../mod/inventory/gui/GuiEnergizer.java | 26 +- .../mod/inventory/gui/GuiEnervator.java | 27 +- .../mod/inventory/gui/GuiFarmer.java | 24 +- .../mod/inventory/gui/GuiFeeder.java | 29 +- .../inventory/gui/GuiFermentingBarrel.java | 26 +- .../mod/inventory/gui/GuiFilter.java | 21 +- .../inventory/{ => gui}/GuiFireworkBox.java | 33 +-- .../mod/inventory/gui/GuiFluidCollector.java | 24 +- .../mod/inventory/gui/GuiFurnaceDouble.java | 30 +-- .../mod/inventory/gui/GuiGiantChest.java | 157 +++++------ .../mod/inventory/gui/GuiGrinder.java | 34 +-- .../mod/inventory/gui/GuiInputter.java | 45 ++-- .../gui/GuiLaserRelayItemWhitelist.java | 35 +-- .../mod/inventory/gui/GuiMiner.java | 29 +- .../mod/inventory/gui/GuiOilGenerator.java | 26 +- .../mod/inventory/gui/GuiPhantomPlacer.java | 26 +- .../mod/inventory/gui/GuiRangedCollector.java | 25 +- .../mod/inventory/gui/GuiRepairer.java | 141 +++++----- .../mod/inventory/gui/GuiSmileyCloud.java | 253 +++++++++--------- .../mod/inventory/gui/GuiXPSolidifier.java | 79 +++--- .../mod/inventory/gui/TexturedButton.java | 2 +- .../mod/items/ItemAllToolAA.java | 1 - .../mod/items/ItemCrystalShard.java | 11 +- .../actuallyadditions/mod/items/ItemDust.java | 19 +- .../mod/items/ItemFoods.java | 33 ++- .../actuallyadditions/mod/items/ItemJams.java | 25 +- .../actuallyadditions/mod/items/ItemMisc.java | 2 +- .../mod/items/ItemPotionRing.java | 1 - .../mod/misc/cloud/SmileyCloudEasterEggs.java | 2 +- .../mod/network/PacketHandlerHelper.java | 2 +- .../mod/network/PacketServerToClient.java | 2 +- .../mod/tile/IEnergyDisplay.java | 3 - .../mod/util/FluidStateMapper.java | 2 +- .../mod/util/IColorProvidingBlock.java | 3 +- .../mod/util/IColorProvidingItem.java | 3 +- .../mod/util/compat/CompatFastBench.java | 4 +- .../mod/util/compat/CompatUtil.java | 2 +- 101 files changed, 1359 insertions(+), 1170 deletions(-) rename src/main/java/de/ellpeck/actuallyadditions/mod/inventory/{ => gui}/GuiFireworkBox.java (59%) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java index c96e9c2c6..04c0c5008 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java @@ -20,7 +20,6 @@ import de.ellpeck.actuallyadditions.mod.event.CommonEvents; import de.ellpeck.actuallyadditions.mod.fluids.InitFluids; import de.ellpeck.actuallyadditions.mod.gen.AAWorldGen; import de.ellpeck.actuallyadditions.mod.inventory.ActuallyContainers; -import de.ellpeck.actuallyadditions.mod.inventory.GuiHandler; import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.items.ItemCoffee; import de.ellpeck.actuallyadditions.mod.items.lens.LensMining; @@ -113,7 +112,6 @@ public class ActuallyAdditions { InitFluids.init(); new UpdateChecker(); BannerHelper.init(); - GuiHandler.init(); InitEntities.init(); // todo: [port] replace AAWorldGen gen = new AAWorldGen(); ItemCoffee.initIngredients(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditionsClient.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditionsClient.java index 969823f71..8ee6b848a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditionsClient.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditionsClient.java @@ -15,7 +15,7 @@ import de.ellpeck.actuallyadditions.mod.entity.InitEntities; import de.ellpeck.actuallyadditions.mod.entity.RenderWorm; import de.ellpeck.actuallyadditions.mod.event.ClientEvents; import de.ellpeck.actuallyadditions.mod.inventory.ActuallyContainers; -import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiBag; +import de.ellpeck.actuallyadditions.mod.inventory.gui.*; import de.ellpeck.actuallyadditions.mod.misc.special.SpecialRenderInit; import de.ellpeck.actuallyadditions.mod.tile.ActuallyTiles; import net.minecraft.client.Minecraft; @@ -31,7 +31,31 @@ public class ActuallyAdditionsClient { public static void setup() { ScreenManager.registerFactory(ActuallyContainers.BAG_CONTAINER.get(), GuiBag::new); - + ScreenManager.registerFactory(ActuallyContainers.BIO_REACTOR_CONTAINER.get(), GuiBioReactor::new); + ScreenManager.registerFactory(ActuallyContainers.BREAKER_CONTAINER.get(), GuiBreaker::new); + ScreenManager.registerFactory(ActuallyContainers.CANOLA_PRESS_CONTAINER.get(), GuiCanolaPress::new); + ScreenManager.registerFactory(ActuallyContainers.COAL_GENERATOR_CONTAINER.get(), GuiCoalGenerator::new); + ScreenManager.registerFactory(ActuallyContainers.COFFEE_MACHINE_CONTAINER.get(), GuiCoffeeMachine::new); + ScreenManager.registerFactory(ActuallyContainers.DIRECTIONAL_BREAKER_CONTAINER.get(), GuiDirectionalBreaker::new); + ScreenManager.registerFactory(ActuallyContainers.DRILL_CONTAINER.get(), GuiDrill::new); + ScreenManager.registerFactory(ActuallyContainers.DROPPER_CONTAINER.get(), GuiDropper::new); + ScreenManager.registerFactory(ActuallyContainers.ENERVATOR_CONTAINER.get(), GuiEnervator::new); + ScreenManager.registerFactory(ActuallyContainers.ENERGIZER_CONTAINER.get(), GuiEnergizer::new); + ScreenManager.registerFactory(ActuallyContainers.FARMER_CONTAINER.get(), GuiFarmer::new); + ScreenManager.registerFactory(ActuallyContainers.FEEDER_CONTAINER.get(), GuiFeeder::new); + ScreenManager.registerFactory(ActuallyContainers.FERMENTING_BARREL_CONTAINER.get(), GuiFermentingBarrel::new); + ScreenManager.registerFactory(ActuallyContainers.FILTER_CONTAINER.get(), GuiFilter::new); + ScreenManager.registerFactory(ActuallyContainers.FIREWORK_BOX_CONTAINER.get(), GuiFireworkBox::new); + ScreenManager.registerFactory(ActuallyContainers.FLUID_COLLECTOR_CONTAINER.get(), GuiFluidCollector::new); + ScreenManager.registerFactory(ActuallyContainers.FURNACE_DOUBLE_CONTAINER.get(), GuiFurnaceDouble::new); + ScreenManager.registerFactory(ActuallyContainers.GRINDER_CONTAINER.get(), GuiGrinder::new); + ScreenManager.registerFactory(ActuallyContainers.INPUTTER_CONTAINER.get(), GuiInputter::new); + ScreenManager.registerFactory(ActuallyContainers.LASER_RELAY_ITEM_WHITELIST_CONTAINER.get(), GuiLaserRelayItemWhitelist::new); + ScreenManager.registerFactory(ActuallyContainers.MINER_CONTAINER.get(), GuiMiner::new); + ScreenManager.registerFactory(ActuallyContainers.OIL_GENERATOR_CONTAINER.get(), GuiOilGenerator::new); + ScreenManager.registerFactory(ActuallyContainers.PHANTOM_PLACER_CONTAINER.get(), GuiPhantomPlacer::new); + ScreenManager.registerFactory(ActuallyContainers.RANGED_COLLECTOR_CONTAINER.get(), GuiRangedCollector::new); + ScreenManager.registerFactory(ActuallyContainers.XPSOLIDIFIER_CONTAINER.get(), GuiXPSolidifier::new); // From old proxy InitEntities.initClient(); MinecraftForge.EVENT_BUS.register(new ClientEvents()); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java index 1caa070a5..7cf4bca67 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockFurnaceDouble.java @@ -37,7 +37,6 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.fml.relauncher.OnlyIn; import java.util.List; import java.util.Random; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java index 1b3a498c3..c71e1f0b0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGreenhouseGlass.java @@ -23,7 +23,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.fml.relauncher.OnlyIn; import org.apache.commons.lang3.tuple.Triple; import java.util.Random; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java index de028e6f2..2a49dfc9a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockGrinder.java @@ -28,7 +28,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.fml.relauncher.OnlyIn; import java.util.Random; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewerHopping.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewerHopping.java index 09b942e3a..98291f60d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewerHopping.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockItemViewerHopping.java @@ -25,7 +25,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.fml.relauncher.OnlyIn; import java.util.List; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java index 3710720d5..21bcb6c81 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLaserRelay.java @@ -50,7 +50,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.fml.common.eventhandler.Event; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import net.minecraftforge.fml.relauncher.OnlyIn; + public class BlockLaserRelay extends BlockContainerBase implements IHudDisplay { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java index ff1f25007..b4e284253 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockLavaFactoryController.java @@ -25,7 +25,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.RayTraceResult; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.fml.relauncher.OnlyIn; + public class BlockLavaFactoryController extends BlockContainerBase implements IHudDisplay { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java index fd3ce2491..bfc547494 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockMiner.java @@ -29,7 +29,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.RayTraceResult; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.fml.relauncher.OnlyIn; + public class BlockMiner extends BlockContainerBase implements IHudDisplay { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java index e1696ffe0..5d7bb6303 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockOilGenerator.java @@ -30,7 +30,6 @@ import net.minecraft.util.Rotation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.fml.relauncher.OnlyIn; import java.util.Random; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java index 141ddc62d..2af936bf6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPhantom.java @@ -36,7 +36,7 @@ import net.minecraft.util.text.TextFormatting; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.fml.relauncher.OnlyIn; + public class BlockPhantom extends BlockContainerBase implements IHudDisplay { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java index 40c2c8981..6b1da55e2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockPlayerInterface.java @@ -28,7 +28,7 @@ import net.minecraft.util.math.RayTraceResult; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.fml.relauncher.OnlyIn; + public class BlockPlayerInterface extends BlockContainerBase implements IHudDisplay { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java index f5075934c..abbe0ebf3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockSlabs.java @@ -29,7 +29,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.OnlyIn; + public class BlockSlabs extends BlockBase { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTinyTorch.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTinyTorch.java index 08a9a2c38..da9fee499 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTinyTorch.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockTinyTorch.java @@ -26,7 +26,6 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.fml.relauncher.OnlyIn; import javax.annotation.Nullable; import java.util.Random; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java index 5be15c76a..5d7ec6e1d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/BlockWallAA.java @@ -25,7 +25,7 @@ import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.fml.relauncher.OnlyIn; + public class BlockWallAA extends BlockBase { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java index 5ae753a7b..6b0fef5ca 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/blocks/render/RenderSmileyCloud.java @@ -20,10 +20,10 @@ //import de.ellpeck.actuallyadditions.mod.util.AssetUtil; //import net.minecraft.block.BlockHorizontal; //import net.minecraft.client.Minecraft; -//import net.minecraft.client.renderer.GlStateManager; +// //import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; //import net.minecraftforge.api.distmarker.Dist; -//import net.minecraftforge.fml.relauncher.OnlyIn; +// // //import java.util.Locale; // diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java index 089bc3685..fe7ce8819 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/button/BookmarkButton.java @@ -73,7 +73,7 @@ public class BookmarkButton extends Button { GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); GlStateManager.blendFunc(770, 771); int renderHeight = 25; - this.drawTexturedModalRect(this.x, this.y, 224 + (this.assignedPage == null + this.blit(matrices, this.x, this.y, 224 + (this.assignedPage == null ? 0 : 16), 14 - renderHeight + k * renderHeight, this.width, renderHeight); this.mouseDragged(minecraft, x, y); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiBooklet.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiBooklet.java index 1b553a9a8..32188343d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiBooklet.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiBooklet.java @@ -124,7 +124,7 @@ public abstract class GuiBooklet extends GuiBookletBase { int xStart = this.guiLeft + this.xSize / 2 - 16 * this.bookmarkButtons.length / 2; for (int i = 0; i < this.bookmarkButtons.length; i++) { this.bookmarkButtons[i] = new BookmarkButton(1337 + i, xStart + i * 16, this.guiTop + this.ySize, this); - this.buttonList.add(this.bookmarkButtons[i]); + this.addButton(this.bookmarkButtons[i]); if (data.bookmarks[i] != null) { this.bookmarkButtons[i].assignedPage = data.bookmarks[i]; @@ -133,7 +133,7 @@ public abstract class GuiBooklet extends GuiBookletBase { } this.buttonTrials = new TrialsButton(this); - this.buttonList.add(this.buttonTrials); + this.addButton(this.buttonTrials); } @Override @@ -171,12 +171,12 @@ public abstract class GuiBooklet extends GuiBookletBase { public void drawScreenPre(int mouseX, int mouseY, float partialTicks) { GlStateManager.color(1F, 1F, 1F); - this.mc.getTextureManager().bindTexture(RES_LOC_GUI); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC_GUI); drawModalRectWithCustomSizedTexture(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize, 512, 512); if (this.hasSearchBar()) { - this.mc.getTextureManager().bindTexture(RES_LOC_GADGETS); - this.drawTexturedModalRect(this.guiLeft + this.xSize, this.guiTop + this.ySize - 40, 188, 0, 68, 14); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC_GADGETS); + this.blit(matrices, this.guiLeft + this.xSize, this.guiTop + this.ySize - 40, 188, 0, 68, 14); boolean unicodeBefore = this.fontRenderer.getUnicodeFlag(); this.fontRenderer.setUnicodeFlag(true); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiEntry.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiEntry.java index 7348f0374..b549d611a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiEntry.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiEntry.java @@ -17,11 +17,9 @@ import de.ellpeck.actuallyadditions.api.booklet.internal.GuiBookletBase; import de.ellpeck.actuallyadditions.mod.booklet.button.EntryButton; import de.ellpeck.actuallyadditions.mod.booklet.entry.BookletEntryTrials; import de.ellpeck.actuallyadditions.mod.booklet.misc.BookletUtils; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.screen.Screen; import net.minecraft.item.ItemStack; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.fml.relauncher.OnlyIn; import java.io.IOException; import java.util.List; @@ -94,7 +92,7 @@ public class GuiEntry extends GuiBooklet { int id = y + x * BUTTONS_PER_PAGE; if (this.chapters.size() > id + idOffset) { IBookletChapter chapter = this.chapters.get(id + idOffset); - this.buttonList.add(new EntryButton(this, id, this.guiLeft + 14 + x * 142, this.guiTop + 11 + y * 13, 115, 10, chapter.getLocalizedNameWithFormatting(), chapter.getDisplayItemStack())); + this.addButton(new EntryButton(this, id, this.guiLeft + 14 + x * 142, this.guiTop + 11 + y * 13, 115, 10, chapter.getLocalizedNameWithFormatting(), chapter.getDisplayItemStack())); } else { return; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiMainPage.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiMainPage.java index 7e7c74cfd..6913ff96d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiMainPage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiMainPage.java @@ -136,20 +136,20 @@ public class GuiMainPage extends GuiBooklet { configText.add(TextFormatting.GOLD + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".configButton.name")); configText.addAll(this.font.listFormattedStringToWidth(StringUtil.localizeFormatted("booklet." + ActuallyAdditions.MODID + ".configButton.desc", ActuallyAdditions.NAME).replaceAll("\\\\n", "\n"), 200)); this.configButton = new TexturedButton(RES_LOC_GADGETS, -388, this.guiLeft + 16, this.guiTop + this.ySize - 30, 188, 14, 16, 16, configText); - this.buttonList.add(this.configButton); + this.addButton(this.configButton); List achievementText = new ArrayList<>(); achievementText.add(TextFormatting.GOLD + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".achievementButton.name")); achievementText.addAll(this.font.listFormattedStringToWidth(StringUtil.localizeFormatted("booklet." + ActuallyAdditions.MODID + ".achievementButton.desc", ActuallyAdditions.NAME), 200)); //this.achievementButton = new TexturedButton(RES_LOC_GADGETS, -389, this.guiLeft+36, this.guiTop+this.ySize-30, 204, 14, 16, 16, achievementText); - //this.buttonList.add(this.achievementButton); + //this.addButton(this.achievementButton); PlayerSave data = PlayerData.getDataFromPlayer(this.getMinecraft().player); if (!data.didBookTutorial) { this.showTutorial = true; this.tutorialButton = new GuiButton(666666, this.guiLeft + 140 / 2 - 50, this.guiTop + 146, 100, 20, "Please click me <3"); - this.buttonList.add(this.tutorialButton); + this.addButton(this.tutorialButton); this.configButton.visible = false; //this.achievementButton.visible = false; @@ -159,7 +159,7 @@ public class GuiMainPage extends GuiBooklet { List displayed = getDisplayedEntries(); if (displayed.size() > i) { IBookletEntry entry = displayed.get(i); - this.buttonList.add(new EntryButton(this, i, this.guiLeft + 156, this.guiTop + 11 + i * 13, 115, 10, "- " + entry.getLocalizedNameWithFormatting(), ItemStack.EMPTY)); + this.addButton(new EntryButton(this, i, this.guiLeft + 156, this.guiTop + 11 + i * 13, 115, 10, "- " + entry.getLocalizedNameWithFormatting(), ItemStack.EMPTY)); } else { return; } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiPage.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiPage.java index bcb5fd3f1..d98dfff66 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiPage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/gui/GuiPage.java @@ -118,7 +118,7 @@ public class GuiPage extends GuiBooklet { List links = this.getWebLinks(); if (links != null && !links.isEmpty()) { this.buttonViewOnline = new TexturedButton(RES_LOC_GADGETS, -782822, this.guiLeft + this.xSize - 24, this.guiTop + this.ySize - 25, 0, 172, 16, 16, Collections.singletonList(TextFormatting.GOLD + StringUtil.localize("booklet." + ActuallyAdditions.MODID + ".onlineButton.name"))); - this.buttonList.add(this.buttonViewOnline); + this.addButton(this.buttonViewOnline); } for (int i = 0; i < this.pages.length; i++) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/misc/GuiAAAchievements.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/misc/GuiAAAchievements.java index f1d3b9b15..1e5a84736 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/misc/GuiAAAchievements.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/misc/GuiAAAchievements.java @@ -19,7 +19,7 @@ import net.minecraft.client.gui.achievement.GuiAchievements; import net.minecraft.stats.StatisticsManager; import net.minecraftforge.fml.relauncher.ReflectionHelper; import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.OnlyIn; + import org.lwjgl.input.Keyboard; import java.io.IOException; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java index 66d16ee57..ed8033d82 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/creative/CreativeTab.java @@ -25,7 +25,7 @@ //import net.minecraftforge.fluids.FluidStack; //import net.minecraftforge.fluids.FluidUtil; //import net.minecraftforge.fml.relauncher.Side; -//import net.minecraftforge.fml.relauncher.OnlyIn; +// // //public class CreativeTab extends CreativeTabs { // diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java b/src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java index 075d2c81e..946e72c85 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/entity/InitEntities.java @@ -14,8 +14,7 @@ import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fml.client.registry.RenderingRegistry; import net.minecraftforge.fml.common.registry.EntityRegistry; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.OnlyIn; + public final class InitEntities { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/RenderWorm.java b/src/main/java/de/ellpeck/actuallyadditions/mod/entity/RenderWorm.java index f633bbe37..844373fbf 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/entity/RenderWorm.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/entity/RenderWorm.java @@ -13,14 +13,13 @@ package de.ellpeck.actuallyadditions.mod.entity; import de.ellpeck.actuallyadditions.mod.items.InitItems; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.Render; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.fml.relauncher.OnlyIn; + @OnlyIn(Dist.CLIENT) public class RenderWorm extends Render { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ActuallyContainers.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ActuallyContainers.java index 6fe3a0ea1..098ac8fb8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ActuallyContainers.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ActuallyContainers.java @@ -17,8 +17,26 @@ public class ActuallyContainers { public static final RegistryObject> COAL_GENERATOR_CONTAINER = CONTAINERS.register("coal_generator_container", () -> IForgeContainerType.create(ContainerCoalGenerator::fromNetwork)); public static final RegistryObject> COFFEE_MACHINE_CONTAINER = CONTAINERS.register("coffee_machine_container", () -> IForgeContainerType.create(ContainerCoffeeMachine::fromNetwork)); public static final RegistryObject> DIRECTIONAL_BREAKER_CONTAINER = CONTAINERS.register("directional_breaker_container", () -> IForgeContainerType.create(ContainerDirectionalBreaker::fromNetwork)); + public static final RegistryObject> DRILL_CONTAINER = CONTAINERS.register("drill_container", () -> IForgeContainerType.create(ContainerDrill::fromNetwork)); public static final RegistryObject> DROPPER_CONTAINER = CONTAINERS.register("dropper_container", () -> IForgeContainerType.create(ContainerDropper::fromNetwork)); public static final RegistryObject> ENERVATOR_CONTAINER = CONTAINERS.register("enervator_container", () -> IForgeContainerType.create(ContainerEnervator::fromNetwork)); public static final RegistryObject> ENERGIZER_CONTAINER = CONTAINERS.register("energizer_container", () -> IForgeContainerType.create(ContainerEnergizer::fromNetwork)); + + public static final RegistryObject> FARMER_CONTAINER = CONTAINERS.register("farmer_container", () -> IForgeContainerType.create(ContainerFarmer::fromNetwork)); + public static final RegistryObject> FEEDER_CONTAINER = CONTAINERS.register("feeder_container", () -> IForgeContainerType.create(ContainerFeeder::fromNetwork)); + public static final RegistryObject> FERMENTING_BARREL_CONTAINER = CONTAINERS.register("fermenting_barrel_container", () -> IForgeContainerType.create(ContainerFermentingBarrel::fromNetwork)); + public static final RegistryObject> FILTER_CONTAINER = CONTAINERS.register("filter_container", () -> IForgeContainerType.create(ContainerFilter::fromNetwork)); + public static final RegistryObject> FIREWORK_BOX_CONTAINER = CONTAINERS.register("firework_box_container", () -> IForgeContainerType.create(ContainerFireworkBox::fromNetwork)); + public static final RegistryObject> FLUID_COLLECTOR_CONTAINER = CONTAINERS.register("fluid_collector_container", () -> IForgeContainerType.create(ContainerFluidCollector::fromNetwork)); + public static final RegistryObject> FURNACE_DOUBLE_CONTAINER = CONTAINERS.register("furnace_double_container", () -> IForgeContainerType.create(ContainerFurnaceDouble::fromNetwork)); + public static final RegistryObject> GRINDER_CONTAINER = CONTAINERS.register("grinder_container", () -> IForgeContainerType.create(ContainerGrinder::fromNetwork)); + public static final RegistryObject> INPUTTER_CONTAINER = CONTAINERS.register("inputter_container", () -> IForgeContainerType.create(ContainerInputter::fromNetwork)); + public static final RegistryObject> LASER_RELAY_ITEM_WHITELIST_CONTAINER = CONTAINERS.register("laser_relay_item_whitelist_container", () -> IForgeContainerType.create(ContainerLaserRelayItemWhitelist::fromNetwork)); + public static final RegistryObject> MINER_CONTAINER = CONTAINERS.register("miner_container", () -> IForgeContainerType.create(ContainerMiner::fromNetwork)); + public static final RegistryObject> OIL_GENERATOR_CONTAINER = CONTAINERS.register("oil_generator_container", () -> IForgeContainerType.create(ContainerOilGenerator::fromNetwork)); + public static final RegistryObject> PHANTOM_PLACER_CONTAINER = CONTAINERS.register("phantom_placer_container", () -> IForgeContainerType.create(ContainerPhantomPlacer::fromNetwork)); + public static final RegistryObject> RANGED_COLLECTOR_CONTAINER = CONTAINERS.register("ranged_collector_container", () -> IForgeContainerType.create(ContainerRangedCollector::fromNetwork)); + public static final RegistryObject> XPSOLIDIFIER_CONTAINER = CONTAINERS.register("xpsolidifier_container", () -> IForgeContainerType.create(ContainerXPSolidifier::fromNetwork)); + } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBioReactor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBioReactor.java index 0e5ee2c74..796852f6d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBioReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerBioReactor.java @@ -23,7 +23,7 @@ import net.minecraft.network.PacketBuffer; import java.util.Objects; public class ContainerBioReactor extends Container { - private final TileEntityBioReactor tile; + public final TileEntityBioReactor tile; public static ContainerBioReactor fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { return new ContainerBioReactor(windowId, inv, (TileEntityBioReactor) Objects.requireNonNull(inv.player.world.getTileEntity(data.readBlockPos()))); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java index d0e669767..8ab2b1fd8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCanolaPress.java @@ -25,7 +25,7 @@ import java.util.Objects; public class ContainerCanolaPress extends Container { - private final TileEntityCanolaPress press; + public final TileEntityCanolaPress press; public static ContainerCanolaPress fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { return new ContainerCanolaPress(windowId, inv, (TileEntityCanolaPress) Objects.requireNonNull(inv.player.world.getTileEntity(data.readBlockPos()))); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java index 94e2eeddf..6dac5ac15 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerCoalGenerator.java @@ -25,7 +25,7 @@ import java.util.Objects; public class ContainerCoalGenerator extends Container { - private final TileEntityCoalGenerator generator; + public final TileEntityCoalGenerator generator; public static ContainerCoalGenerator fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { return new ContainerCoalGenerator(windowId, inv, (TileEntityCoalGenerator) Objects.requireNonNull(inv.player.world.getTileEntity(data.readBlockPos()))); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java index bd9cd71aa..f6f9158f9 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDirectionalBreaker.java @@ -24,7 +24,7 @@ import java.util.Objects; public class ContainerDirectionalBreaker extends Container { - private final TileEntityDirectionalBreaker breaker; + public final TileEntityDirectionalBreaker breaker; public static ContainerDirectionalBreaker fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { return new ContainerDirectionalBreaker(windowId, inv, (TileEntityDirectionalBreaker) Objects.requireNonNull(inv.player.world.getTileEntity(data.readBlockPos()))); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java index 306c2d9bd..47fe222c0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDrill.java @@ -18,10 +18,11 @@ import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.ClickType; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.container.ClickType; +import net.minecraft.inventory.container.Container; +import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; public class ContainerDrill extends Container { @@ -30,11 +31,16 @@ public class ContainerDrill extends Container { private final ItemStackHandlerAA drillInventory = new ItemStackHandlerAA(SLOT_AMOUNT); private final PlayerInventory inventory; - public ContainerDrill(PlayerInventory inventory) { + public static ContainerDrill fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { + return new ContainerDrill(windowId, inv); + } + + public ContainerDrill(int windowId, PlayerInventory inventory) { + super(ActuallyContainers.DRILL_CONTAINER.get(), windowId); this.inventory = inventory; for (int i = 0; i < SLOT_AMOUNT; i++) { - this.addSlotToContainer(new SlotItemHandlerUnconditioned(this.drillInventory, i, 44 + i * 18, 19) { + this.addSlot(new SlotItemHandlerUnconditioned(this.drillInventory, i, 44 + i * 18, 19) { @Override public boolean isItemValid(ItemStack stack) { return stack.getItem() instanceof ItemDrillUpgrade; @@ -44,14 +50,14 @@ public class ContainerDrill extends Container { for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { - this.addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 58 + i * 18)); + this.addSlot(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 58 + i * 18)); } } for (int i = 0; i < 9; i++) { if (i == inventory.currentItem) { - this.addSlotToContainer(new SlotImmovable(inventory, i, 8 + i * 18, 116)); + this.addSlot(new SlotImmovable(inventory, i, 8 + i * 18, 116)); } else { - this.addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 116)); + this.addSlot(new Slot(inventory, i, 8 + i * 18, 116)); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java index 7e5cde8f0..fbc4de0d4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerDropper.java @@ -25,7 +25,7 @@ import java.util.Objects; public class ContainerDropper extends Container { - private final TileEntityDropper dropper; + public final TileEntityDropper dropper; PlayerEntity player; public static ContainerDropper fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java index 02d5b82e1..7741dfc94 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnergizer.java @@ -30,7 +30,7 @@ import java.util.Objects; public class ContainerEnergizer extends Container { public static final EquipmentSlotType[] VALID_EQUIPMENT_SLOTS = new EquipmentSlotType[]{EquipmentSlotType.HEAD, EquipmentSlotType.CHEST, EquipmentSlotType.LEGS, EquipmentSlotType.FEET}; - private final TileEntityEnergizer energizer; + public final TileEntityEnergizer energizer; public static ContainerEnergizer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { return new ContainerEnergizer(windowId, inv, (TileEntityEnergizer) Objects.requireNonNull(inv.player.world.getTileEntity(data.readBlockPos()))); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java index dbf6057a7..20969abce 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerEnervator.java @@ -28,14 +28,14 @@ import java.util.Objects; public class ContainerEnervator extends Container { - private final TileEntityEnervator enervator; + public final TileEntityEnervator enervator; public static ContainerEnervator fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { return new ContainerEnervator(windowId, inv, (TileEntityEnervator) Objects.requireNonNull(inv.player.world.getTileEntity(data.readBlockPos()))); } public ContainerEnervator(int windowId, PlayerInventory inventory, TileEntityEnervator tile) { - super(ActuallyContainers.ENERGIZER_CONTAINER.get(), windowId); + super(ActuallyContainers.ENERVATOR_CONTAINER.get(), windowId); this.enervator = tile; this.addSlot(new SlotItemHandlerUnconditioned(this.enervator.inv, 0, 76, 73)); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFarmer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFarmer.java index 1a3044861..46485bee2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFarmer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFarmer.java @@ -11,7 +11,6 @@ package de.ellpeck.actuallyadditions.mod.inventory; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityFarmer; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.entity.player.PlayerEntity; @@ -19,13 +18,21 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; + +import java.util.Objects; public class ContainerFarmer extends Container { - private final TileEntityFarmer farmer; + public final TileEntityFarmer farmer; - public ContainerFarmer(PlayerInventory inventory, TileEntityBase tile) { - this.farmer = (TileEntityFarmer) tile; + public static ContainerFarmer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { + return new ContainerFarmer(windowId, inv, (TileEntityFarmer) Objects.requireNonNull(inv.player.world.getTileEntity(data.readBlockPos()))); + } + + public ContainerFarmer(int windowId, PlayerInventory inventory, TileEntityFarmer tile) { + super(ActuallyContainers.FARMER_CONTAINER.get(), windowId); + this.farmer = tile; for (int i = 0; i < 3; i++) { for (int j = 0; j < 2; j++) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java index 5675ebacd..230fe06be 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFeeder.java @@ -11,30 +11,37 @@ package de.ellpeck.actuallyadditions.mod.inventory; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityFeeder; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.container.Container; +import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; + +import java.util.Objects; public class ContainerFeeder extends Container { - private final TileEntityFeeder tileFeeder; + public final TileEntityFeeder feeder; - public ContainerFeeder(PlayerInventory inventory, TileEntityBase tile) { - this.tileFeeder = (TileEntityFeeder) tile; - this.addSlotToContainer(new SlotItemHandlerUnconditioned(this.tileFeeder.inv, 0, 80, 45)); + public static ContainerFeeder fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { + return new ContainerFeeder(windowId, inv, (TileEntityFeeder) Objects.requireNonNull(inv.player.world.getTileEntity(data.readBlockPos()))); + } + + public ContainerFeeder(int windowId, PlayerInventory inventory, TileEntityFeeder tile) { + super(ActuallyContainers.FEEDER_CONTAINER.get(), windowId); + this.feeder = tile; + this.addSlot(new SlotItemHandlerUnconditioned(this.feeder.inv, 0, 80, 45)); for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { - this.addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 74 + i * 18)); + this.addSlot(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 74 + i * 18)); } } for (int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 132)); + this.addSlot(new Slot(inventory, i, 8 + i * 18, 132)); } } @@ -86,6 +93,6 @@ public class ContainerFeeder extends Container { @Override public boolean canInteractWith(PlayerEntity player) { - return this.tileFeeder.canPlayerUse(player); + return this.feeder.canPlayerUse(player); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java index 46ab7f873..30e07e601 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFermentingBarrel.java @@ -10,29 +10,36 @@ package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityFermentingBarrel; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.container.Container; +import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; + +import java.util.Objects; public class ContainerFermentingBarrel extends Container { - private final TileEntityFermentingBarrel barrel; + public final TileEntityFermentingBarrel barrel; - public ContainerFermentingBarrel(PlayerInventory inventory, TileEntityBase tile) { - this.barrel = (TileEntityFermentingBarrel) tile; + public static ContainerFermentingBarrel fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { + return new ContainerFermentingBarrel(windowId, inv, (TileEntityFermentingBarrel) Objects.requireNonNull(inv.player.world.getTileEntity(data.readBlockPos()))); + } + + public ContainerFermentingBarrel(int windowId, PlayerInventory inventory, TileEntityFermentingBarrel tile) { + super(ActuallyContainers.FERMENTING_BARREL_CONTAINER.get(), windowId); + this.barrel = tile; for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { - this.addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 97 + i * 18)); + this.addSlot(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 97 + i * 18)); } } for (int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 155)); + this.addSlot(new Slot(inventory, i, 8 + i * 18, 155)); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFilter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFilter.java index 0104bc929..28e0831bb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFilter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFilter.java @@ -17,10 +17,11 @@ import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.ClickType; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.container.ClickType; +import net.minecraft.inventory.container.Container; +import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; public class ContainerFilter extends Container { @@ -29,25 +30,30 @@ public class ContainerFilter extends Container { private final ItemStackHandlerAA filterInventory = new ItemStackHandlerAA(SLOT_AMOUNT); private final PlayerInventory inventory; - public ContainerFilter(PlayerInventory inventory) { + public static ContainerFilter fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { + return new ContainerFilter(windowId, inv); + } + + public ContainerFilter(int windowId, PlayerInventory inventory) { + super(ActuallyContainers.FILTER_CONTAINER.get(), windowId); this.inventory = inventory; for (int i = 0; i < 4; i++) { for (int j = 0; j < 6; j++) { - this.addSlotToContainer(new SlotFilter(this.filterInventory, j + i * 6, 35 + j * 18, 10 + i * 18)); + this.addSlot(new SlotFilter(this.filterInventory, j + i * 6, 35 + j * 18, 10 + i * 18)); } } for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { - this.addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 94 + i * 18)); + this.addSlot(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 94 + i * 18)); } } for (int i = 0; i < 9; i++) { if (i == inventory.currentItem) { - this.addSlotToContainer(new SlotImmovable(inventory, i, 8 + i * 18, 152)); + this.addSlot(new SlotImmovable(inventory, i, 8 + i * 18, 152)); } else { - this.addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 152)); + this.addSlot(new Slot(inventory, i, 8 + i * 18, 152)); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFireworkBox.java index deda0a006..852ca08ca 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFireworkBox.java @@ -11,11 +11,21 @@ package de.ellpeck.actuallyadditions.mod.inventory; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.Container; +import net.minecraft.entity.player.PlayerInventory; +import net.minecraft.inventory.container.Container; import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; public class ContainerFireworkBox extends Container { + public static ContainerFireworkBox fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { + return new ContainerFireworkBox(windowId, inv); + } + + public ContainerFireworkBox(int windowId, PlayerInventory inventory) { + super(ActuallyContainers.FIREWORK_BOX_CONTAINER.get(), windowId); + } + @Override public ItemStack transferStackInSlot(PlayerEntity playerIn, int index) { return ItemStack.EMPTY; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java index 51a23798c..9e847334c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFluidCollector.java @@ -10,29 +10,36 @@ package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityFluidCollector; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.container.Container; +import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; + +import java.util.Objects; public class ContainerFluidCollector extends Container { - private final TileEntityFluidCollector collector; + public final TileEntityFluidCollector collector; - public ContainerFluidCollector(PlayerInventory inventory, TileEntityBase tile) { - this.collector = (TileEntityFluidCollector) tile; + public static ContainerFluidCollector fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { + return new ContainerFluidCollector(windowId, inv, (TileEntityFluidCollector) Objects.requireNonNull(inv.player.world.getTileEntity(data.readBlockPos()))); + } + + public ContainerFluidCollector(int windowId, PlayerInventory inventory, TileEntityFluidCollector tile) { + super(ActuallyContainers.FLUID_COLLECTOR_CONTAINER.get(), windowId); + this.collector = tile; for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { - this.addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 97 + i * 18)); + this.addSlot(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 97 + i * 18)); } } for (int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 155)); + this.addSlot(new Slot(inventory, i, 8 + i * 18, 155)); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java index 180ee4512..8ed3e3e09 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerFurnaceDouble.java @@ -12,35 +12,42 @@ package de.ellpeck.actuallyadditions.mod.inventory; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceDouble; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.container.Container; +import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.network.PacketBuffer; + +import java.util.Objects; public class ContainerFurnaceDouble extends Container { - private final TileEntityFurnaceDouble tileFurnace; + public final TileEntityFurnaceDouble furnace; - public ContainerFurnaceDouble(PlayerInventory inventory, TileEntityBase tile) { - this.tileFurnace = (TileEntityFurnaceDouble) tile; + public static ContainerFurnaceDouble fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { + return new ContainerFurnaceDouble(windowId, inv, (TileEntityFurnaceDouble) Objects.requireNonNull(inv.player.world.getTileEntity(data.readBlockPos()))); + } - this.addSlotToContainer(new SlotItemHandlerUnconditioned(this.tileFurnace.inv, TileEntityFurnaceDouble.SLOT_INPUT_1, 51, 21)); - this.addSlotToContainer(new SlotOutput(this.tileFurnace.inv, TileEntityFurnaceDouble.SLOT_OUTPUT_1, 51, 69)); - this.addSlotToContainer(new SlotItemHandlerUnconditioned(this.tileFurnace.inv, TileEntityFurnaceDouble.SLOT_INPUT_2, 109, 21)); - this.addSlotToContainer(new SlotOutput(this.tileFurnace.inv, TileEntityFurnaceDouble.SLOT_OUTPUT_2, 108, 69)); + public ContainerFurnaceDouble(int windowId, PlayerInventory inventory, TileEntityFurnaceDouble tile) { + super(ActuallyContainers.FURNACE_DOUBLE_CONTAINER.get(), windowId); + this.furnace = tile; + + this.addSlot(new SlotItemHandlerUnconditioned(this.furnace.inv, TileEntityFurnaceDouble.SLOT_INPUT_1, 51, 21)); + this.addSlot(new SlotOutput(this.furnace.inv, TileEntityFurnaceDouble.SLOT_OUTPUT_1, 51, 69)); + this.addSlot(new SlotItemHandlerUnconditioned(this.furnace.inv, TileEntityFurnaceDouble.SLOT_INPUT_2, 109, 21)); + this.addSlot(new SlotOutput(this.furnace.inv, TileEntityFurnaceDouble.SLOT_OUTPUT_2, 108, 69)); for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { - this.addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 97 + i * 18)); + this.addSlot(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 97 + i * 18)); } } for (int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 155)); + this.addSlot(new Slot(inventory, i, 8 + i * 18, 155)); } } @@ -105,6 +112,6 @@ public class ContainerFurnaceDouble extends Container { @Override public boolean canInteractWith(PlayerEntity player) { - return this.tileFurnace.canPlayerUse(player); + return this.furnace.canPlayerUse(player); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java index 37e47d36d..268faddc2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGiantChest.java @@ -1,98 +1,99 @@ -/* - * This file ("ContainerGiantChest.java") is part of the Actually Additions mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015-2017 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.inventory; - -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChest; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import invtweaks.api.container.ChestContainer; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -@ChestContainer(rowSize = 13, isLargeChest = true) -public class ContainerGiantChest extends Container { - - public final TileEntityGiantChest tileChest; - - public ContainerGiantChest(PlayerInventory inventory, TileEntityBase tile, int page) { - this.tileChest = (TileEntityGiantChest) tile; - - for (int i = 0; i < 9; i++) { - for (int j = 0; j < 13; j++) { - this.addSlotToContainer(new SlotItemHandlerUnconditioned(this.tileChest.inv, 9 * 13 * page + j + i * 13, 5 + j * 18, 5 + i * 18)); - } - } - - for (int i = 0; i < 3; i++) { - for (int j = 0; j < 9; j++) { - this.addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 33 + 8 + j * 18, 172 + 4 + i * 18)); - } - } - for (int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(inventory, i, 33 + 8 + i * 18, 172 + 62)); - } - } - - @Override - public ItemStack transferStackInSlot(PlayerEntity player, int slot) { - int inventoryStart = 117; - int inventoryEnd = inventoryStart + 26; - int hotbarStart = inventoryEnd + 1; - int hotbarEnd = hotbarStart + 8; - - Slot theSlot = this.inventorySlots.get(slot); - - if (theSlot != null && theSlot.getHasStack()) { - ItemStack newStack = theSlot.getStack(); - ItemStack currentStack = newStack.copy(); - - //Other Slots in Inventory excluded - if (slot >= inventoryStart) { - //Shift from Inventory - if (!this.mergeItemStack(newStack, 0, 117, false)) { - // - if (slot >= inventoryStart && slot <= inventoryEnd) { - if (!this.mergeItemStack(newStack, hotbarStart, hotbarEnd + 1, false)) { - return StackUtil.getEmpty(); - } - } else if (slot >= inventoryEnd + 1 && slot < hotbarEnd + 1 && !this.mergeItemStack(newStack, inventoryStart, inventoryEnd + 1, false)) { - return StackUtil.getEmpty(); - } - } - } else if (!this.mergeItemStack(newStack, inventoryStart, hotbarEnd + 1, true)) { - return StackUtil.getEmpty(); - } - - if (!StackUtil.isValid(newStack)) { - theSlot.putStack(StackUtil.getEmpty()); - } else { - theSlot.onSlotChanged(); - } - - if (newStack.getCount() == currentStack.getCount()) { - return StackUtil.getEmpty(); - } - theSlot.onTake(player, newStack); - - return currentStack; - } - return StackUtil.getEmpty(); - } - - @Override - public boolean canInteractWith(PlayerEntity player) { - return this.tileChest.canPlayerUse(player); - } -} +// TODO: [port][note] no longer used +///* +// * This file ("ContainerGiantChest.java") is part of the Actually Additions mod for Minecraft. +// * It is created and owned by Ellpeck and distributed +// * under the Actually Additions License to be found at +// * http://ellpeck.de/actaddlicense +// * View the source code at https://github.com/Ellpeck/ActuallyAdditions +// * +// * © 2015-2017 Ellpeck +// */ +// +//package de.ellpeck.actuallyadditions.mod.inventory; +// +//import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; +//import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +//import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChest; +//import de.ellpeck.actuallyadditions.mod.util.StackUtil; +//import invtweaks.api.container.ChestContainer; +//import net.minecraft.entity.player.PlayerEntity; +//import net.minecraft.entity.player.PlayerInventory; +//import net.minecraft.inventory.container.Container; +//import net.minecraft.inventory.container.Slot; +//import net.minecraft.item.ItemStack; +// +//@ChestContainer(rowSize = 13, isLargeChest = true) +//public class ContainerGiantChest extends Container { +// +// public final TileEntityGiantChest tileChest; +// +// public ContainerGiantChest(PlayerInventory inventory, TileEntityBase tile, int page) { +// this.tileChest = (TileEntityGiantChest) tile; +// +// for (int i = 0; i < 9; i++) { +// for (int j = 0; j < 13; j++) { +// this.addSlot(new SlotItemHandlerUnconditioned(this.tileChest.inv, 9 * 13 * page + j + i * 13, 5 + j * 18, 5 + i * 18)); +// } +// } +// +// for (int i = 0; i < 3; i++) { +// for (int j = 0; j < 9; j++) { +// this.addSlot(new Slot(inventory, j + i * 9 + 9, 33 + 8 + j * 18, 172 + 4 + i * 18)); +// } +// } +// for (int i = 0; i < 9; i++) { +// this.addSlot(new Slot(inventory, i, 33 + 8 + i * 18, 172 + 62)); +// } +// } +// +// @Override +// public ItemStack transferStackInSlot(PlayerEntity player, int slot) { +// int inventoryStart = 117; +// int inventoryEnd = inventoryStart + 26; +// int hotbarStart = inventoryEnd + 1; +// int hotbarEnd = hotbarStart + 8; +// +// Slot theSlot = this.inventorySlots.get(slot); +// +// if (theSlot != null && theSlot.getHasStack()) { +// ItemStack newStack = theSlot.getStack(); +// ItemStack currentStack = newStack.copy(); +// +// //Other Slots in Inventory excluded +// if (slot >= inventoryStart) { +// //Shift from Inventory +// if (!this.mergeItemStack(newStack, 0, 117, false)) { +// // +// if (slot >= inventoryStart && slot <= inventoryEnd) { +// if (!this.mergeItemStack(newStack, hotbarStart, hotbarEnd + 1, false)) { +// return StackUtil.getEmpty(); +// } +// } else if (slot >= inventoryEnd + 1 && slot < hotbarEnd + 1 && !this.mergeItemStack(newStack, inventoryStart, inventoryEnd + 1, false)) { +// return StackUtil.getEmpty(); +// } +// } +// } else if (!this.mergeItemStack(newStack, inventoryStart, hotbarEnd + 1, true)) { +// return StackUtil.getEmpty(); +// } +// +// if (!StackUtil.isValid(newStack)) { +// theSlot.putStack(StackUtil.getEmpty()); +// } else { +// theSlot.onSlotChanged(); +// } +// +// if (newStack.getCount() == currentStack.getCount()) { +// return StackUtil.getEmpty(); +// } +// theSlot.onTake(player, newStack); +// +// return currentStack; +// } +// return StackUtil.getEmpty(); +// } +// +// @Override +// public boolean canInteractWith(PlayerEntity player) { +// return this.tileChest.canPlayerUse(player); +// } +//} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java index 6c92a6c80..90375c48d 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerGrinder.java @@ -13,7 +13,6 @@ package de.ellpeck.actuallyadditions.mod.inventory; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput; import de.ellpeck.actuallyadditions.mod.recipe.CrusherRecipeRegistry; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityGrinder; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.entity.player.PlayerEntity; @@ -21,38 +20,45 @@ import net.minecraft.entity.player.PlayerInventory; import net.minecraft.inventory.container.Container; import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; + +import java.util.Objects; public class ContainerGrinder extends Container { - public final TileEntityGrinder tileGrinder; - private final boolean isDouble; + public final boolean isDouble; - public ContainerGrinder(PlayerInventory inventory, TileEntityBase tile, boolean isDouble) { - this.tileGrinder = (TileEntityGrinder) tile; + public static ContainerGrinder fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { + return new ContainerGrinder(windowId, inv, data.readBoolean(), (TileEntityGrinder) Objects.requireNonNull(inv.player.world.getTileEntity(data.readBlockPos()))); + } + + public ContainerGrinder(int windowId, PlayerInventory inventory, boolean isDouble, TileEntityGrinder tile) { + super(ActuallyContainers.GRINDER_CONTAINER.get(), windowId); + this.tileGrinder = tile; this.isDouble = isDouble; - this.addSlotToContainer(new SlotItemHandlerUnconditioned(this.tileGrinder.inv, TileEntityGrinder.SLOT_INPUT_1, this.isDouble + this.addSlot(new SlotItemHandlerUnconditioned(this.tileGrinder.inv, TileEntityGrinder.SLOT_INPUT_1, this.isDouble ? 51 : 80, 21)); - this.addSlotToContainer(new SlotOutput(this.tileGrinder.inv, TileEntityGrinder.SLOT_OUTPUT_1_1, this.isDouble + this.addSlot(new SlotOutput(this.tileGrinder.inv, TileEntityGrinder.SLOT_OUTPUT_1_1, this.isDouble ? 37 : 66, 69)); - this.addSlotToContainer(new SlotOutput(this.tileGrinder.inv, TileEntityGrinder.SLOT_OUTPUT_1_2, this.isDouble + this.addSlot(new SlotOutput(this.tileGrinder.inv, TileEntityGrinder.SLOT_OUTPUT_1_2, this.isDouble ? 64 : 92, 69)); if (this.isDouble) { - this.addSlotToContainer(new SlotItemHandlerUnconditioned(this.tileGrinder.inv, TileEntityGrinder.SLOT_INPUT_2, 109, 21)); - this.addSlotToContainer(new SlotOutput(this.tileGrinder.inv, TileEntityGrinder.SLOT_OUTPUT_2_1, 96, 69)); - this.addSlotToContainer(new SlotOutput(this.tileGrinder.inv, TileEntityGrinder.SLOT_OUTPUT_2_2, 121, 69)); + this.addSlot(new SlotItemHandlerUnconditioned(this.tileGrinder.inv, TileEntityGrinder.SLOT_INPUT_2, 109, 21)); + this.addSlot(new SlotOutput(this.tileGrinder.inv, TileEntityGrinder.SLOT_OUTPUT_2_1, 96, 69)); + this.addSlot(new SlotOutput(this.tileGrinder.inv, TileEntityGrinder.SLOT_OUTPUT_2_2, 121, 69)); } for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { - this.addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 97 + i * 18)); + this.addSlot(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 97 + i * 18)); } } for (int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 155)); + this.addSlot(new Slot(inventory, i, 8 + i * 18, 155)); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java index 64afffc7a..87a8a0c5c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerInputter.java @@ -13,27 +13,32 @@ package de.ellpeck.actuallyadditions.mod.inventory; import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiInputter; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityInputter; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.ClickType; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.container.ClickType; +import net.minecraft.inventory.container.Container; +import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; + +import java.util.Objects; public class ContainerInputter extends Container { + public final TileEntityInputter tileInputter; + public final boolean isAdvanced; - private final TileEntityInputter tileInputter; + public static ContainerInputter fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { + return new ContainerInputter(windowId, inv, data.readBoolean(), (TileEntityInputter) Objects.requireNonNull(inv.player.world.getTileEntity(data.readBlockPos()))); + } - private final boolean isAdvanced; - - public ContainerInputter(PlayerInventory inventory, TileEntityBase tile, boolean isAdvanced) { - this.tileInputter = (TileEntityInputter) tile; + public ContainerInputter(int windowId, PlayerInventory inventory, boolean isAdvanced, TileEntityInputter tile) { + super(ActuallyContainers.INPUTTER_CONTAINER.get(), windowId); + this.tileInputter = tile; this.isAdvanced = isAdvanced; - this.addSlotToContainer(new SlotItemHandlerUnconditioned(this.tileInputter.inv, 0, 80, 21 + (isAdvanced + this.addSlot(new SlotItemHandlerUnconditioned(this.tileInputter.inv, 0, 80, 21 + (isAdvanced ? 12 : 0))); @@ -41,7 +46,7 @@ public class ContainerInputter extends Container { for (int i = 0; i < 2; i++) { for (int x = 0; x < 3; x++) { for (int y = 0; y < 4; y++) { - this.addSlotToContainer(new SlotFilter(i == 0 + this.addSlot(new SlotFilter(i == 0 ? this.tileInputter.leftFilter : this.tileInputter.rightFilter, y + x * 4, 20 + i * 84 + x * 18, 6 + y * 18)); } @@ -51,13 +56,13 @@ public class ContainerInputter extends Container { for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { - this.addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 101 + i * 18 + (isAdvanced + this.addSlot(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 101 + i * 18 + (isAdvanced ? GuiInputter.OFFSET_ADVANCED : 0))); } } for (int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 159 + (isAdvanced + this.addSlot(new Slot(inventory, i, 8 + i * 18, 159 + (isAdvanced ? GuiInputter.OFFSET_ADVANCED : 0))); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java index 50fdc4cb3..62466840a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerLaserRelayItemWhitelist.java @@ -11,27 +11,34 @@ package de.ellpeck.actuallyadditions.mod.inventory; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayItemWhitelist; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.ClickType; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.container.ClickType; +import net.minecraft.inventory.container.Container; +import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; + +import java.util.Objects; public class ContainerLaserRelayItemWhitelist extends Container { - private final TileEntityLaserRelayItemWhitelist tile; + public final TileEntityLaserRelayItemWhitelist tile; - public ContainerLaserRelayItemWhitelist(PlayerInventory inventory, TileEntityBase tile) { - this.tile = (TileEntityLaserRelayItemWhitelist) tile; + public static ContainerLaserRelayItemWhitelist fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { + return new ContainerLaserRelayItemWhitelist(windowId, inv, (TileEntityLaserRelayItemWhitelist) Objects.requireNonNull(inv.player.world.getTileEntity(data.readBlockPos()))); + } + + public ContainerLaserRelayItemWhitelist(int windowId, PlayerInventory inventory, TileEntityLaserRelayItemWhitelist tile) { + super(ActuallyContainers.LASER_RELAY_ITEM_WHITELIST_CONTAINER.get(), windowId); + this.tile = tile; for (int i = 0; i < 2; i++) { for (int x = 0; x < 3; x++) { for (int y = 0; y < 4; y++) { - this.addSlotToContainer(new SlotFilter(i == 0 + this.addSlot(new SlotFilter(i == 0 ? this.tile.leftFilter : this.tile.rightFilter, y + x * 4, 20 + i * 84 + x * 18, 6 + y * 18)); } @@ -40,11 +47,11 @@ public class ContainerLaserRelayItemWhitelist extends Container { for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { - this.addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 97 + i * 18)); + this.addSlot(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 97 + i * 18)); } } for (int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 155)); + this.addSlot(new Slot(inventory, i, 8 + i * 18, 155)); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java index 673a1f291..55e859942 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerMiner.java @@ -11,35 +11,42 @@ package de.ellpeck.actuallyadditions.mod.inventory; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityMiner; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.container.Container; +import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; + +import java.util.Objects; public class ContainerMiner extends Container { - private final TileEntityMiner miner; + public final TileEntityMiner miner; - public ContainerMiner(PlayerInventory inventory, TileEntityBase tile) { - this.miner = (TileEntityMiner) tile; + public static ContainerMiner fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { + return new ContainerMiner(windowId, inv, (TileEntityMiner) Objects.requireNonNull(inv.player.world.getTileEntity(data.readBlockPos()))); + } + + public ContainerMiner(int windowId, PlayerInventory inventory, TileEntityMiner tile) { + super(ActuallyContainers.MINER_CONTAINER.get(), windowId); + this.miner = tile; for (int i = 0; i < 3; i++) { for (int j = 0; j < 3; j++) { - this.addSlotToContainer(new SlotItemHandlerUnconditioned(this.miner.inv, j + i * 3, 62 + j * 18, 21 + i * 18)); + this.addSlot(new SlotItemHandlerUnconditioned(this.miner.inv, j + i * 3, 62 + j * 18, 21 + i * 18)); } } for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { - this.addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 97 + i * 18)); + this.addSlot(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 97 + i * 18)); } } for (int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 155)); + this.addSlot(new Slot(inventory, i, 8 + i * 18, 155)); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java index 1baa6b016..b1534f732 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerOilGenerator.java @@ -10,29 +10,36 @@ package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityOilGenerator; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.container.Container; +import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; + +import java.util.Objects; public class ContainerOilGenerator extends Container { - private final TileEntityOilGenerator generator; + public final TileEntityOilGenerator generator; - public ContainerOilGenerator(PlayerInventory inventory, TileEntityBase tile) { - this.generator = (TileEntityOilGenerator) tile; + public static ContainerOilGenerator fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { + return new ContainerOilGenerator(windowId, inv, (TileEntityOilGenerator) Objects.requireNonNull(inv.player.world.getTileEntity(data.readBlockPos()))); + } + + public ContainerOilGenerator(int windowId, PlayerInventory inventory, TileEntityOilGenerator tile) { + super(ActuallyContainers.OIL_GENERATOR_CONTAINER.get(), windowId); + this.generator = tile; for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { - this.addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 97 + i * 18)); + this.addSlot(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 97 + i * 18)); } } for (int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 155)); + this.addSlot(new Slot(inventory, i, 8 + i * 18, 155)); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java index 3ae06b6e6..109debde0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerPhantomPlacer.java @@ -11,35 +11,42 @@ package de.ellpeck.actuallyadditions.mod.inventory; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomPlacer; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.container.Container; +import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; + +import java.util.Objects; public class ContainerPhantomPlacer extends Container { - private final TileEntityPhantomPlacer placer; + public final TileEntityPhantomPlacer placer; - public ContainerPhantomPlacer(PlayerInventory inventory, TileEntityBase tile) { - this.placer = (TileEntityPhantomPlacer) tile; + public static ContainerPhantomPlacer fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { + return new ContainerPhantomPlacer(windowId, inv, (TileEntityPhantomPlacer) Objects.requireNonNull(inv.player.world.getTileEntity(data.readBlockPos()))); + } + + public ContainerPhantomPlacer(int windowId, PlayerInventory inventory, TileEntityPhantomPlacer tile) { + super(ActuallyContainers.PHANTOM_PLACER_CONTAINER.get(), windowId); + this.placer = tile; for (int i = 0; i < 3; i++) { for (int j = 0; j < 3; j++) { - this.addSlotToContainer(new SlotItemHandlerUnconditioned(this.placer.inv, j + i * 3, 62 + j * 18, 21 + i * 18)); + this.addSlot(new SlotItemHandlerUnconditioned(this.placer.inv, j + i * 3, 62 + j * 18, 21 + i * 18)); } } for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { - this.addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 97 + i * 18)); + this.addSlot(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 97 + i * 18)); } } for (int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 155)); + this.addSlot(new Slot(inventory, i, 8 + i * 18, 155)); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java index 80e532111..0d6b81ca7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRangedCollector.java @@ -12,41 +12,48 @@ package de.ellpeck.actuallyadditions.mod.inventory; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotFilter; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityRangedCollector; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.ClickType; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.container.ClickType; +import net.minecraft.inventory.container.Container; +import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; + +import java.util.Objects; public class ContainerRangedCollector extends Container { - private final TileEntityRangedCollector collector; + public final TileEntityRangedCollector collector; - public ContainerRangedCollector(PlayerInventory inventory, TileEntityBase tile) { - this.collector = (TileEntityRangedCollector) tile; + public static ContainerRangedCollector fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { + return new ContainerRangedCollector(windowId, inv, (TileEntityRangedCollector) Objects.requireNonNull(inv.player.world.getTileEntity(data.readBlockPos()))); + } + + public ContainerRangedCollector(int windowId, PlayerInventory inventory, TileEntityRangedCollector tile) { + super(ActuallyContainers.RANGED_COLLECTOR_CONTAINER.get(), windowId); + this.collector = tile; for (int i = 0; i < 2; i++) { for (int j = 0; j < 3; j++) { - this.addSlotToContainer(new SlotItemHandlerUnconditioned(this.collector.inv, j + i * 3, 96 + j * 18, 24 + i * 18)); + this.addSlot(new SlotItemHandlerUnconditioned(this.collector.inv, j + i * 3, 96 + j * 18, 24 + i * 18)); } } for (int i = 0; i < 4; i++) { for (int j = 0; j < 3; j++) { - this.addSlotToContainer(new SlotFilter(this.collector.filter, j + i * 3, 20 + j * 18, 6 + i * 18)); + this.addSlot(new SlotFilter(this.collector.filter, j + i * 3, 20 + j * 18, 6 + i * 18)); } } for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { - this.addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 90 + i * 18)); + this.addSlot(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 90 + i * 18)); } } for (int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 148)); + this.addSlot(new Slot(inventory, i, 8 + i * 18, 148)); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java index 4579eee1b..534c271d0 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerRepairer.java @@ -1,97 +1,98 @@ -/* - * This file ("ContainerRepairer.java") is part of the Actually Additions mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015-2017 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.inventory; - -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; -import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.util.StackUtil; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -public class ContainerRepairer extends Container { - - private final TileEntityItemRepairer tileRepairer; - - public ContainerRepairer(PlayerInventory inventory, TileEntityBase tile) { - this.tileRepairer = (TileEntityItemRepairer) tile; - - this.addSlotToContainer(new SlotItemHandlerUnconditioned(this.tileRepairer.inv, TileEntityItemRepairer.SLOT_INPUT, 47, 53)); - this.addSlotToContainer(new SlotOutput(this.tileRepairer.inv, TileEntityItemRepairer.SLOT_OUTPUT, 109, 53)); - - for (int i = 0; i < 3; i++) { - for (int j = 0; j < 9; j++) { - this.addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 97 + i * 18)); - } - } - for (int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 155)); - } - } - - @Override - public ItemStack transferStackInSlot(PlayerEntity player, int slot) { - int inventoryStart = 2; - int inventoryEnd = inventoryStart + 26; - int hotbarStart = inventoryEnd + 1; - int hotbarEnd = hotbarStart + 8; - - Slot theSlot = this.inventorySlots.get(slot); - - if (theSlot != null && theSlot.getHasStack()) { - ItemStack newStack = theSlot.getStack(); - ItemStack currentStack = newStack.copy(); - - //Other Slots in Inventory excluded - if (slot >= inventoryStart) { - //Shift from Inventory - if (TileEntityItemRepairer.canBeRepaired(newStack)) { - if (!this.mergeItemStack(newStack, TileEntityItemRepairer.SLOT_INPUT, TileEntityItemRepairer.SLOT_INPUT + 1, false)) { - return StackUtil.getEmpty(); - } - } - // - - else if (slot >= inventoryStart && slot <= inventoryEnd) { - if (!this.mergeItemStack(newStack, hotbarStart, hotbarEnd + 1, false)) { - return StackUtil.getEmpty(); - } - } else if (slot >= inventoryEnd + 1 && slot < hotbarEnd + 1 && !this.mergeItemStack(newStack, inventoryStart, inventoryEnd + 1, false)) { - return StackUtil.getEmpty(); - } - } else if (!this.mergeItemStack(newStack, inventoryStart, hotbarEnd + 1, false)) { - return StackUtil.getEmpty(); - } - - if (!StackUtil.isValid(newStack)) { - theSlot.putStack(StackUtil.getEmpty()); - } else { - theSlot.onSlotChanged(); - } - - if (newStack.getCount() == currentStack.getCount()) { - return StackUtil.getEmpty(); - } - theSlot.onTake(player, newStack); - - return currentStack; - } - return StackUtil.getEmpty(); - } - - @Override - public boolean canInteractWith(PlayerEntity player) { - return this.tileRepairer.canPlayerUse(player); - } -} +// TODO: [port][note] no longer needed +///* +// * This file ("ContainerRepairer.java") is part of the Actually Additions mod for Minecraft. +// * It is created and owned by Ellpeck and distributed +// * under the Actually Additions License to be found at +// * http://ellpeck.de/actaddlicense +// * View the source code at https://github.com/Ellpeck/ActuallyAdditions +// * +// * © 2015-2017 Ellpeck +// */ +// +//package de.ellpeck.actuallyadditions.mod.inventory; +// +//import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; +//import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput; +//import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +//import de.ellpeck.actuallyadditions.mod.util.StackUtil; +//import net.minecraft.entity.player.PlayerEntity; +//import net.minecraft.entity.player.PlayerInventory; +//import net.minecraft.inventory.container.Container; +//import net.minecraft.inventory.container.Slot; +//import net.minecraft.item.ItemStack; +// +//public class ContainerRepairer extends Container { +// +// private final TileEntityItemRepairer tileRepairer; +// +// public ContainerRepairer(PlayerInventory inventory, TileEntityBase tile) { +// this.tileRepairer = (TileEntityItemRepairer) tile; +// +// this.addSlot(new SlotItemHandlerUnconditioned(this.tileRepairer.inv, TileEntityItemRepairer.SLOT_INPUT, 47, 53)); +// this.addSlot(new SlotOutput(this.tileRepairer.inv, TileEntityItemRepairer.SLOT_OUTPUT, 109, 53)); +// +// for (int i = 0; i < 3; i++) { +// for (int j = 0; j < 9; j++) { +// this.addSlot(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 97 + i * 18)); +// } +// } +// for (int i = 0; i < 9; i++) { +// this.addSlot(new Slot(inventory, i, 8 + i * 18, 155)); +// } +// } +// +// @Override +// public ItemStack transferStackInSlot(PlayerEntity player, int slot) { +// int inventoryStart = 2; +// int inventoryEnd = inventoryStart + 26; +// int hotbarStart = inventoryEnd + 1; +// int hotbarEnd = hotbarStart + 8; +// +// Slot theSlot = this.inventorySlots.get(slot); +// +// if (theSlot != null && theSlot.getHasStack()) { +// ItemStack newStack = theSlot.getStack(); +// ItemStack currentStack = newStack.copy(); +// +// //Other Slots in Inventory excluded +// if (slot >= inventoryStart) { +// //Shift from Inventory +// if (TileEntityItemRepairer.canBeRepaired(newStack)) { +// if (!this.mergeItemStack(newStack, TileEntityItemRepairer.SLOT_INPUT, TileEntityItemRepairer.SLOT_INPUT + 1, false)) { +// return StackUtil.getEmpty(); +// } +// } +// // +// +// else if (slot >= inventoryStart && slot <= inventoryEnd) { +// if (!this.mergeItemStack(newStack, hotbarStart, hotbarEnd + 1, false)) { +// return StackUtil.getEmpty(); +// } +// } else if (slot >= inventoryEnd + 1 && slot < hotbarEnd + 1 && !this.mergeItemStack(newStack, inventoryStart, inventoryEnd + 1, false)) { +// return StackUtil.getEmpty(); +// } +// } else if (!this.mergeItemStack(newStack, inventoryStart, hotbarEnd + 1, false)) { +// return StackUtil.getEmpty(); +// } +// +// if (!StackUtil.isValid(newStack)) { +// theSlot.putStack(StackUtil.getEmpty()); +// } else { +// theSlot.onSlotChanged(); +// } +// +// if (newStack.getCount() == currentStack.getCount()) { +// return StackUtil.getEmpty(); +// } +// theSlot.onTake(player, newStack); +// +// return currentStack; +// } +// return StackUtil.getEmpty(); +// } +// +// @Override +// public boolean canInteractWith(PlayerEntity player) { +// return this.tileRepairer.canPlayerUse(player); +// } +//} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java index 85cd101c3..582facf4f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerSmileyCloud.java @@ -1,28 +1,29 @@ -/* - * This file ("ContainerSmileyCloud.java") is part of the Actually Additions mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015-2017 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.inventory; - -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.Container; -import net.minecraft.item.ItemStack; - -public class ContainerSmileyCloud extends Container { - - @Override - public ItemStack transferStackInSlot(PlayerEntity player, int slot) { - return ItemStack.EMPTY; - } - - @Override - public boolean canInteractWith(PlayerEntity player) { - return true; - } -} +// TODO: [port][note] no longer needed +///* +// * This file ("ContainerSmileyCloud.java") is part of the Actually Additions mod for Minecraft. +// * It is created and owned by Ellpeck and distributed +// * under the Actually Additions License to be found at +// * http://ellpeck.de/actaddlicense +// * View the source code at https://github.com/Ellpeck/ActuallyAdditions +// * +// * © 2015-2017 Ellpeck +// */ +// +//package de.ellpeck.actuallyadditions.mod.inventory; +// +//import net.minecraft.entity.player.PlayerEntity; +//import net.minecraft.inventory.container.Container; +//import net.minecraft.item.ItemStack; +// +//public class ContainerSmileyCloud extends Container { +// +// @Override +// public ItemStack transferStackInSlot(PlayerEntity player, int slot) { +// return ItemStack.EMPTY; +// } +// +// @Override +// public boolean canInteractWith(PlayerEntity player) { +// return true; +// } +//} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java index 3de239005..3e2745ea8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/ContainerXPSolidifier.java @@ -13,32 +13,39 @@ package de.ellpeck.actuallyadditions.mod.inventory; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotItemHandlerUnconditioned; import de.ellpeck.actuallyadditions.mod.inventory.slot.SlotOutput; import de.ellpeck.actuallyadditions.mod.items.ItemSolidifiedExperience; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityXPSolidifier; import de.ellpeck.actuallyadditions.mod.util.StackUtil; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; +import net.minecraft.inventory.container.Container; +import net.minecraft.inventory.container.Slot; import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; + +import java.util.Objects; public class ContainerXPSolidifier extends Container { - private final TileEntityXPSolidifier solidifier; + public final TileEntityXPSolidifier solidifier; - public ContainerXPSolidifier(PlayerInventory inventory, TileEntityBase tile) { - this.solidifier = (TileEntityXPSolidifier) tile; + public static ContainerXPSolidifier fromNetwork(int windowId, PlayerInventory inv, PacketBuffer data) { + return new ContainerXPSolidifier(windowId, inv, (TileEntityXPSolidifier) Objects.requireNonNull(inv.player.world.getTileEntity(data.readBlockPos()))); + } - this.addSlotToContainer(new SlotOutput(this.solidifier.inv, 0, 95, 8)); - this.addSlotToContainer(new SlotItemHandlerUnconditioned(this.solidifier.inv, 1, 65, 8)); + public ContainerXPSolidifier(int windowId, PlayerInventory inventory, TileEntityXPSolidifier tile) { + super(ActuallyContainers.XPSOLIDIFIER_CONTAINER.get(), windowId); + this.solidifier = tile; + + this.addSlot(new SlotOutput(this.solidifier.inv, 0, 95, 8)); + this.addSlot(new SlotItemHandlerUnconditioned(this.solidifier.inv, 1, 65, 8)); for (int i = 0; i < 3; i++) { for (int j = 0; j < 9; j++) { - this.addSlotToContainer(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 97 + i * 18)); + this.addSlot(new Slot(inventory, j + i * 9 + 9, 8 + j * 18, 97 + i * 18)); } } for (int i = 0; i < 9; i++) { - this.addSlotToContainer(new Slot(inventory, i, 8 + i * 18, 155)); + this.addSlot(new Slot(inventory, i, 8 + i * 18, 155)); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiHandler.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiHandler.java index d892beaa0..ab068febc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiHandler.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiHandler.java @@ -10,7 +10,6 @@ package de.ellpeck.actuallyadditions.mod.inventory; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.booklet.gui.GuiBooklet; import de.ellpeck.actuallyadditions.mod.booklet.gui.GuiMainPage; import de.ellpeck.actuallyadditions.mod.booklet.misc.BookletUtils; @@ -22,99 +21,92 @@ import de.ellpeck.actuallyadditions.mod.util.compat.CompatUtil; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.common.network.IGuiHandler; -import net.minecraftforge.fml.common.network.NetworkRegistry; -public class GuiHandler implements IGuiHandler { +public class GuiHandler { - public static void init() { - ActuallyAdditions.LOGGER.info("Initializing GuiHandler..."); - NetworkRegistry.INSTANCE.registerGuiHandler(ActuallyAdditions.INSTANCE, new GuiHandler()); - } - - @Override + @Deprecated public Object getServerGuiElement(int id, PlayerEntity player, World world, int x, int y, int z) { TileEntityBase tile = null; if (GuiTypes.values()[id].checkTileEntity) { tile = (TileEntityBase) world.getTileEntity(new BlockPos(x, y, z)); } switch (GuiTypes.values()[id]) { - case FEEDER: - return new ContainerFeeder(player.inventory, tile); - case GIANT_CHEST: - return new ContainerGiantChest(player.inventory, tile, 0); - case GIANT_CHEST_PAGE_2: - return new ContainerGiantChest(player.inventory, tile, 1); - case GIANT_CHEST_PAGE_3: - return new ContainerGiantChest(player.inventory, tile, 2); - case CRAFTER: - return CompatUtil.getCrafterContainerElement(player, world, x, y, z); - case GRINDER: - return new ContainerGrinder(player.inventory, tile, false); - case GRINDER_DOUBLE: - return new ContainerGrinder(player.inventory, tile, true); - case FURNACE_DOUBLE: - return new ContainerFurnaceDouble(player.inventory, tile); - case INPUTTER: - return new ContainerInputter(player.inventory, tile, false); - case INPUTTER_ADVANCED: - return new ContainerInputter(player.inventory, tile, true); - case REPAIRER: - return new ContainerRepairer(player.inventory, tile); - case BREAKER: - return new ContainerBreaker(player.inventory, tile); - case DROPPER: - return new ContainerDropper(player, tile); - case CANOLA_PRESS: - return new ContainerCanolaPress(player.inventory, tile); - case FERMENTING_BARREL: - return new ContainerFermentingBarrel(player.inventory, tile); - case COAL_GENERATOR: - return new ContainerCoalGenerator(player.inventory, tile); - case OIL_GENERATOR: - return new ContainerOilGenerator(player.inventory, tile); - case PHANTOM_PLACER: - return new ContainerPhantomPlacer(player.inventory, tile); - case FLUID_COLLECTOR: - return new ContainerFluidCollector(player.inventory, tile); - case COFFEE_MACHINE: - return new ContainerCoffeeMachine(player.inventory, tile); - case DRILL: - return new ContainerDrill(player.inventory); - case FILTER: - return new ContainerFilter(player.inventory); - case ENERGIZER: - return new ContainerEnergizer(player, tile); - case ENERVATOR: - return new ContainerEnervator(player, tile); - case XP_SOLIDIFIER: - return new ContainerXPSolidifier(player.inventory, tile); - case CLOUD: - return new ContainerSmileyCloud(); - case DIRECTIONAL_BREAKER: - return new ContainerDirectionalBreaker(player.inventory, tile); - case RANGED_COLLECTOR: - return new ContainerRangedCollector(player.inventory, tile); - case MINER: - return new ContainerMiner(player.inventory, tile); - case LASER_RELAY_ITEM_WHITELIST: - return new ContainerLaserRelayItemWhitelist(player.inventory, tile); - case BAG: - return new ContainerBag(player.getHeldItemMainhand(), player.inventory, false); - case VOID_BAG: - return new ContainerBag(player.getHeldItemMainhand(), player.inventory, true); - case BIO_REACTOR: - return new ContainerBioReactor(player.inventory, tile); - case FARMER: - return new ContainerFarmer(player.inventory, tile); - case FIREWORK_BOX: - return new ContainerFireworkBox(); + // case FEEDER: + // return new ContainerFeeder(player.inventory, tile); + // case GIANT_CHEST: + // return new ContainerGiantChest(player.inventory, tile, 0); + // case GIANT_CHEST_PAGE_2: + // return new ContainerGiantChest(player.inventory, tile, 1); + // case GIANT_CHEST_PAGE_3: + // return new ContainerGiantChest(player.inventory, tile, 2); + // case CRAFTER: + // return CompatUtil.getCrafterContainerElement(player, world, x, y, z); + // case GRINDER: + // return new ContainerGrinder(player.inventory, tile, false); + // case GRINDER_DOUBLE: + // return new ContainerGrinder(player.inventory, tile, true); + // case FURNACE_DOUBLE: + // return new ContainerFurnaceDouble(player.inventory, tile); + // case INPUTTER: + // return new ContainerInputter(player.inventory, tile, false); + // case INPUTTER_ADVANCED: + // return new ContainerInputter(player.inventory, tile, true); + // case REPAIRER: + // return new ContainerRepairer(player.inventory, tile); + // case BREAKER: + // return new ContainerBreaker(player.inventory, tile); + // case DROPPER: + // return new ContainerDropper(player, tile); + // case CANOLA_PRESS: + // return new ContainerCanolaPress(player.inventory, tile); + // case FERMENTING_BARREL: + // return new ContainerFermentingBarrel(player.inventory, tile); + // case COAL_GENERATOR: + // return new ContainerCoalGenerator(player.inventory, tile); + // case OIL_GENERATOR: + // return new ContainerOilGenerator(player.inventory, tile); + // case PHANTOM_PLACER: + // return new ContainerPhantomPlacer(player.inventory, tile); + // case FLUID_COLLECTOR: + // return new ContainerFluidCollector(player.inventory, tile); + // case COFFEE_MACHINE: + // return new ContainerCoffeeMachine(player.inventory, tile); + // case DRILL: + // return new ContainerDrill(player.inventory); + // case FILTER: + // return new ContainerFilter(player.inventory); + // case ENERGIZER: + // return new ContainerEnergizer(player, tile); + // case ENERVATOR: + // return new ContainerEnervator(player, tile); + // case XP_SOLIDIFIER: + // return new ContainerXPSolidifier(player.inventory, tile); + // case CLOUD: + // return new ContainerSmileyCloud(); + // case DIRECTIONAL_BREAKER: + // return new ContainerDirectionalBreaker(player.inventory, tile); + // case RANGED_COLLECTOR: + // return new ContainerRangedCollector(player.inventory, tile); + // case MINER: + // return new ContainerMiner(player.inventory, tile); + // case LASER_RELAY_ITEM_WHITELIST: + // return new ContainerLaserRelayItemWhitelist(player.inventory, tile); + // case BAG: + // return new ContainerBag(player.getHeldItemMainhand(), player.inventory, false); + // case VOID_BAG: + // return new ContainerBag(player.getHeldItemMainhand(), player.inventory, true); + // case BIO_REACTOR: + // return new ContainerBioReactor(player.inventory, tile); + // case FARMER: + // return new ContainerFarmer(player.inventory, tile); + // case FIREWORK_BOX: + // return new ContainerFireworkBox(); default: return null; } } - @Override + @Deprecated public Object getClientGuiElement(int id, PlayerEntity player, World world, int x, int y, int z) { TileEntityBase tile = null; if (GuiTypes.values()[id].checkTileEntity) { @@ -143,8 +135,8 @@ public class GuiHandler implements IGuiHandler { return new GuiInputter(player.inventory, tile, true); case REPAIRER: return new GuiRepairer(player.inventory, tile); - case BREAKER: - return new GuiBreaker(player.inventory, tile); + // case BREAKER: + // return new GuiBreaker(player.inventory, tile); case DROPPER: return new GuiDropper(player, tile); case CANOLA_PRESS: @@ -209,6 +201,7 @@ public class GuiHandler implements IGuiHandler { } } + @Deprecated public enum GuiTypes { FEEDER, GIANT_CHEST, diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java index 8d7ada93b..d09d51233 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/EnergyDisplay.java @@ -15,10 +15,8 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraftforge.fml.client.config.GuiUtils; -import net.minecraftforge.fml.relauncher.OnlyIn; import java.text.NumberFormat; import java.util.ArrayList; @@ -57,19 +55,19 @@ public class EnergyDisplay extends Gui { int barY = this.y; if (this.outline) { - this.drawTexturedModalRect(this.x, this.y, 52, 163, 26, 93); + this.blit(matrices, this.x, this.y, 52, 163, 26, 93); barX += 4; barY += 4; } - this.drawTexturedModalRect(barX, barY, 18, 171, 18, 85); + this.blit(matrices, barX, barY, 18, 171, 18, 85); if (this.rfReference.getEnergyStored() > 0) { int i = this.rfReference.getEnergyStored() * 83 / this.rfReference.getMaxEnergyStored(); float[] color = AssetUtil.getWheelColor(mc.world.getTotalWorldTime() % 256); GlStateManager.color(color[0] / 255F, color[1] / 255F, color[2] / 255F); - this.drawTexturedModalRect(barX + 1, barY + 84 - i, 36, 172, 16, i); + this.blit(matrices, barX + 1, barY + 84 - i, 36, 172, 16, i); GlStateManager.color(1F, 1F, 1F); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FilterSettingsGui.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FilterSettingsGui.java index 0325bd6c6..a3ca51d55 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FilterSettingsGui.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FilterSettingsGui.java @@ -16,10 +16,8 @@ import de.ellpeck.actuallyadditions.mod.tile.FilterSettings; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.GuiButton; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.fml.client.config.GuiUtils; -import net.minecraftforge.fml.relauncher.OnlyIn; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FluidDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FluidDisplay.java index ad3b0af6f..961b02d0f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FluidDisplay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/FluidDisplay.java @@ -14,13 +14,11 @@ import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fml.client.config.GuiUtils; -import net.minecraftforge.fml.relauncher.OnlyIn; import java.text.NumberFormat; import java.util.Collections; @@ -63,12 +61,12 @@ public class FluidDisplay extends Gui { int barY = this.y; if (this.outline) { - this.drawTexturedModalRect(this.x, this.y, 52, 163, 26, 93); + this.blit(matrices, this.x, this.y, 52, 163, 26, 93); barX += 4; barY += 4; } - this.drawTexturedModalRect(barX, barY, 0, 171, 18, 85); + this.blit(matrices, barX, barY, 0, 171, 18, 85); FluidStack stack = this.fluidReference.getFluid(); Fluid fluid = stack == null diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBag.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBag.java index 5baba1480..dc7cbc6a4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBag.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBag.java @@ -56,7 +56,7 @@ public class GuiBag extends GuiWtfMojang { this.buttonAutoInsert = new GuiButton(0, this.guiLeft - 21, this.guiTop + 8, 20, 20, (this.container.autoInsert ? TextFormatting.DARK_GREEN : TextFormatting.RED) + "I"); - this.buttonList.add(this.buttonAutoInsert); + this.addButton(this.buttonAutoInsert); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java index 65754f9b4..748e89e58 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiBioReactor.java @@ -11,30 +11,29 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; import de.ellpeck.actuallyadditions.mod.inventory.ContainerBioReactor; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityBioReactor; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; -public class GuiBioReactor extends GuiWtfMojang { +public class GuiBioReactor extends GuiWtfMojang { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_bio_reactor"); private final TileEntityBioReactor tile; private EnergyDisplay energy; - public GuiBioReactor(PlayerInventory inventory, TileEntityBase tile) { - super(new ContainerBioReactor(inventory, tile)); - this.tile = (TileEntityBioReactor) tile; + public GuiBioReactor(ContainerBioReactor container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); + this.tile = container.tile; this.xSize = 176; this.ySize = 93 + 86; } @Override - public void initGui() { - super.initGui(); + public void init() { + super.init(); this.energy = new EnergyDisplay(this.guiLeft + 116, this.guiTop + 5, this.tile.storage); } @@ -53,15 +52,15 @@ public class GuiBioReactor extends GuiWtfMojang { public void drawGuiContainerBackgroundLayer(float f, int x, int y) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC); + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 93); if (this.tile.burnTime > 0) { int i = this.tile.burnTime * 13 / this.tile.maxBurnTime; - this.drawTexturedModalRect(this.guiLeft + 87, this.guiTop + 51 + 12 - i, 176, 96 - i, 14, i); + this.blit(matrices, this.guiLeft + 87, this.guiTop + 51 + 12 - i, 176, 96 - i, 14, i); } if (this.tile.producePerTick > 0) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java index a466fe953..c17a6be84 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCanolaPress.java @@ -10,26 +10,27 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; +import com.mojang.blaze3d.platform.GlStateManager; import de.ellpeck.actuallyadditions.mod.inventory.ContainerCanolaPress; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityCanolaPress; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; @OnlyIn(Dist.CLIENT) -public class GuiCanolaPress extends GuiWtfMojang { +public class GuiCanolaPress extends GuiWtfMojang { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_canola_press"); private final TileEntityCanolaPress press; private EnergyDisplay energy; private FluidDisplay fluid; - public GuiCanolaPress(PlayerInventory inventory, TileEntityBase tile) { - super(new ContainerCanolaPress(inventory, tile)); - this.press = (TileEntityCanolaPress) tile; + public GuiCanolaPress(ContainerCanolaPress container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); + this.press = container.press; this.xSize = 176; this.ySize = 93 + 86; } @@ -58,15 +59,15 @@ public class GuiCanolaPress extends GuiWtfMojang { public void drawGuiContainerBackgroundLayer(float f, int x, int y) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC); + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 93); if (this.press.currentProcessTime > 0) { int i = this.press.getProcessScaled(29); - this.drawTexturedModalRect(this.guiLeft + 83, this.guiTop + 32, 176, 0, 12, i); + this.blit(matrices, this.guiLeft + 83, this.guiTop + 32, 176, 0, 12, i); } this.energy.draw(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java index 12f50b726..91ec13d21 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoalGenerator.java @@ -11,24 +11,24 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; import de.ellpeck.actuallyadditions.mod.inventory.ContainerCoalGenerator; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoalGenerator; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.api.distmarker.Dist; + @OnlyIn(Dist.CLIENT) -public class GuiCoalGenerator extends GuiWtfMojang { +public class GuiCoalGenerator extends GuiWtfMojang { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_coal_generator"); private final TileEntityCoalGenerator generator; private EnergyDisplay energy; - public GuiCoalGenerator(PlayerInventory inventory, TileEntityBase tile) { - super(new ContainerCoalGenerator(inventory, tile)); - this.generator = (TileEntityCoalGenerator) tile; + public GuiCoalGenerator(ContainerCoalGenerator container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); + this.generator = container.generator; this.xSize = 176; this.ySize = 93 + 86; } @@ -54,15 +54,15 @@ public class GuiCoalGenerator extends GuiWtfMojang { public void drawGuiContainerBackgroundLayer(float f, int x, int y) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC); + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 93); if (this.generator.currentBurnTime > 0) { int i = this.generator.getBurningScaled(13); - this.drawTexturedModalRect(this.guiLeft + 87, this.guiTop + 27 + 12 - i, 176, 96 - i, 14, i); + this.blit(matrices, this.guiLeft + 87, this.guiTop + 27 + 12 - i, 176, 96 - i, 14, i); } this.energy.draw(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java index b25f91f1a..054981973 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiCoffeeMachine.java @@ -13,20 +13,18 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.inventory.ContainerCoffeeMachine; import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityCoffeeMachine; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.api.distmarker.Dist; import java.util.Collections; @OnlyIn(Dist.CLIENT) -public class GuiCoffeeMachine extends GuiWtfMojang { +public class GuiCoffeeMachine extends GuiWtfMojang { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_coffee_machine"); private final TileEntityCoffeeMachine machine; @@ -34,9 +32,9 @@ public class GuiCoffeeMachine extends GuiWtfMojang { private EnergyDisplay energy; private FluidDisplay fluid; - public GuiCoffeeMachine(PlayerInventory inventory, TileEntityBase tile) { - super(new ContainerCoffeeMachine(inventory, tile)); - this.machine = (TileEntityCoffeeMachine) tile; + public GuiCoffeeMachine(ContainerCoffeeMachine container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); + this.machine = container.machine; this.xSize = 176; this.ySize = 93 + 86; } @@ -46,7 +44,7 @@ public class GuiCoffeeMachine extends GuiWtfMojang { super.initGui(); GuiButton buttonOkay = new GuiButton(0, this.guiLeft + 60, this.guiTop + 11, 58, 20, StringUtil.localize("info." + ActuallyAdditions.MODID + ".gui.ok")); - this.buttonList.add(buttonOkay); + this.addButton(buttonOkay); this.energy = new EnergyDisplay(this.guiLeft + 16, this.guiTop + 5, this.machine.storage); this.fluid = new FluidDisplay(this.guiLeft - 30, this.guiTop + 1, this.machine.tank, true, false); @@ -74,23 +72,23 @@ public class GuiCoffeeMachine extends GuiWtfMojang { public void drawGuiContainerBackgroundLayer(float f, int x, int y) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC); + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 93); if (this.machine.coffeeCacheAmount > 0) { int i = this.machine.getCoffeeScaled(30); - this.drawTexturedModalRect(this.guiLeft + 41, this.guiTop + 56 - i, 192, 0, 8, i); + this.blit(matrices, this.guiLeft + 41, this.guiTop + 56 - i, 192, 0, 8, i); } if (this.machine.brewTime > 0) { int i = this.machine.getBrewScaled(23); - this.drawTexturedModalRect(this.guiLeft + 53, this.guiTop + 42, 192, 30, i, 16); + this.blit(matrices, this.guiLeft + 53, this.guiTop + 42, 192, 30, i, 16); int j = this.machine.getBrewScaled(26); - this.drawTexturedModalRect(this.guiLeft + 99 + 25 - j, this.guiTop + 44, 192 + 25 - j, 46, j, 12); + this.blit(matrices, this.guiLeft + 99 + 25 - j, this.guiTop + 44, 192 + 25 - j, 46, j, 12); } this.energy.draw(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java index d5694bf63..bc7cf2cf6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDirectionalBreaker.java @@ -10,25 +10,27 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; +import com.mojang.blaze3d.platform.GlStateManager; import de.ellpeck.actuallyadditions.mod.inventory.ContainerDirectionalBreaker; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityDirectionalBreaker; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + @OnlyIn(Dist.CLIENT) -public class GuiDirectionalBreaker extends GuiWtfMojang { +public class GuiDirectionalBreaker extends GuiWtfMojang { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_directional_breaker"); private final TileEntityDirectionalBreaker breaker; private EnergyDisplay energy; - public GuiDirectionalBreaker(PlayerInventory inventory, TileEntityBase tile) { - super(new ContainerDirectionalBreaker(inventory, tile)); - this.breaker = (TileEntityDirectionalBreaker) tile; + public GuiDirectionalBreaker(ContainerDirectionalBreaker container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); + this.breaker = container.breaker; this.xSize = 176; this.ySize = 93 + 86; } @@ -55,11 +57,11 @@ public class GuiDirectionalBreaker extends GuiWtfMojang { public void drawGuiContainerBackgroundLayer(float f, int x, int y) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC); + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 93); this.energy.draw(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java index 9ae85dca8..736566c7e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDrill.java @@ -10,22 +10,25 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; +import com.mojang.blaze3d.platform.GlStateManager; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.inventory.ContainerDrill; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + @OnlyIn(Dist.CLIENT) -public class GuiDrill extends GuiWtfMojang { +public class GuiDrill extends GuiWtfMojang { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_drill"); - public GuiDrill(PlayerInventory inventory) { - super(new ContainerDrill(inventory)); + public GuiDrill(ContainerDrill container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); this.xSize = 176; this.ySize = 54 + 86; } @@ -39,10 +42,10 @@ public class GuiDrill extends GuiWtfMojang { public void drawGuiContainerBackgroundLayer(float f, int x, int y) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 54, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 54, 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 54); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC); + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 54); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java index 41c6c4199..6a6eb29bc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiDropper.java @@ -10,25 +10,26 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; +import com.mojang.blaze3d.platform.GlStateManager; import de.ellpeck.actuallyadditions.mod.inventory.ContainerDropper; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityDropper; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + @OnlyIn(Dist.CLIENT) -public class GuiDropper extends GuiWtfMojang { +public class GuiDropper extends GuiWtfMojang { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_breaker"); private final TileEntityDropper dropper; - public GuiDropper(PlayerEntity player, TileEntityBase tile) { - super(new ContainerDropper(player, tile)); - this.dropper = (TileEntityDropper) tile; + public GuiDropper(ContainerDropper container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); + this.dropper = container.dropper; this.xSize = 176; this.ySize = 93 + 86; } @@ -42,10 +43,10 @@ public class GuiDropper extends GuiWtfMojang { public void drawGuiContainerBackgroundLayer(float f, int x, int y) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC); + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 93); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java index 244ce010c..e0d92394e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnergizer.java @@ -10,26 +10,26 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; +import com.mojang.blaze3d.platform.GlStateManager; import de.ellpeck.actuallyadditions.mod.inventory.ContainerEnergizer; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnergizer; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; @OnlyIn(Dist.CLIENT) -public class GuiEnergizer extends GuiWtfMojang { +public class GuiEnergizer extends GuiWtfMojang { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_energizer"); private final TileEntityEnergizer energizer; private EnergyDisplay energy; - public GuiEnergizer(PlayerEntity inventory, TileEntityBase tile) { - super(new ContainerEnergizer(inventory, tile)); - this.energizer = (TileEntityEnergizer) tile; + public GuiEnergizer(ContainerEnergizer container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); + this.energizer = container.energizer; this.xSize = 176; this.ySize = 93 + 86; } @@ -55,11 +55,11 @@ public class GuiEnergizer extends GuiWtfMojang { public void drawGuiContainerBackgroundLayer(float f, int x, int y) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC); + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 93); this.energy.draw(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java index 8fe9c56ad..db02ee136 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiEnervator.java @@ -10,26 +10,27 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; +import com.mojang.blaze3d.platform.GlStateManager; import de.ellpeck.actuallyadditions.mod.inventory.ContainerEnervator; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityEnervator; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + @OnlyIn(Dist.CLIENT) -public class GuiEnervator extends GuiWtfMojang { +public class GuiEnervator extends GuiWtfMojang { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_energizer"); private final TileEntityEnervator enervator; private EnergyDisplay energy; - public GuiEnervator(PlayerEntity inventory, TileEntityBase tile) { - super(new ContainerEnervator(inventory, tile)); - this.enervator = (TileEntityEnervator) tile; + public GuiEnervator(ContainerEnervator container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); + this.enervator = container.enervator; this.xSize = 176; this.ySize = 93 + 86; } @@ -55,11 +56,11 @@ public class GuiEnervator extends GuiWtfMojang { public void drawGuiContainerBackgroundLayer(float f, int x, int y) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC); + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 93); this.energy.draw(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFarmer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFarmer.java index 952351d04..1ff44adbe 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFarmer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFarmer.java @@ -10,26 +10,28 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; +import com.mojang.blaze3d.platform.GlStateManager; import de.ellpeck.actuallyadditions.mod.inventory.ContainerFarmer; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityFarmer; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + @OnlyIn(Dist.CLIENT) -public class GuiFarmer extends GuiWtfMojang { +public class GuiFarmer extends GuiWtfMojang { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_farmer"); private final TileEntityFarmer farmer; private EnergyDisplay energy; - public GuiFarmer(PlayerInventory inventory, TileEntityBase tile) { - super(new ContainerFarmer(inventory, tile)); - this.farmer = (TileEntityFarmer) tile; + public GuiFarmer(ContainerFarmer container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); + this.farmer = container.farmer; this.xSize = 176; this.ySize = 93 + 86; } @@ -50,11 +52,11 @@ public class GuiFarmer extends GuiWtfMojang { public void drawGuiContainerBackgroundLayer(float f, int x, int y) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC); + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 93); this.energy.draw(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java index 8550bc60b..236757cc3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFeeder.java @@ -10,28 +10,29 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; +import com.mojang.blaze3d.platform.GlStateManager; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.inventory.ContainerFeeder; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityFeeder; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import java.util.Arrays; @OnlyIn(Dist.CLIENT) -public class GuiFeeder extends GuiWtfMojang { +public class GuiFeeder extends GuiWtfMojang { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_feeder"); public final TileEntityFeeder tileFeeder; - public GuiFeeder(PlayerInventory inventory, TileEntityBase tile) { - super(new ContainerFeeder(inventory, tile)); - this.tileFeeder = (TileEntityFeeder) tile; + public GuiFeeder(ContainerFeeder container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); + this.tileFeeder = container.feeder; this.xSize = 176; this.ySize = 70 + 86; } @@ -57,22 +58,22 @@ public class GuiFeeder extends GuiWtfMojang { @Override public void drawGuiContainerBackgroundLayer(float f, int x, int y) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 70, 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 70); + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 70, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC); + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 70); if (this.tileFeeder.currentTimer > 0) { int i = this.tileFeeder.getCurrentTimerToScale(20); - this.drawTexturedModalRect(this.guiLeft + 85, this.guiTop + 42 - i, 181, 19 + 19 - i, 6, 20); + this.blit(matrices, this.guiLeft + 85, this.guiTop + 42 - i, 181, 19 + 19 - i, 6, 20); } if (this.tileFeeder.currentAnimalAmount >= 2 && this.tileFeeder.currentAnimalAmount < TileEntityFeeder.THRESHOLD) { - this.drawTexturedModalRect(this.guiLeft + 70, this.guiTop + 31, 192, 16, 8, 8); + this.blit(matrices, this.guiLeft + 70, this.guiTop + 31, 192, 16, 8, 8); } if (this.tileFeeder.currentAnimalAmount >= TileEntityFeeder.THRESHOLD) { - this.drawTexturedModalRect(this.guiLeft + 70, this.guiTop + 31, 192, 24, 8, 8); + this.blit(matrices, this.guiLeft + 70, this.guiTop + 31, 192, 24, 8, 8); } } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java index f359d2f8c..808c41f08 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFermentingBarrel.java @@ -10,26 +10,28 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; +import com.mojang.blaze3d.platform.GlStateManager; import de.ellpeck.actuallyadditions.mod.inventory.ContainerFermentingBarrel; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityFermentingBarrel; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + @OnlyIn(Dist.CLIENT) -public class GuiFermentingBarrel extends GuiWtfMojang { +public class GuiFermentingBarrel extends GuiWtfMojang { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_fermenting_barrel"); private final TileEntityFermentingBarrel press; private FluidDisplay input; private FluidDisplay output; - public GuiFermentingBarrel(PlayerInventory inventory, TileEntityBase tile) { - super(new ContainerFermentingBarrel(inventory, tile)); - this.press = (TileEntityFermentingBarrel) tile; + public GuiFermentingBarrel(ContainerFermentingBarrel container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); + this.press = container.barrel; this.xSize = 176; this.ySize = 93 + 86; } @@ -57,15 +59,15 @@ public class GuiFermentingBarrel extends GuiWtfMojang { public void drawGuiContainerBackgroundLayer(float f, int x, int y) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC); + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 93); if (this.press.currentProcessTime > 0) { int i = this.press.getProcessScaled(29); - this.drawTexturedModalRect(this.guiLeft + 82, this.guiTop + 34, 176, 0, 12, i); + this.blit(matrices, this.guiLeft + 82, this.guiTop + 34, 176, 0, 12, i); } this.input.draw(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFilter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFilter.java index 69de8dfa9..b2f68e9a8 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFilter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFilter.java @@ -10,22 +10,25 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; +import com.mojang.blaze3d.platform.GlStateManager; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.inventory.ContainerFilter; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + @OnlyIn(Dist.CLIENT) -public class GuiFilter extends GuiWtfMojang { +public class GuiFilter extends GuiWtfMojang { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_filter"); - public GuiFilter(PlayerInventory inventory) { - super(new ContainerFilter(inventory)); + public GuiFilter(ContainerFilter container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); this.xSize = 176; this.ySize = 90 + 86; } @@ -39,10 +42,10 @@ public class GuiFilter extends GuiWtfMojang { public void drawGuiContainerBackgroundLayer(float f, int x, int y) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 90, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 90, 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 90); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC); + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 90); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiFireworkBox.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFireworkBox.java similarity index 59% rename from src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiFireworkBox.java rename to src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFireworkBox.java index 991a9b288..52f897600 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/GuiFireworkBox.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFireworkBox.java @@ -8,18 +8,19 @@ * © 2015-2017 Ellpeck */ -package de.ellpeck.actuallyadditions.mod.inventory; +package de.ellpeck.actuallyadditions.mod.inventory.gui; +import de.ellpeck.actuallyadditions.mod.inventory.ContainerFireworkBox; import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; import de.ellpeck.actuallyadditions.mod.tile.TileEntityFireworkBox; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiPageButtonList.GuiResponder; import net.minecraft.client.gui.GuiSlider; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + @OnlyIn(Dist.CLIENT) public class GuiFireworkBox extends GuiContainer implements GuiResponder { @@ -37,20 +38,20 @@ public class GuiFireworkBox extends GuiContainer implements GuiResponder { public void initGui() { super.initGui(); - this.buttonList.add(new CustomSlider(this, 0, this.guiLeft, this.guiTop, "Value Play", 0F, 5F, this.tile.intValuePlay, IntFormatter.INSTANCE)); - this.buttonList.add(new CustomSlider(this, 1, this.guiLeft, this.guiTop + 20, "Average Charge Amount", 1F, 4F, this.tile.chargeAmount, IntFormatter.INSTANCE)); - this.buttonList.add(new CustomSlider(this, 2, this.guiLeft, this.guiTop + 40, "Average Flight Time", 1F, 3F, this.tile.flightTime, IntFormatter.INSTANCE)); - this.buttonList.add(new CustomSlider(this, 3, this.guiLeft, this.guiTop + 60, "Effect Chance", 0F, 1F, this.tile.trailOrFlickerChance, null)); - this.buttonList.add(new CustomSlider(this, 4, this.guiLeft, this.guiTop + 80, "Flicker/Trail Ratio", 0F, 1F, this.tile.flickerChance, null)); - this.buttonList.add(new CustomSlider(this, 5, this.guiLeft, this.guiTop + 100, "Color Amount", 1, 6, this.tile.colorAmount, IntFormatter.INSTANCE)); + this.addButton(new CustomSlider(this, 0, this.guiLeft, this.guiTop, "Value Play", 0F, 5F, this.tile.intValuePlay, IntFormatter.INSTANCE)); + this.addButton(new CustomSlider(this, 1, this.guiLeft, this.guiTop + 20, "Average Charge Amount", 1F, 4F, this.tile.chargeAmount, IntFormatter.INSTANCE)); + this.addButton(new CustomSlider(this, 2, this.guiLeft, this.guiTop + 40, "Average Flight Time", 1F, 3F, this.tile.flightTime, IntFormatter.INSTANCE)); + this.addButton(new CustomSlider(this, 3, this.guiLeft, this.guiTop + 60, "Effect Chance", 0F, 1F, this.tile.trailOrFlickerChance, null)); + this.addButton(new CustomSlider(this, 4, this.guiLeft, this.guiTop + 80, "Flicker/Trail Ratio", 0F, 1F, this.tile.flickerChance, null)); + this.addButton(new CustomSlider(this, 5, this.guiLeft, this.guiTop + 100, "Color Amount", 1, 6, this.tile.colorAmount, IntFormatter.INSTANCE)); - this.buttonList.add(new CustomSlider(this, 6, this.guiLeft + 150, this.guiTop, "Small Ball", 0F, 1F, this.tile.typeChance0, null)); - this.buttonList.add(new CustomSlider(this, 7, this.guiLeft + 150, this.guiTop + 20, "Large Ball", 0F, 1F, this.tile.typeChance1, null)); - this.buttonList.add(new CustomSlider(this, 8, this.guiLeft + 150, this.guiTop + 40, "Star Shape", 0F, 1F, this.tile.typeChance2, null)); - this.buttonList.add(new CustomSlider(this, 9, this.guiLeft + 150, this.guiTop + 60, "Creeper Shape", 0F, 1F, this.tile.typeChance3, null)); - this.buttonList.add(new CustomSlider(this, 10, this.guiLeft + 150, this.guiTop + 80, "Burst", 0F, 1F, this.tile.typeChance4, null)); + this.addButton(new CustomSlider(this, 6, this.guiLeft + 150, this.guiTop, "Small Ball", 0F, 1F, this.tile.typeChance0, null)); + this.addButton(new CustomSlider(this, 7, this.guiLeft + 150, this.guiTop + 20, "Large Ball", 0F, 1F, this.tile.typeChance1, null)); + this.addButton(new CustomSlider(this, 8, this.guiLeft + 150, this.guiTop + 40, "Star Shape", 0F, 1F, this.tile.typeChance2, null)); + this.addButton(new CustomSlider(this, 9, this.guiLeft + 150, this.guiTop + 60, "Creeper Shape", 0F, 1F, this.tile.typeChance3, null)); + this.addButton(new CustomSlider(this, 10, this.guiLeft + 150, this.guiTop + 80, "Burst", 0F, 1F, this.tile.typeChance4, null)); - this.buttonList.add(new CustomSlider(this, 11, this.guiLeft + 150, this.guiTop + 100, "Area of Effect", 0, 4, this.tile.areaOfEffect, IntFormatter.INSTANCE)); + this.addButton(new CustomSlider(this, 11, this.guiLeft + 150, this.guiTop + 100, "Area of Effect", 0, 4, this.tile.areaOfEffect, IntFormatter.INSTANCE)); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java index b29fb5aec..0623181c5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFluidCollector.java @@ -10,25 +10,27 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; +import com.mojang.blaze3d.platform.GlStateManager; import de.ellpeck.actuallyadditions.mod.inventory.ContainerFluidCollector; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityFluidCollector; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + @OnlyIn(Dist.CLIENT) -public class GuiFluidCollector extends GuiWtfMojang { +public class GuiFluidCollector extends GuiWtfMojang { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_fluid_collector"); private final TileEntityFluidCollector collector; private FluidDisplay fluid; - public GuiFluidCollector(PlayerInventory inventory, TileEntityBase tile) { - super(new ContainerFluidCollector(inventory, tile)); - this.collector = (TileEntityFluidCollector) tile; + public GuiFluidCollector(ContainerFluidCollector container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); + this.collector = container.collector; this.xSize = 176; this.ySize = 93 + 86; } @@ -55,11 +57,11 @@ public class GuiFluidCollector extends GuiWtfMojang { public void drawGuiContainerBackgroundLayer(float f, int x, int y) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC); + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 93); this.fluid.draw(); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java index 3b2745f0e..70e429520 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiFurnaceDouble.java @@ -10,25 +10,25 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; +import com.mojang.blaze3d.platform.GlStateManager; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.inventory.ContainerFurnaceDouble; import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityFurnaceDouble; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import java.io.IOException; import java.util.Collections; @OnlyIn(Dist.CLIENT) -public class GuiFurnaceDouble extends GuiWtfMojang { +public class GuiFurnaceDouble extends GuiWtfMojang { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_furnace_double"); private final TileEntityFurnaceDouble tileFurnace; @@ -36,9 +36,9 @@ public class GuiFurnaceDouble extends GuiWtfMojang { private GuiButton buttonAutoSplit; - public GuiFurnaceDouble(PlayerInventory inventory, TileEntityBase tile) { - super(new ContainerFurnaceDouble(inventory, tile)); - this.tileFurnace = (TileEntityFurnaceDouble) tile; + public GuiFurnaceDouble(ContainerFurnaceDouble container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); + this.tileFurnace = container.furnace; this.xSize = 176; this.ySize = 93 + 86; } @@ -61,7 +61,7 @@ public class GuiFurnaceDouble extends GuiWtfMojang { this.energy = new EnergyDisplay(this.guiLeft + 27, this.guiTop + 5, this.tileFurnace.storage); this.buttonAutoSplit = new GuiInputter.SmallerButton(0, this.guiLeft, this.guiTop, "S"); - this.buttonList.add(this.buttonAutoSplit); + this.addButton(this.buttonAutoSplit); } @Override @@ -89,19 +89,19 @@ public class GuiFurnaceDouble extends GuiWtfMojang { public void drawGuiContainerBackgroundLayer(float f, int x, int y) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC); + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 93); if (this.tileFurnace.firstSmeltTime > 0) { int i = this.tileFurnace.getFirstTimeToScale(23); - this.drawTexturedModalRect(this.guiLeft + 51, this.guiTop + 40, 176, 0, 24, i); + this.blit(matrices, this.guiLeft + 51, this.guiTop + 40, 176, 0, 24, i); } if (this.tileFurnace.secondSmeltTime > 0) { int i = this.tileFurnace.getSecondTimeToScale(23); - this.drawTexturedModalRect(this.guiLeft + 101, this.guiTop + 40, 176, 22, 24, i); + this.blit(matrices, this.guiLeft + 101, this.guiTop + 40, 176, 22, 24, i); } this.energy.draw(); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java index 5496c01c2..06aed6435 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGiantChest.java @@ -1,78 +1,79 @@ -/* - * This file ("GuiGiantChest.java") is part of the Actually Additions mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015-2017 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.inventory.gui; - -import de.ellpeck.actuallyadditions.mod.inventory.ContainerGiantChest; -import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChest; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChestLarge; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChestMedium; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.OnlyIn; - -import java.io.IOException; - -@OnlyIn(Dist.CLIENT) -public class GuiGiantChest extends GuiWtfMojang { - - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_giant_chest"); - - private final TileEntityGiantChest chest; - private final int page; - - public GuiGiantChest(PlayerInventory inventory, TileEntityBase tile, int page) { - super(new ContainerGiantChest(inventory, tile, page)); - this.chest = (TileEntityGiantChest) tile; - this.page = page; - - this.xSize = 242; - this.ySize = 172 + 86; - } - - @Override - public void initGui() { - super.initGui(); - - if (this.page > 0) { - this.buttonList.add(new GuiButton(this.page - 1, this.guiLeft + 13, this.guiTop + 172, 20, 20, "<")); - } - - if (this.page == 0 && this.chest instanceof TileEntityGiantChestMedium || this.page <= 1 && this.chest instanceof TileEntityGiantChestLarge) { - this.buttonList.add(new GuiButton(this.page + 1, this.guiLeft + 209, this.guiTop + 172, 20, 20, ">")); - } - } - - @Override - protected void actionPerformed(GuiButton button) throws IOException { - if (button.id >= 0 && button.id < 3) { - PacketHandlerHelper.sendButtonPacket(this.chest, button.id); - } - } - - @Override - public void drawGuiContainerForegroundLayer(int x, int y) { - AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.chest); - } - - @Override - public void drawGuiContainerBackgroundLayer(float f, int x, int y) { - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 242, 190); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft + 33, this.guiTop + 172, 0, 0, 176, 86); - } -} +// TODO: [port] no longer needed +///* +// * This file ("GuiGiantChest.java") is part of the Actually Additions mod for Minecraft. +// * It is created and owned by Ellpeck and distributed +// * under the Actually Additions License to be found at +// * http://ellpeck.de/actaddlicense +// * View the source code at https://github.com/Ellpeck/ActuallyAdditions +// * +// * © 2015-2017 Ellpeck +// */ +// +//package de.ellpeck.actuallyadditions.mod.inventory.gui; +// +//import de.ellpeck.actuallyadditions.mod.inventory.ContainerGiantChest; +//import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; +//import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +//import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChest; +//import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChestLarge; +//import de.ellpeck.actuallyadditions.mod.tile.TileEntityGiantChestMedium; +//import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +//import net.minecraft.client.gui.widget.button.Button; +//import net.minecraft.entity.player.PlayerInventory; +//import net.minecraft.util.ResourceLocation; +//import net.minecraftforge.api.distmarker.Dist; +//import net.minecraftforge.api.distmarker.OnlyIn; +// +//import java.io.IOException; +// +//@OnlyIn(Dist.CLIENT) +//public class GuiGiantChest extends GuiWtfMojang { +// +// private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_giant_chest"); +// +// private final TileEntityGiantChest chest; +// private final int page; +// +// public GuiGiantChest(PlayerInventory inventory, TileEntityBase tile, int page) { +// super(new ContainerGiantChest(inventory, tile, page)); +// this.chest = (TileEntityGiantChest) tile; +// this.page = page; +// +// this.xSize = 242; +// this.ySize = 172 + 86; +// } +// +// @Override +// public void initGui() { +// super.initGui(); +// +// if (this.page > 0) { +// this.addButton(new GuiButton(this.page - 1, this.guiLeft + 13, this.guiTop + 172, 20, 20, "<")); +// } +// +// if (this.page == 0 && this.chest instanceof TileEntityGiantChestMedium || this.page <= 1 && this.chest instanceof TileEntityGiantChestLarge) { +// this.addButton(new GuiButton(this.page + 1, this.guiLeft + 209, this.guiTop + 172, 20, 20, ">")); +// } +// } +// +// @Override +// protected void actionPerformed(GuiButton button) throws IOException { +// if (button.id >= 0 && button.id < 3) { +// PacketHandlerHelper.sendButtonPacket(this.chest, button.id); +// } +// } +// +// @Override +// public void drawGuiContainerForegroundLayer(int x, int y) { +// AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.chest); +// } +// +// @Override +// public void drawGuiContainerBackgroundLayer(float f, int x, int y) { +// GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); +// this.getMinecraft().getTextureManager().bindTexture(RES_LOC); +// this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 242, 190); +// this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); +// this.blit(matrices, this.guiLeft + 33, this.guiTop + 172, 0, 0, 176, 86); +// } +//} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java index cc9537adf..628f2ae23 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiGrinder.java @@ -10,6 +10,7 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; +import com.mojang.blaze3d.platform.GlStateManager; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.inventory.ContainerGrinder; import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; @@ -17,18 +18,19 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityGrinder; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.gui.widget.button.Button; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import java.io.IOException; import java.util.Collections; @OnlyIn(Dist.CLIENT) -public class GuiGrinder extends GuiWtfMojang { +public class GuiGrinder extends GuiWtfMojang { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_grinder"); private static final ResourceLocation RES_LOC_DOUBLE = AssetUtil.getGuiLocation("gui_grinder_double"); @@ -36,16 +38,16 @@ public class GuiGrinder extends GuiWtfMojang { private final boolean isDouble; private EnergyDisplay energy; - private GuiButton buttonAutoSplit; + private Button buttonAutoSplit; public GuiGrinder(PlayerInventory inventoryPlayer, TileEntityBase tile) { this(inventoryPlayer, tile, false); } - private GuiGrinder(PlayerInventory inventory, TileEntityBase tile, boolean isDouble) { - super(new ContainerGrinder(inventory, tile, isDouble)); - this.tileGrinder = (TileEntityGrinder) tile; - this.isDouble = isDouble; + private GuiGrinder(ContainerGrinder container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); + this.tileGrinder = container.tileGrinder; + this.isDouble = container.isDouble; this.xSize = 176; this.ySize = 93 + 86; } @@ -59,7 +61,7 @@ public class GuiGrinder extends GuiWtfMojang { if (this.isDouble) { this.buttonAutoSplit = new GuiInputter.SmallerButton(0, this.guiLeft - 10, this.guiTop, "S"); - this.buttonList.add(this.buttonAutoSplit); + this.addButton(this.buttonAutoSplit); } } @@ -103,24 +105,24 @@ public class GuiGrinder extends GuiWtfMojang { public void drawGuiContainerBackgroundLayer(float f, int x, int y) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(this.isDouble + this.getMinecraft().getTextureManager().bindTexture(this.isDouble ? RES_LOC_DOUBLE : RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 93); if (this.tileGrinder.firstCrushTime > 0) { int i = this.tileGrinder.getFirstTimeToScale(23); - this.drawTexturedModalRect(this.guiLeft + (this.isDouble + this.blit(matrices, this.guiLeft + (this.isDouble ? 51 : 80), this.guiTop + 40, 176, 0, 24, i); } if (this.isDouble) { if (this.tileGrinder.secondCrushTime > 0) { int i = this.tileGrinder.getSecondTimeToScale(23); - this.drawTexturedModalRect(this.guiLeft + 101, this.guiTop + 40, 176, 22, 24, i); + this.blit(matrices, this.guiLeft + 101, this.guiTop + 40, 176, 22, 24, i); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java index 165fd8ba3..fd5db71fd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiInputter.java @@ -10,26 +10,27 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; +import com.mojang.blaze3d.platform.GlStateManager; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.inventory.ContainerInputter; import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityInputter; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiTextField; -import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.gui.widget.button.Button; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import org.lwjgl.input.Keyboard; import java.io.IOException; @OnlyIn(Dist.CLIENT) -public class GuiInputter extends GuiWtfMojang { +public class GuiInputter extends GuiWtfMojang { public static final int OFFSET_ADVANCED = 12 + 36; public static final String[] SIDES = new String[]{StringUtil.localize("info." + ActuallyAdditions.MODID + ".gui.disabled"), StringUtil.localize("info." + ActuallyAdditions.MODID + ".gui.up"), StringUtil.localize("info." + ActuallyAdditions.MODID + ".gui.down"), StringUtil.localize("info." + ActuallyAdditions.MODID + ".gui.north"), StringUtil.localize("info." + ActuallyAdditions.MODID + ".gui.east"), StringUtil.localize("info." + ActuallyAdditions.MODID + ".gui.south"), StringUtil.localize("info." + ActuallyAdditions.MODID + ".gui.west")}; @@ -45,14 +46,14 @@ public class GuiInputter extends GuiWtfMojang { private FilterSettingsGui leftFilter; private FilterSettingsGui rightFilter; - public GuiInputter(PlayerInventory inventory, TileEntityBase tile, boolean isAdvanced) { - super(new ContainerInputter(inventory, tile, isAdvanced)); - this.tileInputter = (TileEntityInputter) tile; + public GuiInputter(ContainerInputter container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); + this.tileInputter = container.tileInputter; this.xSize = 176; - this.ySize = 97 + 86 + (isAdvanced + this.ySize = 97 + 86 + (container.isAdvanced ? OFFSET_ADVANCED : 0); - this.isAdvanced = isAdvanced; + this.isAdvanced = container.isAdvanced; } @Override @@ -100,12 +101,12 @@ public class GuiInputter extends GuiWtfMojang { ? OFFSET_ADVANCED : 0), "<"); - this.buttonList.add(buttonSidePutP); - this.buttonList.add(buttonSidePullP); - this.buttonList.add(buttonSidePutM); - this.buttonList.add(buttonSidePullM); + this.addButton(buttonSidePutP); + this.addButton(buttonSidePullP); + this.addButton(buttonSidePutM); + this.addButton(buttonSidePullM); - this.buttonList.add(new TinyButton(TileEntityInputter.OKAY_BUTTON_ID, this.guiLeft + 84, this.guiTop + 91 + (this.isAdvanced + this.addButton(new TinyButton(TileEntityInputter.OKAY_BUTTON_ID, this.guiLeft + 84, this.guiTop + 91 + (this.isAdvanced ? OFFSET_ADVANCED : 0))); } @@ -146,15 +147,15 @@ public class GuiInputter extends GuiWtfMojang { public void drawGuiContainerBackgroundLayer(float f, int x, int y) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 97 + (this.isAdvanced + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 97 + (this.isAdvanced ? OFFSET_ADVANCED : 0), 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(this.isAdvanced + this.getMinecraft().getTextureManager().bindTexture(this.isAdvanced ? RES_LOC_ADVANCED : RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 97 + (this.isAdvanced + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 97 + (this.isAdvanced ? OFFSET_ADVANCED : 0)); @@ -273,7 +274,7 @@ public class GuiInputter extends GuiWtfMojang { } @OnlyIn(Dist.CLIENT) - public static class SmallerButton extends GuiButton { + public static class SmallerButton extends Button { public final ResourceLocation resLoc = AssetUtil.getGuiLocation("gui_inputter"); private final boolean smaller; @@ -299,7 +300,7 @@ public class GuiInputter extends GuiWtfMojang { GlStateManager.enableBlend(); GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); GlStateManager.blendFunc(770, 771); - this.drawTexturedModalRect(this.x, this.y, this.smaller + this.blit(matrices, this.x, this.y, this.smaller ? 200 : 176, k * this.height, this.width, this.height); this.mouseDragged(mc, x, y); @@ -337,7 +338,7 @@ public class GuiInputter extends GuiWtfMojang { GlStateManager.enableBlend(); GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); GlStateManager.blendFunc(770, 771); - this.drawTexturedModalRect(this.x, this.y, 192, k * 8, 8, 8); + this.blit(matrices, this.x, this.y, 192, k * 8, 8, 8); this.mouseDragged(mc, x, y); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java index 28d5fb9c8..5c8413911 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiLaserRelayItemWhitelist.java @@ -10,26 +10,27 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; +import com.mojang.blaze3d.platform.GlStateManager; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.inventory.ContainerLaserRelayItemWhitelist; import de.ellpeck.actuallyadditions.mod.inventory.gui.GuiInputter.SmallerButton; import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelayItemWhitelist; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.gui.widget.button.Button; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import java.util.ArrayList; import java.util.List; @OnlyIn(Dist.CLIENT) -public class GuiLaserRelayItemWhitelist extends GuiWtfMojang { +public class GuiLaserRelayItemWhitelist extends GuiWtfMojang { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_laser_relay_item_whitelist"); private final TileEntityLaserRelayItemWhitelist tile; @@ -37,12 +38,12 @@ public class GuiLaserRelayItemWhitelist extends GuiWtfMojang { private FilterSettingsGui leftFilter; private FilterSettingsGui rightFilter; - private GuiButton buttonSmartWhitelistLeft; - private GuiButton buttonSmartWhitelistRight; + private Button buttonSmartWhitelistLeft; + private Button buttonSmartWhitelistRight; - public GuiLaserRelayItemWhitelist(PlayerInventory inventory, TileEntityBase tile) { - super(new ContainerLaserRelayItemWhitelist(inventory, tile)); - this.tile = (TileEntityLaserRelayItemWhitelist) tile; + public GuiLaserRelayItemWhitelist(ContainerLaserRelayItemWhitelist container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); + this.tile = container.tile; this.xSize = 176; this.ySize = 93 + 86; } @@ -64,12 +65,12 @@ public class GuiLaserRelayItemWhitelist extends GuiWtfMojang { this.buttonSmartWhitelistLeft = new SmallerButton(2, this.guiLeft + 3, this.guiTop + 79, "S"); this.buttonSmartWhitelistRight = new SmallerButton(3, this.guiLeft + 157, this.guiTop + 79, "S"); - this.buttonList.add(this.buttonSmartWhitelistLeft); - this.buttonList.add(this.buttonSmartWhitelistRight); + this.addButton(this.buttonSmartWhitelistLeft); + this.addButton(this.buttonSmartWhitelistRight); } @Override - public void actionPerformed(GuiButton button) { + public void actionPerformed(Button button) { PacketHandlerHelper.sendButtonPacket(this.tile, button.id); } @@ -102,11 +103,11 @@ public class GuiLaserRelayItemWhitelist extends GuiWtfMojang { public void drawGuiContainerBackgroundLayer(float f, int x, int y) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC); + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 93); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java index af9658c1f..9e9fa321c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiMiner.java @@ -10,27 +10,28 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; +import com.mojang.blaze3d.platform.GlStateManager; import de.ellpeck.actuallyadditions.mod.inventory.ContainerMiner; import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityMiner; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + @OnlyIn(Dist.CLIENT) -public class GuiMiner extends GuiWtfMojang { +public class GuiMiner extends GuiWtfMojang { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_breaker"); private final TileEntityMiner miner; - public GuiMiner(PlayerInventory inventory, TileEntityBase tile) { - super(new ContainerMiner(inventory, tile)); - this.miner = (TileEntityMiner) tile; + public GuiMiner(ContainerMiner container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); + this.miner = container.miner; this.xSize = 176; this.ySize = 93 + 86; } @@ -40,10 +41,10 @@ public class GuiMiner extends GuiWtfMojang { super.initGui(); GuiButton buttonMode = new GuiButton(0, this.guiLeft + this.xSize / 2 - 51, this.guiTop + 75, 50, 20, "Mode"); - this.buttonList.add(buttonMode); + this.addButton(buttonMode); GuiButton buttonReset = new GuiButton(1, this.guiLeft + this.xSize / 2 + 1, this.guiTop + 75, 50, 20, "Reset"); - this.buttonList.add(buttonReset); + this.addButton(buttonReset); } @Override @@ -55,11 +56,11 @@ public class GuiMiner extends GuiWtfMojang { public void drawGuiContainerBackgroundLayer(float f, int x, int y) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC); + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 93); String mining = this.miner.onlyMineOres ? "Only Mining Ores" diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java index 2eb4a111f..992b062ad 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiOilGenerator.java @@ -10,19 +10,21 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; +import com.mojang.blaze3d.platform.GlStateManager; import de.ellpeck.actuallyadditions.mod.inventory.ContainerOilGenerator; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityOilGenerator; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.resources.I18n; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + @OnlyIn(Dist.CLIENT) -public class GuiOilGenerator extends GuiWtfMojang { +public class GuiOilGenerator extends GuiWtfMojang { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_oil_generator"); private final TileEntityOilGenerator generator; @@ -30,9 +32,9 @@ public class GuiOilGenerator extends GuiWtfMojang { private EnergyDisplay energy; private FluidDisplay fluid; - public GuiOilGenerator(PlayerInventory inventory, TileEntityBase tile) { - super(new ContainerOilGenerator(inventory, tile)); - this.generator = (TileEntityOilGenerator) tile; + public GuiOilGenerator(ContainerOilGenerator container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); + this.generator = container.generator; this.xSize = 176; this.ySize = 93 + 86; } @@ -60,15 +62,15 @@ public class GuiOilGenerator extends GuiWtfMojang { public void drawGuiContainerBackgroundLayer(float f, int x, int y) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC); + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 93); if (this.generator.currentBurnTime > 0 && this.generator.maxBurnTime > 0) { int i = this.generator.getBurningScaled(13); - this.drawTexturedModalRect(this.guiLeft + 72, this.guiTop + 44 + 12 - i, 176, 96 - i, 14, i); + this.blit(matrices, this.guiLeft + 72, this.guiTop + 44 + 12 - i, 176, 96 - i, 14, i); } if (this.generator.maxBurnTime > 0 && this.generator.currentEnergyProduce > 0) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java index 5a18dacf0..e2b10fe21 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiPhantomPlacer.java @@ -10,33 +10,33 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; +import com.mojang.blaze3d.platform.GlStateManager; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.inventory.ContainerPhantomPlacer; import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityPhantomPlacer; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.text.ITextComponent; import net.minecraft.util.text.TextFormatting; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; import java.io.IOException; import java.util.ArrayList; import java.util.List; @OnlyIn(Dist.CLIENT) -public class GuiPhantomPlacer extends GuiWtfMojang { +public class GuiPhantomPlacer extends GuiWtfMojang { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_breaker"); private final TileEntityPhantomPlacer placer; - public GuiPhantomPlacer(PlayerInventory inventory, TileEntityBase tile) { - super(new ContainerPhantomPlacer(inventory, tile)); - this.placer = (TileEntityPhantomPlacer) tile; + public GuiPhantomPlacer(ContainerPhantomPlacer container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); + this.placer = container.placer; this.xSize = 176; this.ySize = 93 + 86; } @@ -46,7 +46,7 @@ public class GuiPhantomPlacer extends GuiWtfMojang { super.initGui(); if (!this.placer.isBreaker) { - this.buttonList.add(new GuiButton(0, this.guiLeft + 63, this.guiTop + 75, 50, 20, this.getSide())); + this.addButton(new GuiButton(0, this.guiLeft + 63, this.guiTop + 75, 50, 20, this.getSide())); } } @@ -93,10 +93,10 @@ public class GuiPhantomPlacer extends GuiWtfMojang { public void drawGuiContainerBackgroundLayer(float f, int x, int y) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC); + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 93); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java index 1807333b7..728cc9c23 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRangedCollector.java @@ -10,28 +10,29 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; +import com.mojang.blaze3d.platform.GlStateManager; import de.ellpeck.actuallyadditions.mod.inventory.ContainerRangedCollector; import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityRangedCollector; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.GlStateManager; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + @OnlyIn(Dist.CLIENT) -public class GuiRangedCollector extends GuiWtfMojang { +public class GuiRangedCollector extends GuiWtfMojang { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_ranged_collector"); private final TileEntityRangedCollector collector; private FilterSettingsGui filter; - public GuiRangedCollector(PlayerInventory inventory, TileEntityBase tile) { - super(new ContainerRangedCollector(inventory, tile)); - this.collector = (TileEntityRangedCollector) tile; + public GuiRangedCollector(ContainerRangedCollector container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); + this.collector = container.collector; this.xSize = 176; this.ySize = 86 + 86; } @@ -66,11 +67,11 @@ public class GuiRangedCollector extends GuiWtfMojang { public void drawGuiContainerBackgroundLayer(float f, int x, int y) { GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 86, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 86, 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC); + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 86); } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java index a302a4115..95bd631db 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiRepairer.java @@ -1,69 +1,72 @@ -/* - * This file ("GuiRepairer.java") is part of the Actually Additions mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015-2017 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.inventory.gui; - -import de.ellpeck.actuallyadditions.mod.inventory.ContainerRepairer; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.OnlyIn; - -@OnlyIn(Dist.CLIENT) -public class GuiRepairer extends GuiWtfMojang { - - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_repairer"); - private final TileEntityItemRepairer tileRepairer; - private EnergyDisplay energy; - - public GuiRepairer(PlayerInventory inventory, TileEntityBase tile) { - super(new ContainerRepairer(inventory, tile)); - this.tileRepairer = (TileEntityItemRepairer) tile; - this.xSize = 176; - this.ySize = 93 + 86; - } - - @Override - public void initGui() { - super.initGui(); - this.energy = new EnergyDisplay(this.guiLeft + 27, this.guiTop + 5, this.tileRepairer.storage); - } - - @Override - public void drawScreen(int x, int y, float f) { - super.drawScreen(x, y, f); - this.energy.drawOverlay(x, y); - } - - @Override - public void drawGuiContainerForegroundLayer(int x, int y) { - AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.tileRepairer); - } - - @Override - public void drawGuiContainerBackgroundLayer(float f, int x, int y) { - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); - - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); - - if (TileEntityItemRepairer.canBeRepaired(this.tileRepairer.inv.getStackInSlot(TileEntityItemRepairer.SLOT_INPUT))) { - int i = this.tileRepairer.getItemDamageToScale(22); - this.drawTexturedModalRect(this.guiLeft + 73, this.guiTop + 52, 176, 28, i, 16); - } - - this.energy.draw(); - } -} +// TODO: [port][note] no longer needed +///* +// * This file ("GuiRepairer.java") is part of the Actually Additions mod for Minecraft. +// * It is created and owned by Ellpeck and distributed +// * under the Actually Additions License to be found at +// * http://ellpeck.de/actaddlicense +// * View the source code at https://github.com/Ellpeck/ActuallyAdditions +// * +// * © 2015-2017 Ellpeck +// */ +// +//package de.ellpeck.actuallyadditions.mod.inventory.gui; +// +//import com.mojang.blaze3d.platform.GlStateManager; +//import de.ellpeck.actuallyadditions.mod.inventory.ContainerRepairer; +//import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +//import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +//import net.minecraft.entity.player.PlayerInventory; +//import net.minecraft.util.ResourceLocation; +//import net.minecraftforge.api.distmarker.Dist; +//import net.minecraftforge.api.distmarker.OnlyIn; +// +// +//@OnlyIn(Dist.CLIENT) +//public class GuiRepairer extends GuiWtfMojang { +// +// private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_repairer"); +// private final TileEntityItemRepairer tileRepairer; +// private EnergyDisplay energy; +// +// public GuiRepairer(PlayerInventory inventory, TileEntityBase tile) { +// super(new ContainerRepairer(inventory, tile)); +// this.tileRepairer = (TileEntityItemRepairer) tile; +// this.xSize = 176; +// this.ySize = 93 + 86; +// } +// +// @Override +// public void initGui() { +// super.initGui(); +// this.energy = new EnergyDisplay(this.guiLeft + 27, this.guiTop + 5, this.tileRepairer.storage); +// } +// +// @Override +// public void drawScreen(int x, int y, float f) { +// super.drawScreen(x, y, f); +// this.energy.drawOverlay(x, y); +// } +// +// @Override +// public void drawGuiContainerForegroundLayer(int x, int y) { +// AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.tileRepairer); +// } +// +// @Override +// public void drawGuiContainerBackgroundLayer(float f, int x, int y) { +// GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); +// +// this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); +// this.blit(matrices, this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); +// +// this.getMinecraft().getTextureManager().bindTexture(RES_LOC); +// this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 93); +// +// if (TileEntityItemRepairer.canBeRepaired(this.tileRepairer.inv.getStackInSlot(TileEntityItemRepairer.SLOT_INPUT))) { +// int i = this.tileRepairer.getItemDamageToScale(22); +// this.blit(matrices, this.guiLeft + 73, this.guiTop + 52, 176, 28, i, 16); +// } +// +// this.energy.draw(); +// } +//} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java index 9b71763c8..60005c957 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiSmileyCloud.java @@ -1,126 +1,127 @@ -/* - * This file ("GuiSmileyCloud.java") is part of the Actually Additions mod for Minecraft. - * It is created and owned by Ellpeck and distributed - * under the Actually Additions License to be found at - * http://ellpeck.de/actaddlicense - * View the source code at https://github.com/Ellpeck/ActuallyAdditions - * - * © 2015-2017 Ellpeck - */ - -package de.ellpeck.actuallyadditions.mod.inventory.gui; - -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -import de.ellpeck.actuallyadditions.mod.inventory.ContainerSmileyCloud; -import de.ellpeck.actuallyadditions.mod.network.PacketClientToServer; -import de.ellpeck.actuallyadditions.mod.network.PacketHandler; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; -import de.ellpeck.actuallyadditions.mod.tile.TileEntitySmileyCloud; -import de.ellpeck.actuallyadditions.mod.util.AssetUtil; -import de.ellpeck.actuallyadditions.mod.util.StringUtil; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiTextField; -import net.minecraft.client.renderer.GlStateManager; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.OnlyIn; -import org.lwjgl.input.Keyboard; - -import java.io.IOException; - -@OnlyIn(Dist.CLIENT) -public class GuiSmileyCloud extends GuiWtfMojang { - - private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_smiley_cloud"); - - private final int x; - private final int y; - private final int z; - private final World world; - private final TileEntitySmileyCloud cloud; - private GuiTextField nameField; - - public GuiSmileyCloud(TileEntityBase tile, int x, int y, int z, World world) { - super(new ContainerSmileyCloud()); - this.cloud = (TileEntitySmileyCloud) tile; - this.x = x; - this.y = y; - this.z = z; - this.world = world; - this.xSize = 124; - this.ySize = 20; - } - - @Override - public void initGui() { - super.initGui(); - - this.nameField = new GuiTextField(4000, this.fontRenderer, this.guiLeft + 5, this.guiTop + 6, 114, 8); - this.nameField.setMaxStringLength(20); - this.nameField.setEnableBackgroundDrawing(false); - this.nameField.setFocused(true); - } - - @Override - public void drawGuiContainerForegroundLayer(int x, int y) { - String name = this.cloud.name == null || this.cloud.name.isEmpty() - ? "" - : TextFormatting.GOLD + this.cloud.name + TextFormatting.RESET + " " + StringUtil.localize("info." + ActuallyAdditions.MODID + ".gui.the") + " "; - String localizedName = name + StringUtil.localize("container." + ActuallyAdditions.MODID + ".cloud.name"); - this.fontRenderer.drawString(localizedName, this.xSize / 2 - this.fontRenderer.getStringWidth(localizedName) / 2, -10, StringUtil.DECIMAL_COLOR_WHITE); - } - - @Override - public void drawGuiContainerBackgroundLayer(float f, int x, int y) { - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); - - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize); - - this.nameField.drawTextBox(); - } - - @Override - protected void mouseClicked(int par1, int par2, int par3) throws IOException { - this.nameField.mouseClicked(par1, par2, par3); - super.mouseClicked(par1, par2, par3); - } - - @Override - public void keyTyped(char theChar, int key) throws IOException { - if (key != 1 && this.nameField.isFocused()) { - if (key == Keyboard.KEY_RETURN || key == Keyboard.KEY_NUMPADENTER) { - this.setVariable(this.nameField); - } else { - this.nameField.textboxKeyTyped(theChar, key); - } - } else { - super.keyTyped(theChar, key); - } - } - - @Override - public void updateScreen() { - super.updateScreen(); - this.nameField.updateCursorCounter(); - } - - public void setVariable(GuiTextField field) { - this.sendPacket(field.getText(), 0); - field.setText(""); - } - - private void sendPacket(String text, int textID) { - CompoundNBT compound = new CompoundNBT(); - compound.putInt("X", this.x); - compound.putInt("Y", this.y); - compound.putInt("Z", this.z); - compound.putInt("WorldID", this.world.provider.getDimension()); - compound.putInt("PlayerID", Minecraft.getInstance().player.getEntityId()); - compound.putInt("TextID", textID); - compound.setString("Text", text); - PacketHandler.THE_NETWORK.sendToServer(new PacketClientToServer(compound, PacketHandler.GUI_STRING_TO_TILE_HANDLER)); - } -} +// TODO: [port][note] no longer needed +///* +// * This file ("GuiSmileyCloud.java") is part of the Actually Additions mod for Minecraft. +// * It is created and owned by Ellpeck and distributed +// * under the Actually Additions License to be found at +// * http://ellpeck.de/actaddlicense +// * View the source code at https://github.com/Ellpeck/ActuallyAdditions +// * +// * © 2015-2017 Ellpeck +// */ +// +//package de.ellpeck.actuallyadditions.mod.inventory.gui; +// +//import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +//import de.ellpeck.actuallyadditions.mod.inventory.ContainerSmileyCloud; +//import de.ellpeck.actuallyadditions.mod.network.PacketClientToServer; +//import de.ellpeck.actuallyadditions.mod.network.PacketHandler; +//import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; +//import de.ellpeck.actuallyadditions.mod.tile.TileEntitySmileyCloud; +//import de.ellpeck.actuallyadditions.mod.util.AssetUtil; +//import de.ellpeck.actuallyadditions.mod.util.StringUtil; +//import net.minecraft.client.Minecraft; +//import net.minecraft.client.gui.GuiTextField; +//import net.minecraft.nbt.CompoundNBT; +//import net.minecraft.util.ResourceLocation; +//import net.minecraft.util.text.TextFormatting; +//import net.minecraft.world.World; +//import net.minecraftforge.api.distmarker.Dist; +//import net.minecraftforge.api.distmarker.OnlyIn; +//import org.lwjgl.input.Keyboard; +// +//import java.io.IOException; +// +//@OnlyIn(Dist.CLIENT) +//public class GuiSmileyCloud extends GuiWtfMojang { +// +// private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_smiley_cloud"); +// +// private final int x; +// private final int y; +// private final int z; +// private final World world; +// private final TileEntitySmileyCloud cloud; +// private GuiTextField nameField; +// +// public GuiSmileyCloud(TileEntityBase tile, int x, int y, int z, World world) { +// super(new ContainerSmileyCloud()); +// this.cloud = (TileEntitySmileyCloud) tile; +// this.x = x; +// this.y = y; +// this.z = z; +// this.world = world; +// this.xSize = 124; +// this.ySize = 20; +// } +// +// @Override +// public void initGui() { +// super.initGui(); +// +// this.nameField = new GuiTextField(4000, this.fontRenderer, this.guiLeft + 5, this.guiTop + 6, 114, 8); +// this.nameField.setMaxStringLength(20); +// this.nameField.setEnableBackgroundDrawing(false); +// this.nameField.setFocused(true); +// } +// +// @Override +// public void drawGuiContainerForegroundLayer(int x, int y) { +// String name = this.cloud.name == null || this.cloud.name.isEmpty() +// ? "" +// : TextFormatting.GOLD + this.cloud.name + TextFormatting.RESET + " " + StringUtil.localize("info." + ActuallyAdditions.MODID + ".gui.the") + " "; +// String localizedName = name + StringUtil.localize("container." + ActuallyAdditions.MODID + ".cloud.name"); +// this.fontRenderer.drawString(localizedName, this.xSize / 2 - this.fontRenderer.getStringWidth(localizedName) / 2, -10, StringUtil.DECIMAL_COLOR_WHITE); +// } +// +// @Override +// public void drawGuiContainerBackgroundLayer(float f, int x, int y) { +// GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); +// +// this.getMinecraft().getTextureManager().bindTexture(RES_LOC); +// this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, this.xSize, this.ySize); +// +// this.nameField.drawTextBox(); +// } +// +// @Override +// protected void mouseClicked(int par1, int par2, int par3) throws IOException { +// this.nameField.mouseClicked(par1, par2, par3); +// super.mouseClicked(par1, par2, par3); +// } +// +// @Override +// public void keyTyped(char theChar, int key) throws IOException { +// if (key != 1 && this.nameField.isFocused()) { +// if (key == Keyboard.KEY_RETURN || key == Keyboard.KEY_NUMPADENTER) { +// this.setVariable(this.nameField); +// } else { +// this.nameField.textboxKeyTyped(theChar, key); +// } +// } else { +// super.keyTyped(theChar, key); +// } +// } +// +// @Override +// public void updateScreen() { +// super.updateScreen(); +// this.nameField.updateCursorCounter(); +// } +// +// public void setVariable(GuiTextField field) { +// this.sendPacket(field.getText(), 0); +// field.setText(""); +// } +// +// private void sendPacket(String text, int textID) { +// CompoundNBT compound = new CompoundNBT(); +// compound.putInt("X", this.x); +// compound.putInt("Y", this.y); +// compound.putInt("Z", this.z); +// compound.putInt("WorldID", this.world.provider.getDimension()); +// compound.putInt("PlayerID", Minecraft.getInstance().player.getEntityId()); +// compound.putInt("TextID", textID); +// compound.setString("Text", text); +// PacketHandler.THE_NETWORK.sendToServer(new PacketClientToServer(compound, PacketHandler.GUI_STRING_TO_TILE_HANDLER)); +// } +//} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java index f1aecc7d9..733ec6d30 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/GuiXPSolidifier.java @@ -10,77 +10,80 @@ package de.ellpeck.actuallyadditions.mod.inventory.gui; +import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.platform.GlStateManager; import de.ellpeck.actuallyadditions.mod.inventory.ContainerXPSolidifier; import de.ellpeck.actuallyadditions.mod.network.PacketHandlerHelper; -import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import de.ellpeck.actuallyadditions.mod.tile.TileEntityXPSolidifier; import de.ellpeck.actuallyadditions.mod.util.AssetUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.gui.widget.button.Button; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.fml.relauncher.OnlyIn; +import net.minecraft.util.text.ITextComponent; +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.api.distmarker.OnlyIn; + @OnlyIn(Dist.CLIENT) -public class GuiXPSolidifier extends GuiWtfMojang { +public class GuiXPSolidifier extends GuiWtfMojang { private static final ResourceLocation RES_LOC = AssetUtil.getGuiLocation("gui_xp_solidifier"); private final TileEntityXPSolidifier solidifier; - public GuiXPSolidifier(PlayerInventory inventory, TileEntityBase tile) { - super(new ContainerXPSolidifier(inventory, tile)); - this.solidifier = (TileEntityXPSolidifier) tile; + public GuiXPSolidifier(ContainerXPSolidifier container, PlayerInventory inventory, ITextComponent title) { + super(container, inventory); + this.solidifier = container.solidifier; this.xSize = 176; this.ySize = 93 + 86; } @Override - public void initGui() { - super.initGui(); + public void init() { + super.init(); - GuiButton buttonOne = new GuiInputter.SmallerButton(0, this.guiLeft + 62, this.guiTop + 44, "1"); - GuiButton buttonFive = new GuiInputter.SmallerButton(1, this.guiLeft + 80, this.guiTop + 44, "5"); - GuiButton buttonTen = new GuiInputter.SmallerButton(2, this.guiLeft + 99, this.guiTop + 44, "10"); - GuiButton buttonTwenty = new GuiInputter.SmallerButton(3, this.guiLeft + 62, this.guiTop + 61, "20"); - GuiButton buttonThirty = new GuiInputter.SmallerButton(4, this.guiLeft + 80, this.guiTop + 61, "30"); - GuiButton buttonForty = new GuiInputter.SmallerButton(5, this.guiLeft + 99, this.guiTop + 61, "40"); - GuiButton buttonFifty = new GuiInputter.SmallerButton(6, this.guiLeft + 62, this.guiTop + 78, "50"); - GuiButton buttonSixtyFour = new GuiInputter.SmallerButton(7, this.guiLeft + 80, this.guiTop + 78, "64"); - GuiButton buttonAll = new GuiInputter.SmallerButton(8, this.guiLeft + 99, this.guiTop + 78, "All"); + Button buttonOne = new GuiInputter.SmallerButton(0, this.guiLeft + 62, this.guiTop + 44, "1"); + Button buttonFive = new GuiInputter.SmallerButton(1, this.guiLeft + 80, this.guiTop + 44, "5"); + Button buttonTen = new GuiInputter.SmallerButton(2, this.guiLeft + 99, this.guiTop + 44, "10"); + Button buttonTwenty = new GuiInputter.SmallerButton(3, this.guiLeft + 62, this.guiTop + 61, "20"); + Button buttonThirty = new GuiInputter.SmallerButton(4, this.guiLeft + 80, this.guiTop + 61, "30"); + Button buttonForty = new GuiInputter.SmallerButton(5, this.guiLeft + 99, this.guiTop + 61, "40"); + Button buttonFifty = new GuiInputter.SmallerButton(6, this.guiLeft + 62, this.guiTop + 78, "50"); + Button buttonSixtyFour = new GuiInputter.SmallerButton(7, this.guiLeft + 80, this.guiTop + 78, "64"); + Button buttonAll = new GuiInputter.SmallerButton(8, this.guiLeft + 99, this.guiTop + 78, "All"); - this.buttonList.add(buttonOne); - this.buttonList.add(buttonFive); - this.buttonList.add(buttonTen); - this.buttonList.add(buttonTwenty); - this.buttonList.add(buttonThirty); - this.buttonList.add(buttonForty); - this.buttonList.add(buttonFifty); - this.buttonList.add(buttonSixtyFour); - this.buttonList.add(buttonAll); + this.addButton(buttonOne); + this.addButton(buttonFive); + this.addButton(buttonTen); + this.addButton(buttonTwenty); + this.addButton(buttonThirty); + this.addButton(buttonForty); + this.addButton(buttonFifty); + this.addButton(buttonSixtyFour); + this.addButton(buttonAll); } @Override - public void drawGuiContainerForegroundLayer(int x, int y) { - AssetUtil.displayNameString(this.fontRenderer, this.xSize, -10, this.solidifier); + public void drawGuiContainerForegroundLayer(MatrixStack matrices, int x, int y) { + AssetUtil.displayNameString(matrices, this.font, this.xSize, -10, this.solidifier); } @Override - public void drawGuiContainerBackgroundLayer(float f, int x, int y) { - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + public void drawGuiContainerBackgroundLayer(MatrixStack matrices, float f, int x, int y) { + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); - this.mc.getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); - this.drawTexturedModalRect(this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); + this.getMinecraft().getTextureManager().bindTexture(AssetUtil.GUI_INVENTORY_LOCATION); + this.blit(matrices, this.guiLeft, this.guiTop + 93, 0, 0, 176, 86); - this.mc.getTextureManager().bindTexture(RES_LOC); - this.drawTexturedModalRect(this.guiLeft, this.guiTop, 0, 0, 176, 93); + this.getMinecraft().getTextureManager().bindTexture(RES_LOC); + this.blit(matrices, this.guiLeft, this.guiTop, 0, 0, 176, 93); - this.drawCenteredString(this.fontRenderer, Integer.toString(this.solidifier.amount), this.guiLeft + 88, this.guiTop + 30, StringUtil.DECIMAL_COLOR_WHITE); + drawCenteredString(matrices, this.font, Integer.toString(this.solidifier.amount), this.guiLeft + 88, this.guiTop + 30, StringUtil.DECIMAL_COLOR_WHITE); } @Override - public void actionPerformed(GuiButton button) { + public void actionPerformed(Button button) { PacketHandlerHelper.sendButtonPacket(this.solidifier, button.id); this.solidifier.onButtonPressed(button.id, Minecraft.getInstance().player); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/TexturedButton.java b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/TexturedButton.java index 0fb9e6d7a..223b8ea1e 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/TexturedButton.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/inventory/gui/TexturedButton.java @@ -55,7 +55,7 @@ public class TexturedButton extends Button { GlStateManager.enableBlend(); GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0); GlStateManager.blendFunc(770, 771); - this.drawTexturedModalRect(this.x, this.y, this.texturePosX, this.texturePosY - this.height + k * this.height, this.width, this.height); + this.blit(matrices, this.x, this.y, this.texturePosX, this.texturePosY - this.height + k * this.height, this.width, this.height); this.mouseDragged(minecraft, x, y); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java index 1cc6848eb..1ab2b2f41 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemAllToolAA.java @@ -32,7 +32,6 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.fml.relauncher.OnlyIn; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystalShard.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystalShard.java index d904e80fd..dfa7bf6a2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystalShard.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemCrystalShard.java @@ -21,8 +21,7 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.common.IRarity; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.OnlyIn; + public class ItemCrystalShard extends ItemBase implements IColorProvidingItem { @@ -39,12 +38,16 @@ public class ItemCrystalShard extends ItemBase implements IColorProvidingItem { @Override public String getTranslationKey(ItemStack stack) { - return stack.getItemDamage() >= BlockCrystal.ALL_CRYSTALS.length ? StringUtil.BUGGED_ITEM_NAME : this.getTranslationKey() + "_" + BlockCrystal.ALL_CRYSTALS[stack.getItemDamage()].name; + return stack.getItemDamage() >= BlockCrystal.ALL_CRYSTALS.length + ? StringUtil.BUGGED_ITEM_NAME + : this.getTranslationKey() + "_" + BlockCrystal.ALL_CRYSTALS[stack.getItemDamage()].name; } @Override public IRarity getForgeRarity(ItemStack stack) { - return stack.getItemDamage() >= BlockCrystal.ALL_CRYSTALS.length ? EnumRarity.COMMON : BlockCrystal.ALL_CRYSTALS[stack.getItemDamage()].rarity; + return stack.getItemDamage() >= BlockCrystal.ALL_CRYSTALS.length + ? EnumRarity.COMMON + : BlockCrystal.ALL_CRYSTALS[stack.getItemDamage()].rarity; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java index 09cec274e..e284f30f7 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemDust.java @@ -20,8 +20,7 @@ import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.OnlyIn; + public class ItemDust extends ItemBase implements IColorProvidingItem { @@ -39,12 +38,16 @@ public class ItemDust extends ItemBase implements IColorProvidingItem { @Override public String getTranslationKey(ItemStack stack) { - return stack.getItemDamage() >= ALL_DUSTS.length ? StringUtil.BUGGED_ITEM_NAME : this.getTranslationKey() + "_" + ALL_DUSTS[stack.getItemDamage()].name; + return stack.getItemDamage() >= ALL_DUSTS.length + ? StringUtil.BUGGED_ITEM_NAME + : this.getTranslationKey() + "_" + ALL_DUSTS[stack.getItemDamage()].name; } @Override public EnumRarity getRarity(ItemStack stack) { - return stack.getItemDamage() >= ALL_DUSTS.length ? EnumRarity.COMMON : ALL_DUSTS[stack.getItemDamage()].rarity; + return stack.getItemDamage() >= ALL_DUSTS.length + ? EnumRarity.COMMON + : ALL_DUSTS[stack.getItemDamage()].rarity; } @Override @@ -67,12 +70,16 @@ public class ItemDust extends ItemBase implements IColorProvidingItem { @OnlyIn(Dist.CLIENT) @Override public IItemColor getItemColor() { - return (stack, pass) -> stack.getItemDamage() >= ALL_DUSTS.length ? 0xFFFFFF : ALL_DUSTS[stack.getItemDamage()].color; + return (stack, pass) -> stack.getItemDamage() >= ALL_DUSTS.length + ? 0xFFFFFF + : ALL_DUSTS[stack.getItemDamage()].color; } @Override public int getItemBurnTime(ItemStack stack) { - if (stack.getMetadata() == 6) return 1200; + if (stack.getMetadata() == 6) { + return 1200; + } return super.getItemBurnTime(stack); } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java index 0a055bee2..0cb124533 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFoods.java @@ -25,8 +25,7 @@ import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.OnlyIn; + public class ItemFoods extends ItemFoodBase { @@ -42,7 +41,9 @@ public class ItemFoods extends ItemFoodBase { @Override public ItemStack onItemUseFinish(ItemStack stack, World world, EntityLivingBase player) { ItemStack stackToReturn = super.onItemUseFinish(stack, world, player); - ItemStack returnItem = stack.getItemDamage() >= ALL_FOODS.length ? null : ALL_FOODS[stack.getItemDamage()].returnItem; + ItemStack returnItem = stack.getItemDamage() >= ALL_FOODS.length + ? null + : ALL_FOODS[stack.getItemDamage()].returnItem; if (StackUtil.isValid(returnItem) && player instanceof PlayerEntity) { if (!((PlayerEntity) player).inventory.addItemStackToInventory(returnItem.copy())) { if (!world.isRemote) { @@ -57,22 +58,32 @@ public class ItemFoods extends ItemFoodBase { @Override public int getMaxItemUseDuration(ItemStack stack) { - return stack.getItemDamage() >= ALL_FOODS.length ? 0 : ALL_FOODS[stack.getItemDamage()].useDuration; + return stack.getItemDamage() >= ALL_FOODS.length + ? 0 + : ALL_FOODS[stack.getItemDamage()].useDuration; } @Override public EnumAction getItemUseAction(ItemStack stack) { - return stack.getItemDamage() >= ALL_FOODS.length ? EnumAction.EAT : ALL_FOODS[stack.getItemDamage()].getsDrunken ? EnumAction.DRINK : EnumAction.EAT; + return stack.getItemDamage() >= ALL_FOODS.length + ? EnumAction.EAT + : ALL_FOODS[stack.getItemDamage()].getsDrunken + ? EnumAction.DRINK + : EnumAction.EAT; } @Override public int getHealAmount(ItemStack stack) { - return stack.getItemDamage() >= ALL_FOODS.length ? 0 : ALL_FOODS[stack.getItemDamage()].healAmount; + return stack.getItemDamage() >= ALL_FOODS.length + ? 0 + : ALL_FOODS[stack.getItemDamage()].healAmount; } @Override public float getSaturationModifier(ItemStack stack) { - return stack.getItemDamage() >= ALL_FOODS.length ? 0 : ALL_FOODS[stack.getItemDamage()].saturation; + return stack.getItemDamage() >= ALL_FOODS.length + ? 0 + : ALL_FOODS[stack.getItemDamage()].saturation; } @Override @@ -82,12 +93,16 @@ public class ItemFoods extends ItemFoodBase { @Override public String getTranslationKey(ItemStack stack) { - return stack.getItemDamage() >= ALL_FOODS.length ? StringUtil.BUGGED_ITEM_NAME : this.getTranslationKey() + "_" + ALL_FOODS[stack.getItemDamage()].name; + return stack.getItemDamage() >= ALL_FOODS.length + ? StringUtil.BUGGED_ITEM_NAME + : this.getTranslationKey() + "_" + ALL_FOODS[stack.getItemDamage()].name; } @Override public EnumRarity getRarity(ItemStack stack) { - return stack.getItemDamage() >= ALL_FOODS.length ? EnumRarity.COMMON : ALL_FOODS[stack.getItemDamage()].rarity; + return stack.getItemDamage() >= ALL_FOODS.length + ? EnumRarity.COMMON + : ALL_FOODS[stack.getItemDamage()].rarity; } @Override diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java index 456de82ce..e607e7abc 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemJams.java @@ -27,8 +27,7 @@ import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; import net.minecraft.util.NonNullList; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.OnlyIn; + public class ItemJams extends ItemFoodBase implements IColorProvidingItem { @@ -48,12 +47,16 @@ public class ItemJams extends ItemFoodBase implements IColorProvidingItem { @Override public String getTranslationKey(ItemStack stack) { - return stack.getItemDamage() >= ALL_JAMS.length ? StringUtil.BUGGED_ITEM_NAME : this.getTranslationKey() + "_" + ALL_JAMS[stack.getItemDamage()].name; + return stack.getItemDamage() >= ALL_JAMS.length + ? StringUtil.BUGGED_ITEM_NAME + : this.getTranslationKey() + "_" + ALL_JAMS[stack.getItemDamage()].name; } @Override public EnumRarity getRarity(ItemStack stack) { - return stack.getItemDamage() >= ALL_JAMS.length ? EnumRarity.COMMON : ALL_JAMS[stack.getItemDamage()].rarity; + return stack.getItemDamage() >= ALL_JAMS.length + ? EnumRarity.COMMON + : ALL_JAMS[stack.getItemDamage()].rarity; } @Override @@ -89,12 +92,16 @@ public class ItemJams extends ItemFoodBase implements IColorProvidingItem { @Override public int getHealAmount(ItemStack stack) { - return stack.getItemDamage() >= ALL_JAMS.length ? 0 : ALL_JAMS[stack.getItemDamage()].healAmount; + return stack.getItemDamage() >= ALL_JAMS.length + ? 0 + : ALL_JAMS[stack.getItemDamage()].healAmount; } @Override public float getSaturationModifier(ItemStack stack) { - return stack.getItemDamage() >= ALL_JAMS.length ? 0 : ALL_JAMS[stack.getItemDamage()].saturation; + return stack.getItemDamage() >= ALL_JAMS.length + ? 0 + : ALL_JAMS[stack.getItemDamage()].saturation; } @Override @@ -107,6 +114,10 @@ public class ItemJams extends ItemFoodBase implements IColorProvidingItem { @Override @OnlyIn(Dist.CLIENT) public IItemColor getItemColor() { - return (stack, pass) -> pass > 0 ? stack.getItemDamage() >= ALL_JAMS.length ? 0xFFFFFF : ALL_JAMS[stack.getItemDamage()].color : 0xFFFFFF; + return (stack, pass) -> pass > 0 + ? stack.getItemDamage() >= ALL_JAMS.length + ? 0xFFFFFF + : ALL_JAMS[stack.getItemDamage()].color + : 0xFFFFFF; } } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java index f3bc46ac6..1cc4aacca 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemMisc.java @@ -26,7 +26,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraftforge.common.IRarity; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.IFluidBlock; -import net.minecraftforge.fml.relauncher.OnlyIn; + public class ItemMisc extends ItemBase { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java index 7e13a8c48..210374371 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemPotionRing.java @@ -34,7 +34,6 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.MathHelper; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.OnlyIn; import javax.annotation.Nullable; import java.util.Collections; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java index 2722c3cd3..ba695d064 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/cloud/SmileyCloudEasterEggs.java @@ -20,7 +20,7 @@ //import de.ellpeck.actuallyadditions.mod.items.metalists.TheMiscItems; //import de.ellpeck.actuallyadditions.mod.util.AssetUtil; //import net.minecraft.block.Block; -//import net.minecraft.client.renderer.GlStateManager; +// //import net.minecraft.init.Blocks; //import net.minecraft.init.Items; //import net.minecraft.item.ItemStack; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandlerHelper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandlerHelper.java index 706e91d3b..c244aef8a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandlerHelper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketHandlerHelper.java @@ -21,7 +21,7 @@ import net.minecraft.entity.player.ServerPlayerEntity; import net.minecraft.nbt.CompoundNBT; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.math.BlockPos; -import net.minecraftforge.fml.relauncher.OnlyIn; + public final class PacketHandlerHelper { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketServerToClient.java b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketServerToClient.java index bfde3981c..fed82fa7c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketServerToClient.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/network/PacketServerToClient.java @@ -18,7 +18,7 @@ import net.minecraft.network.PacketBuffer; import net.minecraftforge.fml.common.network.simpleimpl.IMessage; import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler; import net.minecraftforge.fml.common.network.simpleimpl.MessageContext; -import net.minecraftforge.fml.relauncher.OnlyIn; + public class PacketServerToClient implements IMessage { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IEnergyDisplay.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IEnergyDisplay.java index 3c05fed92..8a2029b56 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IEnergyDisplay.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/IEnergyDisplay.java @@ -10,9 +10,6 @@ package de.ellpeck.actuallyadditions.mod.tile; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.OnlyIn; - public interface IEnergyDisplay { @OnlyIn(Dist.CLIENT) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java index b67588e82..928362858 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/FluidStateMapper.java @@ -17,7 +17,7 @@ import net.minecraft.client.renderer.block.statemap.StateMapperBase; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fml.relauncher.OnlyIn; + /** * (Excerpted from Tinkers' Construct with permission, thanks guys!) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/IColorProvidingBlock.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/IColorProvidingBlock.java index 837cceae4..25313b750 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/IColorProvidingBlock.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/IColorProvidingBlock.java @@ -11,8 +11,7 @@ package de.ellpeck.actuallyadditions.mod.util; import net.minecraft.client.renderer.color.IBlockColor; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.OnlyIn; + public interface IColorProvidingBlock { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/IColorProvidingItem.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/IColorProvidingItem.java index b7ebe6a9b..e3b015946 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/IColorProvidingItem.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/IColorProvidingItem.java @@ -11,8 +11,7 @@ package de.ellpeck.actuallyadditions.mod.util; import net.minecraft.client.renderer.color.IItemColor; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.OnlyIn; + public interface IColorProvidingItem { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/CompatFastBench.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/CompatFastBench.java index a0a6c4650..a47ee8ee3 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/CompatFastBench.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/CompatFastBench.java @@ -2,11 +2,9 @@ package de.ellpeck.actuallyadditions.mod.util.compat; import net.minecraft.client.gui.Gui; import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.Container; +import net.minecraft.inventory.container.Container; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.OnlyIn; import shadows.fastbench.gui.ContainerFastBench; import shadows.fastbench.gui.GuiFastBench; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/CompatUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/CompatUtil.java index 2986913da..134c71bcb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/CompatUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/compat/CompatUtil.java @@ -18,7 +18,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; import net.minecraftforge.fml.common.Loader; import net.minecraftforge.fml.common.event.FMLInterModComms; -import net.minecraftforge.fml.relauncher.OnlyIn; + public final class CompatUtil {