From c9ac8fccef10d968faf9ec60d116694ef511cd14 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 5 Mar 2019 22:32:29 +0800 Subject: v2.3.2 --- .../java/me/shedaniel/rei/plugin/DefaultBlastingCategory.java | 4 ++-- .../java/me/shedaniel/rei/plugin/DefaultBlastingDisplay.java | 4 ++-- .../java/me/shedaniel/rei/plugin/DefaultBrewingCategory.java | 4 ++-- .../java/me/shedaniel/rei/plugin/DefaultBrewingDisplay.java | 4 ++-- .../java/me/shedaniel/rei/plugin/DefaultCampfireCategory.java | 4 ++-- .../java/me/shedaniel/rei/plugin/DefaultCampfireDisplay.java | 4 ++-- .../java/me/shedaniel/rei/plugin/DefaultCraftingCategory.java | 4 ++-- .../java/me/shedaniel/rei/plugin/DefaultCraftingDisplay.java | 4 ++-- src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java | 10 +++++----- .../java/me/shedaniel/rei/plugin/DefaultSmeltingCategory.java | 4 ++-- .../java/me/shedaniel/rei/plugin/DefaultSmeltingDisplay.java | 4 ++-- .../java/me/shedaniel/rei/plugin/DefaultSmokingCategory.java | 4 ++-- .../java/me/shedaniel/rei/plugin/DefaultSmokingDisplay.java | 5 ++--- .../me/shedaniel/rei/plugin/DefaultStoneCuttingCategory.java | 4 ++-- .../me/shedaniel/rei/plugin/DefaultStoneCuttingDisplay.java | 4 ++-- 15 files changed, 33 insertions(+), 34 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/plugin') diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultBlastingCategory.java b/src/main/java/me/shedaniel/rei/plugin/DefaultBlastingCategory.java index b2881f9f7..3f496d7ea 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultBlastingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultBlastingCategory.java @@ -1,7 +1,7 @@ package me.shedaniel.rei.plugin; import com.mojang.blaze3d.platform.GlStateManager; -import me.shedaniel.rei.api.IRecipeCategory; +import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.gui.widget.IWidget; import me.shedaniel.rei.gui.widget.ItemSlotWidget; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; @@ -19,7 +19,7 @@ import java.util.LinkedList; import java.util.List; import java.util.function.Supplier; -public class DefaultBlastingCategory implements IRecipeCategory { +public class DefaultBlastingCategory implements RecipeCategory { private static final Identifier DISPLAY_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/display.png"); diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultBlastingDisplay.java b/src/main/java/me/shedaniel/rei/plugin/DefaultBlastingDisplay.java index 669f53f16..1c1d9c81e 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultBlastingDisplay.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultBlastingDisplay.java @@ -1,7 +1,7 @@ package me.shedaniel.rei.plugin; import com.google.common.collect.Lists; -import me.shedaniel.rei.api.IRecipeDisplay; +import me.shedaniel.rei.api.RecipeDisplay; import net.minecraft.block.entity.FurnaceBlockEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -13,7 +13,7 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -public class DefaultBlastingDisplay implements IRecipeDisplay { +public class DefaultBlastingDisplay implements RecipeDisplay { private BlastingRecipe display; private List> input; diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultBrewingCategory.java b/src/main/java/me/shedaniel/rei/plugin/DefaultBrewingCategory.java index da322758c..004c83445 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultBrewingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultBrewingCategory.java @@ -1,7 +1,7 @@ package me.shedaniel.rei.plugin; import com.mojang.blaze3d.platform.GlStateManager; -import me.shedaniel.rei.api.IRecipeCategory; +import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.gui.widget.IWidget; import me.shedaniel.rei.gui.widget.ItemSlotWidget; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; @@ -20,7 +20,7 @@ import java.util.LinkedList; import java.util.List; import java.util.function.Supplier; -public class DefaultBrewingCategory implements IRecipeCategory { +public class DefaultBrewingCategory implements RecipeCategory { private static final Identifier DISPLAY_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/display.png"); diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultBrewingDisplay.java b/src/main/java/me/shedaniel/rei/plugin/DefaultBrewingDisplay.java index afa763d8a..b49300689 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultBrewingDisplay.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultBrewingDisplay.java @@ -1,6 +1,6 @@ package me.shedaniel.rei.plugin; -import me.shedaniel.rei.api.IRecipeDisplay; +import me.shedaniel.rei.api.RecipeDisplay; import net.minecraft.block.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -13,7 +13,7 @@ import java.util.Arrays; import java.util.List; import java.util.Optional; -public class DefaultBrewingDisplay implements IRecipeDisplay { +public class DefaultBrewingDisplay implements RecipeDisplay { private ItemStack input, output; private Ingredient reactant; diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultCampfireCategory.java b/src/main/java/me/shedaniel/rei/plugin/DefaultCampfireCategory.java index fb87875bd..a11fe1d24 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultCampfireCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultCampfireCategory.java @@ -1,7 +1,7 @@ package me.shedaniel.rei.plugin; import com.mojang.blaze3d.platform.GlStateManager; -import me.shedaniel.rei.api.IRecipeCategory; +import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.gui.widget.IWidget; import me.shedaniel.rei.gui.widget.ItemSlotWidget; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; @@ -19,7 +19,7 @@ import java.util.LinkedList; import java.util.List; import java.util.function.Supplier; -public class DefaultCampfireCategory implements IRecipeCategory { +public class DefaultCampfireCategory implements RecipeCategory { private static final Identifier DISPLAY_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/display.png"); diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultCampfireDisplay.java b/src/main/java/me/shedaniel/rei/plugin/DefaultCampfireDisplay.java index e638008df..184f3c54a 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultCampfireDisplay.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultCampfireDisplay.java @@ -1,7 +1,7 @@ package me.shedaniel.rei.plugin; import com.google.common.collect.Lists; -import me.shedaniel.rei.api.IRecipeDisplay; +import me.shedaniel.rei.api.RecipeDisplay; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.cooking.CampfireCookingRecipe; @@ -13,7 +13,7 @@ import java.util.Collections; import java.util.List; import java.util.Optional; -public class DefaultCampfireDisplay implements IRecipeDisplay { +public class DefaultCampfireDisplay implements RecipeDisplay { private List inputs, output; private int cookTime; diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultCraftingCategory.java b/src/main/java/me/shedaniel/rei/plugin/DefaultCraftingCategory.java index 460e399db..cf9bc2cf5 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultCraftingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultCraftingCategory.java @@ -2,7 +2,7 @@ package me.shedaniel.rei.plugin; import com.google.common.collect.Lists; import com.mojang.blaze3d.platform.GlStateManager; -import me.shedaniel.rei.api.IRecipeCategory; +import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.gui.widget.IWidget; import me.shedaniel.rei.gui.widget.ItemSlotWidget; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; @@ -19,7 +19,7 @@ import java.util.LinkedList; import java.util.List; import java.util.function.Supplier; -public class DefaultCraftingCategory implements IRecipeCategory { +public class DefaultCraftingCategory implements RecipeCategory { private static final Identifier DISPLAY_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/display.png"); diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultCraftingDisplay.java b/src/main/java/me/shedaniel/rei/plugin/DefaultCraftingDisplay.java index 5f3f88595..97275cae5 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultCraftingDisplay.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultCraftingDisplay.java @@ -1,10 +1,10 @@ package me.shedaniel.rei.plugin; -import me.shedaniel.rei.api.IRecipeDisplay; +import me.shedaniel.rei.api.RecipeDisplay; import net.minecraft.recipe.Recipe; import net.minecraft.util.Identifier; -public interface DefaultCraftingDisplay extends IRecipeDisplay { +public interface DefaultCraftingDisplay extends RecipeDisplay { @Override default Identifier getRecipeCategory() { diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java index cbedffe8e..0fd543ef9 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java @@ -29,7 +29,7 @@ import net.minecraft.util.registry.Registry; import java.util.*; -public class DefaultPlugin implements IRecipePlugin { +public class DefaultPlugin implements REIPlugin { public static final Identifier CRAFTING = new Identifier("roughlyenoughitems", "plugins/crafting"); public static final Identifier SMELTING = new Identifier("roughlyenoughitems", "plugins/smelting"); @@ -57,11 +57,11 @@ public class DefaultPlugin implements IRecipePlugin { } @Override - public void registerItems(ItemRegisterer itemRegisterer) { + public void registerItems(ItemRegistry itemRegistry) { Registry.ITEM.stream().forEach(item -> { - itemRegisterer.registerItemStack(item.getDefaultStack()); + itemRegistry.registerItemStack(item.getDefaultStack()); try { - itemRegisterer.registerItemStack(itemRegisterer.getAllStacksFromItem(item)); + itemRegistry.registerItemStack(itemRegistry.getAllStacksFromItem(item)); } catch (Exception e) { } }); @@ -71,7 +71,7 @@ public class DefaultPlugin implements IRecipePlugin { map.put(enchantment, i); ItemStack itemStack = new ItemStack(Items.ENCHANTED_BOOK); EnchantmentHelper.set(map, itemStack); - itemRegisterer.registerItemStack(Items.ENCHANTED_BOOK, itemStack); + itemRegistry.registerItemStack(Items.ENCHANTED_BOOK, itemStack); } }); } diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingCategory.java b/src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingCategory.java index 119c6abb6..5025efbff 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingCategory.java @@ -1,7 +1,7 @@ package me.shedaniel.rei.plugin; import com.mojang.blaze3d.platform.GlStateManager; -import me.shedaniel.rei.api.IRecipeCategory; +import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.gui.widget.IWidget; import me.shedaniel.rei.gui.widget.ItemSlotWidget; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; @@ -19,7 +19,7 @@ import java.util.LinkedList; import java.util.List; import java.util.function.Supplier; -public class DefaultSmeltingCategory implements IRecipeCategory { +public class DefaultSmeltingCategory implements RecipeCategory { private static final Identifier DISPLAY_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/display.png"); diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingDisplay.java b/src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingDisplay.java index cc4fb9fd0..044daa28f 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingDisplay.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingDisplay.java @@ -1,7 +1,7 @@ package me.shedaniel.rei.plugin; import com.google.common.collect.Lists; -import me.shedaniel.rei.api.IRecipeDisplay; +import me.shedaniel.rei.api.RecipeDisplay; import net.minecraft.block.entity.FurnaceBlockEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -13,7 +13,7 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -public class DefaultSmeltingDisplay implements IRecipeDisplay { +public class DefaultSmeltingDisplay implements RecipeDisplay { private SmeltingRecipe display; private List> input; diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingCategory.java b/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingCategory.java index cc21ac649..2ecaa6d0b 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingCategory.java @@ -1,7 +1,7 @@ package me.shedaniel.rei.plugin; import com.mojang.blaze3d.platform.GlStateManager; -import me.shedaniel.rei.api.IRecipeCategory; +import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.gui.widget.IWidget; import me.shedaniel.rei.gui.widget.ItemSlotWidget; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; @@ -19,7 +19,7 @@ import java.util.LinkedList; import java.util.List; import java.util.function.Supplier; -public class DefaultSmokingCategory implements IRecipeCategory { +public class DefaultSmokingCategory implements RecipeCategory { private static final Identifier DISPLAY_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/display.png"); diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingDisplay.java b/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingDisplay.java index afbd7264e..988cd2b04 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingDisplay.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingDisplay.java @@ -1,11 +1,10 @@ package me.shedaniel.rei.plugin; import com.google.common.collect.Lists; -import me.shedaniel.rei.api.IRecipeDisplay; +import me.shedaniel.rei.api.RecipeDisplay; import net.minecraft.block.entity.FurnaceBlockEntity; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.recipe.cooking.SmeltingRecipe; import net.minecraft.recipe.cooking.SmokingRecipe; import net.minecraft.util.Identifier; @@ -14,7 +13,7 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; -public class DefaultSmokingDisplay implements IRecipeDisplay { +public class DefaultSmokingDisplay implements RecipeDisplay { private SmokingRecipe display; private List> input; diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultStoneCuttingCategory.java b/src/main/java/me/shedaniel/rei/plugin/DefaultStoneCuttingCategory.java index 2429246f9..88f01b5fc 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultStoneCuttingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultStoneCuttingCategory.java @@ -1,7 +1,7 @@ package me.shedaniel.rei.plugin; import com.mojang.blaze3d.platform.GlStateManager; -import me.shedaniel.rei.api.IRecipeCategory; +import me.shedaniel.rei.api.RecipeCategory; import me.shedaniel.rei.gui.widget.IWidget; import me.shedaniel.rei.gui.widget.ItemSlotWidget; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; @@ -18,7 +18,7 @@ import java.util.LinkedList; import java.util.List; import java.util.function.Supplier; -public class DefaultStoneCuttingCategory implements IRecipeCategory { +public class DefaultStoneCuttingCategory implements RecipeCategory { private static final Identifier DISPLAY_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/display.png"); diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultStoneCuttingDisplay.java b/src/main/java/me/shedaniel/rei/plugin/DefaultStoneCuttingDisplay.java index 31938753a..f0b84152a 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultStoneCuttingDisplay.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultStoneCuttingDisplay.java @@ -1,7 +1,7 @@ package me.shedaniel.rei.plugin; import com.google.common.collect.Lists; -import me.shedaniel.rei.api.IRecipeDisplay; +import me.shedaniel.rei.api.RecipeDisplay; import net.minecraft.item.ItemStack; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.StonecuttingRecipe; @@ -13,7 +13,7 @@ import java.util.Collections; import java.util.List; import java.util.Optional; -public class DefaultStoneCuttingDisplay implements IRecipeDisplay { +public class DefaultStoneCuttingDisplay implements RecipeDisplay { private List inputs, output; private StonecuttingRecipe display; -- cgit