diff options
| author | shedaniel <daniel@shedaniel.me> | 2021-08-19 17:50:32 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2021-08-19 17:50:32 +0800 |
| commit | 0e1c2c118a6fcd997089565da6f9edf7c5989445 (patch) | |
| tree | 7084e4fd6724f500b07f11b7f23c34290b2b49cd /runtime/src/main/java | |
| parent | e2c4f4c8a8bf2f111850d1ef0f5a9172f858c7e5 (diff) | |
| download | RoughlyEnoughItems-0e1c2c118a6fcd997089565da6f9edf7c5989445.tar.gz RoughlyEnoughItems-0e1c2c118a6fcd997089565da6f9edf7c5989445.tar.bz2 RoughlyEnoughItems-0e1c2c118a6fcd997089565da6f9edf7c5989445.zip | |
Fix conflicts
Diffstat (limited to 'runtime/src/main/java')
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java index 18a6c3b65..621ee02e4 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/config/ConfigManagerImpl.java @@ -69,7 +69,6 @@ import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.components.Button; import net.minecraft.client.gui.components.events.GuiEventListener; -import net.minecraft.client.gui.narration.NarratableEntry; import net.minecraft.client.gui.screens.Screen; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; @@ -324,10 +323,6 @@ public class ConfigManagerImpl implements ConfigManager { public List<? extends GuiEventListener> children() { return Collections.emptyList(); } - - public List<? extends NarratableEntry> narratables() { - return Collections.emptyList(); - } } try { |