Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-16 17:13:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mc1.15/dev' into mc1.16/dev

Browse source
This commit is contained in:
Zelophed 2020-10-17 17:33:54 +02:00
commit bbe7ef820d
3 changed files with 108 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,7 @@ import com.simibubi.create.compat.jei.category.BlockCuttingCategory.CondensedBlo
import com.simibubi.create.content.contraptions.components.press.MechanicalPressTileEntity;
import com.simibubi.create.content.contraptions.processing.BasinRecipe;
import com.simibubi.create.content.logistics.block.inventories.AdjustableCrateScreen;
import com.simibubi.create.content.logistics.item.filter.AbstractFilterScreen;
import com.simibubi.create.content.schematics.block.SchematicannonScreen;
import com.simibubi.create.foundation.config.AllConfigs;
import com.simibubi.create.foundation.config.CRecipes;
@ -25,6 +26,7 @@ import net.minecraft.item.crafting.*;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.TextFormatting;
import javax.annotation.Nonnull;
import java.util.List;
import java.util.function.Predicate;
import java.util.stream.Collectors;
@ -37,6 +39,7 @@ public class CreateJEI implements IModPlugin {
public static final IIngredientType<FluidIngredient> FLUIDS = new IIngredientType<FluidIngredient>() {
@Override
@Nonnull
public Class<? extends FluidIngredient> getIngredientClass() {
return FluidIngredient.class;
}
@ -60,6 +63,7 @@ public class CreateJEI implements IModPlugin {
private final MechanicalCraftingCategory mechanicalCraftingExclusiveCategory;
@Override
@Nonnull
public ResourceLocation getPluginUid() {
return ID;
}
@ -188,6 +192,8 @@ public class CreateJEI implements IModPlugin {
public void registerGuiHandlers(IGuiHandlerRegistration registration) {
registration.addGuiContainerHandler(AdjustableCrateScreen.class, new SlotMover<>());
registration.addGuiContainerHandler(SchematicannonScreen.class, new SlotMover<>());
registration.addGhostIngredientHandler(AbstractFilterScreen.class, new FilterGhostIngredientHandler());
}
private static List<IRecipe<?>> findRecipes(AllRecipeTypes recipe) {

91
src/main/java/com/simibubi/create/compat/jei/FilterGhostIngredientHandler.java Normal file
View file

@ -0,0 +1,91 @@
package com.simibubi.create.compat.jei;
import com.simibubi.create.content.logistics.item.filter.AbstractFilterContainer;
import com.simibubi.create.content.logistics.item.filter.AbstractFilterScreen;
import com.simibubi.create.content.logistics.item.filter.AttributeFilterScreen;
import com.simibubi.create.content.logistics.item.filter.FilterScreenPacket;
import com.simibubi.create.foundation.networking.AllPackets;
import mcp.MethodsReturnNonnullByDefault;
import mezz.jei.api.gui.handlers.IGhostIngredientHandler;
import net.minecraft.client.renderer.Rectangle2d;
import net.minecraft.inventory.container.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompoundNBT;
import org.apache.logging.log4j.LogManager;
import javax.annotation.ParametersAreNonnullByDefault;
import java.util.ArrayList;
import java.util.List;
@MethodsReturnNonnullByDefault
@ParametersAreNonnullByDefault
public class FilterGhostIngredientHandler<T extends AbstractFilterContainer> implements IGhostIngredientHandler<AbstractFilterScreen<T>> {
@Override
public <I> List<Target<I>> getTargets(AbstractFilterScreen<T> gui, I ingredient, boolean doStart) {
List<Target<I>> targets = new ArrayList<>();
boolean isAttributeFilter = gui instanceof AttributeFilterScreen;
if (ingredient instanceof ItemStack) {
for (int i = 36; i < gui.getContainer().inventorySlots.size(); i++) {
targets.add(new FilterGhostTarget<>(gui, i - 36, isAttributeFilter));
//Only accept items in 1st slot. 2nd is used for functionality, don't wanna override that one
if (isAttributeFilter) break;
}
}
return targets;
}
@Override
public void onComplete() {}
@Override
public boolean shouldHighlightTargets() {
//TODO change to false and highlight the slots ourself in some better way
return true;
}
private static class FilterGhostTarget<I, T extends AbstractFilterContainer> implements Target<I> {
private final Rectangle2d area;
private final AbstractFilterScreen<T> gui;
private final int slotIndex;
private final boolean isAttributeFilter;
public FilterGhostTarget(AbstractFilterScreen<T> gui, int slotIndex, boolean isAttributeFilter) {
this.gui = gui;
this.slotIndex = slotIndex;
this.isAttributeFilter = isAttributeFilter;
Slot slot = gui.getContainer().inventorySlots.get(slotIndex + 36);
this.area = new Rectangle2d(
gui.getGuiLeft() + slot.xPos,
gui.getGuiTop() + slot.yPos,
16,
16);
}
@Override
public Rectangle2d getArea() {
return area;
}
@Override
public void accept(I ingredient) {
ItemStack stack = ((ItemStack) ingredient).copy();
LogManager.getLogger().info(stack);
stack.setCount(1);
gui.getContainer().filterInventory.setStackInSlot(slotIndex, stack);
if (isAttributeFilter) return;
//sync new filter contents with server
CompoundNBT data = new CompoundNBT();
data.putInt("Slot", slotIndex);
data.put("Item", stack.serializeNBT());
AllPackets.channel.sendToServer(new FilterScreenPacket(FilterScreenPacket.Option.UPDATE_FILTER_ITEM, data));
}
}
}

19
src/main/java/com/simibubi/create/content/logistics/item/filter/FilterScreenPacket.java
View file

@ -1,23 +1,22 @@
package com.simibubi.create.content.logistics.item.filter;
import java.util.function.Supplier;
import com.simibubi.create.content.logistics.item.filter.AttributeFilterContainer.WhitelistMode;
import com.simibubi.create.foundation.networking.SimplePacketBase;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.network.PacketBuffer;
import net.minecraftforge.fml.network.NetworkEvent.Context;
import java.util.function.Supplier;
public class FilterScreenPacket extends SimplePacketBase {
enum Option {
CLEAR, WHITELIST, WHITELIST2, BLACKLIST, RESPECT_DATA, IGNORE_DATA, ADD_TAG, ADD_INVERTED_TAG;
public enum Option {
CLEAR, WHITELIST, WHITELIST2, BLACKLIST, RESPECT_DATA, IGNORE_DATA, UPDATE_FILTER_ITEM, ADD_TAG, ADD_INVERTED_TAG;
}
private Option option;
private CompoundNBT data;
private final Option option;
private final CompoundNBT data;
public FilterScreenPacket(Option option) {
this(option, new CompoundNBT());
@ -45,7 +44,7 @@ public class FilterScreenPacket extends SimplePacketBase {
ServerPlayerEntity player = context.get().getSender();
if (player == null)
return;
if (player.openContainer instanceof AbstractFilterContainer) {
AbstractFilterContainer c = (AbstractFilterContainer) player.openContainer;
if (option == Option.CLEAR) {
@ -64,6 +63,10 @@ public class FilterScreenPacket extends SimplePacketBase {
c.respectNBT = true;
if (option == Option.IGNORE_DATA)
c.respectNBT = false;
if (option == Option.UPDATE_FILTER_ITEM)
c.filterInventory.setStackInSlot(
data.getInt("Slot"),
net.minecraft.item.ItemStack.read(data.getCompound("Item")));
}
if (player.openContainer instanceof AttributeFilterContainer) {