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

Refactor machine ingredients

Browse source
This commit is contained in:
modmuss50 2019-07-28 14:50:06 +01:00
parent a7de6b428a
commit 0118d5a999
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/techreborn/api/recipe/recipes/BlastFurnaceRecipe.java
View file

@ -46,12 +46,6 @@ public class BlastFurnaceRecipe extends RebornRecipe {
heat = JsonHelper.getInt(jsonObject, "heat"); heat = JsonHelper.getInt(jsonObject, "heat");
} }
@Override
public void serialize(JsonObject jsonObject) {
super.serialize(jsonObject);
jsonObject.addProperty("heat", heat);
}
@Override @Override
public boolean canCraft(final BlockEntity blockEntity) { public boolean canCraft(final BlockEntity blockEntity) {
if (blockEntity instanceof IndustrialBlastFurnaceBlockEntity) { if (blockEntity instanceof IndustrialBlastFurnaceBlockEntity) {

10
src/main/java/techreborn/blockentity/machine/iron/IronAlloyFurnaceBlockEntity.java
View file

@ -33,8 +33,9 @@ import reborncore.api.blockentity.InventoryProvider;
import reborncore.client.containerBuilder.IContainerProvider; import reborncore.client.containerBuilder.IContainerProvider;
import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.containerBuilder.builder.BuiltContainer;
import reborncore.client.containerBuilder.builder.ContainerBuilder; import reborncore.client.containerBuilder.builder.ContainerBuilder;
import reborncore.common.crafting.RebornIngredient; import reborncore.common.crafting.ingredient.RebornIngredient;
import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.RebornRecipe;
import reborncore.common.crafting.ingredient.StackIngredient;
import reborncore.common.registration.RebornRegister; import reborncore.common.registration.RebornRegister;
import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.blockentity.MachineBaseBlockEntity;
import reborncore.common.util.RebornInventory; import reborncore.common.util.RebornInventory;
@ -43,6 +44,9 @@ import techreborn.init.ModRecipes;
import techreborn.init.TRContent; import techreborn.init.TRContent;
import techreborn.init.TRBlockEntities; import techreborn.init.TRBlockEntities;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Consumer;
@RebornRegister(TechReborn.MOD_ID) @RebornRegister(TechReborn.MOD_ID)
public class IronAlloyFurnaceBlockEntity extends MachineBaseBlockEntity public class IronAlloyFurnaceBlockEntity extends MachineBaseBlockEntity
implements IToolDrop, InventoryProvider, IContainerProvider { implements IToolDrop, InventoryProvider, IContainerProvider {
@ -196,7 +200,9 @@ public class IronAlloyFurnaceBlockEntity extends MachineBaseBlockEntity
for (RebornIngredient ingredient : recipeType.getRebornIngredients()) { for (RebornIngredient ingredient : recipeType.getRebornIngredients()) {
for (int inputSlot = 0; inputSlot < 2; inputSlot++) { for (int inputSlot = 0; inputSlot < 2; inputSlot++) {
if (ingredient.test(this.inventory.getInvStack(inputSlot))) { if (ingredient.test(this.inventory.getInvStack(inputSlot))) {
inventory.shrinkSlot(inputSlot, ingredient.getSize()); AtomicInteger count = new AtomicInteger(1);
ingredient.ifType(StackIngredient.class, stackIngredient -> count.set(stackIngredient.getCount()));
inventory.shrinkSlot(inputSlot, count.get());
break; break;
} }
} }

4
src/main/java/techreborn/rei/MachineRecipeDisplay.java
View file

@ -3,7 +3,7 @@ package techreborn.rei;
import me.shedaniel.rei.api.RecipeDisplay; import me.shedaniel.rei.api.RecipeDisplay;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.Identifier; import net.minecraft.util.Identifier;
import reborncore.common.crafting.RebornIngredient; import reborncore.common.crafting.ingredient.RebornIngredient;
import reborncore.common.crafting.RebornRecipe; import reborncore.common.crafting.RebornRecipe;
import java.util.List; import java.util.List;
@ -18,7 +18,7 @@ public class MachineRecipeDisplay<R extends RebornRecipe> implements RecipeDispl
public MachineRecipeDisplay(R recipe) { public MachineRecipeDisplay(R recipe) {
this.recipe = recipe; this.recipe = recipe;
this.inputs = recipe.getRebornIngredients().stream().map(RebornIngredient::getStacks).collect(Collectors.toList()); this.inputs = recipe.getRebornIngredients().stream().map(RebornIngredient::getPreviewStacks).collect(Collectors.toList());
this.outputs = recipe.getOutputs(); this.outputs = recipe.getOutputs();
} }