Skip to content

Commit

Permalink
feat: smithing table pattern encoding
Browse files Browse the repository at this point in the history
  • Loading branch information
@raoulvdberge
raoulvdberge committed Aug 6, 2024
1 parent a4bd22d commit 45dc41f
Show file tree
Hide file tree
Showing 43 changed files with 779 additions and 328 deletions.
1 change: 1 addition & 0 deletions .idea/dictionaries/refinedstorage.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 0 additions & 14 deletions ...src/main/java/com/refinedmods/refinedstorage/common/api/autocrafting/CraftingPattern.java
View file

This file was deleted.

11 changes: 0 additions & 11 deletions ...c/main/java/com/refinedmods/refinedstorage/common/api/autocrafting/ProcessingPattern.java
View file

This file was deleted.

9 changes: 0 additions & 9 deletions .../main/java/com/refinedmods/refinedstorage/common/api/autocrafting/StonecutterPattern.java
View file

This file was deleted.

7 changes: 7 additions & 0 deletions ...ge-common/src/main/java/com/refinedmods/refinedstorage/common/AbstractModInitializer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import com.refinedmods.refinedstorage.common.autocrafting.PatternItem;
import com.refinedmods.refinedstorage.common.autocrafting.PatternState;
import com.refinedmods.refinedstorage.common.autocrafting.ProcessingPatternState;
import com.refinedmods.refinedstorage.common.autocrafting.SmithingTablePatternState;
import com.refinedmods.refinedstorage.common.autocrafting.StonecutterPatternState;
import com.refinedmods.refinedstorage.common.configurationcard.ConfigurationCardItem;
import com.refinedmods.refinedstorage.common.configurationcard.ConfigurationCardState;
Expand Down Expand Up @@ -880,6 +881,12 @@ protected final void registerDataComponents(final RegistryCallback<DataComponent
.persistent(StonecutterPatternState.CODEC)
.networkSynchronized(StonecutterPatternState.STREAM_CODEC)
.build()));
DataComponents.INSTANCE.setSmithingTablePatternState(
callback.register(createIdentifier("smithing_table_pattern_state"),
() -> DataComponentType.<SmithingTablePatternState>builder()
.persistent(SmithingTablePatternState.CODEC)
.networkSynchronized(SmithingTablePatternState.STREAM_CODEC)
.build()));
}

protected final void registerInventorySlotReference() {
Expand Down
11 changes: 11 additions & 0 deletions ...mon/src/main/java/com/refinedmods/refinedstorage/common/autocrafting/CraftingPattern.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.refinedmods.refinedstorage.common.autocrafting;

import com.refinedmods.refinedstorage.api.resource.ResourceAmount;
import com.refinedmods.refinedstorage.common.api.autocrafting.Pattern;
import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey;

import java.util.List;

record CraftingPattern(List<List<PlatformResourceKey>> inputs, ResourceAmount output, List<ResourceAmount> byproducts)
implements Pattern {
}
7 changes: 2 additions & 5 deletions ...refinedmods/refinedstorage/common/autocrafting/CraftingPatternClientTooltipComponent.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.refinedmods.refinedstorage.common.autocrafting;

import com.refinedmods.refinedstorage.common.api.RefinedStorageApi;
import com.refinedmods.refinedstorage.common.api.autocrafting.CraftingPattern;
import com.refinedmods.refinedstorage.common.api.support.resource.PlatformResourceKey;
import com.refinedmods.refinedstorage.common.support.resource.ItemResource;

Expand All @@ -23,7 +22,7 @@
import static com.refinedmods.refinedstorage.common.util.IdentifierUtil.createIdentifier;
import static java.util.Objects.requireNonNullElse;

public class CraftingPatternClientTooltipComponent implements ClientTooltipComponent {
class CraftingPatternClientTooltipComponent implements ClientTooltipComponent {
private static final long CYCLE_MS = 1000;
private static final int ARROW_SPACING = 8;
private static final ResourceLocation LARGE_SLOT = createIdentifier("large_slot");
Expand All @@ -42,9 +41,7 @@ public class CraftingPatternClientTooltipComponent implements ClientTooltipCompo
private long cycleStart = 0;
private int currentCycle = 0;

public CraftingPatternClientTooltipComponent(final int width,
final int height,
final CraftingPattern craftingPattern) {
CraftingPatternClientTooltipComponent(final int width, final int height, final CraftingPattern craftingPattern) {
this.width = width;
this.height = height;
this.craftingPattern = craftingPattern;
Expand Down
129 changes: 93 additions & 36 deletions .../main/java/com/refinedmods/refinedstorage/common/autocrafting/PatternGridBlockEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
import com.refinedmods.refinedstorage.common.content.Items;
import com.refinedmods.refinedstorage.common.grid.AbstractGridBlockEntity;
import com.refinedmods.refinedstorage.common.grid.AbstractGridContainerMenu;
import com.refinedmods.refinedstorage.common.grid.CraftingState;
import com.refinedmods.refinedstorage.common.grid.GridData;
import com.refinedmods.refinedstorage.common.support.BlockEntityWithDrops;
import com.refinedmods.refinedstorage.common.support.CraftingMatrix;
import com.refinedmods.refinedstorage.common.support.FilteredContainer;
import com.refinedmods.refinedstorage.common.support.RecipeMatrix;
import com.refinedmods.refinedstorage.common.support.RecipeMatrixContainer;
import com.refinedmods.refinedstorage.common.support.containermenu.NetworkNodeExtendedMenuProvider;
import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerData;
import com.refinedmods.refinedstorage.common.support.resource.ResourceContainerImpl;
Expand All @@ -40,8 +40,11 @@
import net.minecraft.world.inventory.ResultContainer;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.CraftingInput;
import net.minecraft.world.item.crafting.CraftingRecipe;
import net.minecraft.world.item.crafting.RecipeHolder;
import net.minecraft.world.item.crafting.SingleRecipeInput;
import net.minecraft.world.item.crafting.SmithingRecipe;
import net.minecraft.world.item.crafting.SmithingRecipeInput;
import net.minecraft.world.item.crafting.StonecutterRecipe;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.state.BlockState;
Expand All @@ -50,6 +53,7 @@

public class PatternGridBlockEntity extends AbstractGridBlockEntity implements BlockEntityWithDrops,
NetworkNodeExtendedMenuProvider<PatternGridData> {
private static final String TAG_CRAFTING_INPUT = "crafting_input";
private static final String TAG_PATTERN_INPUT = "pattern_input";
private static final String TAG_PATTERN_OUTPUT = "pattern_output";
private static final String TAG_PROCESSING_INPUT = "processing_input";
Expand All @@ -58,13 +62,22 @@ public class PatternGridBlockEntity extends AbstractGridBlockEntity implements B
private static final String TAG_PATTERN_TYPE = "processing";
private static final String TAG_STONECUTTER_INPUT = "stonecutter_input";
private static final String TAG_STONECUTTER_SELECTED_RECIPE = "stonecutter_selected_recipe";
private static final String TAG_SMITHING_INPUT = "smithing_input";

private final CraftingState craftingState = new CraftingState(this::setChanged, this::getLevel);
private final RecipeMatrix<CraftingRecipe, CraftingInput> craftingRecipe = RecipeMatrix.crafting(
this::setChanged,
this::getLevel
);
private final ProcessingMatrixInputResourceContainer processingInput = createProcessingMatrixInputContainer();
private final ResourceContainer processingOutput = createProcessingMatrixOutputContainer();
private final FilteredContainer patternInput = new FilteredContainer(1, PatternGridBlockEntity::isValidPattern);
private final FilteredContainer patternOutput = new PatternOutputContainer();
private final StonecutterInputContainer stonecutterInput = new StonecutterInputContainer(this::getLevel);
private final RecipeMatrix<SmithingRecipe, SmithingRecipeInput> smithingTableRecipe = RecipeMatrix.smithingTable(
this::setChanged,
this::getLevel
);

private boolean fuzzyMode;
private PatternType patternType = PatternType.CRAFTING;

Expand All @@ -82,12 +95,12 @@ public PatternGridBlockEntity(final BlockPos pos, final BlockState state) {
stonecutterInput.addListener(container -> setChanged());
}

CraftingMatrix getCraftingMatrix() {
return craftingState.getCraftingMatrix();
RecipeMatrixContainer getCraftingMatrix() {
return craftingRecipe.getMatrix();
}

ResultContainer getCraftingResult() {
return craftingState.getCraftingResult();
return craftingRecipe.getResult();
}

ProcessingMatrixInputResourceContainer getProcessingInput() {
Expand Down Expand Up @@ -119,6 +132,14 @@ void setStonecutterSelectedRecipe(final int index) {
setChanged();
}

RecipeMatrixContainer getSmithingTableMatrix() {
return smithingTableRecipe.getMatrix();
}

ResultContainer getSmithingTableResult() {
return smithingTableRecipe.getResult();
}

@Override
public void saveAdditional(final CompoundTag tag, final HolderLookup.Provider provider) {
super.saveAdditional(tag, provider);
Expand All @@ -130,7 +151,8 @@ public void saveAdditional(final CompoundTag tag, final HolderLookup.Provider pr
tag.put(TAG_PROCESSING_OUTPUT, processingOutput.toTag(provider));
tag.put(TAG_STONECUTTER_INPUT, ContainerUtil.write(stonecutterInput, provider));
tag.putInt(TAG_STONECUTTER_SELECTED_RECIPE, stonecutterInput.getSelectedRecipe());
craftingState.writeToTag(tag, provider);
tag.put(TAG_SMITHING_INPUT, smithingTableRecipe.writeToTag(provider));
tag.put(TAG_CRAFTING_INPUT, craftingRecipe.writeToTag(provider));
}

@Override
Expand All @@ -154,14 +176,20 @@ public void loadAdditional(final CompoundTag tag, final HolderLookup.Provider pr
ContainerUtil.read(tag.getCompound(TAG_STONECUTTER_INPUT), stonecutterInput, provider);
}
stonecutterInput.setSelectedRecipe(tag.getInt(TAG_STONECUTTER_SELECTED_RECIPE));
craftingState.readFromTag(tag, provider);
if (tag.contains(TAG_SMITHING_INPUT)) {
smithingTableRecipe.readFromTag(tag.getCompound(TAG_SMITHING_INPUT), provider);
}
if (tag.contains(TAG_CRAFTING_INPUT)) {
craftingRecipe.readFromTag(tag.getCompound(TAG_CRAFTING_INPUT), provider);
}
}

@Override
public void setLevel(final Level level) {
super.setLevel(level);
craftingState.updateResult(level);
craftingRecipe.updateResult(level);
stonecutterInput.updateRecipes(level);
smithingTableRecipe.updateResult(level);
}

boolean isFuzzyMode() {
Expand Down Expand Up @@ -214,8 +242,8 @@ public NonNullList<ItemStack> getDrops() {
final NonNullList<ItemStack> drops = NonNullList.create();
drops.add(patternInput.getItem(0));
drops.add(patternOutput.getItem(0));
for (int i = 0; i < craftingState.getCraftingMatrix().getContainerSize(); ++i) {
drops.add(craftingState.getCraftingMatrix().getItem(i));
for (int i = 0; i < craftingRecipe.getMatrix().getContainerSize(); ++i) {
drops.add(craftingRecipe.getMatrix().getItem(i));
}
return drops;
}
Expand All @@ -225,19 +253,19 @@ void clear() {
return;
}
switch (patternType) {
case CRAFTING -> {
craftingState.getCraftingMatrix().clearContent();
craftingState.updateResult(level);
}
case PROCESSING -> {
processingInput.clear();
processingOutput.clear();
}
case CRAFTING -> craftingRecipe.clear(level);
case PROCESSING -> clearProcessing();
case STONECUTTER -> stonecutterInput.clearContent();
case SMITHING_TABLE -> smithingTableRecipe.clear(level);
}
setChanged();
}

private void clearProcessing() {
processingInput.clear();
processingOutput.clear();
}

void createPattern() {
if (level == null || !isPatternAvailable()) {
return;
Expand All @@ -246,7 +274,7 @@ void createPattern() {
case CRAFTING -> createCraftingPattern();
case PROCESSING -> createProcessingPattern();
case STONECUTTER -> createStonecutterPattern();
default -> null;
case SMITHING_TABLE -> createSmithingTablePattern();
};
if (result != null) {
final boolean shouldExtractInputPattern = patternOutput.getItem(0).isEmpty();
Expand All @@ -259,7 +287,7 @@ void createPattern() {

@Nullable
private ItemStack createCraftingPattern() {
if (!craftingState.hasCraftingResult()) {
if (!craftingRecipe.hasResult()) {
return null;
}
final ItemStack result = createPatternStack(PatternType.CRAFTING);
Expand Down Expand Up @@ -317,6 +345,21 @@ private ItemStack createStonecutterPattern() {
return result;
}

@Nullable
private ItemStack createSmithingTablePattern() {
if (!smithingTableRecipe.hasResult()) {
return null;
}
final ItemStack result = createPatternStack(PatternType.SMITHING_TABLE);
final SmithingTablePatternState state = new SmithingTablePatternState(
smithingTableRecipe.getMatrix().getItem(0),
smithingTableRecipe.getMatrix().getItem(1),
smithingTableRecipe.getMatrix().getItem(2)
);
result.set(DataComponents.INSTANCE.getSmithingTablePatternState(), state);
return result;
}

private static ItemStack createPatternStack(final PatternType patternType) {
final ItemStack result = new ItemStack(Items.INSTANCE.getPattern());
final PatternState patternState = new PatternState(UUID.randomUUID(), patternType);
Expand All @@ -333,52 +376,56 @@ void copyPattern(final ItemStack stack) {
switch (patternState.type()) {
case CRAFTING -> {
final CraftingPatternState state = stack.get(DataComponents.INSTANCE.getCraftingPatternState());
if (state == null) {
return;
if (state != null) {
copyCraftingPattern(state);
}
copyCraftingPattern(state);
}
case PROCESSING -> {
final ProcessingPatternState state = stack.get(DataComponents.INSTANCE.getProcessingPatternState());
if (state == null) {
return;
if (state != null) {
copyProcessingPattern(state);
}
copyProcessingPattern(state);
}
case STONECUTTER -> {
final StonecutterPatternState state = stack.get(DataComponents.INSTANCE.getStonecutterPatternState());
if (state == null) {
return;
if (state != null) {
copyStonecutterPattern(state);
}
}
case SMITHING_TABLE -> {
final SmithingTablePatternState state = stack.get(
DataComponents.INSTANCE.getSmithingTablePatternState()
);
if (state != null) {
copySmithingTablePattern(state);
}
copyStonecutterPattern(state);
}
}
setChanged();
}

private void copyCraftingPattern(final CraftingPatternState state) {
this.fuzzyMode = state.fuzzyMode();
craftingState.getCraftingMatrix().clearContent();
craftingRecipe.getMatrix().clearContent();
final CraftingInput.Positioned positionedInput = state.input();
final int left = positionedInput.left();
final int top = positionedInput.top();
final CraftingInput input = positionedInput.input();
for (int x = 0; x < input.width(); ++x) {
for (int y = 0; y < input.height(); ++y) {
final int matrixIndex = x + left + (y + top) * craftingState.getCraftingMatrix().getWidth();
final int matrixIndex = x + left + (y + top) * craftingRecipe.getMatrix().getWidth();
final int recipeIndex = x + y * input.width();
final ItemStack stack = input.getItem(recipeIndex);
craftingState.getCraftingMatrix().setItem(matrixIndex, stack);
craftingRecipe.getMatrix().setItem(matrixIndex, stack);
}
}
if (level != null) {
craftingState.updateResult(level);
craftingRecipe.updateResult(level);
}
}

private void copyProcessingPattern(final ProcessingPatternState state) {
processingInput.clear();
processingOutput.clear();
clearProcessing();
for (int i = 0; i < state.inputs().size(); ++i) {
final int ii = i;
state.inputs().get(i).ifPresent(input -> processingInput.set(ii, input));
Expand Down Expand Up @@ -406,6 +453,16 @@ private void copyStonecutterPattern(final StonecutterPatternState state) {
}
}

private void copySmithingTablePattern(final SmithingTablePatternState state) {
smithingTableRecipe.getMatrix().clearContent();
smithingTableRecipe.getMatrix().setItem(0, state.template());
smithingTableRecipe.getMatrix().setItem(1, state.base());
smithingTableRecipe.getMatrix().setItem(2, state.addition());
if (level != null) {
smithingTableRecipe.updateResult(level);
}
}

private boolean isPatternAvailable() {
return !patternInput.getItem(0).isEmpty() || !patternOutput.getItem(0).isEmpty();
}
Expand Down
Loading

0 comments on commit 45dc41f

Please sign in to comment.