diff options
Diffstat (limited to 'src/main/java/me/shedaniel/plugin/furnace')
| -rwxr-xr-x | src/main/java/me/shedaniel/plugin/furnace/VanillaFurnaceCategory.java | 16 | ||||
| -rwxr-xr-x | src/main/java/me/shedaniel/plugin/furnace/VanillaFurnaceRecipe.java | 14 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/main/java/me/shedaniel/plugin/furnace/VanillaFurnaceCategory.java b/src/main/java/me/shedaniel/plugin/furnace/VanillaFurnaceCategory.java index 1f38b6964..969ae4265 100755 --- a/src/main/java/me/shedaniel/plugin/furnace/VanillaFurnaceCategory.java +++ b/src/main/java/me/shedaniel/plugin/furnace/VanillaFurnaceCategory.java @@ -1,14 +1,14 @@ package me.shedaniel.plugin.furnace; import me.shedaniel.api.IDisplayCategory; -import me.shedaniel.gui.widget.REISlot; import me.shedaniel.gui.widget.Control; +import me.shedaniel.gui.widget.REISlot; import me.shedaniel.gui.widget.WidgetArrow; -import net.minecraft.client.resources.I18n; -import net.minecraft.init.Blocks; +import net.minecraft.block.Blocks; +import net.minecraft.block.entity.FurnaceBlockEntity; +import net.minecraft.client.resource.language.I18n; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntityFurnace; import java.util.ArrayList; import java.util.LinkedList; @@ -25,7 +25,7 @@ public class VanillaFurnaceCategory implements IDisplayCategory<VanillaFurnaceRe @Override public String getDisplayName() { - return I18n.format("category.rei.smelting"); + return I18n.translate("category.rei.smelting"); } @Override @@ -54,7 +54,7 @@ public class VanillaFurnaceCategory implements IDisplayCategory<VanillaFurnaceRe REISlot fuelSlot = new REISlot(80, 100 + number * 75); fuelSlot.setStackList(getFuel()); fuelSlot.setDrawBackground(true); - fuelSlot.setExtraTooltip(I18n.format("category.rei.smelting.fuel")); + fuelSlot.setExtraTooltip(I18n.translate("category.rei.smelting.fuel")); slots.add(inputSlot); slots.add(outputSlot); @@ -79,11 +79,11 @@ public class VanillaFurnaceCategory implements IDisplayCategory<VanillaFurnaceRe } private List<ItemStack> getFuel() { - return TileEntityFurnace.getBurnTimes().keySet().stream().map(Item::getDefaultInstance).collect(Collectors.toList()); + return FurnaceBlockEntity.getBurnTimeMap().keySet().stream().map(Item::getDefaultStack).collect(Collectors.toList()); } @Override public ItemStack getCategoryIcon() { - return new ItemStack(Blocks.FURNACE.asItem()); + return new ItemStack(Blocks.FURNACE.getItem()); } } diff --git a/src/main/java/me/shedaniel/plugin/furnace/VanillaFurnaceRecipe.java b/src/main/java/me/shedaniel/plugin/furnace/VanillaFurnaceRecipe.java index a8c18d251..97c6b5460 100755 --- a/src/main/java/me/shedaniel/plugin/furnace/VanillaFurnaceRecipe.java +++ b/src/main/java/me/shedaniel/plugin/furnace/VanillaFurnaceRecipe.java @@ -2,37 +2,37 @@ package me.shedaniel.plugin.furnace; import me.shedaniel.api.IRecipe; import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.FurnaceRecipe; -import net.minecraft.item.crafting.Ingredient; +import net.minecraft.recipe.Ingredient; +import net.minecraft.recipe.smelting.SmeltingRecipe; import java.util.LinkedList; import java.util.List; public class VanillaFurnaceRecipe implements IRecipe<ItemStack> { - private final FurnaceRecipe recipe; + private final SmeltingRecipe recipe; @Override public String getId() { return "furnace"; } - public VanillaFurnaceRecipe(FurnaceRecipe recipe) { + public VanillaFurnaceRecipe(SmeltingRecipe recipe) { this.recipe = recipe; } @Override public List<ItemStack> getOutput() { List<ItemStack> output = new LinkedList<>(); - output.add(recipe.getRecipeOutput().copy()); + output.add(recipe.getOutput().copy()); return output; } @Override public List<List<ItemStack>> getInput() { List<List<ItemStack>> input = new LinkedList<>(); - for(Ingredient ingredient : recipe.getIngredients()) { + for(Ingredient ingredient : recipe.getPreviewInputs()) { List<ItemStack> ingredients = new LinkedList<>(); - for(ItemStack matchingStack : ingredient.getMatchingStacks()) { + for(ItemStack matchingStack : ingredient.getStackArray()) { ingredients.add(matchingStack); } input.add(ingredients); |
