-
-
Notifications
You must be signed in to change notification settings - Fork 92
Add pattern grid turtles #790
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
JCLemme
wants to merge
11
commits into
IntelligenceModding:dev/1.21.1
Choose a base branch
from
JCLemme:dev/1.21.1
base: dev/1.21.1
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
5907a04
feat: First version of the pattern grid turtle, can craft both types …
JCLemme 86507ed
feat: Added Javadocs to internal functions
JCLemme b2b083b
fix: a comment
JCLemme 9a4c4fe
fix: Set up CheckStyle and linted previous commits
JCLemme 3f8d162
Update src/main/java/de/srendi/advancedperipherals/common/addons/comp…
JCLemme 0478bbb
fix: Now utilizing LuaTable
JCLemme 556a33d
Merge remote-tracking branch 'origin/dev/1.21.1' into dev/1.21.1
JCLemme ae0e4da
fix: Classpath items
JCLemme 9e489c3
feat: Added toggle to config handler
JCLemme 14a6333
Merge branch 'dev/1.21.1' into fork/JCLemme/dev/1.21.1
SirEndii b730a97
Replace Object return types to the actual return type
SirEndii File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
4 changes: 4 additions & 0 deletions
4
...rated/resources/data/advancedperipherals/computercraft/turtle_upgrade/pattern_turtle.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| { | ||
| "type": "advancedperipherals:pattern_turtle", | ||
| "item": "refinedstorage:pattern_grid" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
302 changes: 302 additions & 0 deletions
302
...ndi/advancedperipherals/common/addons/computercraft/peripheral/PatternGridPeripheral.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,302 @@ | ||
| package de.srendi.advancedperipherals.common.addons.computercraft.peripheral; | ||
|
|
||
| import com.refinedmods.refinedstorage.api.autocrafting.Pattern; | ||
| import com.refinedmods.refinedstorage.api.resource.ResourceAmount; | ||
| import com.refinedmods.refinedstorage.api.resource.ResourceKey; | ||
| import com.refinedmods.refinedstorage.common.api.autocrafting.PatternProviderItem; | ||
| import com.refinedmods.refinedstorage.common.autocrafting.CraftingPatternState; | ||
| import com.refinedmods.refinedstorage.common.autocrafting.PatternState; | ||
| import com.refinedmods.refinedstorage.common.autocrafting.ProcessingPatternState; | ||
| import com.refinedmods.refinedstorage.common.autocrafting.patterngrid.PatternType; | ||
| import com.refinedmods.refinedstorage.common.content.DataComponents; | ||
| import com.refinedmods.refinedstorage.common.content.Items; | ||
| import com.refinedmods.refinedstorage.common.support.resource.FluidResource; | ||
| import com.refinedmods.refinedstorage.common.support.resource.ItemResource; | ||
|
|
||
| import java.util.*; | ||
|
|
||
| import dan200.computercraft.api.lua.LuaFunction; | ||
| import dan200.computercraft.api.lua.MethodResult; | ||
| import dan200.computercraft.api.turtle.ITurtleAccess; | ||
| import dan200.computercraft.api.turtle.TurtleSide; | ||
| import de.srendi.advancedperipherals.common.addons.APAddon; | ||
| import de.srendi.advancedperipherals.common.addons.computercraft.owner.TurtlePeripheralOwner; | ||
| import de.srendi.advancedperipherals.common.addons.refinedstorage.RSApi; | ||
| import de.srendi.advancedperipherals.common.configuration.APConfig; | ||
| import de.srendi.advancedperipherals.lib.peripherals.BasePeripheral; | ||
| import net.minecraft.core.registries.BuiltInRegistries; | ||
| import net.minecraft.resources.ResourceLocation; | ||
| import net.minecraft.world.Container; | ||
| import net.minecraft.world.item.Item; | ||
| import net.minecraft.world.item.ItemStack; | ||
| import net.minecraft.world.item.crafting.CraftingInput; | ||
| import net.minecraft.world.level.material.Fluid; | ||
| import net.minecraft.world.level.material.Fluids; | ||
|
|
||
| public class PatternGridPeripheral extends BasePeripheral<TurtlePeripheralOwner> { | ||
|
|
||
| public static final String PERIPHERAL_TYPE = "pattern_grid"; | ||
|
|
||
| protected PatternGridPeripheral(TurtlePeripheralOwner owner) { | ||
| super(PERIPHERAL_TYPE, owner); | ||
| } | ||
|
|
||
| public PatternGridPeripheral(ITurtleAccess turtle, TurtleSide side) { | ||
| this(new TurtlePeripheralOwner(turtle, side)); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isEnabled() { | ||
| return APAddon.REFINEDSTORAGE.isLoaded() && APConfig.PERIPHERALS_CONFIG.enableCompassTurtle.get(); | ||
| } | ||
|
|
||
| /** | ||
| * Returns information about a pattern, in the style of the RS Bridge ".getPattern()" method. | ||
| * | ||
| * @param target the pattern item to examine | ||
| * @return a Map containing the properties as returned by the RSApi | ||
| * @throws RuntimeException if the pattern is blank, or if the item isn't a pattern at all | ||
| */ | ||
| public Map<String, Object> getDetailsForItem(ItemStack target) throws IllegalArgumentException, IllegalStateException { | ||
| if (!target.is(Items.INSTANCE.getPattern())) { | ||
| throw new IllegalArgumentException("Not a pattern"); | ||
| } | ||
|
|
||
| Optional<Pattern> pattern = Optional.empty(); | ||
| if (target.getItem() instanceof PatternProviderItem patternProvider) { | ||
| pattern = patternProvider.getPattern(target, this.getLevel()); | ||
| } | ||
|
|
||
| if (pattern.isEmpty()) { | ||
| throw new IllegalStateException("Pattern is blank"); | ||
| } else { | ||
JCLemme marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| return (Map<String, Object>) RSApi.parsePattern(pattern.get(), null); | ||
SirEndii marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
| } | ||
|
|
||
| @LuaFunction(mainThread = true) | ||
| public MethodResult getDetails(Optional<Integer> slot) { | ||
| try { | ||
| ITurtleAccess turtle = this.getPeripheralOwner().getTurtle(); | ||
| // Note: the hack at the end of the line here converts between CC slot numbering (from 1) to Java slot numbering (from 0). | ||
| // It's broken out like this so we can call getDetailsForItem from the builder functions later, and not have to care | ||
| // what Lua thinks about array indexing. | ||
| ItemStack target = turtle.getInventory().getItem(slot.orElse(turtle.getSelectedSlot() + 1) - 1); | ||
| return MethodResult.of(getDetailsForItem(target)); | ||
| } catch (RuntimeException e) { | ||
JCLemme marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| // Did you know: passing a naked RuntimeException to the Lua interpreter causes a bizarre hang | ||
| return MethodResult.of(false, e.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| // ----------------------------------------------------------------------------------------------------------------- | ||
|
|
||
| /** | ||
| * Ensures that a slot contains patterns. | ||
| * | ||
| * @param slot the slot number to look in | ||
| * @return how many patterns are in the slot | ||
| * @throws RuntimeException if the slot doesn't contain any patterns | ||
| */ | ||
| private int verifyPatternsInSlot(int slot) throws IllegalStateException { | ||
| Container turtleInventory = this.getPeripheralOwner().getTurtle().getInventory(); | ||
| ItemStack selected = turtleInventory.getItem(slot); | ||
| if (selected.is(Items.INSTANCE.getPattern()) && selected.getCount() > 0) { | ||
| return selected.getCount(); | ||
| } else { | ||
| // TODO: do I even care to do this here | ||
| throw new IllegalStateException("No pattern available"); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Finds a free slot in which to insert the result of a pattern build. | ||
| * | ||
| * @param source the slot containing our source pattern | ||
| * @return which slot to store the built pattern in | ||
| * @throws RuntimeException if there are no free slots in the turtle | ||
| */ | ||
| private int getFreeSlotAfterBuild(int source) throws IllegalStateException { | ||
| // We assume that we'll consume one of whatever is in the source slot. | ||
| Container turtleInventory = this.getPeripheralOwner().getTurtle().getInventory(); | ||
|
|
||
| if (turtleInventory.getItem(source).getCount() <= 1) { | ||
| // We're using the last of something, so feel free to take its place. | ||
| return source; | ||
| } else { | ||
| // Otherwise... are there any free slots? | ||
| for (int i = 0; i < turtleInventory.getContainerSize(); i++) { | ||
| if (turtleInventory.getItem(i).getCount() == 0) { | ||
| return i; | ||
| } | ||
| } | ||
| // Turtle's full, keep movin' | ||
| throw new IllegalStateException("No room in destination"); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Attempts to match a String resource name to an ItemResource or FluidResource. | ||
| * | ||
| * @param name the resource name | ||
| * @return a ResourceKey representing the resource | ||
| * @throws RuntimeException if the name doesn't match a resource | ||
| */ | ||
| private ResourceKey parseResourceName(String name) throws IllegalArgumentException { | ||
| try { | ||
| ResourceLocation location = ResourceLocation.parse(name); | ||
| // Try as item first | ||
| Item item = BuiltInRegistries.ITEM.get(location); | ||
| // The parser seems to be greedy... sometimes it'll map an invalid Item to air. Make sure it behaves. | ||
| if (!item.equals(BuiltInRegistries.ITEM.get(ResourceLocation.parse("minecraft:air")))) { | ||
SirEndii marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| return new ItemResource(item); | ||
| } | ||
| // Try as fluid | ||
| Fluid fluid = BuiltInRegistries.FLUID.get(location); | ||
| if (!fluid.equals(Fluids.EMPTY)) { | ||
| return new FluidResource(fluid); | ||
| } | ||
| throw new IllegalArgumentException("Couldn't find item or fluid: " + name); | ||
| } catch (Exception e) { | ||
JCLemme marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| throw new IllegalArgumentException("Couldn't find item or fluid: " + name); | ||
| } | ||
| } | ||
|
|
||
| // ----------------------------------------------------------------------------------------------------------------- | ||
|
|
||
| // Build a crafting pattern from a table of slots. | ||
| @LuaFunction(mainThread = true) | ||
| public MethodResult buildCrafting(Map<?, ?> recipeInput, Optional<Boolean> fuzzy) { | ||
| ITurtleAccess turtle = this.getPeripheralOwner().getTurtle(); | ||
|
|
||
| try { | ||
| verifyPatternsInSlot(turtle.getSelectedSlot()); | ||
| int destinationSlot = getFreeSlotAfterBuild(turtle.getSelectedSlot()); | ||
|
|
||
| ItemStack patternStack = new ItemStack(Items.INSTANCE.getPattern()); | ||
| PatternState patternState = new PatternState(UUID.randomUUID(), PatternType.CRAFTING); | ||
| patternStack.set(DataComponents.INSTANCE.getPatternState(), patternState); | ||
|
|
||
| List<ItemStack> ingredients = new ArrayList<>(Collections.nCopies(9, ItemStack.EMPTY)); | ||
|
|
||
| for (Object o : recipeInput.keySet()) { | ||
| // Note: I'm assuming that Lua returns all numbers as doubles. | ||
| // Only care about slots 1 through 9 in the input; we'll just ignore everything else. | ||
| if (o instanceof Double) { | ||
| int slot = ((Double) o).intValue() - 1; | ||
| if (slot >= 0 && slot < 9) { | ||
| if (recipeInput.get(o) instanceof String) { | ||
| ingredients.set(slot, ((ItemResource) parseResourceName((String) recipeInput.get(o))).toItemStack()); | ||
| } else { | ||
| return MethodResult.of(false, "Couldn't parse item in slot " + slot); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| CraftingInput craftingInput = CraftingInput.of(3, 3, ingredients); | ||
| CraftingInput.Positioned positioned = new CraftingInput.Positioned(craftingInput, 0, 0); | ||
| CraftingPatternState craftingState = new CraftingPatternState(fuzzy.orElse(false), positioned); | ||
| patternStack.set(DataComponents.INSTANCE.getCraftingPatternState(), craftingState); | ||
|
|
||
| // Kismet: a bad recipe will be caught automatically | ||
| Map<String, Object> result; | ||
| try { | ||
| result = getDetailsForItem(patternStack); | ||
| } catch (Exception e) { | ||
| throw new RuntimeException("Bad recipe"); | ||
| } | ||
|
|
||
| turtle.getInventory().removeItem(turtle.getSelectedSlot(), 1); | ||
| turtle.getInventory().setItem(destinationSlot, patternStack); | ||
|
|
||
| return MethodResult.of(true, result); | ||
| } catch (Exception e) { | ||
JCLemme marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| // I like exceptions but the other peripherals in this mod don't use them. So just return errors as strings. | ||
| return MethodResult.of(false, e.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| // ----------------------------------------------------------------------------------------------------------------- | ||
|
|
||
| // Build a processing pattern from a list of ingredients. | ||
| @LuaFunction(mainThread = true) | ||
| public MethodResult buildProcessing(Map<?, ?> recipeInput) { | ||
| ITurtleAccess turtle = this.getPeripheralOwner().getTurtle(); | ||
|
|
||
| try { | ||
| verifyPatternsInSlot(turtle.getSelectedSlot()); | ||
| int destinationSlot = getFreeSlotAfterBuild(turtle.getSelectedSlot()); | ||
|
|
||
| ItemStack patternStack = new ItemStack(Items.INSTANCE.getPattern()); | ||
| PatternState patternState = new PatternState(UUID.randomUUID(), PatternType.PROCESSING); | ||
| patternStack.set(DataComponents.INSTANCE.getPatternState(), patternState); | ||
|
|
||
| List<Optional<ProcessingPatternState.ProcessingIngredient>> ingredients = new ArrayList<>(); | ||
| List<Optional<ResourceAmount>> results = new ArrayList<>(); | ||
|
|
||
| /* Attempt to parse our recipe. We should be passed in a table that looks like this: | ||
| * | ||
| * { | ||
| * inputs = { | ||
| * [1] = { name = "<item>", count = <int> }, | ||
| * [2] = { name = "<item>", alts = { [1] = "<tag>", ... }, count = <int> }, | ||
| * ... | ||
| * }, | ||
| * outputs = { | ||
| * [1] = { name = "<item>", count = <int> }, | ||
| * ... | ||
| * } | ||
| * } | ||
| * | ||
| * Note that input names can be passed as a string or as an array of strings (for alternates). | ||
| * That's a lot to validate, so barring better options, we'll just catch and error out. | ||
| */ | ||
| try { | ||
| // Lua sends in all numbers as doubles. We don't really care about the index. | ||
| Map<Double, Map<String, Object>> inputMap = (Map<Double, Map<String, Object>>) recipeInput.get("inputs"); | ||
JCLemme marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| for (Map<String, Object> thisInput : inputMap.values()) { | ||
| int thisCount = ((Double) thisInput.get("count")).intValue(); | ||
JCLemme marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| ResourceKey thisItem = parseResourceName((String) thisInput.get("name")); | ||
| List<ResourceLocation> theseAlts = new ArrayList<>(); | ||
|
|
||
| if (thisInput.containsKey("alts")) { | ||
| theseAlts = ((Map<Double, String>) thisInput.get("alts")).values().stream().map( | ||
JCLemme marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| ResourceLocation::parse).toList(); | ||
| } | ||
|
|
||
| ingredients.add(Optional.of(new ProcessingPatternState.ProcessingIngredient(new ResourceAmount(thisItem, thisCount), theseAlts))); | ||
| } | ||
|
|
||
| Map<Double, Map<String, Object>> outputMap = (Map<Double, Map<String, Object>>) recipeInput.get("outputs"); | ||
JCLemme marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| for (Map<String, Object> thisOutput : outputMap.values()) { | ||
| int thisCount = ((Double) thisOutput.get("count")).intValue(); | ||
| ResourceKey thisItem = parseResourceName((String) thisOutput.get("name")); | ||
| results.add(Optional.of(new ResourceAmount(thisItem, thisCount))); | ||
| } | ||
| } catch (Exception e) { | ||
JCLemme marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| throw new RuntimeException("Recipe is malformed"); | ||
| } | ||
|
|
||
| ProcessingPatternState processingState = new ProcessingPatternState(ingredients, results); | ||
| patternStack.set(DataComponents.INSTANCE.getProcessingPatternState(), processingState); | ||
|
|
||
| // Kismet: a bad recipe will be caught automatically | ||
| Map<String, Object> result; | ||
| try { | ||
| result = getDetailsForItem(patternStack); | ||
| } catch (Exception e) { | ||
JCLemme marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| throw new RuntimeException("Pattern couldn't be built"); | ||
| } | ||
|
|
||
| turtle.getInventory().removeItem(turtle.getSelectedSlot(), 1); | ||
| turtle.getInventory().setItem(destinationSlot, patternStack); | ||
|
|
||
| // And now the reversal of the ugly hack in getDetails above. | ||
| return MethodResult.of(true, result); | ||
| } catch (Exception e) { | ||
JCLemme marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| // I like exceptions but the other peripherals in this mod don't use them. So just return errors as strings. | ||
| return MethodResult.of(false, e.getMessage()); | ||
| } | ||
| } | ||
| } | ||
40 changes: 40 additions & 0 deletions
40
...ndi/advancedperipherals/common/addons/computercraft/turtles/TurtlePatternGridUpgrade.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| package de.srendi.advancedperipherals.common.addons.computercraft.turtles; | ||
|
|
||
| import dan200.computercraft.api.turtle.ITurtleAccess; | ||
| import dan200.computercraft.api.turtle.ITurtleUpgrade; | ||
| import dan200.computercraft.api.turtle.TurtleSide; | ||
| import dan200.computercraft.api.upgrades.UpgradeType; | ||
| import de.srendi.advancedperipherals.AdvancedPeripherals; | ||
| import de.srendi.advancedperipherals.common.addons.computercraft.peripheral.PatternGridPeripheral; | ||
| import de.srendi.advancedperipherals.common.setup.CCRegistration; | ||
| import de.srendi.advancedperipherals.lib.turtle.PeripheralTurtleUpgrade; | ||
| import net.minecraft.client.resources.model.ModelResourceLocation; | ||
| import net.minecraft.world.item.ItemStack; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| public class TurtlePatternGridUpgrade extends PeripheralTurtleUpgrade<PatternGridPeripheral> { | ||
|
|
||
| public TurtlePatternGridUpgrade(ItemStack stack) { | ||
| super(CCRegistration.ID.PATTERN_TURTLE, stack); | ||
| } | ||
|
|
||
| @Override | ||
| public ModelResourceLocation getLeftModel() { | ||
| return new ModelResourceLocation(AdvancedPeripherals.getRL("turtle_pattern_upgrade_left"), "inventory"); | ||
| } | ||
|
|
||
| @Override | ||
| public ModelResourceLocation getRightModel() { | ||
| return new ModelResourceLocation(AdvancedPeripherals.getRL("turtle_pattern_upgrade_right"), "inventory"); | ||
| } | ||
|
|
||
| @Override | ||
| protected PatternGridPeripheral buildPeripheral(@NotNull ITurtleAccess turtle, @NotNull TurtleSide side) { | ||
| return new PatternGridPeripheral(turtle, side); | ||
| } | ||
|
|
||
| @Override | ||
| public UpgradeType<? extends ITurtleUpgrade> getType() { | ||
| return CCRegistration.PATTERN_TURTLE.get(); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.