robaertschi/EnvironmentTech
1
0
Fork 0
mirror of https://github.com/RoBaertschi/EnvironmentTech.git synced 2025-04-19 23:03:28 +00:00
Code Issues Packages Projects 1 Releases Wiki Activity

fix output also possible to be the input.

Browse Source
This commit is contained in:
Robin 2024-06-09 22:46:12 +02:00
parent 1d4de7d85e
commit 8fb9ee31d9
5 changed files with 109 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/robaertschi/environmenttech/client/screen/EnvCollectorScreen.java
View File

@ -22,7 +22,7 @@ public class EnvCollectorScreen extends AbstractContainerScreen<EnvCollectorMenu
@Override
protected void init() {
super.init();
storageRenderer = new EnvStorageRenderer(leftPos + 8, topPos + 11, menu.getBlockEntity().getEnvStorage());
storageRenderer = new EnvStorageRenderer(leftPos + imageWidth - 18, topPos + 11, menu.getBlockEntity().getEnvStorage());
}
@Override
@ -45,6 +45,7 @@ public class EnvCollectorScreen extends AbstractContainerScreen<EnvCollectorMenu
@Override
protected void renderLabels(@NotNull GuiGraphics pGuiGraphics, int pMouseX, int pMouseY) {
storageRenderer.renderTooltip(pGuiGraphics, pMouseX, pMouseY, leftPos, topPos, font);
super.renderLabels(pGuiGraphics, pMouseX, pMouseY);
}
@Override

46
src/main/java/robaertschi/environmenttech/data/capabilities/AdaptedItemHandler.java Normal file
View File

@ -0,0 +1,46 @@
package robaertschi.environmenttech.data.capabilities;
import lombok.AllArgsConstructor;
import net.minecraft.world.item.ItemStack;
import net.neoforged.neoforge.items.IItemHandlerModifiable;
import org.jetbrains.annotations.NotNull;
@AllArgsConstructor
public class AdaptedItemHandler implements IItemHandlerModifiable {
private final IItemHandlerModifiable handler;
@Override
public void setStackInSlot(int slot, @NotNull ItemStack stack) {
handler.setStackInSlot(slot, stack);
}
@Override
public int getSlots() {
return handler.getSlots();
}
@Override
public @NotNull ItemStack getStackInSlot(int slot) {
return handler.getStackInSlot(slot);
}
@Override
public @NotNull ItemStack insertItem(int slot, @NotNull ItemStack stack, boolean simulate) {
return handler.insertItem(slot, stack, simulate);
}
@Override
public @NotNull ItemStack extractItem(int slot, int amount, boolean simulate) {
return handler.extractItem(slot, amount, simulate);
}
@Override
public int getSlotLimit(int slot) {
return 0;
}
@Override
public boolean isItemValid(int slot, @NotNull ItemStack stack) {
return handler.isItemValid(slot, stack);
}
}

11
src/main/java/robaertschi/environmenttech/data/capabilities/ETCapabilities.java
View File

@ -1,5 +1,6 @@
package robaertschi.environmenttech.data.capabilities;
import net.minecraft.core.Direction;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.neoforge.capabilities.BlockCapability;
import net.neoforged.neoforge.capabilities.Capabilities;
@ -22,7 +23,15 @@ public class ETCapabilities {
event.registerBlockEntity(
Capabilities.ItemHandler.BLOCK,
ETBlockEntities.ENV_COLLECTOR_BLOCK_ENTITY.get(),
(object, context) -> object.getInventory()
(object, context) -> {
if (context == null) {
return object.getInventory().get();
}
if (context == Direction.DOWN) {
return object.getOutputItemHandler().get();
}
return object.getInputItemHandler().get();
}
);
event.registerBlockEntity(

64
src/main/java/robaertschi/environmenttech/level/block/entity/EnvCollectorBlockEntity.java
View File

@ -20,11 +20,16 @@ import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.chunk.ChunkAccess;
import net.neoforged.jarjar.nio.util.Lazy;
import net.neoforged.neoforge.items.IItemHandler;
import net.neoforged.neoforge.items.IItemHandlerModifiable;
import net.neoforged.neoforge.items.ItemStackHandler;
import net.neoforged.neoforge.items.wrapper.CombinedInvWrapper;
import net.neoforged.neoforge.items.wrapper.RecipeWrapper;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import robaertschi.environmenttech.data.attachments.ETAttachments;
import robaertschi.environmenttech.data.capabilities.AdaptedItemHandler;
import robaertschi.environmenttech.data.capabilities.EnvStorage;
import robaertschi.environmenttech.data.capabilities.EnvType;
import robaertschi.environmenttech.data.recipes.ETRecipes;
@ -42,13 +47,13 @@ public class EnvCollectorBlockEntity extends BlockEntity implements MenuProvider
public static final int SLOT_OUTPUT_COUNT = 1;
public static final int SLOT_COUNT = SLOT_INPUT_COUNT + SLOT_OUTPUT_COUNT;
public static final String INVENTORY_KEY = "Inventory";
public static final String INPUT_INVENTORY_KEY = "InputInventory";
public static final String OUTPUT_INVENTORY_KEY = "OutputInventory";
public static final String ENV_KEY = "ENV";
public static final String PROGRESS_KEY = "Progress";
@Getter
private final ItemStackHandler inventory = new ItemStackHandler(2) {
@Override
private final ItemStackHandler inputInventory = new ItemStackHandler(SLOT_INPUT_COUNT) {
protected void onContentsChanged(int slot) {
EnvCollectorBlockEntity.this.setChanged();
assert level != null;
@ -56,15 +61,42 @@ public class EnvCollectorBlockEntity extends BlockEntity implements MenuProvider
level.sendBlockUpdated(getBlockPos(), getBlockState(), getBlockState(), 3);
}
}
};
@Getter
private final ItemStackHandler outputInventory = new ItemStackHandler(SLOT_INPUT_COUNT) {
protected void onContentsChanged(int slot) {
EnvCollectorBlockEntity.this.setChanged();
assert level != null;
if (!level.isClientSide()) {
level.sendBlockUpdated(getBlockPos(), getBlockState(), getBlockState(), 3);
}
}
};
@Getter
private final Lazy<IItemHandlerModifiable> inventory = Lazy.of(() -> new CombinedInvWrapper(inputInventory, outputInventory) {
@Override
public boolean isItemValid(int slot, @NotNull ItemStack stack) {
return slot < SLOT_INPUT_COUNT;
}
};
});
@Getter
private final RecipeWrapper recipeWrapper = new RecipeWrapper(inventory);
private final Lazy<IItemHandler> inputItemHandler = Lazy.of(() -> new AdaptedItemHandler(inputInventory) {
@Override
public @NotNull ItemStack extractItem(int slot, int amount, boolean simulate) {
return ItemStack.EMPTY;
}
});
@Getter
private final Lazy<IItemHandler> outputItemHandler = Lazy.of(() -> new AdaptedItemHandler(outputInventory) {
@Override
public @NotNull ItemStack insertItem(int slot, @NotNull ItemStack stack, boolean simulate) {
return stack;
}
});
@Getter
private final Lazy<RecipeWrapper> recipeWrapper = Lazy.of(() -> new RecipeWrapper(inventory.get()));
@Getter
private final EnvStorage envStorage = new EnvStorage(EnvType.Chunk, 64, 0, 1) {
@ -124,7 +156,8 @@ public class EnvCollectorBlockEntity extends BlockEntity implements MenuProvider
protected void loadAdditional(@NotNull CompoundTag pTag, HolderLookup.@NotNull Provider provider) {
super.loadAdditional(pTag, provider);
CompoundTag modData = pTag.getCompound(MODID);
this.inventory.deserializeNBT(provider, modData.getCompound(INVENTORY_KEY));
inputInventory.deserializeNBT(provider, modData.getCompound(INPUT_INVENTORY_KEY));
outputInventory.deserializeNBT(provider, modData.getCompound(OUTPUT_INVENTORY_KEY));
this.envStorage.setEnvStored(modData.getLong(ENV_KEY));
this.progress = modData.getInt(PROGRESS_KEY);
// this.maxProgress = modData.getInt(MAX_PROGRESS_KEY);
@ -134,7 +167,8 @@ public class EnvCollectorBlockEntity extends BlockEntity implements MenuProvider
protected void saveAdditional(@NotNull CompoundTag pTag, HolderLookup.@NotNull Provider provider) {
super.saveAdditional(pTag, provider);
CompoundTag modData = new CompoundTag();
modData.put(INVENTORY_KEY, inventory.serializeNBT(provider));
modData.put(INPUT_INVENTORY_KEY, inputInventory.serializeNBT(provider));
modData.put(OUTPUT_INVENTORY_KEY, outputInventory.serializeNBT(provider));
modData.putLong(ENV_KEY, envStorage.getEnvStored());
modData.putInt(PROGRESS_KEY, progress);
// modData.putInt(MAX_PROGRESS_KEY, maxProgress);
@ -143,21 +177,21 @@ public class EnvCollectorBlockEntity extends BlockEntity implements MenuProvider
public ItemStack getInputItem() {
return this.inventory.getStackInSlot(0);
return this.inputInventory.getStackInSlot(0);
}
public ItemStack getOutputItem() {
return this.inventory.getStackInSlot(1);
return this.outputInventory.getStackInSlot(0);
}
@SuppressWarnings("unused")
public void setInputItem(ItemStack itemStack) {
this.inventory.setStackInSlot(0, itemStack);
this.inputInventory.setStackInSlot(0, itemStack);
}
public void setOutputItem(ItemStack itemStack) {
this.inventory.setStackInSlot(1, itemStack);
this.outputInventory.setStackInSlot(0, itemStack);
}
@ -199,7 +233,7 @@ public class EnvCollectorBlockEntity extends BlockEntity implements MenuProvider
assert currentRecipe != null;
if (getOutputItem().isEmpty()) {
setOutputItem(currentRecipe.assemble(recipeWrapper, level.registryAccess()));
setOutputItem(currentRecipe.assemble(recipeWrapper.get(), level.registryAccess()));
} else {
getOutputItem().setCount(getOutputItem().getCount() + 1);
}
@ -208,9 +242,9 @@ public class EnvCollectorBlockEntity extends BlockEntity implements MenuProvider
private boolean hasRecipe(Level level) {
if (currentRecipe != null) {
return currentRecipe.matches(recipeWrapper, level);
return currentRecipe.matches(recipeWrapper.get(), level);
}
var recipe = level.getRecipeManager().getRecipeFor(ETRecipes.ENV_COLLECTOR_RECIPE_TYPE.get(), recipeWrapper, level);
var recipe = level.getRecipeManager().getRecipeFor(ETRecipes.ENV_COLLECTOR_RECIPE_TYPE.get(), recipeWrapper.get(), level);
if (recipe.isEmpty()) {
progress = 0;
return false;

4
src/main/java/robaertschi/environmenttech/menu/EnvCollectorMenu.java
View File

@ -30,8 +30,8 @@ public class EnvCollectorMenu extends AbstractContainerMenu {
super(ETMenus.ENV_COLLECTOR_MENU.get(), pContainerId);
this.blockEntity = blockEntity;
this.data = data;
addSlot(new SlotItemHandler(blockEntity.getInventory(), 0, 54, 34));
addSlot(new SlotItemHandler(blockEntity.getInventory(), 1, 116, 35));
addSlot(new SlotItemHandler(blockEntity.getInputInventory(), 0, 54, 34));
addSlot(new SlotItemHandler(blockEntity.getOutputInventory(), 0, 116, 35));
layoutPlayerInventorySlots(player.getInventory(), 8, 84);
addDataSlots(data);