From 6d6a1175b5c21d9fdcde6b70087b77ec9a41c4a5 Mon Sep 17 00:00:00 2001 From: Frank Date: Tue, 17 May 2022 16:54:09 +0200 Subject: [PATCH] Disabled REI (not available in 1.19) --- .../integration/rei/REIAlloyingCategory.java | 4 +++- .../integration/rei/REIAlloyingDisplay.java | 4 +++- .../integration/rei/REIAlloyingFuelCategory.java | 5 +++-- .../integration/rei/REIAlloyingFuelDisplay.java | 12 +++++++----- .../betterend/integration/rei/REIAnvilCategory.java | 5 +++-- .../betterend/integration/rei/REIAnvilDisplay.java | 4 +++- .../integration/rei/REIBlastingDisplay.java | 3 ++- .../integration/rei/REIInfusionCategory.java | 5 +++-- .../integration/rei/REIInfusionDisplay.java | 3 ++- .../java/ru/betterend/integration/rei/REIPlugin.java | 4 +++- 10 files changed, 32 insertions(+), 17 deletions(-) diff --git a/src/main/java/ru/betterend/integration/rei/REIAlloyingCategory.java b/src/main/java/ru/betterend/integration/rei/REIAlloyingCategory.java index 9b9abaec..49b83808 100644 --- a/src/main/java/ru/betterend/integration/rei/REIAlloyingCategory.java +++ b/src/main/java/ru/betterend/integration/rei/REIAlloyingCategory.java @@ -1,5 +1,6 @@ package ru.betterend.integration.rei; +/* import com.google.common.collect.Lists; import com.mojang.blaze3d.vertex.PoseStack; import it.unimi.dsi.fastutil.ints.IntList; @@ -13,7 +14,7 @@ import me.shedaniel.rei.api.common.entry.EntryIngredient; import me.shedaniel.rei.api.common.entry.EntryStack; import net.minecraft.client.gui.GuiComponent; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; + import org.jetbrains.annotations.NotNull; import ru.betterend.registry.EndBlocks; @@ -114,3 +115,4 @@ public class REIAlloyingCategory implements DisplayCategory return 49; } } +*/ \ No newline at end of file diff --git a/src/main/java/ru/betterend/integration/rei/REIAlloyingDisplay.java b/src/main/java/ru/betterend/integration/rei/REIAlloyingDisplay.java index f9deb7d8..9871f20e 100644 --- a/src/main/java/ru/betterend/integration/rei/REIAlloyingDisplay.java +++ b/src/main/java/ru/betterend/integration/rei/REIAlloyingDisplay.java @@ -1,5 +1,6 @@ package ru.betterend.integration.rei; +/* import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.display.SimpleGridMenuDisplay; import me.shedaniel.rei.api.common.display.basic.BasicDisplay; @@ -7,7 +8,7 @@ import me.shedaniel.rei.api.common.entry.EntryStack; import me.shedaniel.rei.api.common.util.EntryIngredients; import me.shedaniel.rei.api.common.util.EntryStacks; import net.minecraft.ChatFormatting; -import net.minecraft.network.chat.TranslatableComponent; + import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; import net.minecraft.world.item.crafting.Recipe; @@ -104,3 +105,4 @@ public class REIAlloyingDisplay extends BasicDisplay implements SimpleGridMenuDi .collect(Collectors.toList()); } } +*/ \ No newline at end of file diff --git a/src/main/java/ru/betterend/integration/rei/REIAlloyingFuelCategory.java b/src/main/java/ru/betterend/integration/rei/REIAlloyingFuelCategory.java index 673ab572..43a0d63b 100644 --- a/src/main/java/ru/betterend/integration/rei/REIAlloyingFuelCategory.java +++ b/src/main/java/ru/betterend/integration/rei/REIAlloyingFuelCategory.java @@ -1,5 +1,5 @@ package ru.betterend.integration.rei; - +/* import com.google.common.collect.Lists; import com.mojang.blaze3d.vertex.PoseStack; import me.shedaniel.math.Point; @@ -15,7 +15,7 @@ import me.shedaniel.rei.api.common.entry.EntryStack; import me.shedaniel.rei.api.common.util.EntryStacks; import net.minecraft.client.Minecraft; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; + import net.minecraft.world.item.Items; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -105,3 +105,4 @@ public class REIAlloyingFuelCategory implements DisplayCategory getCategoryIdentifier() { @@ -34,3 +34,5 @@ public class REIAlloyingFuelDisplay extends BasicDisplay { } } + +*/ diff --git a/src/main/java/ru/betterend/integration/rei/REIAnvilCategory.java b/src/main/java/ru/betterend/integration/rei/REIAnvilCategory.java index ef1220e1..5bb266b1 100644 --- a/src/main/java/ru/betterend/integration/rei/REIAnvilCategory.java +++ b/src/main/java/ru/betterend/integration/rei/REIAnvilCategory.java @@ -1,5 +1,5 @@ package ru.betterend.integration.rei; - +/* import com.google.common.collect.Lists; import com.mojang.blaze3d.vertex.PoseStack; import it.unimi.dsi.fastutil.ints.IntList; @@ -13,7 +13,7 @@ import me.shedaniel.rei.api.common.entry.EntryIngredient; import me.shedaniel.rei.api.common.entry.EntryStack; import net.minecraft.client.gui.GuiComponent; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; + import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.ItemStack; import net.minecraft.world.level.block.Block; @@ -119,3 +119,4 @@ public class REIAnvilCategory implements DisplayCategory { } } +*/ \ No newline at end of file diff --git a/src/main/java/ru/betterend/integration/rei/REIAnvilDisplay.java b/src/main/java/ru/betterend/integration/rei/REIAnvilDisplay.java index d1b32775..addf055b 100644 --- a/src/main/java/ru/betterend/integration/rei/REIAnvilDisplay.java +++ b/src/main/java/ru/betterend/integration/rei/REIAnvilDisplay.java @@ -1,5 +1,5 @@ package ru.betterend.integration.rei; - +/* import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.display.SimpleGridMenuDisplay; import me.shedaniel.rei.api.common.display.basic.BasicDisplay; @@ -59,3 +59,5 @@ public class REIAnvilDisplay extends BasicDisplay implements SimpleGridMenuDispl return 1; } } +*/ + diff --git a/src/main/java/ru/betterend/integration/rei/REIBlastingDisplay.java b/src/main/java/ru/betterend/integration/rei/REIBlastingDisplay.java index 5a133156..457b973f 100644 --- a/src/main/java/ru/betterend/integration/rei/REIBlastingDisplay.java +++ b/src/main/java/ru/betterend/integration/rei/REIBlastingDisplay.java @@ -1,5 +1,5 @@ package ru.betterend.integration.rei; - +/* import net.minecraft.world.item.crafting.BlastingRecipe; public class REIBlastingDisplay extends REIAlloyingDisplay { @@ -7,3 +7,4 @@ public class REIBlastingDisplay extends REIAlloyingDisplay { super(recipe, recipe.getExperience(), recipe.getCookingTime()); } } +*/ \ No newline at end of file diff --git a/src/main/java/ru/betterend/integration/rei/REIInfusionCategory.java b/src/main/java/ru/betterend/integration/rei/REIInfusionCategory.java index 0be2955a..57e94378 100644 --- a/src/main/java/ru/betterend/integration/rei/REIInfusionCategory.java +++ b/src/main/java/ru/betterend/integration/rei/REIInfusionCategory.java @@ -1,5 +1,5 @@ package ru.betterend.integration.rei; - +/* import com.google.common.collect.Lists; import me.shedaniel.math.Point; import me.shedaniel.math.Rectangle; @@ -10,7 +10,7 @@ import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.entry.EntryIngredient; import me.shedaniel.rei.api.common.entry.EntryStack; import net.minecraft.network.chat.Component; -import net.minecraft.network.chat.TranslatableComponent; + import net.minecraft.resources.ResourceLocation; import org.jetbrains.annotations.NotNull; import ru.betterend.BetterEnd; @@ -108,3 +108,4 @@ public class REIInfusionCategory implements DisplayCategory return 104; } } + */ diff --git a/src/main/java/ru/betterend/integration/rei/REIInfusionDisplay.java b/src/main/java/ru/betterend/integration/rei/REIInfusionDisplay.java index a6fd9e9f..50b16531 100644 --- a/src/main/java/ru/betterend/integration/rei/REIInfusionDisplay.java +++ b/src/main/java/ru/betterend/integration/rei/REIInfusionDisplay.java @@ -1,5 +1,5 @@ package ru.betterend.integration.rei; - +/* import me.shedaniel.rei.api.common.category.CategoryIdentifier; import me.shedaniel.rei.api.common.display.SimpleGridMenuDisplay; import me.shedaniel.rei.api.common.display.basic.BasicDisplay; @@ -60,3 +60,4 @@ public class REIInfusionDisplay extends BasicDisplay implements SimpleGridMenuDi // return this.input; //} } +*/ \ No newline at end of file diff --git a/src/main/java/ru/betterend/integration/rei/REIPlugin.java b/src/main/java/ru/betterend/integration/rei/REIPlugin.java index 3371c605..f2685f5f 100644 --- a/src/main/java/ru/betterend/integration/rei/REIPlugin.java +++ b/src/main/java/ru/betterend/integration/rei/REIPlugin.java @@ -1,5 +1,5 @@ package ru.betterend.integration.rei; - +/* import com.google.common.collect.Lists; import me.shedaniel.rei.api.client.plugins.REIClientPlugin; import me.shedaniel.rei.api.client.registry.category.CategoryRegistry; @@ -25,6 +25,7 @@ import ru.betterend.registry.EndBlocks; import java.util.List; import java.util.stream.Collectors; + //https://github.com/shedaniel/RoughlyEnoughItems/blob/6.x-1.17/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/DefaultClientPlugin.java public class REIPlugin implements REIClientPlugin { public final static ResourceLocation PLUGIN_ID = BetterEnd.makeID("rei_plugin"); @@ -95,3 +96,4 @@ public class REIPlugin implements REIClientPlugin { registry.addWorkstations(DefaultPlugin.FUEL, ITEM_FURNACESArray); } } +*/ \ No newline at end of file