Skip to content

Commit 3041667

Browse files
lineargraphlineargraph
committed
refactor: switch to mojmaps
1 parent 7e5063f commit 3041667

File tree

16 files changed

+381
-295
lines changed

16 files changed

+381
-295
lines changed

‎build-src/src/main/kotlin/moulconfig.fabric.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ the<UniminedExtension>().minecraft {
1717
version(minecraftVersion)
1818
mappings {
1919
intermediary()
20-
yarn(property("moulconfig.yarn") as String)
20+
mojmap()
2121
}
2222

2323
fabric {

‎modern/1.21.10/src/main/resources/moulconfig.accesswidener‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
accessWidener v2 named
22

3-
accessible method net/minecraft/client/gui/DrawContext setScissor (Lnet/minecraft/client/gui/ScreenRect;)V
4-
accessible field net/minecraft/client/gui/DrawContext scissorStack Lnet/minecraft/client/gui/DrawContext$ScissorStack;
5-
accessible method net/minecraft/client/gui/DrawContext drawTexturedQuad (Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIIIFFFFI)V
6-
accessible class net/minecraft/client/gui/DrawContext$ScissorStack
7-
accessible method net/minecraft/client/gui/DrawContext fill (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/texture/TextureSetup;IIIIILjava/lang/Integer;)V
8-
accessible field net/minecraft/client/gui/DrawContext$ScissorStack stack Ljava/util/Deque;
9-
accessible method net/minecraft/client/gui/DrawContext fill (Lcom/mojang/blaze3d/pipeline/RenderPipeline;IIIII)V
10-
accessible method net/minecraft/client/gui/DrawContext drawTexturedQuad (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIIIFFFFI)V
11-
accessible field net/minecraft/client/render/GameRenderer guiState Lnet/minecraft/client/gui/render/state/GuiRenderState;
12-
accessible field net/minecraft/client/gl/RenderPipelines GUI_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
13-
accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;ILcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
14-
accessible class net/minecraft/client/render/RenderLayer$MultiPhase
15-
accessible class net/minecraft/client/render/RenderLayer$MultiPhaseParameters
16-
accessible method net/minecraft/client/render/RenderLayer$MultiPhaseParameters$Builder build (Z)Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;
17-
accessible field net/minecraft/client/gui/DrawContext state Lnet/minecraft/client/gui/render/state/GuiRenderState;
3+
accessible method net/minecraft/client/gui/GuiGraphics setScissor (Lnet/minecraft/client/gui/navigation/ScreenRectangle;)V
4+
accessible field net/minecraft/client/gui/GuiGraphics scissorStack Lnet/minecraft/client/gui/GuiGraphics$ScissorStack;
5+
accessible method net/minecraft/client/gui/GuiGraphics drawTexturedQuad (Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIIIFFFFI)V
6+
accessible class net/minecraft/client/gui/GuiGraphics$ScissorStack
7+
accessible method net/minecraft/client/gui/GuiGraphics fill (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/gui/render/TextureSetup;IIIIILjava/lang/Integer;)V
8+
accessible field net/minecraft/client/gui/GuiGraphics$ScissorStack stack Ljava/util/Deque;
9+
accessible method net/minecraft/client/gui/GuiGraphics fill (Lcom/mojang/blaze3d/pipeline/RenderPipeline;IIIII)V
10+
accessible method net/minecraft/client/gui/GuiGraphics drawTexturedQuad (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/ResourceLocation;IIIIFFFFI)V
11+
accessible field net/minecraft/client/renderer/GameRenderer guiRenderState Lnet/minecraft/client/gui/render/state/GuiRenderState;
12+
accessible field net/minecraft/client/renderer/RenderPipelines GUI_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
13+
accessible method net/minecraft/client/renderer/RenderType of (Ljava/lang/String;ILcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/renderer/RenderType$CompositeRenderType$Parameters;)Lnet/minecraft/client/renderer/RenderType$CompositeRenderType;
14+
accessible class net/minecraft/client/renderer/RenderType$CompositeRenderType
15+
accessible class net/minecraft/client/renderer/RenderType$CompositeRenderType$Parameters
16+
accessible method net/minecraft/client/renderer/RenderType$CompositeRenderType$Parameters$Builder build (Z)Lnet/minecraft/client/renderer/RenderType$CompositeRenderType$Parameters;
17+
accessible field net/minecraft/client/gui/GuiGraphics guiRenderState Lnet/minecraft/client/gui/render/state/GuiRenderState;
18+
accessible method net/minecraft/client/gui/GuiGraphics submitColoredRectangle (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/gui/render/TextureSetup;IIIIILjava/lang/Integer;)V
19+
accessible method net/minecraft/client/gui/GuiGraphics innerBlit (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/ResourceLocation;IIIIFFFFI)V

‎modern/1.21.4/src/main/resources/moulconfig.accesswidener‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
accessWidener v2 named
2-
accessible class net/minecraft/client/gui/DrawContext$ScissorStack
3-
accessible method net/minecraft/client/gui/DrawContext setScissor (Lnet/minecraft/client/gui/ScreenRect;)V
4-
accessible field net/minecraft/client/gui/DrawContext scissorStack Lnet/minecraft/client/gui/DrawContext$ScissorStack;
5-
accessible field net/minecraft/client/gui/DrawContext$ScissorStack stack Ljava/util/Deque;
6-
accessible method net/minecraft/client/gui/DrawContext drawTexturedQuad (Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIIIFFFFI)V
72

8-
accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;Lnet/minecraft/client/render/VertexFormat;Lnet/minecraft/client/render/VertexFormat$DrawMode;IZZLnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
9-
accessible class net/minecraft/client/render/RenderLayer$MultiPhase
10-
accessible class net/minecraft/client/render/RenderLayer$MultiPhaseParameters
11-
accessible class net/minecraft/client/render/RenderPhase$Texture
12-
accessible class net/minecraft/client/render/RenderPhase$DepthTest
13-
accessible class net/minecraft/client/render/RenderPhase$ShaderProgram
14-
accessible class net/minecraft/client/render/RenderPhase$Transparency
15-
accessible field net/minecraft/client/render/RenderPhase TRANSLUCENT_TRANSPARENCY Lnet/minecraft/client/render/RenderPhase$Transparency;
16-
accessible field net/minecraft/client/render/RenderPhase LEQUAL_DEPTH_TEST Lnet/minecraft/client/render/RenderPhase$DepthTest;
17-
accessible field net/minecraft/client/render/RenderPhase POSITION_PROGRAM Lnet/minecraft/client/render/RenderPhase$ShaderProgram;
18-
accessible field net/minecraft/client/render/RenderPhase OR_REVERSE Lnet/minecraft/client/render/RenderPhase$ColorLogic;
3+
accessible method net/minecraft/client/gui/GuiGraphics setScissor (Lnet/minecraft/client/gui/navigation/ScreenRectangle;)V
4+
accessible field net/minecraft/client/gui/GuiGraphics scissorStack Lnet/minecraft/client/gui/GuiGraphics$ScissorStack;
5+
accessible method net/minecraft/client/gui/GuiGraphics drawTexturedQuad (Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIIIFFFFI)V
6+
accessible class net/minecraft/client/gui/GuiGraphics$ScissorStack
7+
accessible method net/minecraft/client/gui/GuiGraphics fill (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/gui/render/TextureSetup;IIIIILjava/lang/Integer;)V
8+
accessible field net/minecraft/client/gui/GuiGraphics$ScissorStack stack Ljava/util/Deque;
9+
accessible method net/minecraft/client/gui/GuiGraphics fill (Lcom/mojang/blaze3d/pipeline/RenderPipeline;IIIII)V
10+
accessible method net/minecraft/client/gui/GuiGraphics drawTexturedQuad (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/ResourceLocation;IIIIFFFFI)V
11+
accessible field net/minecraft/client/renderer/GameRenderer guiRenderState Lnet/minecraft/client/gui/render/state/GuiRenderState;
12+
accessible field net/minecraft/client/renderer/RenderPipelines GUI_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
13+
accessible method net/minecraft/client/renderer/RenderType of (Ljava/lang/String;ILcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/renderer/RenderType$CompositeRenderType$Parameters;)Lnet/minecraft/client/renderer/RenderType$CompositeRenderType;
14+
accessible class net/minecraft/client/renderer/RenderType$CompositeRenderType
15+
accessible class net/minecraft/client/renderer/RenderType$CompositeRenderType$Parameters
16+
accessible method net/minecraft/client/renderer/RenderType$CompositeRenderType$Parameters$Builder build (Z)Lnet/minecraft/client/renderer/RenderType$CompositeRenderType$Parameters;
17+
accessible field net/minecraft/client/gui/GuiGraphics guiRenderState Lnet/minecraft/client/gui/render/state/GuiRenderState;
18+
accessible method net/minecraft/client/gui/GuiGraphics submitColoredRectangle (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/gui/render/TextureSetup;IIIIILjava/lang/Integer;)V
19+
accessible method net/minecraft/client/gui/GuiGraphics innerBlit (Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIIIFFFFI)V
20+
accessible method net/minecraft/client/gui/GuiGraphics bufferSource ()Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;

‎modern/1.21.5/src/main/resources/moulconfig.accesswidener‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
11
accessWidener v2 named
22

3-
accessible method net/minecraft/client/gui/DrawContext setScissor (Lnet/minecraft/client/gui/ScreenRect;)V
4-
accessible field net/minecraft/client/gui/DrawContext scissorStack Lnet/minecraft/client/gui/DrawContext$ScissorStack;
5-
accessible method net/minecraft/client/gui/DrawContext drawTexturedQuad (Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIIIFFFFI)V
6-
accessible class net/minecraft/client/gui/DrawContext$ScissorStack
7-
accessible field net/minecraft/client/gui/DrawContext$ScissorStack stack Ljava/util/Deque;
8-
9-
accessible field net/minecraft/client/gl/RenderPipelines GUI_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
10-
accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;ILcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
11-
accessible class net/minecraft/client/render/RenderLayer$MultiPhase
12-
accessible class net/minecraft/client/render/RenderLayer$MultiPhaseParameters
13-
accessible method net/minecraft/client/render/RenderLayer$MultiPhaseParameters$Builder build (Z)Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;
3+
accessible method net/minecraft/client/gui/GuiGraphics setScissor (Lnet/minecraft/client/gui/navigation/ScreenRectangle;)V
4+
accessible field net/minecraft/client/gui/GuiGraphics scissorStack Lnet/minecraft/client/gui/GuiGraphics$ScissorStack;
5+
accessible method net/minecraft/client/gui/GuiGraphics drawTexturedQuad (Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIIIFFFFI)V
6+
accessible class net/minecraft/client/gui/GuiGraphics$ScissorStack
7+
accessible method net/minecraft/client/gui/GuiGraphics fill (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/gui/render/TextureSetup;IIIIILjava/lang/Integer;)V
8+
accessible field net/minecraft/client/gui/GuiGraphics$ScissorStack stack Ljava/util/Deque;
9+
accessible method net/minecraft/client/gui/GuiGraphics fill (Lcom/mojang/blaze3d/pipeline/RenderPipeline;IIIII)V
10+
accessible method net/minecraft/client/gui/GuiGraphics drawTexturedQuad (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/ResourceLocation;IIIIFFFFI)V
11+
accessible field net/minecraft/client/renderer/GameRenderer guiRenderState Lnet/minecraft/client/gui/render/state/GuiRenderState;
12+
accessible field net/minecraft/client/renderer/RenderPipelines GUI_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
13+
accessible method net/minecraft/client/renderer/RenderType of (Ljava/lang/String;ILcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/renderer/RenderType$CompositeRenderType$Parameters;)Lnet/minecraft/client/renderer/RenderType$CompositeRenderType;
14+
accessible class net/minecraft/client/renderer/RenderType$CompositeRenderType
15+
accessible class net/minecraft/client/renderer/RenderType$CompositeRenderType$Parameters
16+
accessible method net/minecraft/client/renderer/RenderType$CompositeRenderType$Parameters$Builder build (Z)Lnet/minecraft/client/renderer/RenderType$CompositeRenderType$Parameters;
17+
accessible field net/minecraft/client/gui/GuiGraphics guiRenderState Lnet/minecraft/client/gui/render/state/GuiRenderState;
18+
accessible method net/minecraft/client/gui/GuiGraphics submitColoredRectangle (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/gui/render/TextureSetup;IIIIILjava/lang/Integer;)V
19+
accessible method net/minecraft/client/gui/GuiGraphics innerBlit (Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIIIFFFFI)V
20+
accessible method net/minecraft/client/gui/GuiGraphics bufferSource ()Lnet/minecraft/client/renderer/MultiBufferSource$BufferSource;

‎modern/1.21.7/src/main/resources/moulconfig.accesswidener‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
accessWidener v2 named
22

3-
accessible method net/minecraft/client/gui/DrawContext setScissor (Lnet/minecraft/client/gui/ScreenRect;)V
4-
accessible field net/minecraft/client/gui/DrawContext scissorStack Lnet/minecraft/client/gui/DrawContext$ScissorStack;
5-
accessible method net/minecraft/client/gui/DrawContext drawTexturedQuad (Ljava/util/function/Function;Lnet/minecraft/util/Identifier;IIIIFFFFI)V
6-
accessible class net/minecraft/client/gui/DrawContext$ScissorStack
7-
accessible method net/minecraft/client/gui/DrawContext fill (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/texture/TextureSetup;IIIIILjava/lang/Integer;)V
8-
accessible field net/minecraft/client/gui/DrawContext$ScissorStack stack Ljava/util/Deque;
9-
accessible method net/minecraft/client/gui/DrawContext fill (Lcom/mojang/blaze3d/pipeline/RenderPipeline;IIIII)V
10-
accessible method net/minecraft/client/gui/DrawContext drawTexturedQuad (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/util/Identifier;IIIIFFFFI)V
11-
accessible field net/minecraft/client/render/GameRenderer guiState Lnet/minecraft/client/gui/render/state/GuiRenderState;
12-
accessible field net/minecraft/client/gl/RenderPipelines GUI_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
13-
accessible method net/minecraft/client/render/RenderLayer of (Ljava/lang/String;ILcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;)Lnet/minecraft/client/render/RenderLayer$MultiPhase;
14-
accessible class net/minecraft/client/render/RenderLayer$MultiPhase
15-
accessible class net/minecraft/client/render/RenderLayer$MultiPhaseParameters
16-
accessible method net/minecraft/client/render/RenderLayer$MultiPhaseParameters$Builder build (Z)Lnet/minecraft/client/render/RenderLayer$MultiPhaseParameters;
17-
accessible field net/minecraft/client/gui/DrawContext state Lnet/minecraft/client/gui/render/state/GuiRenderState;
3+
accessible method net/minecraft/client/gui/GuiGraphics setScissor (Lnet/minecraft/client/gui/navigation/ScreenRectangle;)V
4+
accessible field net/minecraft/client/gui/GuiGraphics scissorStack Lnet/minecraft/client/gui/GuiGraphics$ScissorStack;
5+
accessible method net/minecraft/client/gui/GuiGraphics drawTexturedQuad (Ljava/util/function/Function;Lnet/minecraft/resources/ResourceLocation;IIIIFFFFI)V
6+
accessible class net/minecraft/client/gui/GuiGraphics$ScissorStack
7+
accessible method net/minecraft/client/gui/GuiGraphics fill (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/gui/render/TextureSetup;IIIIILjava/lang/Integer;)V
8+
accessible field net/minecraft/client/gui/GuiGraphics$ScissorStack stack Ljava/util/Deque;
9+
accessible method net/minecraft/client/gui/GuiGraphics fill (Lcom/mojang/blaze3d/pipeline/RenderPipeline;IIIII)V
10+
accessible method net/minecraft/client/gui/GuiGraphics drawTexturedQuad (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/ResourceLocation;IIIIFFFFI)V
11+
accessible field net/minecraft/client/renderer/GameRenderer guiRenderState Lnet/minecraft/client/gui/render/state/GuiRenderState;
12+
accessible field net/minecraft/client/renderer/RenderPipelines GUI_SNIPPET Lcom/mojang/blaze3d/pipeline/RenderPipeline$Snippet;
13+
accessible method net/minecraft/client/renderer/RenderType of (Ljava/lang/String;ILcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/renderer/RenderType$CompositeRenderType$Parameters;)Lnet/minecraft/client/renderer/RenderType$CompositeRenderType;
14+
accessible class net/minecraft/client/renderer/RenderType$CompositeRenderType
15+
accessible class net/minecraft/client/renderer/RenderType$CompositeRenderType$Parameters
16+
accessible method net/minecraft/client/renderer/RenderType$CompositeRenderType$Parameters$Builder build (Z)Lnet/minecraft/client/renderer/RenderType$CompositeRenderType$Parameters;
17+
accessible field net/minecraft/client/gui/GuiGraphics guiRenderState Lnet/minecraft/client/gui/render/state/GuiRenderState;
18+
accessible method net/minecraft/client/gui/GuiGraphics submitColoredRectangle (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/client/gui/render/TextureSetup;IIIIILjava/lang/Integer;)V
19+
accessible method net/minecraft/client/gui/GuiGraphics innerBlit (Lcom/mojang/blaze3d/pipeline/RenderPipeline;Lnet/minecraft/resources/ResourceLocation;IIIIFFFFI)V

‎modern/templates/java/io/github/notenoughupdates/moulconfig/platform/ModernKeybindHelper.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.github.notenoughupdates.moulconfig.platform;
22

3+
import com.mojang.blaze3d.platform.InputConstants;
34
import io.github.notenoughupdates.moulconfig.common.text.StructuredText;
4-
import net.minecraft.client.util.InputUtil;
55
#if MC > 12107
6-
import net.minecraft.client.input.KeyInput;
6+
import net.minecraft.client.input.KeyEvent;
77
#endif
88

99
public class ModernKeybindHelper {
@@ -14,9 +14,9 @@ public static StructuredText getKeyName(int keyCode) { // TODO: translations
1414
return StructuredText.of("Button " + (keyCode + 1));
1515
} else {
1616
#if MC < 12109
17-
StructuredText keyName = MoulConfigText.wrap(InputUtil.fromKeyCode(keyCode, 0).getLocalizedText());
17+
StructuredText keyName = MoulConfigText.wrap(InputConstants.getKey(keyCode, 0).getDisplayName());
1818
#else
19-
StructuredText keyName = MoulConfigText.wrap(InputUtil.fromKeyCode(new KeyInput(keyCode, 0, 0)).getLocalizedText());
19+
StructuredText keyName = MoulConfigText.wrap(InputConstants.getKey(new KeyEvent(keyCode, 0, 0)).getDisplayName());
2020
#endif
2121
if (keyName == null) {
2222
keyName = StructuredText.of("???");

0 commit comments

Comments
 (0)