Implement Recipe API #1395
Closed
Implement Recipe API #1395
+2,171
−37
Conversation
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
Faithcaio
added
status: wip
11 tasks
6 tasks
kashike
suggested changes
Jun 15, 2017
| public boolean apply(@Nullable net.minecraft.item.ItemStack p_apply_1_) { | ||
|
|
||
| // first check for matching predicates | ||
| if (predicates.stream().anyMatch(p -> p.test(ItemStackUtil.fromNative(p_apply_1_)))) { |
| } | ||
|
|
||
| @Override | ||
| public boolean apply(@Nullable net.minecraft.item.ItemStack p_apply_1_) { |
There was a problem hiding this comment.
parameter could use a better name.
| } | ||
|
|
||
| @Override | ||
| public boolean apply(@Nullable ItemStack p_apply_1_) { |
There was a problem hiding this comment.
parameter could use a better name
|
|
||
| @Override | ||
| public boolean apply(@Nullable ItemStack p_apply_1_) { | ||
| return delegate.test(ItemStackUtil.fromNative(p_apply_1_)); |
| @Override | ||
| public Collection<CraftingRecipe> getRecipes() { | ||
| // TODO Unmodifiable? | ||
| return Streams.stream(CraftingManager.REGISTRY.iterator()).map(CraftingRecipe.class::cast).collect(Collectors.toList()); |
There was a problem hiding this comment.
.collect(ImmutableList.toImmutableList())
Faithcaio
force-pushed
the
feature/recipe
branch
from
c7d5d92 to
eb1f33a
Compare
liach
reviewed
Jun 15, 2017
|
|
||
| @Override | ||
| public ShapedCraftingRecipe.Builder group(@Nullable String name) { | ||
| this.groupName = name == null ? "" : name; |
| @@ -82,6 +83,11 @@ | |||
| @Shadow | |||
| public abstract Slot getSlot(int slotId); | |||
|
|
|||
| @Shadow | |||
| public ItemStack slotClick(int slotId, int dragType, ClickType clickTypeIn, EntityPlayer player) { | |||
| throw new IllegalStateException("Shadowed."); | |||
There was a problem hiding this comment.
Why not making this abstract?
There was a problem hiding this comment.
MixinContainerCrafting extends this and calls super.slotClick
| public RecipeRegistry getRecipeRegistry() { | ||
| throw new UnsupportedOperationException(); // TODO | ||
| public CraftingRecipeRegistry getCraftingRecipeRegistry() { | ||
| return new SpongeCraftingRecipeRegistry(); // TODO cache it somewhere |
There was a problem hiding this comment.
Cache it in SpongeCraftingRecipeRegistry?
|
|
||
|
|
||
| public net.minecraft.entity.passive.EntityVillager field_175561_bA # DEFAULT_TRADE_LIST_MAP | ||
| public net.minecraft.entity.EntityList func_191303_a(ILjava/lang/String;Ljava/lang/Class;Ljava/lang/String;)V # register |
There was a problem hiding this comment.
must have happened when rebasing stuff
liach
reviewed
Jun 15, 2017
| @@ -28,6 +28,7 @@ | |||
|
|
|||
| import com.google.common.collect.ImmutableList; | |||
| import com.google.common.collect.Streams; | |||
| import com.google.inject.Singleton; | |||
There was a problem hiding this comment.
Do you want this annotation?
liach
approved these changes
Jun 15, 2017
Closed
Faithcaio
force-pushed
the
feature/recipe
branch
3 times, most recently
from
b44fa86 to
d5aad0a
Compare
stephan-gh
suggested changes
Jun 18, 2017
| } | ||
|
|
||
| @Inject(method = "getSmeltingResult", at = @At("RETURN"), cancellable = true) | ||
| public void onGetSmeltingResult(ItemStack stack, CallbackInfoReturnable<ItemStack> cir) { |
There was a problem hiding this comment.
There is no need to have this public
| } | ||
|
|
||
| @Inject(method = "getSmeltingExperience", at = @At("RETURN"), cancellable = true) | ||
| public void onGetSmeltingExperience(ItemStack stack, CallbackInfoReturnable<Float> cir) { |
There was a problem hiding this comment.
There is no need to have this public
Faithcaio
force-pushed
the
feature/recipe
branch
3 times, most recently
from
68e8a4c to
96ebeb6
Compare
Faithcaio
force-pushed
the
feature/recipe
branch
from
96ebeb6 to
ad869e0
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
SpongeAPI|SpongeCommon|SpongeForge
Continuation of #1119 of SpongePowered/SpongeAPI#1098
Updated for MC 1.12
InventoryUtil: CraftingInventory <-> InventoryCrafting UtilItemStackUtil: List <-> native Ingredient[]AbstractSpongeCraftingRecipe/DelegateSpongeCraftingRecipe: for custom CraftingRecipe Impls.CustomIngredient: For Ingredients using Predicates instead of Items.DelegateIngredient: For custom Ingredient Impls.IngredientUtil: Ingredient <-> native IngredientSpongeCraftingRecipeRegistry: delegates registration to theCraftingManagerSpongeIngredientBuilder: Builder for IngredientsSpongeShapedCraftingRecipeBuilder: Builder for shaped CraftingRecipesSpongeShapelessCraftingRecipeBuilder: Builder for shapeless CraftingRecipesMatchSmeltingVanillaItemStack:SpongeSmeltingRecipe:SpongeSmeltingRecipeBuilderMixinContainerCrafting:MixinIRecipe: make IRecipe implement CraftingRecipeMixinIngredient: make native Ingredient implement IngredientMixinShapedRecipes: make ShapedRecipes implement ShapedCraftingRecipeMixinShapelessRecipes: make ShapelessRecipes implement ShapelessCraftingRecipeMixinFurnaceRecipes: make FurnaceRecipes implement SmeltingRecipeRegistryCommonModuleRegistry: register Builders:Ingredient,ShapedCraftingRecipe,ShapelessCraftingRecipe,SmeltingRecipeIdeas for Further enhancement: