Rolling machine port/fixes

This commit is contained in:
modmuss50 2019-08-12 15:05:49 +01:00
parent 1dd83875ef
commit 2a5708b328
23 changed files with 472 additions and 124 deletions

View file

@ -1,54 +0,0 @@
/*
* This file is part of TechReborn, licensed under the MIT License (MIT).
*
* Copyright (c) 2018 TechReborn
*
* 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 techreborn.api;
import net.minecraft.inventory.CraftingInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.recipe.Recipe;
import net.minecraft.util.Identifier;
import net.minecraft.world.World;
public class RollingMachineRecipe {
public static final RollingMachineRecipe instance = new RollingMachineRecipe();
public void addShapedOreRecipe(Identifier resourceLocation, ItemStack outputItemStack, Object... objectInputs) {
}
public void addShapelessOreRecipe(Identifier resourceLocation, ItemStack outputItemStack, Object... objectInputs) {
}
public ItemStack findMatchingRecipeOutput(CraftingInventory inv, World world) {
return ItemStack.EMPTY;
}
public Recipe findMatchingRecipe(CraftingInventory inv, World world) {
return null;
}
}

View file

@ -0,0 +1,84 @@
package techreborn.api.recipe.recipes;
import com.google.gson.JsonObject;
import net.minecraft.inventory.CraftingInventory;
import net.minecraft.inventory.Inventory;
import net.minecraft.item.ItemStack;
import net.minecraft.recipe.Ingredient;
import net.minecraft.recipe.RecipeSerializer;
import net.minecraft.recipe.ShapedRecipe;
import net.minecraft.util.DefaultedList;
import net.minecraft.util.Identifier;
import net.minecraft.util.JsonHelper;
import net.minecraft.world.World;
import reborncore.common.crafting.RebornRecipe;
import reborncore.common.crafting.RebornRecipeType;
import reborncore.common.crafting.ingredient.RebornIngredient;
import java.util.Collections;
import java.util.List;
public class RollingMachineRecipe extends RebornRecipe {
private ShapedRecipe shapedRecipe;
private JsonObject shaped;
public RollingMachineRecipe(RebornRecipeType<?> type, Identifier name) {
super(type, name);
}
@Override
public void deserialize(JsonObject jsonObject) {
shaped = JsonHelper.getObject(jsonObject, "shaped");
shapedRecipe = RecipeSerializer.SHAPED.read(getId(), shaped);
}
@Override
public void serialize(JsonObject jsonObject) {
jsonObject.add("shaped", shaped);
}
@Override
public DefaultedList<RebornIngredient> getRebornIngredients() {
return DefaultedList.of();
}
@Override
public List<ItemStack> getOutputs() {
return Collections.singletonList(shapedRecipe.getOutput());
}
@SuppressWarnings("deprecation")
@Override
public ItemStack getOutput() {
return shapedRecipe.getOutput();
}
@SuppressWarnings("deprecation")
@Override
public DefaultedList<Ingredient> getPreviewInputs() {
return shapedRecipe.getPreviewInputs();
}
@SuppressWarnings("deprecation")
@Override
public boolean matches(Inventory inv, World worldIn) {
return shapedRecipe.matches((CraftingInventory) inv, worldIn);
}
@SuppressWarnings("deprecation")
@Override
public ItemStack craft(Inventory inv) {
return shapedRecipe.craft((CraftingInventory) inv);
}
@SuppressWarnings("deprecation")
@Override
public boolean fits(int width, int height) {
return shapedRecipe.fits(width, height);
}
public ShapedRecipe getShapedRecipe() {
return shapedRecipe;
}
}