From 09403054156d029259ee3ce0eadb4f96806036ea Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sat, 13 Feb 2021 14:12:25 +0300 Subject: [PATCH] Merge --- gradle.properties | 2 +- .../betterend/integration/rei/REIAnvilCategory.java | 4 ++-- .../java/ru/betterend/integration/rei/REIPlugin.java | 11 ++++------- src/main/java/ru/betterend/recipe/FurnaceRecipes.java | 1 + 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index d31d8a17..091f260e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ loader_version=0.10.8 # Mod Properties - mod_version = 0.9.0-pre + mod_version = 0.9.1-pre maven_group = ru.betterend archives_base_name = better-end diff --git a/src/main/java/ru/betterend/integration/rei/REIAnvilCategory.java b/src/main/java/ru/betterend/integration/rei/REIAnvilCategory.java index d502e812..7ba9e210 100644 --- a/src/main/java/ru/betterend/integration/rei/REIAnvilCategory.java +++ b/src/main/java/ru/betterend/integration/rei/REIAnvilCategory.java @@ -4,8 +4,6 @@ import java.util.Collections; import java.util.List; import java.util.stream.Collectors; -import net.minecraft.block.Block; -import net.minecraft.item.BlockItem; import org.jetbrains.annotations.NotNull; import com.google.common.collect.Lists; @@ -19,9 +17,11 @@ import me.shedaniel.rei.api.widgets.Widgets; import me.shedaniel.rei.gui.entries.RecipeEntry; import me.shedaniel.rei.gui.entries.SimpleRecipeEntry; import me.shedaniel.rei.gui.widget.Widget; +import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.client.gui.DrawableHelper; import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.item.BlockItem; import net.minecraft.text.TranslatableText; import net.minecraft.util.Identifier; import ru.betterend.blocks.basis.EndAnvilBlock; diff --git a/src/main/java/ru/betterend/integration/rei/REIPlugin.java b/src/main/java/ru/betterend/integration/rei/REIPlugin.java index 2c6f12f1..913b9db7 100644 --- a/src/main/java/ru/betterend/integration/rei/REIPlugin.java +++ b/src/main/java/ru/betterend/integration/rei/REIPlugin.java @@ -1,18 +1,18 @@ package ru.betterend.integration.rei; +import java.util.List; +import java.util.stream.Collectors; + import com.google.common.collect.Lists; + import me.shedaniel.rei.api.EntryStack; import me.shedaniel.rei.api.RecipeHelper; import me.shedaniel.rei.api.plugins.REIPluginV0; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.block.Block; import net.minecraft.block.Blocks; import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemConvertible; import net.minecraft.recipe.BlastingRecipe; -import net.minecraft.recipe.Ingredient; -import net.minecraft.tag.BlockTags; import net.minecraft.util.Identifier; import ru.betterend.BetterEnd; import ru.betterend.blocks.basis.EndAnvilBlock; @@ -22,9 +22,6 @@ import ru.betterend.recipe.builders.InfusionRecipe; import ru.betterend.registry.EndBlocks; import ru.betterend.registry.EndItems; -import java.util.List; -import java.util.stream.Collectors; - @Environment(EnvType.CLIENT) public class REIPlugin implements REIPluginV0 { diff --git a/src/main/java/ru/betterend/recipe/FurnaceRecipes.java b/src/main/java/ru/betterend/recipe/FurnaceRecipes.java index 3c664ec5..8f5546bb 100644 --- a/src/main/java/ru/betterend/recipe/FurnaceRecipes.java +++ b/src/main/java/ru/betterend/recipe/FurnaceRecipes.java @@ -13,5 +13,6 @@ public class FurnaceRecipes { FurnaceRecipe.make("end_berry", EndItems.SHADOW_BERRY_RAW, EndItems.SHADOW_BERRY_COOKED).build(); FurnaceRecipe.make("end_fish", EndItems.END_FISH_RAW, EndItems.END_FISH_COOKED).build(); FurnaceRecipe.make("slime_ball", EndBlocks.JELLYSHROOM_CAP_PURPLE, Items.SLIME_BALL).build(); + FurnaceRecipe.make("menger_sponge", EndBlocks.MENGER_SPONGE_WET, EndBlocks.MENGER_SPONGE).build(); } }