diff options
| author | shedaniel <daniel@shedaniel.me> | 2023-11-02 16:03:44 +0800 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2023-11-02 16:05:35 +0800 |
| commit | 11b87fdd96f5542d646aa8f5136095917f207564 (patch) | |
| tree | b11c8db175d900d742feb86125928d6dbff890be /runtime | |
| parent | b81619d917d472615cd027eca3b408113c7f6750 (diff) | |
| parent | 48db9a4d892888bc80bcfd53ef50b8f304937e2f (diff) | |
| download | RoughlyEnoughItems-11b87fdd96f5542d646aa8f5136095917f207564.tar.gz RoughlyEnoughItems-11b87fdd96f5542d646aa8f5136095917f207564.tar.bz2 RoughlyEnoughItems-11b87fdd96f5542d646aa8f5136095917f207564.zip | |
Merge remote-tracking branch 'origin/12.x-1.20' into 13.x-1.20.2
# Conflicts:
# fabric/src/main/resources/roughlyenoughitems.accessWidener
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/impl/client/gui/RecipeDisplayExporter.java | 2 | ||||
| -rw-r--r-- | runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/RecipeDisplayExporter.java b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/RecipeDisplayExporter.java index 1c2757b15..eb589799f 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/RecipeDisplayExporter.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/client/gui/RecipeDisplayExporter.java @@ -85,7 +85,7 @@ public final class RecipeDisplayExporter { RenderTarget renderTarget = new TextureTarget(window.getWidth(), window.getHeight(), true, false); renderTarget.bindWrite(true); RenderSystem.clear(256, Minecraft.ON_OSX); - Matrix4f matrix4f = new Matrix4f().setOrtho(0.0F, (float) ((double) window.getWidth() / window.getGuiScale()), 0.0F, (float) ((double) window.getHeight() / window.getGuiScale()), 1000.0F, 3000.0F); + Matrix4f matrix4f = new Matrix4f().setOrtho(0.0F, (float) ((double) window.getWidth() / window.getGuiScale()), (float) ((double) window.getHeight() / window.getGuiScale()), 0.0F, 1000.0F, 3000.0F); RenderSystem.setProjectionMatrix(matrix4f, VertexSorting.ORTHOGRAPHIC_Z); PoseStack poseStack = RenderSystem.getModelViewStack(); poseStack.pushPose(); diff --git a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java index c756205e3..6e463d728 100644 --- a/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java +++ b/runtime/src/main/java/me/shedaniel/rei/impl/common/entry/type/EntryRegistryImpl.java @@ -65,7 +65,9 @@ public class EntryRegistryImpl implements EntryRegistry { @Override public void acceptPlugin(REIClientPlugin plugin) { + int size = size(); plugin.registerEntries(this); + InternalLogger.getInstance().trace("Registered %d entries from plugin %s", size() - size, plugin.getPluginProviderName()); } @Override |