Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to 1.21.1 #297

Open
wants to merge 3 commits into
base: versions/1.21.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ writtenbooks {
}

compass {
version = '1.21'
version = '1.21.1'
}

repositories {
Expand Down Expand Up @@ -69,7 +69,7 @@ dependencies {
remapper 'net.minecraftforge:ForgeAutoRenamingTool:1.0.2'

// Enigma, gorgeous interface for editing mappings
enigma 'org.quiltmc:enigma-swing:2.4.0'
enigma 'org.quiltmc:enigma-swing:2.4.2'

// ParchmentJAM, JAMMER integration for migrating mapping data
jammer 'org.parchmentmc.jam:jam-parchment:0.1.0'
Expand Down
4 changes: 2 additions & 2 deletions data/net/minecraft/client/renderer/ShaderInstance.mapping
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ CLASS net/minecraft/client/renderer/ShaderInstance
ARG 1 name
METHOD setDefaultUniforms (Lcom/mojang/blaze3d/vertex/VertexFormat$Mode;Lorg/joml/Matrix4f;Lorg/joml/Matrix4f;Lcom/mojang/blaze3d/platform/Window;)V
ARG 1 mode
ARG 2 projectionMatrix
ARG 3 frustrumMatrix
ARG 2 frustumMatrix
ARG 3 projectionMatrix
ARG 4 window
METHOD setSampler (Ljava/lang/String;Ljava/lang/Object;)V
ARG 1 name
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ CLASS net/minecraft/commands/arguments/EntityArgument
ARG 2 builder
METHOD parse (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/commands/arguments/selector/EntitySelector;
ARG 1 reader
METHOD parse (Lcom/mojang/brigadier/StringReader;Ljava/lang/Object;)Ljava/lang/Object;
ARG 1 reader
ARG 2 suggestionProvider
METHOD parse (Lcom/mojang/brigadier/StringReader;Z)Lnet/minecraft/commands/arguments/selector/EntitySelector;
ARG 1 reader
ARG 2 allowSelectors
CLASS Info
CLASS Template
METHOD <init> (Lnet/minecraft/commands/arguments/EntityArgument$Info;ZZ)V
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ CLASS net/minecraft/commands/arguments/GameProfileArgument
ARG 2 builder
METHOD parse (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/commands/arguments/GameProfileArgument$Result;
ARG 1 reader
METHOD parse (Lcom/mojang/brigadier/StringReader;Ljava/lang/Object;)Ljava/lang/Object;
ARG 1 reader
ARG 2 suggestionProvider
METHOD parse (Lcom/mojang/brigadier/StringReader;Z)Lnet/minecraft/commands/arguments/GameProfileArgument$Result;
ARG 0 reader
ARG 1 allowSelectors
CLASS Result
METHOD getNames (Lnet/minecraft/commands/CommandSourceStack;)Ljava/util/Collection;
ARG 1 source
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@ CLASS net/minecraft/commands/arguments/ScoreHolderArgument
ARG 1 builder
METHOD parse (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/commands/arguments/ScoreHolderArgument$Result;
ARG 1 reader
METHOD parse (Lcom/mojang/brigadier/StringReader;Ljava/lang/Object;)Ljava/lang/Object;
ARG 1 reader
ARG 2 suggestionProvider
METHOD parse (Lcom/mojang/brigadier/StringReader;Z)Lnet/minecraft/commands/arguments/ScoreHolderArgument$Result;
ARG 1 reader
ARG 2 allowSelectors
CLASS Info
CLASS Template
METHOD <init> (Lnet/minecraft/commands/arguments/ScoreHolderArgument$Info;Z)V
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ CLASS net/minecraft/commands/arguments/selector/EntitySelectorParser
ARG 2 allowSelectors
METHOD addPredicate (Ljava/util/function/Predicate;)V
ARG 1 predicate
METHOD allowSelectors (Ljava/lang/Object;)Z
ARG 0 suggestionProvider
METHOD createAabb (DDD)Lnet/minecraft/world/phys/AABB;
ARG 1 sizeX
ARG 3 sizeY
Expand Down