maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove broken AccessorIngredient mixin.

Browse source
This commit is contained in:
modmuss50 2021-08-13 21:08:56 +01:00
parent 7d81e647cb
commit 93c1d65adf
3 changed files with 2 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
RebornCore/src/main/java/reborncore/common/crafting/ingredient/WrappedIngredient.java
View file

@ -28,7 +28,6 @@ import com.google.gson.JsonArray;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.Ingredient;
import reborncore.mixin.common.AccessorIngredient;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -57,7 +56,7 @@ public class WrappedIngredient extends RebornIngredient {
@Override @Override
public List<ItemStack> getPreviewStacks() { public List<ItemStack> getPreviewStacks() {
return Arrays.asList(((AccessorIngredient) (Object) wrapped).getMatchingStacks()); return Arrays.asList(wrapped.getMatchingStacks());
} }
@Override @Override
@ -72,7 +71,7 @@ public class WrappedIngredient extends RebornIngredient {
@Override @Override
public int getCount() { public int getCount() {
return ((AccessorIngredient) (Object) wrapped).getMatchingStacks().length; return wrapped.getMatchingStacks().length;
} }
public static RebornIngredient deserialize(JsonObject jsonObject) { public static RebornIngredient deserialize(JsonObject jsonObject) {

37
RebornCore/src/main/java/reborncore/mixin/common/AccessorIngredient.java
View file

@ -1,37 +0,0 @@
/*
* This file is part of RebornCore, licensed under the MIT License (MIT).
*
* Copyright (c) 2021 TeamReborn
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
package reborncore.mixin.common;
import net.minecraft.item.ItemStack;
import net.minecraft.recipe.Ingredient;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(Ingredient.class)
public interface AccessorIngredient {
@Accessor
ItemStack[] getMatchingStacks();
}

1
RebornCore/src/main/resources/reborncore.common.mixins.json
View file

@ -5,7 +5,6 @@
"mixins": [ "mixins": [
"AccessorFluidBlock", "AccessorFluidBlock",
"AccessorFoliagePlacerType", "AccessorFoliagePlacerType",
"AccessorIngredient",
"AccessorRecipeManager", "AccessorRecipeManager",
"AccessorScreenHandler", "AccessorScreenHandler",
"AccessorSlot", "AccessorSlot",