MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Disabled REI as it crashes with release 1.19

Browse source
This commit is contained in:
Frank 2022-06-08 01:26:32 +02:00
parent 170608fef5
commit bddfa09b12
13 changed files with 812 additions and 822 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build.gradle
View file

@ -47,8 +47,8 @@ dependencies {
modImplementation "com.github.quiqueck:BCLib:${project.bclib_version}" modImplementation "com.github.quiqueck:BCLib:${project.bclib_version}"
} }
useOptional "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}" // useOptional "me.shedaniel:RoughlyEnoughItems-fabric:${project.rei_version}"
useOptional "me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}" //useOptional "me.shedaniel:RoughlyEnoughItems-api-fabric:${project.rei_version}"
} }
def useOptional(String dep) { def useOptional(String dep) {

172
src/main/java/org/betterx/betterend/integration/rei/REIAlloyingCategory.java
View file

@ -1,86 +1,86 @@
package org.betterx.betterend.integration.rei; //package org.betterx.betterend.integration.rei;
//
//
import net.minecraft.network.chat.Component; //import net.minecraft.network.chat.Component;
//
import com.google.common.collect.Lists; //import com.google.common.collect.Lists;
import me.shedaniel.math.Point; //import me.shedaniel.math.Point;
import me.shedaniel.math.Rectangle; //import me.shedaniel.math.Rectangle;
import me.shedaniel.rei.api.client.gui.widgets.Widget; //import me.shedaniel.rei.api.client.gui.widgets.Widget;
import me.shedaniel.rei.api.client.gui.widgets.Widgets; //import me.shedaniel.rei.api.client.gui.widgets.Widgets;
import me.shedaniel.rei.api.client.registry.display.DisplayCategory; //import me.shedaniel.rei.api.client.registry.display.DisplayCategory;
import me.shedaniel.rei.api.common.category.CategoryIdentifier; //import me.shedaniel.rei.api.common.category.CategoryIdentifier;
import me.shedaniel.rei.api.common.entry.EntryIngredient; //import me.shedaniel.rei.api.common.entry.EntryIngredient;
import me.shedaniel.rei.api.common.entry.EntryStack; //import me.shedaniel.rei.api.common.entry.EntryStack;
import org.betterx.betterend.registry.EndBlocks; //import org.betterx.betterend.registry.EndBlocks;
//
import java.text.DecimalFormat; //import java.text.DecimalFormat;
import java.util.List; //import java.util.List;
import org.jetbrains.annotations.NotNull; //import org.jetbrains.annotations.NotNull;
//
public class REIAlloyingCategory implements DisplayCategory<REIAlloyingDisplay> { //public class REIAlloyingCategory implements DisplayCategory<REIAlloyingDisplay> {
private final EntryStack ICON; // private final EntryStack ICON;
//
REIAlloyingCategory(EntryStack icon) { // REIAlloyingCategory(EntryStack icon) {
ICON = icon; // ICON = icon;
} // }
//
@Override // @Override
public @NotNull CategoryIdentifier getCategoryIdentifier() { // public @NotNull CategoryIdentifier getCategoryIdentifier() {
return REIPlugin.ALLOYING; // return REIPlugin.ALLOYING;
} // }
//
@Override // @Override
public @NotNull Component getTitle() { // public @NotNull Component getTitle() {
return Component.translatable(EndBlocks.END_STONE_SMELTER.getDescriptionId()); // return Component.translatable(EndBlocks.END_STONE_SMELTER.getDescriptionId());
} // }
//
@Override // @Override
public @NotNull EntryStack getIcon() { // public @NotNull EntryStack getIcon() {
return ICON; // return ICON;
} // }
//
@Override // @Override
public @NotNull List<Widget> setupDisplay(REIAlloyingDisplay display, Rectangle bounds) { // public @NotNull List<Widget> setupDisplay(REIAlloyingDisplay display, Rectangle bounds) {
Point startPoint = new Point(bounds.getCenterX() - 41, bounds.y + 10); // Point startPoint = new Point(bounds.getCenterX() - 41, bounds.y + 10);
double smeltTime = display.getSmeltTime(); // double smeltTime = display.getSmeltTime();
DecimalFormat df = new DecimalFormat("###.##"); // DecimalFormat df = new DecimalFormat("###.##");
List<Widget> widgets = Lists.newArrayList(); // List<Widget> widgets = Lists.newArrayList();
widgets.add(Widgets.createRecipeBase(bounds)); // widgets.add(Widgets.createRecipeBase(bounds));
widgets.add(Widgets.createResultSlotBackground(new Point(startPoint.x + 61, startPoint.y + 9))); // widgets.add(Widgets.createResultSlotBackground(new Point(startPoint.x + 61, startPoint.y + 9)));
widgets.add(Widgets.createBurningFire(new Point(startPoint.x - 9, startPoint.y + 20)) // widgets.add(Widgets.createBurningFire(new Point(startPoint.x - 9, startPoint.y + 20))
.animationDurationMS(10000)); // .animationDurationMS(10000));
widgets.add(Widgets.createLabel( // widgets.add(Widgets.createLabel(
new Point(bounds.x + bounds.width - 5, bounds.y + 5), // new Point(bounds.x + bounds.width - 5, bounds.y + 5),
Component.translatable("category.rei.cooking.time&xp", // Component.translatable("category.rei.cooking.time&xp",
df.format(display.getXp()), // df.format(display.getXp()),
df.format(smeltTime / 20D) // df.format(smeltTime / 20D)
) // )
).noShadow().rightAligned().color(0xFF404040, 0xFFBBBBBB)); // ).noShadow().rightAligned().color(0xFF404040, 0xFFBBBBBB));
widgets.add(Widgets.createArrow(new Point(startPoint.x + 24, startPoint.y + 8)) // widgets.add(Widgets.createArrow(new Point(startPoint.x + 24, startPoint.y + 8))
.animationDurationTicks(smeltTime)); // .animationDurationTicks(smeltTime));
List<EntryIngredient> inputEntries = display.getInputEntries(); // List<EntryIngredient> inputEntries = display.getInputEntries();
widgets.add(Widgets.createSlot(new Point(startPoint.x - 20, startPoint.y + 1)) // widgets.add(Widgets.createSlot(new Point(startPoint.x - 20, startPoint.y + 1))
.entries(inputEntries.get(0)) // .entries(inputEntries.get(0))
.markInput()); // .markInput());
if (inputEntries.size() > 1) { // if (inputEntries.size() > 1) {
widgets.add(Widgets.createSlot(new Point(startPoint.x + 1, startPoint.y + 1)) // widgets.add(Widgets.createSlot(new Point(startPoint.x + 1, startPoint.y + 1))
.entries(inputEntries.get(1)) // .entries(inputEntries.get(1))
.markInput()); // .markInput());
} else { // } else {
widgets.add(Widgets.createSlot(new Point(startPoint.x + 1, startPoint.y + 1)) // widgets.add(Widgets.createSlot(new Point(startPoint.x + 1, startPoint.y + 1))
.entries(Lists.newArrayList()) // .entries(Lists.newArrayList())
.markInput()); // .markInput());
} // }
widgets.add(Widgets.createSlot(new Point(startPoint.x + 61, startPoint.y + 9)) // widgets.add(Widgets.createSlot(new Point(startPoint.x + 61, startPoint.y + 9))
.entries(display.getOutputEntries().get(0)) // .entries(display.getOutputEntries().get(0))
.disableBackground() // .disableBackground()
.markOutput()); // .markOutput());
return widgets; // return widgets;
} // }
//
@Override // @Override
public int getDisplayHeight() { // public int getDisplayHeight() {
return 49; // return 49;
} // }
} //}

214
src/main/java/org/betterx/betterend/integration/rei/REIAlloyingDisplay.java
View file

@ -1,107 +1,107 @@
package org.betterx.betterend.integration.rei; //package org.betterx.betterend.integration.rei;
//
import net.minecraft.ChatFormatting; //import net.minecraft.ChatFormatting;
import net.minecraft.network.chat.Component; //import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation; //import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.Item; //import net.minecraft.world.item.Item;
import net.minecraft.world.item.crafting.Recipe; //import net.minecraft.world.item.crafting.Recipe;
//
import me.shedaniel.rei.api.common.category.CategoryIdentifier; //import me.shedaniel.rei.api.common.category.CategoryIdentifier;
import me.shedaniel.rei.api.common.display.SimpleGridMenuDisplay; //import me.shedaniel.rei.api.common.display.SimpleGridMenuDisplay;
import me.shedaniel.rei.api.common.display.basic.BasicDisplay; //import me.shedaniel.rei.api.common.display.basic.BasicDisplay;
import me.shedaniel.rei.api.common.entry.EntryStack; //import me.shedaniel.rei.api.common.entry.EntryStack;
import me.shedaniel.rei.api.common.util.EntryIngredients; //import me.shedaniel.rei.api.common.util.EntryIngredients;
import me.shedaniel.rei.api.common.util.EntryStacks; //import me.shedaniel.rei.api.common.util.EntryStacks;
import org.betterx.betterend.blocks.entities.EndStoneSmelterBlockEntity; //import org.betterx.betterend.blocks.entities.EndStoneSmelterBlockEntity;
import org.betterx.betterend.recipe.builders.AlloyingRecipe; //import org.betterx.betterend.recipe.builders.AlloyingRecipe;
//
import java.util.Collections; //import java.util.Collections;
import java.util.List; //import java.util.List;
import java.util.Optional; //import java.util.Optional;
import java.util.stream.Collectors; //import java.util.stream.Collectors;
import org.jetbrains.annotations.NotNull; //import org.jetbrains.annotations.NotNull;
//
public class REIAlloyingDisplay extends BasicDisplay implements SimpleGridMenuDisplay { //public class REIAlloyingDisplay extends BasicDisplay implements SimpleGridMenuDisplay {
//
private static List<EntryStack> fuel; // private static List<EntryStack> fuel;
//
private Recipe<?> recipe; // private Recipe<?> recipe;
private float xp; // private float xp;
private double smeltTime; // private double smeltTime;
//
//
public REIAlloyingDisplay(AlloyingRecipe recipe) { // public REIAlloyingDisplay(AlloyingRecipe recipe) {
this(recipe, recipe.getExperience(), recipe.getSmeltTime()); // this(recipe, recipe.getExperience(), recipe.getSmeltTime());
} // }
//
protected REIAlloyingDisplay(Recipe<?> recipe, float xp, double smeltTime) { // protected REIAlloyingDisplay(Recipe<?> recipe, float xp, double smeltTime) {
super( // super(
EntryIngredients.ofIngredients(recipe.getIngredients()), // EntryIngredients.ofIngredients(recipe.getIngredients()),
Collections.singletonList(EntryIngredients.of(recipe.getResultItem())) // Collections.singletonList(EntryIngredients.of(recipe.getResultItem()))
); // );
this.recipe = recipe; // this.recipe = recipe;
this.xp = xp; // this.xp = xp;
this.smeltTime = smeltTime; // this.smeltTime = smeltTime;
} // }
//
//
public static List<EntryStack> getFuel() { // public static List<EntryStack> getFuel() {
return fuel; // return fuel;
} // }
//
@Override // @Override
public @NotNull Optional<ResourceLocation> getDisplayLocation() { // public @NotNull Optional<ResourceLocation> getDisplayLocation() {
return Optional.ofNullable(recipe).map(Recipe::getId); // return Optional.ofNullable(recipe).map(Recipe::getId);
} // }
//
@Override // @Override
public CategoryIdentifier<?> getCategoryIdentifier() { // public CategoryIdentifier<?> getCategoryIdentifier() {
return REIPlugin.ALLOYING; // return REIPlugin.ALLOYING;
} // }
//
// @Override // // @Override
// public @NotNull List<List<EntryStack>> getRequiredEntries() { // // public @NotNull List<List<EntryStack>> getRequiredEntries() {
// return this.input; // // return this.input;
// } // // }
//
public float getXp() { // public float getXp() {
return this.xp; // return this.xp;
} // }
//
public double getSmeltTime() { // public double getSmeltTime() {
return this.smeltTime; // return this.smeltTime;
} // }
//
public Optional<Recipe<?>> getOptionalRecipe() { // public Optional<Recipe<?>> getOptionalRecipe() {
return Optional.ofNullable(recipe); // return Optional.ofNullable(recipe);
} // }
//
@Override // @Override
public int getWidth() { // public int getWidth() {
return 2; // return 2;
} // }
//
@Override // @Override
public int getHeight() { // public int getHeight() {
return 1; // return 1;
} // }
//
// @Override // // @Override
// public List<List<EntryStack>> getOrganisedInputEntries(ContainerInfo<AbstractContainerMenu> containerInfo, AbstractContainerMenu container) { // // public List<List<EntryStack>> getOrganisedInputEntries(ContainerInfo<AbstractContainerMenu> containerInfo, AbstractContainerMenu container) {
// return this.input; // // return this.input;
// } // // }
//
static { // static {
fuel = EndStoneSmelterBlockEntity.availableFuels() // fuel = EndStoneSmelterBlockEntity.availableFuels()
.keySet() // .keySet()
.stream() // .stream()
.map(Item::getDefaultInstance) // .map(Item::getDefaultInstance)
.map(EntryStacks::of) // .map(EntryStacks::of)
.map(e -> e.setting( // .map(e -> e.setting(
EntryStack.Settings.TOOLTIP_APPEND_EXTRA, // EntryStack.Settings.TOOLTIP_APPEND_EXTRA,
stack -> Collections.singletonList(Component.translatable( // stack -> Collections.singletonList(Component.translatable(
"category.rei.smelting.fuel").withStyle(ChatFormatting.YELLOW)) // "category.rei.smelting.fuel").withStyle(ChatFormatting.YELLOW))
)) // ))
.collect(Collectors.toList()); // .collect(Collectors.toList());
} // }
} //}

214
src/main/java/org/betterx/betterend/integration/rei/REIAlloyingFuelCategory.java
View file

@ -1,107 +1,107 @@
package org.betterx.betterend.integration.rei; //package org.betterx.betterend.integration.rei;
//
import net.minecraft.client.Minecraft; //import net.minecraft.client.Minecraft;
import net.minecraft.network.chat.Component; //import net.minecraft.network.chat.Component;
import net.minecraft.world.item.Items; //import net.minecraft.world.item.Items;
//
import com.google.common.collect.Lists; //import com.google.common.collect.Lists;
import com.mojang.blaze3d.vertex.PoseStack; //import com.mojang.blaze3d.vertex.PoseStack;
import me.shedaniel.math.Point; //import me.shedaniel.math.Point;
import me.shedaniel.math.Rectangle; //import me.shedaniel.math.Rectangle;
import me.shedaniel.rei.api.client.gui.DisplayRenderer; //import me.shedaniel.rei.api.client.gui.DisplayRenderer;
import me.shedaniel.rei.api.client.gui.widgets.Slot; //import me.shedaniel.rei.api.client.gui.widgets.Slot;
import me.shedaniel.rei.api.client.gui.widgets.Tooltip; //import me.shedaniel.rei.api.client.gui.widgets.Tooltip;
import me.shedaniel.rei.api.client.gui.widgets.Widget; //import me.shedaniel.rei.api.client.gui.widgets.Widget;
import me.shedaniel.rei.api.client.gui.widgets.Widgets; //import me.shedaniel.rei.api.client.gui.widgets.Widgets;
import me.shedaniel.rei.api.client.registry.display.DisplayCategory; //import me.shedaniel.rei.api.client.registry.display.DisplayCategory;
import me.shedaniel.rei.api.common.category.CategoryIdentifier; //import me.shedaniel.rei.api.common.category.CategoryIdentifier;
import me.shedaniel.rei.api.common.entry.EntryStack; //import me.shedaniel.rei.api.common.entry.EntryStack;
import me.shedaniel.rei.api.common.util.EntryStacks; //import me.shedaniel.rei.api.common.util.EntryStacks;
//
import java.text.DecimalFormat; //import java.text.DecimalFormat;
import java.util.List; //import java.util.List;
import org.jetbrains.annotations.NotNull; //import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; //import org.jetbrains.annotations.Nullable;
//
public class REIAlloyingFuelCategory implements DisplayCategory<REIAlloyingFuelDisplay> { //public class REIAlloyingFuelCategory implements DisplayCategory<REIAlloyingFuelDisplay> {
private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#.##"); // private static final DecimalFormat DECIMAL_FORMAT = new DecimalFormat("#.##");
//
@Override // @Override
public @NotNull CategoryIdentifier getCategoryIdentifier() { // public @NotNull CategoryIdentifier getCategoryIdentifier() {
return REIPlugin.ALLOYING_FUEL; // return REIPlugin.ALLOYING_FUEL;
} // }
//
@Override // @Override
public @NotNull Component getTitle() { // public @NotNull Component getTitle() {
return Component.translatable("category.rei.fuel"); // return Component.translatable("category.rei.fuel");
} // }
//
@Override // @Override
public int getDisplayHeight() { // public int getDisplayHeight() {
return 49; // return 49;
} // }
//
@Override // @Override
public @NotNull EntryStack getIcon() { // public @NotNull EntryStack getIcon() {
return EntryStacks.of(Items.LAVA_BUCKET); // return EntryStacks.of(Items.LAVA_BUCKET);
} // }
//
@Override // @Override
public List<Widget> setupDisplay(REIAlloyingFuelDisplay recipeDisplay, Rectangle bounds) { // public List<Widget> setupDisplay(REIAlloyingFuelDisplay recipeDisplay, Rectangle bounds) {
Point startPoint = new Point(bounds.getCenterX() - 41, bounds.getCenterY() - 17); // Point startPoint = new Point(bounds.getCenterX() - 41, bounds.getCenterY() - 17);
String burnTime = DECIMAL_FORMAT.format(recipeDisplay.getFuelTime()); // String burnTime = DECIMAL_FORMAT.format(recipeDisplay.getFuelTime());
List<Widget> widgets = Lists.newArrayList(); // List<Widget> widgets = Lists.newArrayList();
widgets.add(Widgets.createRecipeBase(bounds)); // widgets.add(Widgets.createRecipeBase(bounds));
widgets.add(Widgets.createLabel( // widgets.add(Widgets.createLabel(
new Point(bounds.x + 26, bounds.getMaxY() - 15), // new Point(bounds.x + 26, bounds.getMaxY() - 15),
Component.translatable("category.rei.fuel.time", burnTime) // Component.translatable("category.rei.fuel.time", burnTime)
).color(0xFF404040, 0xFFBBBBBB).noShadow().leftAligned()); // ).color(0xFF404040, 0xFFBBBBBB).noShadow().leftAligned());
widgets.add(Widgets.createBurningFire(new Point(bounds.x + 6, startPoint.y + 1)) // widgets.add(Widgets.createBurningFire(new Point(bounds.x + 6, startPoint.y + 1))
.animationDurationTicks(recipeDisplay.getFuelTime())); // .animationDurationTicks(recipeDisplay.getFuelTime()));
widgets.add(Widgets.createSlot(new Point(bounds.x + 6, startPoint.y + 18)) // widgets.add(Widgets.createSlot(new Point(bounds.x + 6, startPoint.y + 18))
.entries(recipeDisplay.getInputEntries().get(0)) // .entries(recipeDisplay.getInputEntries().get(0))
.markInput()); // .markInput());
return widgets; // return widgets;
} // }
//
@Override // @Override
public DisplayRenderer getDisplayRenderer(REIAlloyingFuelDisplay recipe) { // public DisplayRenderer getDisplayRenderer(REIAlloyingFuelDisplay recipe) {
Slot slot = Widgets.createSlot(new Point(0, 0)) // Slot slot = Widgets.createSlot(new Point(0, 0))
.entries(recipe.getInputEntries().get(0)) // .entries(recipe.getInputEntries().get(0))
.disableBackground() // .disableBackground()
.disableHighlight(); // .disableHighlight();
String burnItems = DECIMAL_FORMAT.format(recipe.getFuelTime() / 200d); // String burnItems = DECIMAL_FORMAT.format(recipe.getFuelTime() / 200d);
return new DisplayRenderer() { // return new DisplayRenderer() {
private Component text = Component.translatable( // private Component text = Component.translatable(
"category.rei.fuel.time_short.items", // "category.rei.fuel.time_short.items",
burnItems // burnItems
); // );
//
@Override // @Override
public int getHeight() { // public int getHeight() {
return 22; // return 22;
} // }
//
@Nullable // @Nullable
@Override // @Override
public Tooltip getTooltip(Point point) { // public Tooltip getTooltip(Point point) {
if (slot.containsMouse(point)) return slot.getCurrentTooltip(point); // if (slot.containsMouse(point)) return slot.getCurrentTooltip(point);
return null; // return null;
} // }
//
@Override // @Override
public void render(PoseStack matrices, Rectangle bounds, int mouseX, int mouseY, float delta) { // public void render(PoseStack matrices, Rectangle bounds, int mouseX, int mouseY, float delta) {
slot.setZ(getZ() + 50); // slot.setZ(getZ() + 50);
slot.getBounds().setLocation(bounds.x + 4, bounds.y + 2); // slot.getBounds().setLocation(bounds.x + 4, bounds.y + 2);
slot.render(matrices, mouseX, mouseY, delta); // slot.render(matrices, mouseX, mouseY, delta);
Minecraft.getInstance().font.drawShadow( // Minecraft.getInstance().font.drawShadow(
matrices, // matrices,
text.getVisualOrderText(), // text.getVisualOrderText(),
bounds.x + 25, // bounds.x + 25,
bounds.y + 8, // bounds.y + 8,
-1 // -1
); // );
} // }
}; // };
} // }
} //}

54
src/main/java/org/betterx/betterend/integration/rei/REIAlloyingFuelDisplay.java
View file

@ -1,27 +1,27 @@
package org.betterx.betterend.integration.rei; //package org.betterx.betterend.integration.rei;
//
import me.shedaniel.rei.api.common.category.CategoryIdentifier; //import me.shedaniel.rei.api.common.category.CategoryIdentifier;
import me.shedaniel.rei.api.common.display.basic.BasicDisplay; //import me.shedaniel.rei.api.common.display.basic.BasicDisplay;
import me.shedaniel.rei.api.common.entry.EntryIngredient; //import me.shedaniel.rei.api.common.entry.EntryIngredient;
//
import java.util.Collections; //import java.util.Collections;
import java.util.List; //import java.util.List;
//
public class REIAlloyingFuelDisplay extends BasicDisplay { //public class REIAlloyingFuelDisplay extends BasicDisplay {
private final int fuelTime; // private final int fuelTime;
//
public REIAlloyingFuelDisplay(List<EntryIngredient> fuel, int fuelTime) { // public REIAlloyingFuelDisplay(List<EntryIngredient> fuel, int fuelTime) {
super(fuel, Collections.emptyList()); // super(fuel, Collections.emptyList());
this.fuelTime = fuelTime; // this.fuelTime = fuelTime;
} // }
//
@Override // @Override
public CategoryIdentifier<?> getCategoryIdentifier() { // public CategoryIdentifier<?> getCategoryIdentifier() {
return REIPlugin.ALLOYING_FUEL; // return REIPlugin.ALLOYING_FUEL;
} // }
//
public int getFuelTime() { // public int getFuelTime() {
return fuelTime; // return fuelTime;
} // }
//
} //}

180
src/main/java/org/betterx/betterend/integration/rei/REIAnvilCategory.java
View file

@ -1,90 +1,90 @@
package org.betterx.betterend.integration.rei; //package org.betterx.betterend.integration.rei;
//
import net.minecraft.network.chat.Component; //import net.minecraft.network.chat.Component;
import net.minecraft.world.item.BlockItem; //import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.ItemStack; //import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.Block; //import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks; //import net.minecraft.world.level.block.Blocks;
//
import com.google.common.collect.Lists; //import com.google.common.collect.Lists;
import me.shedaniel.math.Point; //import me.shedaniel.math.Point;
import me.shedaniel.math.Rectangle; //import me.shedaniel.math.Rectangle;
import me.shedaniel.rei.api.client.gui.widgets.Widget; //import me.shedaniel.rei.api.client.gui.widgets.Widget;
import me.shedaniel.rei.api.client.gui.widgets.Widgets; //import me.shedaniel.rei.api.client.gui.widgets.Widgets;
import me.shedaniel.rei.api.client.registry.display.DisplayCategory; //import me.shedaniel.rei.api.client.registry.display.DisplayCategory;
import me.shedaniel.rei.api.common.category.CategoryIdentifier; //import me.shedaniel.rei.api.common.category.CategoryIdentifier;
import me.shedaniel.rei.api.common.entry.EntryIngredient; //import me.shedaniel.rei.api.common.entry.EntryIngredient;
import me.shedaniel.rei.api.common.entry.EntryStack; //import me.shedaniel.rei.api.common.entry.EntryStack;
import org.betterx.betterend.blocks.basis.EndAnvilBlock; //import org.betterx.betterend.blocks.basis.EndAnvilBlock;
//
import java.util.Arrays; //import java.util.Arrays;
import java.util.List; //import java.util.List;
import java.util.stream.Collectors; //import java.util.stream.Collectors;
import org.jetbrains.annotations.NotNull; //import org.jetbrains.annotations.NotNull;
//
public class REIAnvilCategory implements DisplayCategory<REIAnvilDisplay> { //public class REIAnvilCategory implements DisplayCategory<REIAnvilDisplay> {
private final EntryStack<?>[] ANVILS; // private final EntryStack<?>[] ANVILS;
//
REIAnvilCategory(EntryStack<?>[] anvils) { // REIAnvilCategory(EntryStack<?>[] anvils) {
ANVILS = anvils; // ANVILS = anvils;
} // }
//
@Override // @Override
public CategoryIdentifier<REIAnvilDisplay> getCategoryIdentifier() { // public CategoryIdentifier<REIAnvilDisplay> getCategoryIdentifier() {
return REIPlugin.SMITHING; // return REIPlugin.SMITHING;
} // }
//
@Override // @Override
public @NotNull Component getTitle() { // public @NotNull Component getTitle() {
return Component.translatable(Blocks.ANVIL.getDescriptionId()); // return Component.translatable(Blocks.ANVIL.getDescriptionId());
} // }
//
@Override // @Override
public @NotNull EntryStack<?> getIcon() { // public @NotNull EntryStack<?> getIcon() {
return ANVILS[0]; // return ANVILS[0];
} // }
//
//
@Override // @Override
public @NotNull List<Widget> setupDisplay(REIAnvilDisplay display, Rectangle bounds) { // public @NotNull List<Widget> setupDisplay(REIAnvilDisplay display, Rectangle bounds) {
Point startPoint = new Point(bounds.getCenterX() - 41, bounds.y + 10); // Point startPoint = new Point(bounds.getCenterX() - 41, bounds.y + 10);
List<Widget> widgets = Lists.newArrayList(); // List<Widget> widgets = Lists.newArrayList();
widgets.add(Widgets.createRecipeBase(bounds)); // widgets.add(Widgets.createRecipeBase(bounds));
int x = startPoint.x + 10; // int x = startPoint.x + 10;
int y = startPoint.y; // int y = startPoint.y;
widgets.add(Widgets.createResultSlotBackground(new Point(x + 61, y + 5))); // widgets.add(Widgets.createResultSlotBackground(new Point(x + 61, y + 5)));
List<EntryIngredient> inputEntries = display.getInputEntries(); // List<EntryIngredient> inputEntries = display.getInputEntries();
EntryIngredient materials = inputEntries.get(1); // EntryIngredient materials = inputEntries.get(1);
int anvilLevel = display.getAnvilLevel(); // int anvilLevel = display.getAnvilLevel();
List<EntryStack<?>> anvils = Arrays.stream(ANVILS).filter(anvil -> { // List<EntryStack<?>> anvils = Arrays.stream(ANVILS).filter(anvil -> {
Object value = anvil.getValue(); // Object value = anvil.getValue();
if (value instanceof ItemStack) { // if (value instanceof ItemStack) {
value = ((ItemStack) value).getItem(); // value = ((ItemStack) value).getItem();
} // }
Block block = ((BlockItem) value).getBlock(); // Block block = ((BlockItem) value).getBlock();
if (block instanceof EndAnvilBlock) { // if (block instanceof EndAnvilBlock) {
return ((EndAnvilBlock) block).getCraftingLevel() >= anvilLevel; // return ((EndAnvilBlock) block).getCraftingLevel() >= anvilLevel;
} // }
return anvilLevel == 1; // return anvilLevel == 1;
}).collect(Collectors.toList()); // }).collect(Collectors.toList());
widgets.add(Widgets.createArrow(new Point(x + 24, y + 4))); // widgets.add(Widgets.createArrow(new Point(x + 24, y + 4)));
widgets.add(Widgets.createLabel( // widgets.add(Widgets.createLabel(
new Point(bounds.x + bounds.width - 7, bounds.y + bounds.height - 15), // new Point(bounds.x + bounds.width - 7, bounds.y + bounds.height - 15),
Component.translatable("category.rei.damage.amount&dmg", display.getDamage()) // Component.translatable("category.rei.damage.amount&dmg", display.getDamage())
).noShadow().rightAligned().color(0xFF404040, 0xFFBBBBBB)); // ).noShadow().rightAligned().color(0xFF404040, 0xFFBBBBBB));
widgets.add(Widgets.createSlot(new Point(x - 20, y + 4)).entries(materials).markInput()); // widgets.add(Widgets.createSlot(new Point(x - 20, y + 4)).entries(materials).markInput());
widgets.add(Widgets.createSlot(new Point(x + 1, y + 4)).entries(inputEntries.get(0)).markInput()); // widgets.add(Widgets.createSlot(new Point(x + 1, y + 4)).entries(inputEntries.get(0)).markInput());
widgets.add(Widgets.createSlot(new Point(x + 61, y + 5)) // widgets.add(Widgets.createSlot(new Point(x + 61, y + 5))
.entries(display.getOutputEntries().get(0)) // .entries(display.getOutputEntries().get(0))
.disableBackground() // .disableBackground()
.markOutput()); // .markOutput());
widgets.add(Widgets.createSlot(new Point(x - 9, y + 25)).entries(anvils)); // widgets.add(Widgets.createSlot(new Point(x - 9, y + 25)).entries(anvils));
//
return widgets; // return widgets;
} // }
//
@Override // @Override
public int getDisplayHeight() { // public int getDisplayHeight() {
return 60; // return 60;
} // }
} //}

126
src/main/java/org/betterx/betterend/integration/rei/REIAnvilDisplay.java
View file

@ -1,63 +1,63 @@
package org.betterx.betterend.integration.rei; //package org.betterx.betterend.integration.rei;
//
import net.minecraft.resources.ResourceLocation; //import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemStack; //import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.Recipe; //import net.minecraft.world.item.crafting.Recipe;
//
import me.shedaniel.rei.api.common.category.CategoryIdentifier; //import me.shedaniel.rei.api.common.category.CategoryIdentifier;
import me.shedaniel.rei.api.common.display.SimpleGridMenuDisplay; //import me.shedaniel.rei.api.common.display.SimpleGridMenuDisplay;
import me.shedaniel.rei.api.common.display.basic.BasicDisplay; //import me.shedaniel.rei.api.common.display.basic.BasicDisplay;
import me.shedaniel.rei.api.common.util.EntryIngredients; //import me.shedaniel.rei.api.common.util.EntryIngredients;
import org.betterx.bclib.recipes.AnvilRecipe; //import org.betterx.bclib.recipes.AnvilRecipe;
//
import java.util.Collections; //import java.util.Collections;
import java.util.Optional; //import java.util.Optional;
import org.jetbrains.annotations.NotNull; //import org.jetbrains.annotations.NotNull;
//
public class REIAnvilDisplay extends BasicDisplay implements SimpleGridMenuDisplay { //public class REIAnvilDisplay extends BasicDisplay implements SimpleGridMenuDisplay {
//
private final AnvilRecipe recipe; // private final AnvilRecipe recipe;
//
public REIAnvilDisplay(AnvilRecipe recipe) { // public REIAnvilDisplay(AnvilRecipe recipe) {
super( // super(
EntryIngredients.ofIngredients(recipe.getIngredients()), // EntryIngredients.ofIngredients(recipe.getIngredients()),
Collections.singletonList(EntryIngredients.of(recipe.getResultItem())) // Collections.singletonList(EntryIngredients.of(recipe.getResultItem()))
); // );
this.recipe = recipe; // this.recipe = recipe;
//
inputs.get(1).forEach(entryStack -> { // inputs.get(1).forEach(entryStack -> {
if (entryStack.getValue() instanceof ItemStack itemStack) { // if (entryStack.getValue() instanceof ItemStack itemStack) {
itemStack.setCount(recipe.getInputCount()); // itemStack.setCount(recipe.getInputCount());
} // }
}); // });
} // }
//
public int getDamage() { // public int getDamage() {
return recipe.getDamage(); // return recipe.getDamage();
} // }
//
public int getAnvilLevel() { // public int getAnvilLevel() {
return recipe.getAnvilLevel(); // return recipe.getAnvilLevel();
} // }
//
@Override // @Override
public @NotNull Optional<ResourceLocation> getDisplayLocation() { // public @NotNull Optional<ResourceLocation> getDisplayLocation() {
return Optional.ofNullable(recipe).map(Recipe::getId); // return Optional.ofNullable(recipe).map(Recipe::getId);
} // }
//
@Override // @Override
public CategoryIdentifier<?> getCategoryIdentifier() { // public CategoryIdentifier<?> getCategoryIdentifier() {
return REIPlugin.SMITHING; // return REIPlugin.SMITHING;
} // }
//
@Override // @Override
public int getWidth() { // public int getWidth() {
return 2; // return 2;
} // }
//
@Override // @Override
public int getHeight() { // public int getHeight() {
return 1; // return 1;
} // }
} //}
//

18
src/main/java/org/betterx/betterend/integration/rei/REIBlastingDisplay.java
View file

@ -1,9 +1,9 @@
package org.betterx.betterend.integration.rei; //package org.betterx.betterend.integration.rei;
//
import net.minecraft.world.item.crafting.BlastingRecipe; //import net.minecraft.world.item.crafting.BlastingRecipe;
//
public class REIBlastingDisplay extends REIAlloyingDisplay { //public class REIBlastingDisplay extends REIAlloyingDisplay {
public REIBlastingDisplay(BlastingRecipe recipe) { // public REIBlastingDisplay(BlastingRecipe recipe) {
super(recipe, recipe.getExperience(), recipe.getCookingTime()); // super(recipe, recipe.getExperience(), recipe.getCookingTime());
} // }
} //}

222
src/main/java/org/betterx/betterend/integration/rei/REIInfusionCategory.java
View file

@ -1,111 +1,111 @@
package org.betterx.betterend.integration.rei; //package org.betterx.betterend.integration.rei;
//
import net.minecraft.network.chat.Component; //import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation; //import net.minecraft.resources.ResourceLocation;
//
import com.google.common.collect.Lists; //import com.google.common.collect.Lists;
import me.shedaniel.math.Point; //import me.shedaniel.math.Point;
import me.shedaniel.math.Rectangle; //import me.shedaniel.math.Rectangle;
import me.shedaniel.rei.api.client.gui.widgets.Widget; //import me.shedaniel.rei.api.client.gui.widgets.Widget;
import me.shedaniel.rei.api.client.gui.widgets.Widgets; //import me.shedaniel.rei.api.client.gui.widgets.Widgets;
import me.shedaniel.rei.api.client.registry.display.DisplayCategory; //import me.shedaniel.rei.api.client.registry.display.DisplayCategory;
import me.shedaniel.rei.api.common.category.CategoryIdentifier; //import me.shedaniel.rei.api.common.category.CategoryIdentifier;
import me.shedaniel.rei.api.common.entry.EntryIngredient; //import me.shedaniel.rei.api.common.entry.EntryIngredient;
import me.shedaniel.rei.api.common.entry.EntryStack; //import me.shedaniel.rei.api.common.entry.EntryStack;
import org.betterx.betterend.BetterEnd; //import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.registry.EndBlocks; //import org.betterx.betterend.registry.EndBlocks;
//
import java.util.ArrayList; //import java.util.ArrayList;
import java.util.List; //import java.util.List;
import org.jetbrains.annotations.NotNull; //import org.jetbrains.annotations.NotNull;
//
public class REIInfusionCategory implements DisplayCategory<REIInfusionDisplay> { //public class REIInfusionCategory implements DisplayCategory<REIInfusionDisplay> {
//
private final static ResourceLocation BACKGROUND = BetterEnd.makeID("textures/gui/rei_infusion.png"); // private final static ResourceLocation BACKGROUND = BetterEnd.makeID("textures/gui/rei_infusion.png");
private final EntryStack ICON; // private final EntryStack ICON;
//
REIInfusionCategory(EntryStack icon) { // REIInfusionCategory(EntryStack icon) {
ICON = icon; // ICON = icon;
} // }
//
@Override // @Override
public @NotNull CategoryIdentifier getCategoryIdentifier() { // public @NotNull CategoryIdentifier getCategoryIdentifier() {
return REIPlugin.INFUSION; // return REIPlugin.INFUSION;
} // }
//
@Override // @Override
public @NotNull Component getTitle() { // public @NotNull Component getTitle() {
return Component.translatable(EndBlocks.INFUSION_PEDESTAL.getDescriptionId()); // return Component.translatable(EndBlocks.INFUSION_PEDESTAL.getDescriptionId());
} // }
//
@Override // @Override
public @NotNull EntryStack getIcon() { // public @NotNull EntryStack getIcon() {
return ICON; // return ICON;
} // }
//
@Override // @Override
public @NotNull List<Widget> setupDisplay(REIInfusionDisplay display, Rectangle bounds) { // public @NotNull List<Widget> setupDisplay(REIInfusionDisplay display, Rectangle bounds) {
Point centerPoint = new Point(bounds.getCenterX() - 34, bounds.getCenterY() - 2); // Point centerPoint = new Point(bounds.getCenterX() - 34, bounds.getCenterY() - 2);
List<Widget> widgets = Lists.newArrayList(); // List<Widget> widgets = Lists.newArrayList();
widgets.add(Widgets.createRecipeBase(bounds)); // widgets.add(Widgets.createRecipeBase(bounds));
List<EntryIngredient> inputEntries = display.getInputEntries(); // List<EntryIngredient> inputEntries = display.getInputEntries();
List<EntryIngredient> outputEntries = display.getOutputEntries(); // List<EntryIngredient> outputEntries = display.getOutputEntries();
if (inputEntries.size() < 9) { // if (inputEntries.size() < 9) {
List<EntryIngredient> newList = new ArrayList<EntryIngredient>(9); // List<EntryIngredient> newList = new ArrayList<EntryIngredient>(9);
newList.addAll(inputEntries); // newList.addAll(inputEntries);
for (int i = inputEntries.size(); i < 9; i++) { // for (int i = inputEntries.size(); i < 9; i++) {
newList.add(EntryIngredient.empty()); // newList.add(EntryIngredient.empty());
} // }
inputEntries = newList; // inputEntries = newList;
} // }
widgets.add(Widgets.createTexturedWidget(BACKGROUND, bounds.x, bounds.y, 0, 0, 150, 104, 150, 104)); // widgets.add(Widgets.createTexturedWidget(BACKGROUND, bounds.x, bounds.y, 0, 0, 150, 104, 150, 104));
widgets.add(Widgets.createSlot(centerPoint).entries(inputEntries.get(0)).disableBackground().markInput()); // widgets.add(Widgets.createSlot(centerPoint).entries(inputEntries.get(0)).disableBackground().markInput());
widgets.add(Widgets.createSlot(new Point(centerPoint.x, centerPoint.y - 28)) // widgets.add(Widgets.createSlot(new Point(centerPoint.x, centerPoint.y - 28))
.entries(inputEntries.get(1)) // .entries(inputEntries.get(1))
.disableBackground() // .disableBackground()
.markInput()); // .markInput());
widgets.add(Widgets.createSlot(new Point(centerPoint.x + 28, centerPoint.y)) // widgets.add(Widgets.createSlot(new Point(centerPoint.x + 28, centerPoint.y))
.entries(inputEntries.get(3)) // .entries(inputEntries.get(3))
.disableBackground() // .disableBackground()
.markInput()); // .markInput());
widgets.add(Widgets.createSlot(new Point(centerPoint.x, centerPoint.y + 28)) // widgets.add(Widgets.createSlot(new Point(centerPoint.x, centerPoint.y + 28))
.entries(inputEntries.get(5)) // .entries(inputEntries.get(5))
.disableBackground() // .disableBackground()
.markInput()); // .markInput());
widgets.add(Widgets.createSlot(new Point(centerPoint.x - 28, centerPoint.y)) // widgets.add(Widgets.createSlot(new Point(centerPoint.x - 28, centerPoint.y))
.entries(inputEntries.get(7)) // .entries(inputEntries.get(7))
.disableBackground() // .disableBackground()
.markInput()); // .markInput());
widgets.add(Widgets.createSlot(new Point(centerPoint.x + 24, centerPoint.y - 24)) // widgets.add(Widgets.createSlot(new Point(centerPoint.x + 24, centerPoint.y - 24))
.entries(inputEntries.get(2)) // .entries(inputEntries.get(2))
.disableBackground() // .disableBackground()
.markInput()); // .markInput());
widgets.add(Widgets.createSlot(new Point(centerPoint.x + 24, centerPoint.y + 24)) // widgets.add(Widgets.createSlot(new Point(centerPoint.x + 24, centerPoint.y + 24))
.entries(inputEntries.get(4)) // .entries(inputEntries.get(4))
.disableBackground() // .disableBackground()
.markInput()); // .markInput());
widgets.add(Widgets.createSlot(new Point(centerPoint.x - 24, centerPoint.y + 24)) // widgets.add(Widgets.createSlot(new Point(centerPoint.x - 24, centerPoint.y + 24))
.entries(inputEntries.get(6)) // .entries(inputEntries.get(6))
.disableBackground() // .disableBackground()
.markInput()); // .markInput());
widgets.add(Widgets.createSlot(new Point(centerPoint.x - 24, centerPoint.y - 24)) // widgets.add(Widgets.createSlot(new Point(centerPoint.x - 24, centerPoint.y - 24))
.entries(inputEntries.get(8)) // .entries(inputEntries.get(8))
.disableBackground() // .disableBackground()
.markInput()); // .markInput());
widgets.add(Widgets.createSlot(new Point(centerPoint.x + 80, centerPoint.y)) // widgets.add(Widgets.createSlot(new Point(centerPoint.x + 80, centerPoint.y))
.entries(outputEntries.get(0)) // .entries(outputEntries.get(0))
.disableBackground() // .disableBackground()
.markOutput()); // .markOutput());
widgets.add(Widgets.createLabel( // widgets.add(Widgets.createLabel(
new Point(bounds.getMaxX() - 5, bounds.y + 6), // new Point(bounds.getMaxX() - 5, bounds.y + 6),
Component.translatable("category.rei.infusion.time&val", display.getInfusionTime()) // Component.translatable("category.rei.infusion.time&val", display.getInfusionTime())
).noShadow().rightAligned().color(0xFF404040, 0xFFBBBBBB)); // ).noShadow().rightAligned().color(0xFF404040, 0xFFBBBBBB));
return widgets; // return widgets;
} // }
//
@Override // @Override
public int getDisplayHeight() { // public int getDisplayHeight() {
return 104; // return 104;
} // }
} //}
//

126
src/main/java/org/betterx/betterend/integration/rei/REIInfusionDisplay.java
View file

@ -1,63 +1,63 @@
package org.betterx.betterend.integration.rei; //package org.betterx.betterend.integration.rei;
//
import net.minecraft.resources.ResourceLocation; //import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.crafting.Recipe; //import net.minecraft.world.item.crafting.Recipe;
//
import me.shedaniel.rei.api.common.category.CategoryIdentifier; //import me.shedaniel.rei.api.common.category.CategoryIdentifier;
import me.shedaniel.rei.api.common.display.SimpleGridMenuDisplay; //import me.shedaniel.rei.api.common.display.SimpleGridMenuDisplay;
import me.shedaniel.rei.api.common.display.basic.BasicDisplay; //import me.shedaniel.rei.api.common.display.basic.BasicDisplay;
import me.shedaniel.rei.api.common.util.EntryIngredients; //import me.shedaniel.rei.api.common.util.EntryIngredients;
import org.betterx.betterend.recipe.builders.InfusionRecipe; //import org.betterx.betterend.recipe.builders.InfusionRecipe;
//
import java.util.Collections; //import java.util.Collections;
import java.util.Optional; //import java.util.Optional;
import org.jetbrains.annotations.NotNull; //import org.jetbrains.annotations.NotNull;
//
public class REIInfusionDisplay extends BasicDisplay implements SimpleGridMenuDisplay { //public class REIInfusionDisplay extends BasicDisplay implements SimpleGridMenuDisplay {
//
private final InfusionRecipe recipe; // private final InfusionRecipe recipe;
private final int time; // private final int time;
//
public REIInfusionDisplay(InfusionRecipe recipe) { // public REIInfusionDisplay(InfusionRecipe recipe) {
super( // super(
EntryIngredients.ofIngredients(recipe.getIngredients()), // EntryIngredients.ofIngredients(recipe.getIngredients()),
Collections.singletonList(EntryIngredients.of(recipe.getResultItem())) // Collections.singletonList(EntryIngredients.of(recipe.getResultItem()))
); // );
this.recipe = recipe; // this.recipe = recipe;
this.time = recipe.getInfusionTime(); // this.time = recipe.getInfusionTime();
} // }
//
public int getInfusionTime() { // public int getInfusionTime() {
return this.time; // return this.time;
} // }
//
@Override // @Override
public @NotNull Optional<ResourceLocation> getDisplayLocation() { // public @NotNull Optional<ResourceLocation> getDisplayLocation() {
return Optional.ofNullable(recipe).map(Recipe::getId); // return Optional.ofNullable(recipe).map(Recipe::getId);
} // }
//
@Override // @Override
public CategoryIdentifier<?> getCategoryIdentifier() { // public CategoryIdentifier<?> getCategoryIdentifier() {
return REIPlugin.INFUSION; // return REIPlugin.INFUSION;
} // }
//
// @Override // // @Override
// public @NotNull List<List<EntryStack>> getRequiredEntries() { // // public @NotNull List<List<EntryStack>> getRequiredEntries() {
// return this.input; // // return this.input;
// } // // }
//
@Override // @Override
public int getWidth() { // public int getWidth() {
return 0; // return 0;
} // }
//
@Override // @Override
public int getHeight() { // public int getHeight() {
return 0; // return 0;
} // }
//
// @Override // // @Override
// public List<List<EntryStack>> getOrganisedInputEntries(ContainerInfo<AbstractContainerMenu> containerInfo, AbstractContainerMenu container) { // // public List<List<EntryStack>> getOrganisedInputEntries(ContainerInfo<AbstractContainerMenu> containerInfo, AbstractContainerMenu container) {
// return this.input; // // return this.input;
//} // //}
} //}

212
src/main/java/org/betterx/betterend/integration/rei/REIPlugin.java
View file

@ -1,106 +1,106 @@
package org.betterx.betterend.integration.rei; //package org.betterx.betterend.integration.rei;
//
import net.minecraft.resources.ResourceLocation; //import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemStack; //import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.BlastingRecipe; //import net.minecraft.world.item.crafting.BlastingRecipe;
import net.minecraft.world.item.crafting.RecipeType; //import net.minecraft.world.item.crafting.RecipeType;
import net.minecraft.world.level.block.Blocks; //import net.minecraft.world.level.block.Blocks;
//
import net.fabricmc.fabric.api.registry.FuelRegistry; //import net.fabricmc.fabric.api.registry.FuelRegistry;
import net.fabricmc.fabric.impl.content.registry.FuelRegistryImpl; //import net.fabricmc.fabric.impl.content.registry.FuelRegistryImpl;
//
import com.google.common.collect.Lists; //import com.google.common.collect.Lists;
import me.shedaniel.rei.api.client.plugins.REIClientPlugin; //import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
import me.shedaniel.rei.api.client.registry.category.CategoryRegistry; //import me.shedaniel.rei.api.client.registry.category.CategoryRegistry;
import me.shedaniel.rei.api.client.registry.display.DisplayRegistry; //import me.shedaniel.rei.api.client.registry.display.DisplayRegistry;
import me.shedaniel.rei.api.common.category.CategoryIdentifier; //import me.shedaniel.rei.api.common.category.CategoryIdentifier;
import me.shedaniel.rei.api.common.entry.EntryIngredient; //import me.shedaniel.rei.api.common.entry.EntryIngredient;
import me.shedaniel.rei.api.common.entry.EntryStack; //import me.shedaniel.rei.api.common.entry.EntryStack;
import me.shedaniel.rei.api.common.util.EntryIngredients; //import me.shedaniel.rei.api.common.util.EntryIngredients;
import me.shedaniel.rei.api.common.util.EntryStacks; //import me.shedaniel.rei.api.common.util.EntryStacks;
import me.shedaniel.rei.plugin.common.BuiltinPlugin; //import me.shedaniel.rei.plugin.common.BuiltinPlugin;
import org.betterx.bclib.blocks.BaseFurnaceBlock; //import org.betterx.bclib.blocks.BaseFurnaceBlock;
import org.betterx.bclib.recipes.AnvilRecipe; //import org.betterx.bclib.recipes.AnvilRecipe;
import org.betterx.betterend.BetterEnd; //import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.blocks.basis.EndAnvilBlock; //import org.betterx.betterend.blocks.basis.EndAnvilBlock;
import org.betterx.betterend.recipe.builders.AlloyingRecipe; //import org.betterx.betterend.recipe.builders.AlloyingRecipe;
import org.betterx.betterend.recipe.builders.InfusionRecipe; //import org.betterx.betterend.recipe.builders.InfusionRecipe;
import org.betterx.betterend.registry.EndBlocks; //import org.betterx.betterend.registry.EndBlocks;
//
import java.util.Collections; //import java.util.Collections;
import java.util.List; //import java.util.List;
import java.util.stream.Collectors; //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 ////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 class REIPlugin implements REIClientPlugin {
public final static ResourceLocation PLUGIN_ID = BetterEnd.makeID("rei_plugin"); // public final static ResourceLocation PLUGIN_ID = BetterEnd.makeID("rei_plugin");
public final static CategoryIdentifier<REIAlloyingFuelDisplay> ALLOYING_FUEL = CategoryIdentifier.of( // public final static CategoryIdentifier<REIAlloyingFuelDisplay> ALLOYING_FUEL = CategoryIdentifier.of(
BetterEnd.MOD_ID, // BetterEnd.MOD_ID,
"alloying_fuel" // "alloying_fuel"
); // );
public final static CategoryIdentifier<REIAlloyingDisplay> ALLOYING = CategoryIdentifier.of( // public final static CategoryIdentifier<REIAlloyingDisplay> ALLOYING = CategoryIdentifier.of(
BetterEnd.MOD_ID, // BetterEnd.MOD_ID,
AlloyingRecipe.GROUP // AlloyingRecipe.GROUP
); // );
public final static CategoryIdentifier<REIAnvilDisplay> SMITHING = CategoryIdentifier.of( // public final static CategoryIdentifier<REIAnvilDisplay> SMITHING = CategoryIdentifier.of(
BetterEnd.MOD_ID, // BetterEnd.MOD_ID,
AnvilRecipe.ID.getPath() // AnvilRecipe.ID.getPath()
); // );
public final static CategoryIdentifier<REIInfusionDisplay> INFUSION = CategoryIdentifier.of( // public final static CategoryIdentifier<REIInfusionDisplay> INFUSION = CategoryIdentifier.of(
BetterEnd.MOD_ID, // BetterEnd.MOD_ID,
InfusionRecipe.GROUP // InfusionRecipe.GROUP
); // );
//
@Override // @Override
public void registerDisplays(DisplayRegistry registry) { // public void registerDisplays(DisplayRegistry registry) {
registry.registerRecipeFiller(AlloyingRecipe.class, AlloyingRecipe.TYPE, REIAlloyingDisplay::new); // registry.registerRecipeFiller(AlloyingRecipe.class, AlloyingRecipe.TYPE, REIAlloyingDisplay::new);
registry.registerRecipeFiller(BlastingRecipe.class, RecipeType.BLASTING, REIBlastingDisplay::new); // registry.registerRecipeFiller(BlastingRecipe.class, RecipeType.BLASTING, REIBlastingDisplay::new);
registry.registerRecipeFiller(AnvilRecipe.class, AnvilRecipe.TYPE, REIAnvilDisplay::new); // registry.registerRecipeFiller(AnvilRecipe.class, AnvilRecipe.TYPE, REIAnvilDisplay::new);
registry.registerRecipeFiller(InfusionRecipe.class, InfusionRecipe.TYPE, REIInfusionDisplay::new); // registry.registerRecipeFiller(InfusionRecipe.class, InfusionRecipe.TYPE, REIInfusionDisplay::new);
//
//TODO: Migrate to 1.18/1.18.2 // //TODO: Migrate to 1.18/1.18.2
if (FuelRegistry.INSTANCE instanceof FuelRegistryImpl fabricImpl) { // if (FuelRegistry.INSTANCE instanceof FuelRegistryImpl fabricImpl) {
fabricImpl.getFuelTimes().forEach((item, time) -> { // fabricImpl.getFuelTimes().forEach((item, time) -> {
if (time >= 2000) { // if (time >= 2000) {
final List<EntryIngredient> list = Collections.singletonList(EntryIngredients.of(item)); // final List<EntryIngredient> list = Collections.singletonList(EntryIngredients.of(item));
registry.add(new REIAlloyingFuelDisplay(list, time)); // registry.add(new REIAlloyingFuelDisplay(list, time));
} // }
}); // });
} // }
} // }
//
@Override // @Override
public void registerCategories(CategoryRegistry registry) { // public void registerCategories(CategoryRegistry registry) {
EntryStack<ItemStack> endStoneSmelter = EntryStacks.of(EndBlocks.END_STONE_SMELTER); // EntryStack<ItemStack> endStoneSmelter = EntryStacks.of(EndBlocks.END_STONE_SMELTER);
EntryStack<ItemStack> infusionRitual = EntryStacks.of(EndBlocks.INFUSION_PEDESTAL); // EntryStack<ItemStack> infusionRitual = EntryStacks.of(EndBlocks.INFUSION_PEDESTAL);
List<EntryStack<?>> anvils = Lists.newArrayList(EntryIngredients.ofItems(EndBlocks.getModBlocks() // List<EntryStack<?>> anvils = Lists.newArrayList(EntryIngredients.ofItems(EndBlocks.getModBlocks()
.stream() // .stream()
.filter(EndAnvilBlock.class::isInstance) // .filter(EndAnvilBlock.class::isInstance)
.collect(Collectors.toList()))); // .collect(Collectors.toList())));
anvils.add(0, EntryStacks.of(Blocks.ANVIL)); // anvils.add(0, EntryStacks.of(Blocks.ANVIL));
List<EntryStack<?>> ITEM_FURNACES = Lists.newArrayList(EntryIngredients.ofItems(EndBlocks.getModBlocks() // List<EntryStack<?>> ITEM_FURNACES = Lists.newArrayList(EntryIngredients.ofItems(EndBlocks.getModBlocks()
.stream() // .stream()
.filter(BaseFurnaceBlock.class::isInstance) // .filter(BaseFurnaceBlock.class::isInstance)
.collect(Collectors.toList()))); // .collect(Collectors.toList())));
EntryStack<?>[] anvilsArray = anvils.toArray(new EntryStack[0]); // EntryStack<?>[] anvilsArray = anvils.toArray(new EntryStack[0]);
EntryStack<?>[] ITEM_FURNACESArray = ITEM_FURNACES.toArray(new EntryStack[0]); // EntryStack<?>[] ITEM_FURNACESArray = ITEM_FURNACES.toArray(new EntryStack[0]);
//
registry.add( // registry.add(
new REIAlloyingFuelCategory(), // new REIAlloyingFuelCategory(),
new REIAlloyingCategory(endStoneSmelter), // new REIAlloyingCategory(endStoneSmelter),
new REIInfusionCategory(infusionRitual), // new REIInfusionCategory(infusionRitual),
new REIAnvilCategory(anvilsArray) // new REIAnvilCategory(anvilsArray)
); // );
//
registry.addWorkstations(ALLOYING_FUEL, endStoneSmelter); // registry.addWorkstations(ALLOYING_FUEL, endStoneSmelter);
registry.addWorkstations(ALLOYING, endStoneSmelter); // registry.addWorkstations(ALLOYING, endStoneSmelter);
registry.addWorkstations(INFUSION, infusionRitual); // registry.addWorkstations(INFUSION, infusionRitual);
registry.addWorkstations(SMITHING, anvilsArray); // registry.addWorkstations(SMITHING, anvilsArray);
registry.removePlusButton(ALLOYING_FUEL); // registry.removePlusButton(ALLOYING_FUEL);
registry.removePlusButton(SMITHING); // registry.removePlusButton(SMITHING);
//
registry.addWorkstations(BuiltinPlugin.SMELTING, ITEM_FURNACESArray); // registry.addWorkstations(BuiltinPlugin.SMELTING, ITEM_FURNACESArray);
registry.addWorkstations(BuiltinPlugin.FUEL, ITEM_FURNACESArray); // registry.addWorkstations(BuiltinPlugin.FUEL, ITEM_FURNACESArray);
} // }
} //}

90
src/main/java/org/betterx/betterend/registry/EndStructures.java
View file

@ -7,8 +7,9 @@ import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.levelgen.GenerationStep.Decoration; import net.minecraft.world.level.levelgen.GenerationStep.Decoration;
import net.minecraft.world.level.levelgen.structure.pieces.StructurePieceType; import net.minecraft.world.level.levelgen.structure.pieces.StructurePieceType;
import org.betterx.bclib.api.v2.levelgen.structures.BCLStructure;
import org.betterx.bclib.api.v2.levelgen.structures.BCLStructureBuilder;
import org.betterx.bclib.api.v2.tag.TagAPI; import org.betterx.bclib.api.v2.tag.TagAPI;
import org.betterx.bclib.world.structures.BCLStructure;
import org.betterx.betterend.BetterEnd; import org.betterx.betterend.BetterEnd;
import org.betterx.betterend.world.structures.features.*; import org.betterx.betterend.world.structures.features.*;
import org.betterx.betterend.world.structures.piece.*; import org.betterx.betterend.world.structures.piece.*;
@ -22,55 +23,44 @@ public class EndStructures {
PaintedMountainPiece::new); PaintedMountainPiece::new);
public static final StructurePieceType NBT_PIECE = register("nbt_piece", NBTPiece::new); public static final StructurePieceType NBT_PIECE = register("nbt_piece", NBTPiece::new);
public static final BCLStructure<GiantMossyGlowshroomStructure> GIANT_MOSSY_GLOWSHROOM = new BCLStructure<>( public static final BCLStructure<GiantMossyGlowshroomStructure> GIANT_MOSSY_GLOWSHROOM = BCLStructureBuilder
BetterEnd.makeID("giant_mossy_glowshroom"), .start(BetterEnd.makeID("giant_mossy_glowshroom"), GiantMossyGlowshroomStructure::new)
GiantMossyGlowshroomStructure::new, .step(Decoration.SURFACE_STRUCTURES)
Decoration.SURFACE_STRUCTURES, .randomPlacement(16, 8)
16, .build();
8
); public static final BCLStructure<MegaLakeStructure> MEGALAKE = BCLStructureBuilder
public static final BCLStructure<MegaLakeStructure> MEGALAKE = new BCLStructure<>( .start(BetterEnd.makeID("megalake"), MegaLakeStructure::new)
BetterEnd.makeID("megalake"), .step(Decoration.RAW_GENERATION)
MegaLakeStructure::new, .randomPlacement(4, 1)
Decoration.RAW_GENERATION, .build();
4,
1 public static final BCLStructure<MegaLakeSmallStructure> MEGALAKE_SMALL = BCLStructureBuilder
); .start(BetterEnd.makeID("megalake_small"), MegaLakeSmallStructure::new)
public static final BCLStructure<MegaLakeSmallStructure> MEGALAKE_SMALL = new BCLStructure<>( .step(Decoration.RAW_GENERATION)
BetterEnd.makeID("megalake_small"), .randomPlacement(4, 1)
MegaLakeSmallStructure::new, .build();
Decoration.RAW_GENERATION,
4, public static final BCLStructure<MountainStructure> MOUNTAIN = BCLStructureBuilder
1 .start(BetterEnd.makeID("mountain"), MountainStructure::new)
); .step(Decoration.RAW_GENERATION)
public static final BCLStructure<MountainStructure> MOUNTAIN = new BCLStructure<>( .randomPlacement(3, 2)
BetterEnd.makeID("mountain"), .build();
MountainStructure::new, public static final BCLStructure<PaintedMountainStructure> PAINTED_MOUNTAIN = BCLStructureBuilder
Decoration.RAW_GENERATION, .start(BetterEnd.makeID("painted_mountain"), PaintedMountainStructure::new)
3, .step(Decoration.RAW_GENERATION)
2 .randomPlacement(3, 2)
); .build();
public static final BCLStructure<PaintedMountainStructure> PAINTED_MOUNTAIN = new BCLStructure<>( public static final BCLStructure<EternalPortalStructure> ETERNAL_PORTAL = BCLStructureBuilder
BetterEnd.makeID("painted_mountain"), .start(BetterEnd.makeID("eternal_portal"), EternalPortalStructure::new)
PaintedMountainStructure::new, .step(Decoration.RAW_GENERATION)
Decoration.RAW_GENERATION, .randomPlacement(16, 6)
3, .build();
2 public static final BCLStructure<GiantIceStarStructure> GIANT_ICE_STAR = BCLStructureBuilder
); .start(BetterEnd.makeID("giant_ice_star"), GiantIceStarStructure::new)
public static final BCLStructure<EternalPortalStructure> ETERNAL_PORTAL = new BCLStructure<>( .step(Decoration.SURFACE_STRUCTURES)
BetterEnd.makeID("eternal_portal"), .randomPlacement(16, 8)
EternalPortalStructure::new, .build();
Decoration.SURFACE_STRUCTURES,
16,
6
);
public static final BCLStructure<GiantIceStarStructure> GIANT_ICE_STAR = new BCLStructure<>(
BetterEnd.makeID("giant_ice_star"),
GiantIceStarStructure::new,
Decoration.SURFACE_STRUCTURES,
16,
8
);
public static void register() { public static void register() {
} }

2
src/main/resources/fabric.mod.json
View file

@ -28,7 +28,7 @@
"client": [ "client": [
"org.betterx.betterend.client.BetterEndClient" "org.betterx.betterend.client.BetterEndClient"
], ],
"rei_plugins": [ "rei_plugins_disabled": [
"org.betterx.betterend.integration.rei.REIPlugin" "org.betterx.betterend.integration.rei.REIPlugin"
] ]
}, },