aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/me/shedaniel/rei/client/ConfigHelper.java1
-rw-r--r--src/main/java/me/shedaniel/rei/client/ItemListHelper.java2
-rw-r--r--src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java8
-rw-r--r--src/main/java/me/shedaniel/rei/gui/config/ConfigEntry.java4
-rw-r--r--src/main/java/me/shedaniel/rei/gui/config/ConfigEntryListWidget.java2
-rw-r--r--src/main/java/me/shedaniel/rei/gui/config/ConfigScreen.java9
-rw-r--r--src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java2
-rw-r--r--src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java9
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java4
-rw-r--r--src/main/java/me/shedaniel/rei/gui/widget/RecipeViewingWidgetScreen.java10
-rw-r--r--src/main/java/me/shedaniel/rei/listeners/IMixinRecipeBookGui.java2
-rw-r--r--src/main/java/me/shedaniel/rei/listeners/IMixinTabGetter.java2
-rw-r--r--src/main/java/me/shedaniel/rei/mixin/MixinBrewingRecipeRegistry.java10
-rw-r--r--src/main/java/me/shedaniel/rei/mixin/MixinContainerScreen.java10
-rw-r--r--src/main/java/me/shedaniel/rei/mixin/MixinCraftingTableScreen.java2
-rw-r--r--src/main/java/me/shedaniel/rei/mixin/MixinCreativePlayerInventoryScreen.java6
-rw-r--r--src/main/java/me/shedaniel/rei/mixin/MixinPlayerInventoryScreen.java2
-rw-r--r--src/main/java/me/shedaniel/rei/mixin/MixinRecipeBookGui.java2
-rw-r--r--src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java10
-rw-r--r--src/main/resources/assets/roughlyenoughitems/lang/de_de.json4
-rwxr-xr-xsrc/main/resources/fabric.mod.json2
21 files changed, 55 insertions, 48 deletions
diff --git a/src/main/java/me/shedaniel/rei/client/ConfigHelper.java b/src/main/java/me/shedaniel/rei/client/ConfigHelper.java
index caf307313..2331cb8bd 100644
--- a/src/main/java/me/shedaniel/rei/client/ConfigHelper.java
+++ b/src/main/java/me/shedaniel/rei/client/ConfigHelper.java
@@ -15,6 +15,7 @@ public class ConfigHelper {
private REIConfig config;
private boolean craftableOnly;
+ @SuppressWarnings("deprecated")
public ConfigHelper() {
this.configFile = new File(FabricLoader.INSTANCE.getConfigDirectory(), "rei.json");
this.craftableOnly = false;
diff --git a/src/main/java/me/shedaniel/rei/client/ItemListHelper.java b/src/main/java/me/shedaniel/rei/client/ItemListHelper.java
index 81c882d49..d4ccb81e1 100644
--- a/src/main/java/me/shedaniel/rei/client/ItemListHelper.java
+++ b/src/main/java/me/shedaniel/rei/client/ItemListHelper.java
@@ -31,7 +31,7 @@ public class ItemListHelper implements IItemRegisterer {
public ItemStack[] getAllStacksFromItem(Item item) {
DefaultedList<ItemStack> list = DefaultedList.create();
list.add(item.getDefaultStack());
- item.addStacksForDisplay(item.getItemGroup(), list);
+ item.appendItemsForGroup(item.getItemGroup(), list);
TreeSet<ItemStack> stackSet = list.stream().collect(Collectors.toCollection(() -> new TreeSet<ItemStack>((p1, p2) -> ItemStack.areEqual(p1, p2) ? 0 : 1)));
return Lists.newArrayList(stackSet).toArray(new ItemStack[0]);
}
diff --git a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
index 10f84192a..896b4b872 100644
--- a/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
+++ b/src/main/java/me/shedaniel/rei/gui/ContainerScreenOverlay.java
@@ -195,6 +195,8 @@ public class ContainerScreenOverlay extends DrawableContainer {
public void draw(int int_1, int int_2, float float_1) {
if (!GuiHelper.isOverlayVisible())
return;
+ buttonLeft.enabled = itemListOverlay.getWidgets().size() > 0;
+ buttonRight.enabled = itemListOverlay.getWidgets().size() > 0;
widgets.forEach(widget -> {
GuiLighting.disable();
widget.draw(int_1, int_2, float_1);
@@ -269,7 +271,7 @@ public class ContainerScreenOverlay extends DrawableContainer {
}
if (itemStack == null && MinecraftClient.getInstance().currentScreen instanceof RecipeViewingWidgetScreen) {
RecipeViewingWidgetScreen recipeViewingWidget = (RecipeViewingWidgetScreen) MinecraftClient.getInstance().currentScreen;
- for(GuiEventListener entry : recipeViewingWidget.getEntries())
+ for(GuiEventListener entry : recipeViewingWidget.method_1968())
if (entry instanceof ItemSlotWidget && ((HighlightableWidget) entry).isHighlighted(point.x, point.y)) {
itemStack = ((ItemSlotWidget) entry).getCurrentStack();
break;
@@ -291,14 +293,14 @@ public class ContainerScreenOverlay extends DrawableContainer {
public boolean charTyped(char char_1, int int_1) {
if (!GuiHelper.isOverlayVisible())
return false;
- for(GuiEventListener listener : getEntries())
+ for(GuiEventListener listener : method_1968())
if (listener.charTyped(char_1, int_1))
return true;
return super.charTyped(char_1, int_1);
}
@Override
- protected List<? extends GuiEventListener> getEntries() {
+ public List<? extends GuiEventListener> method_1968() {
return widgets;
}
diff --git a/src/main/java/me/shedaniel/rei/gui/config/ConfigEntry.java b/src/main/java/me/shedaniel/rei/gui/config/ConfigEntry.java
index ac993282e..369ed3470 100644
--- a/src/main/java/me/shedaniel/rei/gui/config/ConfigEntry.java
+++ b/src/main/java/me/shedaniel/rei/gui/config/ConfigEntry.java
@@ -43,9 +43,9 @@ public class ConfigEntry extends EntryListWidget.Entry<ConfigEntry> {
if (MinecraftClient.getInstance().textRenderer.isRightToLeft()) {
MinecraftClient.getInstance().textRenderer.drawWithShadow(nameComponent.getFormattedText(), window.getScaledWidth() - MinecraftClient.getInstance().textRenderer.getStringWidth(nameComponent.getFormattedText()) - 40, getY() + 5, 16777215);
this.buttonWidget.text = buttonProvider.getText();
- this.buttonWidget.getBounds().setLocation(10, getY() + 2);
+ this.buttonWidget.getBounds().setLocation(getX(), getY() + 2);
} else {
- MinecraftClient.getInstance().textRenderer.drawWithShadow(nameComponent.getFormattedText(), 10.0F, getY() + 5, 16777215);
+ MinecraftClient.getInstance().textRenderer.drawWithShadow(nameComponent.getFormattedText(), getX(), getY() + 5, 16777215);
this.buttonWidget.text = buttonProvider.getText();
this.buttonWidget.getBounds().setLocation(window.getScaledWidth() - 190, getY() + 2);
}
diff --git a/src/main/java/me/shedaniel/rei/gui/config/ConfigEntryListWidget.java b/src/main/java/me/shedaniel/rei/gui/config/ConfigEntryListWidget.java
index ee74cc568..e6c83593c 100644
--- a/src/main/java/me/shedaniel/rei/gui/config/ConfigEntryListWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/config/ConfigEntryListWidget.java
@@ -15,7 +15,7 @@ public class ConfigEntryListWidget extends EntryListWidget<ConfigEntry> {
}
private ConfigEntry getEntry(int int_1) {
- return this.getEntries().get(int_1);
+ return this.method_1968().get(int_1); //getEntries
}
public void configAddEntry(ConfigEntry entry) {
diff --git a/src/main/java/me/shedaniel/rei/gui/config/ConfigScreen.java b/src/main/java/me/shedaniel/rei/gui/config/ConfigScreen.java
index 65007b2f5..a82375411 100644
--- a/src/main/java/me/shedaniel/rei/gui/config/ConfigScreen.java
+++ b/src/main/java/me/shedaniel/rei/gui/config/ConfigScreen.java
@@ -167,7 +167,7 @@ public class ConfigScreen extends Screen {
}
}
}));
- addButton(new ButtonWidget(0, width / 2 - 100, height - 26, I18n.translate("gui.done")) {
+ addButton(new ButtonWidget(width / 2 - 100, height - 26, I18n.translate("gui.done")) {
@Override
public void onPressed(double double_1, double double_2) {
try {
@@ -187,11 +187,12 @@ public class ConfigScreen extends Screen {
}
@Override
- public void draw(int int_1, int int_2, float float_1) {
+ public void method_18326(int int_1, int int_2, float float_1) {
+ //draw
this.drawTextureBackground(0);
- this.entryListWidget.draw(int_1, int_2, float_1);
+ this.entryListWidget.method_18326(int_1, int_2, float_1);
this.drawStringCentered(this.fontRenderer, I18n.translate("text.rei.config"), this.width / 2, 16, 16777215);
- super.draw(int_1, int_2, float_1);
+ super.method_18326(int_1, int_2, float_1);
}
@Override
diff --git a/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java b/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java
index 81f48c40c..d38cadfa2 100644
--- a/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java
+++ b/src/main/java/me/shedaniel/rei/gui/credits/CreditsEntryListWidget.java
@@ -15,7 +15,7 @@ public class CreditsEntryListWidget extends EntryListWidget<CreditsEntry> {
}
private CreditsEntry getEntry(int int_1) {
- return this.getEntries().get(int_1);
+ return this.method_1968().get(int_1); //getEntries
}
public void creditsAddEntry(CreditsEntry entry) {
diff --git a/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java b/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java
index ed0464e07..bfb9dd589 100644
--- a/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java
+++ b/src/main/java/me/shedaniel/rei/gui/credits/CreditsScreen.java
@@ -34,7 +34,7 @@ public class CreditsScreen extends Screen {
for(String line : I18n.translate("text.rei.credit.text").split("\n"))
entryListWidget.creditsAddEntry(new CreditsEntry(new StringTextComponent(line)));
entryListWidget.creditsAddEntry(new CreditsEntry(new StringTextComponent("")));
- addButton(new ButtonWidget(0, width / 2 - 100, height - 26, I18n.translate("gui.done")) {
+ addButton(new ButtonWidget(width / 2 - 100, height - 26, I18n.translate("gui.done")) {
@Override
public void onPressed(double double_1, double double_2) {
CreditsScreen.this.client.openScreen(parent);
@@ -44,11 +44,12 @@ public class CreditsScreen extends Screen {
}
@Override
- public void draw(int int_1, int int_2, float float_1) {
+ public void method_18326(int int_1, int int_2, float float_1) {
+ //draw
this.drawTextureBackground(0);
- this.entryListWidget.draw(int_1, int_2, float_1);
+ this.entryListWidget.method_18326(int_1, int_2, float_1);
this.drawStringCentered(this.fontRenderer, I18n.translate("text.rei.credits"), this.width / 2, 16, 16777215);
- super.draw(int_1, int_2, float_1);
+ super.method_18326(int_1, int_2, float_1);
}
@Override
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java b/src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java
index cb38c6941..e3d6b94a7 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/ItemListOverlay.java
@@ -44,6 +44,10 @@ public class ItemListOverlay extends Drawable implements IWidget {
GuiHelper.getLastOverlay().addTooltip(new QueuedTooltip(ClientHelper.getMouseLocation(), Arrays.asList(I18n.translate("text.rei.delete_items"))));
}
+ public List<IWidget> getWidgets() {
+ return widgets;
+ }
+
public void updateList(Rectangle bounds, int page, String searchTerm) {
this.rectangle = bounds;
this.widgets = Lists.newLinkedList();
diff --git a/src/main/java/me/shedaniel/rei/gui/widget/RecipeViewingWidgetScreen.java b/src/main/java/me/shedaniel/rei/gui/widget/RecipeViewingWidgetScreen.java
index 1ac5cadc0..e946920d1 100644
--- a/src/main/java/me/shedaniel/rei/gui/widget/RecipeViewingWidgetScreen.java
+++ b/src/main/java/me/shedaniel/rei/gui/widget/RecipeViewingWidgetScreen.java
@@ -218,13 +218,13 @@ public class RecipeViewingWidgetScreen extends Screen {
}
@Override
- public void draw(int mouseX, int mouseY, float partialTicks) {
+ public void method_18326(int mouseX, int mouseY, float partialTicks) {
drawBackground();
tabs.stream().filter(tabWidget -> {
return !tabWidget.isSelected();
}).forEach(tabWidget -> tabWidget.draw(mouseX, mouseY, partialTicks));
GuiLighting.disable();
- super.draw(mouseX, mouseY, partialTicks);
+ super.method_18326(mouseX, mouseY, partialTicks);
widgets.forEach(widget -> {
GuiLighting.disable();
widget.draw(mouseX, mouseY, partialTicks);
@@ -286,11 +286,11 @@ public class RecipeViewingWidgetScreen extends Screen {
@Override
public boolean mouseClicked(double double_1, double double_2, int int_1) {
- for(GuiEventListener entry : getEntries())
+ for(GuiEventListener entry : method_1968()) //getEntries
if (entry.mouseClicked(double_1, double_2, int_1)) {
- focusOn(entry);
+ method_1967(entry); //focusOn
if (int_1 == 0)
- setActive(true);
+ method_1966(true); //setActive
return true;
}
return false;
diff --git a/src/main/java/me/shedaniel/rei/listeners/IMixinRecipeBookGui.java b/src/main/java/me/shedaniel/rei/listeners/IMixinRecipeBookGui.java
index 599467173..a26f2dbae 100644
--- a/src/main/java/me/shedaniel/rei/listeners/IMixinRecipeBookGui.java
+++ b/src/main/java/me/shedaniel/rei/listeners/IMixinRecipeBookGui.java
@@ -4,6 +4,6 @@ import net.minecraft.client.gui.widget.RecipeBookGhostSlots;
public interface IMixinRecipeBookGui {
- public RecipeBookGhostSlots getGhostSlots();
+ public RecipeBookGhostSlots rei_getGhostSlots();
}
diff --git a/src/main/java/me/shedaniel/rei/listeners/IMixinTabGetter.java b/src/main/java/me/shedaniel/rei/listeners/IMixinTabGetter.java
index 773753b66..eeab65c18 100644
--- a/src/main/java/me/shedaniel/rei/listeners/IMixinTabGetter.java
+++ b/src/main/java/me/shedaniel/rei/listeners/IMixinTabGetter.java
@@ -2,6 +2,6 @@ package me.shedaniel.rei.listeners;
public interface IMixinTabGetter {
- public int getSelectedTab();
+ public int rei_getSelectedTab();
}
diff --git a/src/main/java/me/shedaniel/rei/mixin/MixinBrewingRecipeRegistry.java b/src/main/java/me/shedaniel/rei/mixin/MixinBrewingRecipeRegistry.java
index 097ec1c98..5c3e10461 100644
--- a/src/main/java/me/shedaniel/rei/mixin/MixinBrewingRecipeRegistry.java
+++ b/src/main/java/me/shedaniel/rei/mixin/MixinBrewingRecipeRegistry.java
@@ -26,13 +26,13 @@ public class MixinBrewingRecipeRegistry {
private static final List<Potion> REGISTERED_POTION_TYPES = Lists.newArrayList();
private static final List<Ingredient> SELF_POTION_TYPES = Lists.newArrayList();
- @Inject(method = "method_8080", at = @At("RETURN"))
+ @Inject(method = "registerPotionType", at = @At("RETURN"))
private static void method_8080(Item item_1, CallbackInfo ci) {
if (item_1 instanceof PotionItem)
SELF_POTION_TYPES.add(Ingredient.ofItems(new ItemProvider[]{item_1}));
}
- @Inject(method = "method_8071", at = @At("RETURN"))
+ @Inject(method = "registerItemRecipe", at = @At("RETURN"))
private static void method_8071(Item item_1, Item item_2, Item item_3, CallbackInfo ci) {
if (item_1 instanceof PotionItem && item_3 instanceof PotionItem)
SELF_ITEM_RECIPES.add(new BrewingRecipe(item_1, Ingredient.ofItems(new ItemProvider[]{item_2}), item_3));
@@ -41,15 +41,15 @@ public class MixinBrewingRecipeRegistry {
@Inject(method = "registerPotionRecipe", at = @At("RETURN"))
private static void registerPotionRecipe(Potion potion_1, Item item_1, Potion potion_2, CallbackInfo ci) {
if (!REGISTERED_POTION_TYPES.contains(potion_1))
- registerPotionType(potion_1);
+ rei_registerPotionType(potion_1);
if (!REGISTERED_POTION_TYPES.contains(potion_2))
- registerPotionType(potion_2);
+ rei_registerPotionType(potion_2);
SELF_POTION_TYPES.stream().map(Ingredient::getStackArray).forEach(itemStacks -> Arrays.stream(itemStacks).forEach(stack -> {
DefaultPlugin.registerBrewingDisplay(new DefaultBrewingDisplay(PotionUtil.setPotion(stack.copy(), potion_1), Ingredient.ofItems(new ItemProvider[]{item_1}), PotionUtil.setPotion(stack.copy(), potion_2)));
}));
}
- private static void registerPotionType(Potion potion) {
+ private static void rei_registerPotionType(Potion potion) {
REGISTERED_POTION_TYPES.add(potion);
SELF_ITEM_RECIPES.forEach(recipe -> {
DefaultPlugin.registerBrewingDisplay(new DefaultBrewingDisplay(PotionUtil.setPotion(recipe.input.getDefaultStack(), potion), recipe.ingredient, PotionUtil.setPotion(recipe.output.getDefaultStack(), potion)));
diff --git a/src/main/java/me/shedaniel/rei/mixin/MixinContainerScreen.java b/src/main/java/me/shedaniel/rei/mixin/MixinContainerScreen.java
index 7b25314d0..a677192c3 100644
--- a/src/main/java/me/shedaniel/rei/mixin/MixinContainerScreen.java
+++ b/src/main/java/me/shedaniel/rei/mixin/MixinContainerScreen.java
@@ -7,7 +7,6 @@ import me.shedaniel.rei.listeners.IMixinContainerScreen;
import me.shedaniel.rei.listeners.IMixinTabGetter;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.ContainerScreen;
-import net.minecraft.client.gui.GuiEventListener;
import net.minecraft.client.gui.Screen;
import net.minecraft.client.gui.ingame.CreativePlayerInventoryScreen;
import net.minecraft.container.Slot;
@@ -62,11 +61,11 @@ public class MixinContainerScreen extends Screen implements IMixinContainerScree
this.listeners.add(GuiHelper.getLastOverlay(true));
}
- @Inject(method = "draw(IIF)V", at = @At("RETURN"))
+ @Inject(method = "method_18326(IIF)V", at = @At("RETURN"))
public void draw(int int_1, int int_2, float float_1, CallbackInfo info) {
if (MinecraftClient.getInstance().currentScreen instanceof CreativePlayerInventoryScreen) {
IMixinTabGetter tabGetter = (IMixinTabGetter) MinecraftClient.getInstance().currentScreen;
- if (tabGetter.getSelectedTab() != ItemGroup.INVENTORY.getId())
+ if (tabGetter.rei_getSelectedTab() != ItemGroup.INVENTORY.getIndex())
return;
}
GuiHelper.getLastOverlay().drawOverlay(int_1, int_2, float_1);
@@ -86,9 +85,8 @@ public class MixinContainerScreen extends Screen implements IMixinContainerScree
public boolean mouseScrolled(double double_1) {
ContainerScreenOverlay overlay = GuiHelper.getLastOverlay();
if (GuiHelper.isOverlayVisible() && overlay.getRectangle().contains(ClientHelper.getMouseLocation()))
- for(GuiEventListener entry : this.getEntries())
- if (entry.mouseScrolled(double_1))
- return true;
+ if (overlay.mouseScrolled(double_1))
+ return true;
return super.mouseScrolled(double_1);
}
diff --git a/src/main/java/me/shedaniel/rei/mixin/MixinCraftingTableScreen.java b/src/main/java/me/shedaniel/rei/mixin/MixinCraftingTableScreen.java
index cf0b92c0a..0b711dc2d 100644
--- a/src/main/java/me/shedaniel/rei/mixin/MixinCraftingTableScreen.java
+++ b/src/main/java/me/shedaniel/rei/mixin/MixinCraftingTableScreen.java
@@ -33,7 +33,7 @@ public abstract class MixinCraftingTableScreen extends ContainerScreen {
@Inject(method = "mouseClicked", at = @At("HEAD"), cancellable = true)
public void mouseClicked(double mouseX, double mouseY, int button, CallbackInfoReturnable<Boolean> ci) {
if (recipeBookGui.mouseClicked(mouseX, mouseY, button)) {
- focusOn(recipeBookGui);
+ method_1967(recipeBookGui);
ci.setReturnValue(true);
ci.cancel();
}
diff --git a/src/main/java/me/shedaniel/rei/mixin/MixinCreativePlayerInventoryScreen.java b/src/main/java/me/shedaniel/rei/mixin/MixinCreativePlayerInventoryScreen.java
index 0c60a17ae..7d2facb8f 100644
--- a/src/main/java/me/shedaniel/rei/mixin/MixinCreativePlayerInventoryScreen.java
+++ b/src/main/java/me/shedaniel/rei/mixin/MixinCreativePlayerInventoryScreen.java
@@ -28,7 +28,7 @@ public abstract class MixinCreativePlayerInventoryScreen extends AbstractPlayerI
protected abstract boolean doRenderScrollBar();
@Override
- public int getSelectedTab() {
+ public int rei_getSelectedTab() {
return selectedTab;
}
@@ -43,7 +43,7 @@ public abstract class MixinCreativePlayerInventoryScreen extends AbstractPlayerI
@Inject(method = "keyPressed", at = @At("HEAD"), cancellable = true)
public void keyPressed(int int_1, int int_2, int int_3, CallbackInfoReturnable<Boolean> ci) {
- if (selectedTab == ItemGroup.INVENTORY.getId())
+ if (selectedTab == ItemGroup.INVENTORY.getIndex())
if (super.keyPressed(int_1, int_2, int_3)) {
ci.setReturnValue(true);
ci.cancel();
@@ -52,7 +52,7 @@ public abstract class MixinCreativePlayerInventoryScreen extends AbstractPlayerI
@Inject(method = "charTyped", at = @At("HEAD"), cancellable = true)
public void charTyped(char char_1, int int_1, CallbackInfoReturnable<Boolean> ci) {
- if (!this.field_2888 && selectedTab == ItemGroup.INVENTORY.getId())
+ if (!this.field_2888 && selectedTab == ItemGroup.INVENTORY.getIndex())
if (super.charTyped(char_1, int_1)) {
ci.setReturnValue(true);
ci.cancel();
diff --git a/src/main/java/me/shedaniel/rei/mixin/MixinPlayerInventoryScreen.java b/src/main/java/me/shedaniel/rei/mixin/MixinPlayerInventoryScreen.java
index 7071d3d82..ca7439c27 100644
--- a/src/main/java/me/shedaniel/rei/mixin/MixinPlayerInventoryScreen.java
+++ b/src/main/java/me/shedaniel/rei/mixin/MixinPlayerInventoryScreen.java
@@ -34,7 +34,7 @@ public abstract class MixinPlayerInventoryScreen extends AbstractPlayerInventory
@Inject(method = "mouseClicked", at = @At("HEAD"), cancellable = true)
public void mouseClicked(double mouseX, double mouseY, int button, CallbackInfoReturnable<Boolean> ci) {
if (recipeBook.mouseClicked(mouseX, mouseY, button)) {
- focusOn(recipeBook);
+ method_1967(recipeBook);
ci.setReturnValue(true);
ci.cancel();
}
diff --git a/src/main/java/me/shedaniel/rei/mixin/MixinRecipeBookGui.java b/src/main/java/me/shedaniel/rei/mixin/MixinRecipeBookGui.java
index cbd370ab8..a4a129c1a 100644
--- a/src/main/java/me/shedaniel/rei/mixin/MixinRecipeBookGui.java
+++ b/src/main/java/me/shedaniel/rei/mixin/MixinRecipeBookGui.java
@@ -15,7 +15,7 @@ public class MixinRecipeBookGui implements IMixinRecipeBookGui {
protected RecipeBookGhostSlots ghostSlots;
@Override
- public RecipeBookGhostSlots getGhostSlots() {
+ public RecipeBookGhostSlots rei_getGhostSlots() {
return ghostSlots;
}
diff --git a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java
index 3720f1026..1ff89c948 100644
--- a/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java
+++ b/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java
@@ -122,9 +122,9 @@ public class DefaultPlugin implements IRecipePlugin {
@Override
public boolean performAutoCraft(Screen screen, DefaultCraftingDisplay recipe) {
if (screen.getClass().isAssignableFrom(CraftingTableScreen.class))
- ((IMixinRecipeBookGui) (((CraftingTableScreen) screen).getRecipeBookGui())).getGhostSlots().reset();
+ ((IMixinRecipeBookGui) (((CraftingTableScreen) screen).getRecipeBookGui())).rei_getGhostSlots().reset();
else if (screen.getClass().isAssignableFrom(PlayerInventoryScreen.class))
- ((IMixinRecipeBookGui) (((PlayerInventoryScreen) screen).getRecipeBookGui())).getGhostSlots().reset();
+ ((IMixinRecipeBookGui) (((PlayerInventoryScreen) screen).getRecipeBookGui())).rei_getGhostSlots().reset();
else
return false;
MinecraftClient.getInstance().interactionManager.clickRecipe(MinecraftClient.getInstance().player.container.syncId, recipe.getRecipe(), Screen.isShiftPressed());
@@ -145,7 +145,7 @@ public class DefaultPlugin implements IRecipePlugin {
@Override
public boolean performAutoCraft(Screen screen, DefaultSmeltingDisplay recipe) {
if (screen instanceof FurnaceScreen)
- ((IMixinRecipeBookGui) (((FurnaceScreen) screen).getRecipeBookGui())).getGhostSlots().reset();
+ ((IMixinRecipeBookGui) (((FurnaceScreen) screen).getRecipeBookGui())).rei_getGhostSlots().reset();
else
return false;
MinecraftClient.getInstance().interactionManager.clickRecipe(MinecraftClient.getInstance().player.container.syncId, recipe.getRecipe(), Screen.isShiftPressed());
@@ -166,7 +166,7 @@ public class DefaultPlugin implements IRecipePlugin {
@Override
public boolean performAutoCraft(Screen screen, DefaultSmokingDisplay recipe) {
if (screen instanceof SmokerScreen)
- ((IMixinRecipeBookGui) (((SmokerScreen) screen).getRecipeBookGui())).getGhostSlots().reset();
+ ((IMixinRecipeBookGui) (((SmokerScreen) screen).getRecipeBookGui())).rei_getGhostSlots().reset();
else
return false;
MinecraftClient.getInstance().interactionManager.clickRecipe(MinecraftClient.getInstance().player.container.syncId, recipe.getRecipe(), Screen.isShiftPressed());
@@ -192,7 +192,7 @@ public class DefaultPlugin implements IRecipePlugin {
@Override
public boolean performAutoCraft(Screen screen, DefaultBlastingDisplay recipe) {
if (screen instanceof BlastFurnaceScreen)
- ((IMixinRecipeBookGui) (((BlastFurnaceScreen) screen).getRecipeBookGui())).getGhostSlots().reset();
+ ((IMixinRecipeBookGui) (((BlastFurnaceScreen) screen).getRecipeBookGui())).rei_getGhostSlots().reset();
else
return false;
MinecraftClient.getInstance().interactionManager.clickRecipe(MinecraftClient.getInstance().player.container.syncId, recipe.getRecipe(), Screen.isShiftPressed());
diff --git a/src/main/resources/assets/roughlyenoughitems/lang/de_de.json b/src/main/resources/assets/roughlyenoughitems/lang/de_de.json
index 6a14652b3..74f3d2f5c 100644
--- a/src/main/resources/assets/roughlyenoughitems/lang/de_de.json
+++ b/src/main/resources/assets/roughlyenoughitems/lang/de_de.json
@@ -35,10 +35,10 @@
"text.rei.showing_all": "Zeige alle",
"text.rei.delete_items": "§cLösche Item",
"text.rei.check_updates": "Überprüfe Updates: ",
- "text.rei.update_outdated": "§6REI ist veraltet!\\n§6Aktuell: §a%s §6Letzte: §a%s\\n§6Update Priorität: §a%s",
+ "text.rei.update_outdated": "§6REI ist veraltet!\n§6Aktuell: §a%s §6Letzte: §a%s\n§6Update Priorität: §a%s",
"text.rei.update_changelog_line": "§6- %s",
"text.rei.load_default_plugin": "Lade Standard-Plugin: ",
- "text.rei.load_default_plugin.restart_tooltip": "Du möchtest das wahrscheinlich niemals deaktivieren.\\nStarte Minecraft erneut, um die Einstellungen zu übernehmen."
+ "text.rei.load_default_plugin.restart_tooltip": "Du möchtest das wahrscheinlich niemals deaktivieren.\nStarte Minecraft erneut, um die Einstellungen zu übernehmen."
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 9ecf7f31e..0ffdefaba 100755
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -12,7 +12,7 @@
"me.shedaniel.rei.client.ClientHelper"
],
"requires": {
- "fabric": "0.2.1"
+ "fabric": "0.2.2"
},
"recommended": {
"pluginloader": "1.0.6"
generated by cgit (git 2.34.1) at 2026-06-21 21:47:32 +0000