-
Notifications
You must be signed in to change notification settings - Fork 754
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
3c4e77d
commit e919816
Showing
14 changed files
with
354 additions
and
16 deletions.
There are no files selected for viewing
13 changes: 13 additions & 0 deletions
13
...ted/resources/data/tconstruct/recipes/tools/modifiers/worktable/invisible_ink_adding.json
This file contains 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,13 @@ | ||
| { | ||
| "type": "tconstruct:modifier_set_worktable", | ||
| "data_key": "tconstruct:invisible_modifiers", | ||
| "inputs": [ | ||
| { | ||
| "type": "forge:partial_nbt", | ||
| "item": "minecraft:potion", | ||
| "nbt": "{Potion:\"minecraft:invisibility\"}" | ||
| } | ||
| ], | ||
| "blacklist": "tconstruct:invisible_ink_blacklist", | ||
| "add_to_set": true | ||
| } |
16 changes: 16 additions & 0 deletions
16
...d/resources/data/tconstruct/recipes/tools/modifiers/worktable/invisible_ink_removing.json
This file contains 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,16 @@ | ||
| { | ||
| "type": "tconstruct:modifier_set_worktable", | ||
| "data_key": "tconstruct:invisible_modifiers", | ||
| "inputs": [ | ||
| { | ||
| "tag": "forge:milk", | ||
| "amount": 1000, | ||
| "type": "mantle:fluid_container", | ||
| "display": { | ||
| "item": "minecraft:milk_bucket" | ||
| } | ||
| } | ||
| ], | ||
| "blacklist": "tconstruct:invisible_ink_blacklist", | ||
| "add_to_set": false | ||
| } |
17 changes: 17 additions & 0 deletions
17
...generated/resources/data/tconstruct/tinkering/tags/modifiers/invisible_ink_blacklist.json
This file contains 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,17 @@ | ||
| { | ||
| "replace": false, | ||
| "values": [ | ||
| "tconstruct:embellishment", | ||
| "tconstruct:dyed", | ||
| "tconstruct:creative_slot", | ||
| "tconstruct:stat_override", | ||
| { | ||
| "id": "tconstruct:shiny", | ||
| "required": false | ||
| }, | ||
| { | ||
| "id": "tconstruct:golden", | ||
| "required": false | ||
| } | ||
| ] | ||
| } |
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
171 changes: 171 additions & 0 deletions
171
...ain/java/slimeknights/tconstruct/library/recipe/worktable/ModifierSetWorktableRecipe.java
This file contains 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,171 @@ | ||
| package slimeknights.tconstruct.library.recipe.worktable; | ||
|
|
||
| import com.google.common.collect.ImmutableList; | ||
| import com.google.gson.JsonObject; | ||
| import lombok.Getter; | ||
| import net.minecraft.nbt.CompoundTag; | ||
| import net.minecraft.nbt.ListTag; | ||
| import net.minecraft.nbt.StringTag; | ||
| import net.minecraft.nbt.Tag; | ||
| import net.minecraft.network.FriendlyByteBuf; | ||
| import net.minecraft.network.chat.Component; | ||
| import net.minecraft.network.chat.TranslatableComponent; | ||
| import net.minecraft.resources.ResourceLocation; | ||
| import net.minecraft.tags.TagKey; | ||
| import net.minecraft.util.GsonHelper; | ||
| import net.minecraft.world.item.crafting.RecipeSerializer; | ||
| import slimeknights.mantle.recipe.helper.LoggingRecipeSerializer; | ||
| import slimeknights.mantle.recipe.ingredient.SizedIngredient; | ||
| import slimeknights.mantle.util.JsonHelper; | ||
| import slimeknights.tconstruct.TConstruct; | ||
| import slimeknights.tconstruct.library.modifiers.Modifier; | ||
| import slimeknights.tconstruct.library.modifiers.ModifierEntry; | ||
| import slimeknights.tconstruct.library.modifiers.ModifierId; | ||
| import slimeknights.tconstruct.library.modifiers.ModifierManager; | ||
| import slimeknights.tconstruct.library.recipe.ITinkerableContainer; | ||
| import slimeknights.tconstruct.library.recipe.RecipeResult; | ||
| import slimeknights.tconstruct.library.recipe.modifiers.ModifierRecipeLookup; | ||
| import slimeknights.tconstruct.library.tools.nbt.IModDataView; | ||
| import slimeknights.tconstruct.library.tools.nbt.IToolStackView; | ||
| import slimeknights.tconstruct.library.tools.nbt.ModDataNBT; | ||
| import slimeknights.tconstruct.library.tools.nbt.ToolStack; | ||
| import slimeknights.tconstruct.library.utils.Util; | ||
| import slimeknights.tconstruct.tools.TinkerModifiers; | ||
|
|
||
| import javax.annotation.Nullable; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
| import java.util.Set; | ||
| import java.util.function.BiFunction; | ||
| import java.util.function.Predicate; | ||
| import java.util.stream.Collectors; | ||
|
|
||
| /** Recipe to add or remove a modifier from a set in persistent data */ | ||
| public class ModifierSetWorktableRecipe extends AbstractWorktableRecipe { | ||
| /** Message to display if there are no matching modifiers on the tool */ | ||
| private static final Component NO_MATCHES = TConstruct.makeTranslation("recipe", "modifier_set_worktable.empty"); | ||
| /** Logic to fetch a list of strings from the persistent data */ | ||
| private static final BiFunction<CompoundTag, String, ListTag> LIST_GETTER = (tag, name) -> tag.getList(name, Tag.TAG_STRING); | ||
|
|
||
| /** Title to display in the UI and JEI */ | ||
| @Getter | ||
| private final Component title; | ||
| /** Description to display when valid */ | ||
| private final Component description; | ||
| /** Key of the set to fill with modifier names */ | ||
| private final ResourceLocation dataKey; | ||
| /** Tag matching entries that should not be added or removed */ | ||
| private final TagKey<Modifier> blacklist; | ||
| /** Filter of modifiers to display */ | ||
| private final Predicate<ModifierEntry> entryFilter; | ||
| /** If true, adds the matched modifier to the set, if false removes it */ | ||
| private final boolean addToSet; | ||
| /** Cached list of modifiers shown in JEI */ | ||
| private List<ModifierEntry> filteredModifiers = null; | ||
| public ModifierSetWorktableRecipe(ResourceLocation id, ResourceLocation dataKey, List<SizedIngredient> inputs, TagKey<Modifier> blacklist, boolean addToSet) { | ||
| super(id, inputs); | ||
| this.dataKey = dataKey; | ||
| this.addToSet = addToSet; | ||
| String rootKey = Util.makeTranslationKey("recipe", dataKey) + (addToSet ? ".adding" : ".removing"); | ||
| this.title = new TranslatableComponent(rootKey + ".title"); | ||
| this.description = new TranslatableComponent(rootKey + ".description"); | ||
| this.blacklist = blacklist; | ||
| this.entryFilter = entry -> !entry.matches(blacklist); | ||
| } | ||
|
|
||
| @Override | ||
| public Component getDescription(@Nullable ITinkerableContainer inv) { | ||
| if (inv != null && inv.getTinkerable().getUpgrades().getModifiers().stream().noneMatch(this.entryFilter)) { | ||
| return NO_MATCHES; | ||
| } | ||
| return description; | ||
| } | ||
|
|
||
| @Override | ||
| public List<ModifierEntry> getModifierOptions(@Nullable ITinkerableContainer inv) { | ||
| if (inv == null) { | ||
| if (filteredModifiers == null) { | ||
| filteredModifiers = ModifierRecipeLookup.getRecipeModifierList().stream().filter(this.entryFilter).toList(); | ||
| } | ||
| return filteredModifiers; | ||
| } | ||
| IToolStackView tool = inv.getTinkerable(); | ||
| Set<ModifierId> existing = getModifierSet(tool.getPersistentData(), dataKey); | ||
| Predicate<ModifierEntry> applicable = entry -> existing.contains(entry.getId()) != addToSet; | ||
| return inv.getTinkerable().getUpgrades().getModifiers().stream().filter(this.entryFilter).filter(applicable).toList(); | ||
| } | ||
|
|
||
| @Override | ||
| public RecipeResult<ToolStack> getResult(ITinkerableContainer inv, ModifierEntry modifier) { | ||
| ToolStack tool = inv.getTinkerable().copy(); | ||
| ModDataNBT persistentData = tool.getPersistentData(); | ||
| ListTag tagList; | ||
| if (persistentData.contains(dataKey, Tag.TAG_LIST)) { | ||
| tagList = persistentData.get(dataKey, LIST_GETTER); | ||
| } else { | ||
| tagList = new ListTag(); | ||
| persistentData.put(dataKey, tagList); | ||
| } | ||
| String value = modifier.getId().toString(); | ||
| boolean found = false; | ||
| for (int i = 0; i < tagList.size(); i++) { | ||
| if (tagList.getString(i).equals(value)) { | ||
| if (!addToSet) { | ||
| tagList.remove(i); | ||
| } | ||
| found = true; | ||
| break; | ||
| } | ||
| } | ||
| if (!found && addToSet) { | ||
| tagList.add(StringTag.valueOf(value)); | ||
| } | ||
| return RecipeResult.success(tool); | ||
| } | ||
|
|
||
| @Override | ||
| public RecipeSerializer<?> getSerializer() { | ||
| return TinkerModifiers.modifierSetWorktableSerializer.get(); | ||
| } | ||
|
|
||
| /** Gets the set of modifiers in persistent data at the given key */ | ||
| public static Set<ModifierId> getModifierSet(IModDataView modData, ResourceLocation key) { | ||
| return modData.get(key, LIST_GETTER).stream().map(tag -> ModifierId.tryParse(tag.getAsString())).filter(Objects::nonNull).collect(Collectors.toSet()); | ||
| } | ||
|
|
||
| public static class Serializer extends LoggingRecipeSerializer<ModifierSetWorktableRecipe> { | ||
| @Override | ||
| public ModifierSetWorktableRecipe fromJson(ResourceLocation id, JsonObject json) { | ||
| ResourceLocation dataKey = JsonHelper.getResourceLocation(json, "data_key"); | ||
| List<SizedIngredient> ingredients = JsonHelper.parseList(json, "inputs", SizedIngredient::deserialize); | ||
| TagKey<Modifier> blacklist = ModifierManager.getTag(JsonHelper.getResourceLocation(json, "blacklist")); | ||
| boolean addToSet = GsonHelper.getAsBoolean(json, "add_to_set"); | ||
| return new ModifierSetWorktableRecipe(id, dataKey, ingredients, blacklist, addToSet); | ||
| } | ||
|
|
||
| @Nullable | ||
| @Override | ||
| protected ModifierSetWorktableRecipe fromNetworkSafe(ResourceLocation id, FriendlyByteBuf buffer) { | ||
| ResourceLocation dataKey = buffer.readResourceLocation(); | ||
| int size = buffer.readVarInt(); | ||
| ImmutableList.Builder<SizedIngredient> ingredients = ImmutableList.builder(); | ||
| for (int i = 0; i < size; i++) { | ||
| ingredients.add(SizedIngredient.read(buffer)); | ||
| } | ||
| TagKey<Modifier> blacklist = ModifierManager.getTag(buffer.readResourceLocation()); | ||
| boolean addToSet = buffer.readBoolean(); | ||
| return new ModifierSetWorktableRecipe(id, dataKey, ingredients.build(), blacklist, addToSet); | ||
| } | ||
|
|
||
| @Override | ||
| protected void toNetworkSafe(FriendlyByteBuf buffer, ModifierSetWorktableRecipe recipe) { | ||
| buffer.writeResourceLocation(recipe.dataKey); | ||
| buffer.writeVarInt(recipe.inputs.size()); | ||
| for (SizedIngredient ingredient : recipe.inputs) { | ||
| ingredient.write(buffer); | ||
| } | ||
| buffer.writeResourceLocation(recipe.blacklist.location()); | ||
| buffer.writeBoolean(recipe.addToSet); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.