From 7462cc5f7eb62d15cc857034c257ddd530a437de Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Wed, 30 Oct 2019 01:24:42 +0100 Subject: [PATCH] Resolve Merge Issues - Fixed a few leftover errors from the merge --- .../java/com/simibubi/create/compat/jei/CreateJEI.java | 10 +++++++--- .../java/com/simibubi/create/compat/jei/SlotMover.java | 5 +++-- .../receivers/MechanicalMixerTileEntityRenderer.java | 4 ++-- .../modules/logistics/block/belts/BeltFunnelBlock.java | 2 +- .../logistics/block/belts/EntityDetectorBlock.java | 2 +- .../logistics/block/inventories/FlexcrateScreen.java | 6 +++--- .../management/base/LogisticalCasingBlock.java | 2 +- .../LogisticalInventoryControllerScreen.java | 4 ++-- .../management/index/LogisticalIndexScreen.java | 8 ++++---- 9 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java index f579a0530..093ed2493 100644 --- a/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java +++ b/src/main/java/com/simibubi/create/compat/jei/CreateJEI.java @@ -8,12 +8,16 @@ import com.simibubi.create.AllItems; import com.simibubi.create.AllRecipes; import com.simibubi.create.Create; import com.simibubi.create.foundation.utility.Lang; - -import com.simibubi.create.modules.logistics.block.FlexcrateScreen; +import com.simibubi.create.modules.logistics.block.inventories.FlexcrateScreen; import com.simibubi.create.modules.schematics.block.SchematicannonScreen; + import mezz.jei.api.IModPlugin; import mezz.jei.api.JeiPlugin; -import mezz.jei.api.registration.*; +import mezz.jei.api.registration.IGuiHandlerRegistration; +import mezz.jei.api.registration.IRecipeCatalystRegistration; +import mezz.jei.api.registration.IRecipeCategoryRegistration; +import mezz.jei.api.registration.IRecipeRegistration; +import mezz.jei.api.registration.ISubtypeRegistration; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.IRecipe; diff --git a/src/main/java/com/simibubi/create/compat/jei/SlotMover.java b/src/main/java/com/simibubi/create/compat/jei/SlotMover.java index 6d1df645e..3188e3324 100644 --- a/src/main/java/com/simibubi/create/compat/jei/SlotMover.java +++ b/src/main/java/com/simibubi/create/compat/jei/SlotMover.java @@ -1,12 +1,13 @@ package com.simibubi.create.compat.jei; +import java.util.List; + import com.simibubi.create.foundation.gui.AbstractSimiContainerScreen; + import mezz.jei.api.gui.handlers.IGuiContainerHandler; import net.minecraft.client.renderer.Rectangle2d; import net.minecraft.inventory.container.Container; -import java.util.List; - /** * Allows a {@link AbstractSimiContainerScreen} to specify an area in getExtraArea() that will be avoided by JEI * diff --git a/src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalMixerTileEntityRenderer.java b/src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalMixerTileEntityRenderer.java index 50298f176..028f0ddb2 100644 --- a/src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalMixerTileEntityRenderer.java +++ b/src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalMixerTileEntityRenderer.java @@ -21,8 +21,8 @@ public class MechanicalMixerTileEntityRenderer extends KineticTileEntityRenderer final BlockState poleState = AllBlocks.MECHANICAL_MIXER_POLE.get().getDefaultState(); final BlockState headState = AllBlocks.MECHANICAL_MIXER_HEAD.get().getDefaultState(); - cacheIfMissing(poleState, HeadTranslator::new); - cacheIfMissing(headState, HeadTranslator::new); + cacheIfMissing(poleState, getWorld(), HeadTranslator::new); + cacheIfMissing(headState, getWorld(), HeadTranslator::new); final BlockPos pos = te.getPos(); int packedLightmapCoords = poleState.getPackedLightmapCoords(getWorld(), pos); diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/belts/BeltFunnelBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/belts/BeltFunnelBlock.java index 9d6165e90..6f3add356 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/belts/BeltFunnelBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/belts/BeltFunnelBlock.java @@ -11,9 +11,9 @@ import com.simibubi.create.modules.contraptions.relays.belt.AllBeltAttachments.B import com.simibubi.create.modules.contraptions.relays.belt.AllBeltAttachments.IBeltAttachment; import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock; import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Slope; +import com.simibubi.create.modules.contraptions.relays.belt.BeltTileEntity; import com.simibubi.create.modules.logistics.block.IInventoryManipulator; import com.simibubi.create.modules.logistics.transport.CardboardBoxEntity; -import com.simibubi.create.modules.contraptions.relays.belt.BeltTileEntity; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/belts/EntityDetectorBlock.java b/src/main/java/com/simibubi/create/modules/logistics/block/belts/EntityDetectorBlock.java index 6c4f12a6d..601e206b6 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/belts/EntityDetectorBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/belts/EntityDetectorBlock.java @@ -14,8 +14,8 @@ import com.simibubi.create.modules.contraptions.relays.belt.AllBeltAttachments.I import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock; import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Part; import com.simibubi.create.modules.contraptions.relays.belt.BeltBlock.Slope; -import com.simibubi.create.modules.logistics.block.IBlockWithFilter; import com.simibubi.create.modules.contraptions.relays.belt.BeltTileEntity; +import com.simibubi.create.modules.logistics.block.IBlockWithFilter; import net.minecraft.block.Block; import net.minecraft.block.BlockState; diff --git a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/FlexcrateScreen.java b/src/main/java/com/simibubi/create/modules/logistics/block/inventories/FlexcrateScreen.java index 1a707a4ab..7a17c3f3c 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/block/inventories/FlexcrateScreen.java +++ b/src/main/java/com/simibubi/create/modules/logistics/block/inventories/FlexcrateScreen.java @@ -3,6 +3,9 @@ package com.simibubi.create.modules.logistics.block.inventories; import static com.simibubi.create.ScreenResources.FLEXCRATE; import static com.simibubi.create.ScreenResources.PLAYER_INVENTORY; +import java.util.ArrayList; +import java.util.List; + import com.mojang.blaze3d.platform.GlStateManager; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllPackets; @@ -19,9 +22,6 @@ import net.minecraft.client.renderer.Rectangle2d; import net.minecraft.entity.player.PlayerInventory; import net.minecraft.util.text.ITextComponent; -import java.util.ArrayList; -import java.util.List; - public class FlexcrateScreen extends AbstractSimiContainerScreen { private FlexcrateTileEntity te; diff --git a/src/main/java/com/simibubi/create/modules/logistics/management/base/LogisticalCasingBlock.java b/src/main/java/com/simibubi/create/modules/logistics/management/base/LogisticalCasingBlock.java index e5e3a9ffc..1adee5cb9 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/management/base/LogisticalCasingBlock.java +++ b/src/main/java/com/simibubi/create/modules/logistics/management/base/LogisticalCasingBlock.java @@ -23,9 +23,9 @@ import net.minecraft.state.StateContainer.Builder; import net.minecraft.state.properties.BlockStateProperties; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.Direction; -import net.minecraft.util.Hand; import net.minecraft.util.Direction.Axis; import net.minecraft.util.Direction.AxisDirection; +import net.minecraft.util.Hand; import net.minecraft.util.IStringSerializable; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockRayTraceResult; diff --git a/src/main/java/com/simibubi/create/modules/logistics/management/controller/LogisticalInventoryControllerScreen.java b/src/main/java/com/simibubi/create/modules/logistics/management/controller/LogisticalInventoryControllerScreen.java index 7e82a9ce5..80efd0120 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/management/controller/LogisticalInventoryControllerScreen.java +++ b/src/main/java/com/simibubi/create/modules/logistics/management/controller/LogisticalInventoryControllerScreen.java @@ -29,9 +29,9 @@ import com.simibubi.create.foundation.gui.widgets.ScrollInput; import com.simibubi.create.foundation.gui.widgets.SelectionScrollInput; import com.simibubi.create.foundation.utility.ColorHelper; import com.simibubi.create.foundation.utility.Lang; +import com.simibubi.create.modules.logistics.management.base.LogisticalActorTileEntity.Priority; import com.simibubi.create.modules.logistics.management.base.LogisticalControllerBlock; import com.simibubi.create.modules.logistics.management.base.LogisticalControllerBlock.Type; -import com.simibubi.create.modules.logistics.management.base.LogisticalActorTileEntity.Priority; import net.minecraft.block.BlockState; import net.minecraft.client.gui.widget.TextFieldWidget; @@ -105,7 +105,7 @@ public class LogisticalInventoryControllerScreen addressInput.setText(container.te.address); addressInput.setEnableBackgroundDrawing(false); addressInput.setMaxStringLength(256); - addressInput.func_212954_a(this::onAddressInputChanged); + addressInput.setResponder(this::onAddressInputChanged); addressInput.setFocused2(false); priorityInput = new SelectionScrollInput(x + 49, y + 31, 18, 18).forOptions(priorityOptions).titled(priority) diff --git a/src/main/java/com/simibubi/create/modules/logistics/management/index/LogisticalIndexScreen.java b/src/main/java/com/simibubi/create/modules/logistics/management/index/LogisticalIndexScreen.java index b8f9163ce..12ca2795a 100644 --- a/src/main/java/com/simibubi/create/modules/logistics/management/index/LogisticalIndexScreen.java +++ b/src/main/java/com/simibubi/create/modules/logistics/management/index/LogisticalIndexScreen.java @@ -104,7 +104,7 @@ public class LogisticalIndexScreen extends AbstractSimiContainerScreen