From a5c90bb7d4748ba2da024ce468ffeeda99bf4a0f Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 8 May 2019 00:55:25 +0800 Subject: start of 2.9 update beta --- .../me/shedaniel/rei/plugin/DefaultPlugin.java | 37 ++++++++++++++++++---- 1 file changed, 30 insertions(+), 7 deletions(-) (limited to 'src/main/java/me/shedaniel/rei/plugin') diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java index 98e0d2e40..0adabf43f 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java @@ -5,6 +5,7 @@ import me.shedaniel.rei.RoughlyEnoughItemsCore; import me.shedaniel.rei.api.*; import me.shedaniel.rei.client.ScreenHelper; import me.shedaniel.rei.gui.RecipeViewingScreen; +import me.shedaniel.rei.gui.VillagerRecipeViewingScreen; import me.shedaniel.rei.listeners.ContainerScreenHooks; import me.shedaniel.rei.listeners.RecipeBookGuiHooks; import net.minecraft.client.MinecraftClient; @@ -41,13 +42,13 @@ import java.util.List; public class DefaultPlugin implements REIPluginEntry { - public static final Identifier CRAFTING = new Identifier("roughlyenoughitems", "plugins/crafting"); - public static final Identifier SMELTING = new Identifier("roughlyenoughitems", "plugins/smelting"); - public static final Identifier SMOKING = new Identifier("roughlyenoughitems", "plugins/smoking"); - public static final Identifier BLASTING = new Identifier("roughlyenoughitems", "plugins/blasting"); - public static final Identifier CAMPFIRE = new Identifier("roughlyenoughitems", "plugins/campfire"); - public static final Identifier STONE_CUTTING = new Identifier("roughlyenoughitems", "plugins/stone_cutting"); - public static final Identifier BREWING = new Identifier("roughlyenoughitems", "plugins/brewing"); + public static final Identifier CRAFTING = new Identifier("minecraft", "plugins/crafting"); + public static final Identifier SMELTING = new Identifier("minecraft", "plugins/smelting"); + public static final Identifier SMOKING = new Identifier("minecraft", "plugins/smoking"); + public static final Identifier BLASTING = new Identifier("minecraft", "plugins/blasting"); + public static final Identifier CAMPFIRE = new Identifier("minecraft", "plugins/campfire"); + public static final Identifier STONE_CUTTING = new Identifier("minecraft", "plugins/stone_cutting"); + public static final Identifier BREWING = new Identifier("minecraft", "plugins/brewing"); public static final Identifier PLUGIN = new Identifier("roughlyenoughitems", "default_plugin"); private static final List BREWING_DISPLAYS = Lists.newArrayList(); @@ -192,6 +193,28 @@ public class DefaultPlugin implements REIPluginEntry { return -1.0f; } }); + displayHelper.registerBoundsHandler(new DisplayHelper.DisplayBoundsHandler() { + @Override + public Class getBaseSupportedClass() { + return VillagerRecipeViewingScreen.class; + } + + @Override + public Rectangle getLeftBounds(VillagerRecipeViewingScreen screen) { + return new Rectangle(2, 0, ((VillagerRecipeViewingScreen) screen).bounds.x - 4, MinecraftClient.getInstance().window.getScaledHeight()); + } + + @Override + public Rectangle getRightBounds(VillagerRecipeViewingScreen screen) { + int startX = ((VillagerRecipeViewingScreen) screen).bounds.x + ((VillagerRecipeViewingScreen) screen).bounds.width + 2; + return new Rectangle(startX, 0, MinecraftClient.getInstance().window.getScaledWidth() - startX - 2, MinecraftClient.getInstance().window.getScaledHeight()); + } + + @Override + public float getPriority() { + return -1.0f; + } + }); displayHelper.registerBoundsHandler(new DisplayHelper.DisplayBoundsHandler() { @Override public Class getBaseSupportedClass() { -- cgit From 33ed36eff27c1a533dacb2fa73510687f119c12b Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 8 May 2019 01:24:22 +0800 Subject: more internal changes Fix #56 --- .../me/shedaniel/rei/plugin/DefaultBlastingCategory.java | 8 ++++---- .../me/shedaniel/rei/plugin/DefaultBrewingCategory.java | 14 +++++++------- .../me/shedaniel/rei/plugin/DefaultCampfireCategory.java | 6 +++--- .../me/shedaniel/rei/plugin/DefaultCraftingCategory.java | 8 ++++---- .../me/shedaniel/rei/plugin/DefaultSmeltingCategory.java | 8 ++++---- .../me/shedaniel/rei/plugin/DefaultSmokingCategory.java | 8 ++++---- .../shedaniel/rei/plugin/DefaultStoneCuttingCategory.java | 6 +++--- 7 files changed, 29 insertions(+), 29 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 7f40dd211..f090dc4a6 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultBlastingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultBlastingCategory.java @@ -2,7 +2,7 @@ package me.shedaniel.rei.plugin; import com.mojang.blaze3d.platform.GlStateManager; import me.shedaniel.rei.api.RecipeCategory; -import me.shedaniel.rei.gui.widget.ItemSlotWidget; +import me.shedaniel.rei.gui.widget.SlotWidget; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; import me.shedaniel.rei.gui.widget.Widget; import net.minecraft.block.Blocks; @@ -57,14 +57,14 @@ public class DefaultBlastingCategory implements RecipeCategory> input = recipeDisplay.getInput(); - widgets.add(new ItemSlotWidget(startPoint.x + 1, startPoint.y + 1, input.get(0), true, true, true)); - widgets.add(new ItemSlotWidget(startPoint.x + 1, startPoint.y + 37, recipeDisplay.getFuel(), true, true, true) { + widgets.add(new SlotWidget(startPoint.x + 1, startPoint.y + 1, input.get(0), true, true, true)); + widgets.add(new SlotWidget(startPoint.x + 1, startPoint.y + 37, recipeDisplay.getFuel(), true, true, true) { @Override protected List getExtraToolTips(ItemStack stack) { return Arrays.asList(I18n.translate("category.rei.smelting.fuel")); } }); - widgets.add(new ItemSlotWidget(startPoint.x + 61, startPoint.y + 19, recipeDisplay.getOutput(), false, true, true)); + widgets.add(new SlotWidget(startPoint.x + 61, startPoint.y + 19, recipeDisplay.getOutput(), false, true, true)); return widgets; } diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultBrewingCategory.java b/src/main/java/me/shedaniel/rei/plugin/DefaultBrewingCategory.java index 4575d0a94..ed3c84ba0 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultBrewingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultBrewingCategory.java @@ -2,7 +2,7 @@ package me.shedaniel.rei.plugin; import com.mojang.blaze3d.platform.GlStateManager; import me.shedaniel.rei.api.RecipeCategory; -import me.shedaniel.rei.gui.widget.ItemSlotWidget; +import me.shedaniel.rei.gui.widget.SlotWidget; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; import me.shedaniel.rei.gui.widget.Widget; import net.minecraft.block.Blocks; @@ -55,32 +55,32 @@ public class DefaultBrewingCategory implements RecipeCategory getExtraToolTips(ItemStack stack) { return Arrays.asList(I18n.translate("category.rei.brewing.input")); } }); - widgets.add(new ItemSlotWidget(startPoint.x + 40, startPoint.y + 1, recipeDisplay.getInput().get(1), false, true, true) { + widgets.add(new SlotWidget(startPoint.x + 40, startPoint.y + 1, recipeDisplay.getInput().get(1), false, true, true) { @Override protected List getExtraToolTips(ItemStack stack) { return Arrays.asList(I18n.translate("category.rei.brewing.reactant")); } }); - widgets.add(new ItemSlotWidget(startPoint.x + 40, startPoint.y + 35, recipeDisplay.getOutput(0), false, true, true) { + widgets.add(new SlotWidget(startPoint.x + 40, startPoint.y + 35, recipeDisplay.getOutput(0), false, true, true) { @Override protected List getExtraToolTips(ItemStack stack) { return Arrays.asList(I18n.translate("category.rei.brewing.result")); } }); - widgets.add(new ItemSlotWidget(startPoint.x + 63, startPoint.y + 42, recipeDisplay.getOutput(1), false, true, true) { + widgets.add(new SlotWidget(startPoint.x + 63, startPoint.y + 42, recipeDisplay.getOutput(1), false, true, true) { @Override protected List getExtraToolTips(ItemStack stack) { return Arrays.asList(I18n.translate("category.rei.brewing.result")); } }); - widgets.add(new ItemSlotWidget(startPoint.x + 86, startPoint.y + 35, recipeDisplay.getOutput(2), false, true, true) { + widgets.add(new SlotWidget(startPoint.x + 86, startPoint.y + 35, recipeDisplay.getOutput(2), false, true, true) { @Override protected List getExtraToolTips(ItemStack stack) { return Arrays.asList(I18n.translate("category.rei.brewing.result")); diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultCampfireCategory.java b/src/main/java/me/shedaniel/rei/plugin/DefaultCampfireCategory.java index 398e1a366..10a090984 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultCampfireCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultCampfireCategory.java @@ -2,7 +2,7 @@ package me.shedaniel.rei.plugin; import com.mojang.blaze3d.platform.GlStateManager; import me.shedaniel.rei.api.RecipeCategory; -import me.shedaniel.rei.gui.widget.ItemSlotWidget; +import me.shedaniel.rei.gui.widget.SlotWidget; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; import me.shedaniel.rei.gui.widget.Widget; import net.minecraft.block.Blocks; @@ -58,8 +58,8 @@ public class DefaultCampfireCategory implements RecipeCategory> input = recipeDisplaySupplier.get().getInput(); - List slots = Lists.newArrayList(); + List slots = Lists.newArrayList(); for(int y = 0; y < 3; y++) for(int x = 0; x < 3; x++) - slots.add(new ItemSlotWidget(startPoint.x + 1 + x * 18, startPoint.y + 1 + y * 18, Lists.newArrayList(), true, true, true)); + slots.add(new SlotWidget(startPoint.x + 1 + x * 18, startPoint.y + 1 + y * 18, Lists.newArrayList(), true, true, true)); for(int i = 0; i < input.size(); i++) { if (recipeDisplaySupplier.get() instanceof DefaultShapedDisplay) { if (!input.get(i).isEmpty()) @@ -64,7 +64,7 @@ public class DefaultCraftingCategory implements RecipeCategory> input = recipeDisplaySupplier.get().getInput(); - widgets.add(new ItemSlotWidget(startPoint.x + 1, startPoint.y + 1, input.get(0), true, true, true)); - widgets.add(new ItemSlotWidget(startPoint.x + 1, startPoint.y + 37, recipeDisplaySupplier.get().getFuel(), true, true, true) { + widgets.add(new SlotWidget(startPoint.x + 1, startPoint.y + 1, input.get(0), true, true, true)); + widgets.add(new SlotWidget(startPoint.x + 1, startPoint.y + 37, recipeDisplaySupplier.get().getFuel(), true, true, true) { @Override protected List getExtraToolTips(ItemStack stack) { return Arrays.asList(I18n.translate("category.rei.smelting.fuel")); } }); - widgets.add(new ItemSlotWidget(startPoint.x + 61, startPoint.y + 19, recipeDisplaySupplier.get().getOutput(), false, true, true)); + widgets.add(new SlotWidget(startPoint.x + 61, startPoint.y + 19, recipeDisplaySupplier.get().getOutput(), false, true, true)); return widgets; } diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingCategory.java b/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingCategory.java index e1e7e27dc..1df32332e 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingCategory.java @@ -2,7 +2,7 @@ package me.shedaniel.rei.plugin; import com.mojang.blaze3d.platform.GlStateManager; import me.shedaniel.rei.api.RecipeCategory; -import me.shedaniel.rei.gui.widget.ItemSlotWidget; +import me.shedaniel.rei.gui.widget.SlotWidget; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; import me.shedaniel.rei.gui.widget.Widget; import net.minecraft.block.Blocks; @@ -56,14 +56,14 @@ public class DefaultSmokingCategory implements RecipeCategory> input = recipeDisplaySupplier.get().getInput(); - widgets.add(new ItemSlotWidget(startPoint.x + 1, startPoint.y + 1, input.get(0), true, true, true)); - widgets.add(new ItemSlotWidget(startPoint.x + 1, startPoint.y + 37, recipeDisplaySupplier.get().getFuel(), true, true, true) { + widgets.add(new SlotWidget(startPoint.x + 1, startPoint.y + 1, input.get(0), true, true, true)); + widgets.add(new SlotWidget(startPoint.x + 1, startPoint.y + 37, recipeDisplaySupplier.get().getFuel(), true, true, true) { @Override protected List getExtraToolTips(ItemStack stack) { return Arrays.asList(I18n.translate("category.rei.smelting.fuel")); } }); - widgets.add(new ItemSlotWidget(startPoint.x + 61, startPoint.y + 19, recipeDisplaySupplier.get().getOutput(), false, true, true)); + widgets.add(new SlotWidget(startPoint.x + 61, startPoint.y + 19, recipeDisplaySupplier.get().getOutput(), false, true, true)); return widgets; } diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultStoneCuttingCategory.java b/src/main/java/me/shedaniel/rei/plugin/DefaultStoneCuttingCategory.java index bc0465b59..aa7327daf 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultStoneCuttingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultStoneCuttingCategory.java @@ -3,7 +3,7 @@ package me.shedaniel.rei.plugin; import com.mojang.blaze3d.platform.GlStateManager; import me.shedaniel.rei.api.DisplaySettings; import me.shedaniel.rei.api.RecipeCategory; -import me.shedaniel.rei.gui.widget.ItemSlotWidget; +import me.shedaniel.rei.gui.widget.SlotWidget; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; import me.shedaniel.rei.gui.widget.Widget; import net.minecraft.block.Blocks; @@ -51,8 +51,8 @@ public class DefaultStoneCuttingCategory implements RecipeCategory Date: Thu, 9 May 2019 22:38:34 +0800 Subject: VillagerRecipeViewingScreen done --- src/main/java/me/shedaniel/rei/plugin/DefaultBlastingCategory.java | 7 +++++++ src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java | 2 +- src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingCategory.java | 7 +++++++ src/main/java/me/shedaniel/rei/plugin/DefaultSmokingCategory.java | 7 +++++++ 4 files changed, 22 insertions(+), 1 deletion(-) (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 f090dc4a6..99e46de07 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultBlastingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultBlastingCategory.java @@ -2,6 +2,8 @@ package me.shedaniel.rei.plugin; import com.mojang.blaze3d.platform.GlStateManager; import me.shedaniel.rei.api.RecipeCategory; +import me.shedaniel.rei.api.Renderable; +import me.shedaniel.rei.gui.renderables.RecipeRenderer; import me.shedaniel.rei.gui.widget.SlotWidget; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; import me.shedaniel.rei.gui.widget.Widget; @@ -38,6 +40,11 @@ public class DefaultBlastingCategory implements RecipeCategory Arrays.asList(recipe.getInput().get(0)), recipe::getOutput); + } + @Override public List setupDisplay(Supplier recipeDisplaySupplier, Rectangle bounds) { final DefaultBlastingDisplay recipeDisplay = recipeDisplaySupplier.get(); diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java index 0adabf43f..bc9857e86 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java @@ -82,7 +82,7 @@ public class DefaultPlugin implements REIPluginEntry { } }); Registry.ENCHANTMENT.forEach(enchantment -> { - for(int i = enchantment.getMinimumLevel(); i < enchantment.getMaximumLevel(); i++) { + for(int i = enchantment.getMinimumLevel(); i <= enchantment.getMaximumLevel(); i++) { Map map = new HashMap<>(); map.put(enchantment, i); ItemStack itemStack = new ItemStack(Items.ENCHANTED_BOOK); diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingCategory.java b/src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingCategory.java index fb105a4b4..3298e407f 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultSmeltingCategory.java @@ -2,6 +2,8 @@ package me.shedaniel.rei.plugin; import com.mojang.blaze3d.platform.GlStateManager; import me.shedaniel.rei.api.RecipeCategory; +import me.shedaniel.rei.api.Renderable; +import me.shedaniel.rei.gui.renderables.RecipeRenderer; import me.shedaniel.rei.gui.widget.SlotWidget; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; import me.shedaniel.rei.gui.widget.Widget; @@ -38,6 +40,11 @@ public class DefaultSmeltingCategory implements RecipeCategory Arrays.asList(recipe.getInput().get(0)), recipe::getOutput); + } + @Override public List setupDisplay(Supplier recipeDisplaySupplier, Rectangle bounds) { Point startPoint = new Point((int) bounds.getCenterX() - 41, (int) bounds.getCenterY() - 27); diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingCategory.java b/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingCategory.java index 1df32332e..4031d99e2 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingCategory.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultSmokingCategory.java @@ -2,6 +2,8 @@ package me.shedaniel.rei.plugin; import com.mojang.blaze3d.platform.GlStateManager; import me.shedaniel.rei.api.RecipeCategory; +import me.shedaniel.rei.api.Renderable; +import me.shedaniel.rei.gui.renderables.RecipeRenderer; import me.shedaniel.rei.gui.widget.SlotWidget; import me.shedaniel.rei.gui.widget.RecipeBaseWidget; import me.shedaniel.rei.gui.widget.Widget; @@ -38,6 +40,11 @@ public class DefaultSmokingCategory implements RecipeCategory Arrays.asList(recipe.getInput().get(0)), recipe::getOutput); + } + @Override public List setupDisplay(Supplier recipeDisplaySupplier, Rectangle bounds) { Point startPoint = new Point((int) bounds.getCenterX() - 41, (int) bounds.getCenterY() - 27); -- cgit