diff options
Diffstat (limited to 'src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java')
| -rw-r--r-- | src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java | 75 |
1 files changed, 42 insertions, 33 deletions
diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java index 5cd22e0bb..93e1e023d 100644 --- a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java +++ b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java @@ -31,8 +31,10 @@ import me.shedaniel.rei.plugin.smoking.DefaultSmokingCategory; import me.shedaniel.rei.plugin.smoking.DefaultSmokingDisplay; import me.shedaniel.rei.plugin.stonecutting.DefaultStoneCuttingCategory; import me.shedaniel.rei.plugin.stonecutting.DefaultStoneCuttingDisplay; +import me.shedaniel.rei.plugin.stripping.DefaultStrippingCategory; +import me.shedaniel.rei.plugin.stripping.DefaultStrippingDisplay; +import me.shedaniel.rei.plugin.stripping.DummyAxeItem; import net.fabricmc.loader.api.SemanticVersion; -import net.fabricmc.loader.util.version.SemanticVersionImpl; import net.fabricmc.loader.util.version.VersionParsingException; import net.minecraft.block.ComposterBlock; import net.minecraft.client.MinecraftClient; @@ -40,6 +42,7 @@ import net.minecraft.client.gui.screen.ingame.*; import net.minecraft.client.gui.screen.recipebook.RecipeBookProvider; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.item.EnchantedBookItem; import net.minecraft.item.ItemConvertible; import net.minecraft.item.ItemStack; import net.minecraft.item.Items; @@ -54,38 +57,39 @@ import java.util.List; import java.util.*; public class DefaultPlugin implements REIPluginV0 { - + 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 STRIPPING = new Identifier("minecraft", "plugins/stripping"); public static final Identifier BREWING = new Identifier("minecraft", "plugins/brewing"); public static final Identifier PLUGIN = new Identifier("roughlyenoughitems", "default_plugin"); public static final Identifier COMPOSTING = new Identifier("minecraft", "plugins/composting"); private static final Identifier DISPLAY_TEXTURE = new Identifier("roughlyenoughitems", "textures/gui/display.png"); private static final Identifier DISPLAY_TEXTURE_DARK = new Identifier("roughlyenoughitems", "textures/gui/display_dark.png"); private static final List<DefaultBrewingDisplay> BREWING_DISPLAYS = Lists.newArrayList(); - + public static Identifier getDisplayTexture() { return ScreenHelper.isDarkModeEnabled() ? DISPLAY_TEXTURE_DARK : DISPLAY_TEXTURE; } - + public static void registerBrewingDisplay(DefaultBrewingDisplay display) { BREWING_DISPLAYS.add(display); } - + @Override public Identifier getPluginIdentifier() { return PLUGIN; } - + @Override public SemanticVersion getMinimumVersion() throws VersionParsingException { return SemanticVersion.parse("2.10"); } - + @Override public void onFirstLoad(PluginDisabler pluginDisabler) { if (!RoughlyEnoughItemsCore.getConfigManager().getConfig().loadDefaultPlugin) { @@ -95,7 +99,7 @@ public class DefaultPlugin implements REIPluginV0 { pluginDisabler.disablePluginFunction(PLUGIN, PluginFunction.REGISTER_OTHERS); } } - + @Override public void registerItems(ItemRegistry itemRegistry) { Registry.ITEM.stream().forEach(item -> { @@ -103,11 +107,12 @@ public class DefaultPlugin implements REIPluginV0 { try { itemRegistry.registerItemStack(itemRegistry.getAllStacksFromItem(item)); } catch (Exception e) { - e.printStackTrace(); + if (!(item instanceof EnchantedBookItem)) + e.printStackTrace(); } }); Registry.ENCHANTMENT.forEach(enchantment -> { - for(int i = enchantment.getMinimumLevel(); i <= enchantment.getMaximumLevel(); i++) { + for (int i = enchantment.getMinimumLevel(); i <= enchantment.getMaximumLevel(); i++) { Map<Enchantment, Integer> map = new HashMap<>(); map.put(enchantment, i); ItemStack itemStack = new ItemStack(Items.ENCHANTED_BOOK); @@ -116,7 +121,7 @@ public class DefaultPlugin implements REIPluginV0 { } }); } - + @Override public void registerPluginCategories(RecipeHelper recipeHelper) { recipeHelper.registerCategory(new DefaultCraftingCategory()); @@ -127,8 +132,9 @@ public class DefaultPlugin implements REIPluginV0 { recipeHelper.registerCategory(new DefaultStoneCuttingCategory()); recipeHelper.registerCategory(new DefaultBrewingCategory()); recipeHelper.registerCategory(new DefaultCompostingCategory()); + recipeHelper.registerCategory(new DefaultStrippingCategory()); } - + @Override public void registerRecipeDisplays(RecipeHelper recipeHelper) { recipeHelper.registerRecipes(CRAFTING, ShapelessRecipe.class, DefaultShapelessDisplay::new); @@ -142,10 +148,10 @@ public class DefaultPlugin implements REIPluginV0 { List<ItemStack> arrowStack = Collections.singletonList(Items.ARROW.getStackForRender()); RoughlyEnoughItemsCore.getItemRegisterer().getItemList().stream().filter(stack -> stack.getItem().equals(Items.LINGERING_POTION)).forEach(stack -> { List<List<ItemStack>> input = new ArrayList<>(); - for(int i = 0; i < 4; i++) + for (int i = 0; i < 4; i++) input.add(arrowStack); input.add(Collections.singletonList(stack)); - for(int i = 0; i < 4; i++) + for (int i = 0; i < 4; i++) input.add(arrowStack); ItemStack outputStack = new ItemStack(Items.TIPPED_ARROW, 8); PotionUtil.setPotion(outputStack, PotionUtil.getPotion(stack)); @@ -165,15 +171,18 @@ public class DefaultPlugin implements REIPluginV0 { stacks.sort((first, second) -> { return (int) ((map.get(first) - map.get(second)) * 100); }); - for(int i = 0; i < stacks.size(); i += MathHelper.clamp(48, 1, stacks.size() - i)) { + for (int i = 0; i < stacks.size(); i += MathHelper.clamp(48, 1, stacks.size() - i)) { List<ItemConvertible> thisStacks = Lists.newArrayList(); - for(int j = i; j < i + 48; j++) + for (int j = i; j < i + 48; j++) if (j < stacks.size()) thisStacks.add(stacks.get(j)); recipeHelper.registerDisplay(COMPOSTING, new DefaultCompostingDisplay(MathHelper.floor(i / 48f), thisStacks, map, Lists.newArrayList(map.keySet()), new ItemStack[]{new ItemStack(Items.BONE_MEAL)})); } + DummyAxeItem.getStrippedBlocksMap().entrySet().stream().sorted(Comparator.comparing(b -> Registry.BLOCK.getId(b.getKey()))).forEach(set -> { + recipeHelper.registerDisplay(STRIPPING, new DefaultStrippingDisplay(new ItemStack(set.getKey()), new ItemStack(set.getValue()))); + }); } - + @Override public void registerBounds(DisplayHelper displayHelper) { displayHelper.getBaseBoundsHandler().registerExclusionZones(AbstractInventoryScreen.class, new DefaultPotionEffectExclusionZones()); @@ -183,18 +192,18 @@ public class DefaultPlugin implements REIPluginV0 { public Class<?> getBaseSupportedClass() { return AbstractContainerScreen.class; } - + @Override public Rectangle getLeftBounds(AbstractContainerScreen<?> screen) { return new Rectangle(2, 0, ScreenHelper.getLastContainerScreenHooks().rei_getContainerLeft() - 4, MinecraftClient.getInstance().window.getScaledHeight()); } - + @Override public Rectangle getRightBounds(AbstractContainerScreen<?> screen) { int startX = ScreenHelper.getLastContainerScreenHooks().rei_getContainerLeft() + ScreenHelper.getLastContainerScreenHooks().rei_getContainerWidth() + 2; return new Rectangle(startX, 0, MinecraftClient.getInstance().window.getScaledWidth() - startX - 2, MinecraftClient.getInstance().window.getScaledHeight()); } - + @Override public float getPriority() { return -1.0f; @@ -205,18 +214,18 @@ public class DefaultPlugin implements REIPluginV0 { public Class<?> getBaseSupportedClass() { return RecipeViewingScreen.class; } - + @Override public Rectangle getLeftBounds(RecipeViewingScreen screen) { return new Rectangle(2, 0, ((RecipeViewingScreen) screen).getBounds().x - 4, MinecraftClient.getInstance().window.getScaledHeight()); } - + @Override public Rectangle getRightBounds(RecipeViewingScreen screen) { int startX = ((RecipeViewingScreen) screen).getBounds().x + ((RecipeViewingScreen) screen).getBounds().width + 2; return new Rectangle(startX, 0, MinecraftClient.getInstance().window.getScaledWidth() - startX - 2, MinecraftClient.getInstance().window.getScaledHeight()); } - + @Override public float getPriority() { return -1.0f; @@ -227,18 +236,18 @@ public class DefaultPlugin implements REIPluginV0 { 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; @@ -249,30 +258,30 @@ public class DefaultPlugin implements REIPluginV0 { public Class<?> getBaseSupportedClass() { return CreativeInventoryScreen.class; } - + @Override public Rectangle getLeftBounds(CreativeInventoryScreen screen) { return new Rectangle(2, 0, ScreenHelper.getLastContainerScreenHooks().rei_getContainerLeft() - 2, MinecraftClient.getInstance().window.getScaledHeight()); } - + @Override public Rectangle getRightBounds(CreativeInventoryScreen screen) { int startX = ScreenHelper.getLastContainerScreenHooks().rei_getContainerLeft() + ScreenHelper.getLastContainerScreenHooks().rei_getContainerWidth(); return new Rectangle(startX, 0, MinecraftClient.getInstance().window.getScaledWidth() - startX - 2, MinecraftClient.getInstance().window.getScaledHeight()); } - + @Override public Rectangle getItemListArea(Rectangle rectangle) { return new Rectangle(rectangle.x + 1, rectangle.y + 24, rectangle.width - 2, rectangle.height - (RoughlyEnoughItemsCore.getConfigManager().getConfig().sideSearchField ? 27 + 22 : 27)); } - + @Override public float getPriority() { return -0.9f; } }); } - + @Override public void registerOthers(RecipeHelper recipeHelper) { recipeHelper.registerWorkingStations(CRAFTING, new ItemStack(Items.CRAFTING_TABLE)); @@ -292,10 +301,10 @@ public class DefaultPlugin implements REIPluginV0 { recipeHelper.registerScreenClickArea(new Rectangle(78, 32, 28, 23), SmokerScreen.class, SMOKING); recipeHelper.registerScreenClickArea(new Rectangle(78, 32, 28, 23), BlastFurnaceScreen.class, BLASTING); } - + @Override public int getPriority() { return -1; } - + } |