mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2024-12-25 22:46:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

Resolve Merge Issues

Browse source 
- Fixed a few leftover errors from the merge
This commit is contained in:
simibubi 2019-10-30 01:24:42 +01:00
parent 7304f59f55
commit 7462cc5f7e
9 changed files with 24 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/com/simibubi/create/compat/jei/CreateJEI.java
View file

@ -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;

5
src/main/java/com/simibubi/create/compat/jei/SlotMover.java
View file

@ -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
*

4
src/main/java/com/simibubi/create/modules/contraptions/receivers/MechanicalMixerTileEntityRenderer.java
View file

@ -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);

2
src/main/java/com/simibubi/create/modules/logistics/block/belts/BeltFunnelBlock.java
View file

@ -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;

2
src/main/java/com/simibubi/create/modules/logistics/block/belts/EntityDetectorBlock.java
View file

@ -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;

6
src/main/java/com/simibubi/create/modules/logistics/block/inventories/FlexcrateScreen.java
View file

@ -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<FlexcrateContainer> {
private FlexcrateTileEntity te;

2
src/main/java/com/simibubi/create/modules/logistics/management/base/LogisticalCasingBlock.java
View file

@ -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;

4
src/main/java/com/simibubi/create/modules/logistics/management/controller/LogisticalInventoryControllerScreen.java
View file

@ -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)

8
src/main/java/com/simibubi/create/modules/logistics/management/index/LogisticalIndexScreen.java
View file

@ -104,7 +104,7 @@ public class LogisticalIndexScreen extends AbstractSimiContainerScreen<Logistica
searchTextField.setDisabledTextColour(-1);
searchTextField.setEnableBackgroundDrawing(false);
searchTextField.setMaxStringLength(256);
searchTextField.func_212954_a(this::onSearchKeyChanged);
searchTextField.setResponder(this::onSearchKeyChanged);
searchTextField.setFocused2(false);
receiverTextField = new TextFieldWidget(font, guiLeft + 29, guiTop + 240, 116, 8, "");
@ -112,7 +112,7 @@ public class LogisticalIndexScreen extends AbstractSimiContainerScreen<Logistica
receiverTextField.setDisabledTextColour(-1);
receiverTextField.setEnableBackgroundDrawing(false);
receiverTextField.setMaxStringLength(256);
receiverTextField.func_212954_a(this::onReceiverTextChanged);
receiverTextField.setResponder(this::onReceiverTextChanged);
if (initialTargetAddress != null)
receiverTextField.setText(initialTargetAddress);
receiverTextField.setFocused2(false);
@ -205,10 +205,10 @@ public class LogisticalIndexScreen extends AbstractSimiContainerScreen<Logistica
if (receivers.isEmpty())
return;
String address = receivers.get(index);
receiverTextField.func_212954_a(null);
receiverTextField.setResponder(null);
receiverTextField.setSuggestion(null);
receiverTextField.setText(address);
receiverTextField.func_212954_a(this::onReceiverTextChanged);
receiverTextField.setResponder(this::onReceiverTextChanged);
updateSubmitButton();
}