mirror of
https://github.com/FabricMC/fabric.git
synced 2025-07-29 15:39:55 -04:00
22w03a
1.18.1 is also supported with this version.
This commit is contained in:
modmuss50
parent
1f66e6ce26
commit
e66b59e98c
5 changed files with 45 additions and 26 deletions
fabric-gametest-api-v1/src/main/java/net/fabricmc/fabric/mixin/gametest/server
fabric-lifecycle-events-v1/src/main/java/net/fabricmc/fabric/mixin/event/lifecycle/client
fabric-rendering-v1/src/main/java/net/fabricmc/fabric/mixin/client/rendering
fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/mixin/resource/loader
gradle.properties|
|
@ -64,10 +64,18 @@ public class MainMixin {
|
|||
|
||||
// Exit with a non-zero exit code when the server fails to start.
|
||||
// Otherwise gradlew test will succeed without errors, although no tests have been run.
|
||||
@Inject(method = "main", at = @At(value = "INVOKE", target = "Lorg/apache/logging/log4j/Logger;fatal(Ljava/lang/String;Ljava/lang/Throwable;)V", shift = At.Shift.AFTER, remap = false), remap = false)
|
||||
@Inject(method = "main", at = @At(value = "INVOKE", target = "Lorg/slf4j/Logger;error(Lorg/slf4j/Marker;Ljava/lang/String;Ljava/lang/Throwable;)V", shift = At.Shift.AFTER, remap = false), remap = false, require = 0)
|
||||
private static void exitOnError(CallbackInfo info) {
|
||||
if (FabricGameTestHelper.ENABLED) {
|
||||
System.exit(-1);
|
||||
}
|
||||
}
|
||||
|
||||
@Deprecated(forRemoval = true) // 1.18.1 support
|
||||
@Inject(method = "main", at = @At(value = "INVOKE", target = "Lorg/apache/logging/log4j/Logger;fatal(Ljava/lang/String;Ljava/lang/Throwable;)V", shift = At.Shift.AFTER, remap = false), remap = false, require = 0)
|
||||
private static void exitOnErrorLegacy(CallbackInfo info) {
|
||||
if (FabricGameTestHelper.ENABLED) {
|
||||
System.exit(-1);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ public abstract class MinecraftClientMixin {
|
|||
ClientTickEvents.END_CLIENT_TICK.invoker().onEndTick((MinecraftClient) (Object) this);
|
||||
}
|
||||
|
||||
@Inject(at = @At(value = "INVOKE", target = "Lorg/apache/logging/log4j/Logger;info(Ljava/lang/String;)V", shift = At.Shift.AFTER), method = "stop")
|
||||
@Inject(at = @At(value = "INVOKE", target = "{1}(Ljava/lang/String;)V" /* Logger.info */, shift = At.Shift.AFTER, remap = false), method = "stop")
|
||||
private void onStopping(CallbackInfo ci) {
|
||||
ClientLifecycleEvents.CLIENT_STOPPING.invoker().onClientStopping((MinecraftClient) (Object) this);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -196,8 +196,19 @@ public abstract class MixinWorldRenderer {
|
|||
}
|
||||
}
|
||||
|
||||
@Inject(at = @At(value = "INVOKE", target = "Ljava/lang/Runnable;run()V", shift = At.Shift.AFTER, ordinal = 0), method = "renderSky(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/util/math/Matrix4f;FLjava/lang/Runnable;)V", cancellable = true)
|
||||
@Deprecated(forRemoval = true) // 1.18.1 support
|
||||
@Inject(at = @At(value = "INVOKE", target = "Ljava/lang/Runnable;run()V", shift = At.Shift.AFTER, ordinal = 0), method = "method_3257(Lnet/minecraft/class_4587;Lnet/minecraft/class_1159;FLjava/lang/Runnable;)V", cancellable = true, require = 0, remap = false)
|
||||
private void renderSky(MatrixStack matrices, Matrix4f matrix4f, float tickDelta, Runnable runnable, CallbackInfo info) {
|
||||
fabricRenderSky(info);
|
||||
}
|
||||
|
||||
@Inject(at = @At(value = "INVOKE", target = "Ljava/lang/Runnable;run()V", shift = At.Shift.AFTER, ordinal = 0), method = "renderSky(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/util/math/Matrix4f;FLnet/minecraft/client/render/Camera;ZLjava/lang/Runnable;)V", cancellable = true, require = 0)
|
||||
private void renderSky(MatrixStack matrices, Matrix4f matrix4f, float tickDelta, Camera camera, boolean bl, Runnable runnable, CallbackInfo info) {
|
||||
fabricRenderSky(info);
|
||||
}
|
||||
|
||||
@Unique
|
||||
private void fabricRenderSky(CallbackInfo info) {
|
||||
if (this.client.world != null) {
|
||||
DimensionRenderingRegistry.SkyRenderer renderer = DimensionRenderingRegistry.getSkyRenderer(world.getRegistryKey());
|
||||
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ public class ReloadableResourceManagerImplMixin {
|
|||
@Final
|
||||
private List<ResourceReloader> reloaders;
|
||||
|
||||
@Inject(at = @At(value = "INVOKE", target = "Lorg/apache/logging/log4j/Logger;isDebugEnabled()Z", remap = false), method = "reload")
|
||||
@Inject(at = @At(value = "INVOKE", target = "{1}()Z" /* isDebugEnabled()Z */, remap = false), method = "reload")
|
||||
private void reload(Executor prepareExecutor, Executor applyExecutor, CompletableFuture<Unit> initialStage, List<ResourcePack> packs, CallbackInfoReturnable<ResourceReload> info) {
|
||||
ResourceManagerHelperImpl.sort(type, this.reloaders);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,57 +1,57 @@
|
|||
org.gradle.jvmargs=-Xmx2560M
|
||||
|
||||
version=0.46.1
|
||||
minecraft_version=1.18.1
|
||||
yarn_version=+build.7
|
||||
version=0.46.2
|
||||
minecraft_version=22w03a
|
||||
yarn_version=+build.1
|
||||
loader_version=0.12.12
|
||||
|
||||
prerelease=false
|
||||
prerelease=true
|
||||
|
||||
# Do not manually update, use the bumpversions task:
|
||||
fabric-api-base-version=0.4.1
|
||||
fabric-api-lookup-api-v1-version=1.5.0
|
||||
fabric-api-lookup-api-v1-version=1.5.1
|
||||
fabric-biome-api-v1-version=6.0.1
|
||||
fabric-blockrenderlayer-v1-version=1.1.9
|
||||
fabric-command-api-v1-version=1.1.6
|
||||
fabric-commands-v0-version=0.2.5
|
||||
fabric-containers-v0-version=0.1.18
|
||||
fabric-content-registries-v0-version=0.4.5
|
||||
fabric-content-registries-v0-version=0.4.6
|
||||
fabric-crash-report-info-v1-version=0.1.8
|
||||
fabric-data-generation-api-v1-version=1.1.2
|
||||
fabric-dimensions-v1-version=2.1.9
|
||||
fabric-entity-events-v1-version=1.4.5
|
||||
fabric-events-interaction-v0-version=0.4.16
|
||||
fabric-events-lifecycle-v0-version=0.2.6
|
||||
fabric-events-lifecycle-v0-version=0.2.7
|
||||
fabric-game-rule-api-v1-version=1.0.10
|
||||
fabric-gametest-api-v1-version=1.0.7
|
||||
fabric-gametest-api-v1-version=1.0.8
|
||||
fabric-item-api-v1-version=1.3.0
|
||||
fabric-item-groups-v0-version=0.3.3
|
||||
fabric-item-groups-v0-version=0.3.4
|
||||
fabric-key-binding-api-v1-version=1.0.8
|
||||
fabric-keybindings-v0-version=0.2.6
|
||||
fabric-lifecycle-events-v1-version=1.4.10
|
||||
fabric-lifecycle-events-v1-version=1.4.11
|
||||
fabric-loot-tables-v1-version=1.0.8
|
||||
fabric-mining-level-api-v1-version=1.0.3
|
||||
fabric-mining-levels-v0-version=0.1.8
|
||||
fabric-mining-level-api-v1-version=1.0.4
|
||||
fabric-mining-levels-v0-version=0.1.9
|
||||
fabric-models-v0-version=0.3.3
|
||||
fabric-networking-api-v1-version=1.0.18
|
||||
fabric-networking-v0-version=0.3.5
|
||||
fabric-object-builder-api-v1-version=1.11.1
|
||||
fabric-object-builders-v0-version=0.7.9
|
||||
fabric-object-builder-api-v1-version=1.11.2
|
||||
fabric-object-builders-v0-version=0.7.10
|
||||
fabric-particles-v1-version=0.2.9
|
||||
fabric-registry-sync-v0-version=0.9.0
|
||||
fabric-renderer-api-v1-version=0.4.10
|
||||
fabric-renderer-indigo-version=0.4.13
|
||||
fabric-renderer-registries-v1-version=3.2.7
|
||||
fabric-renderer-registries-v1-version=3.2.8
|
||||
fabric-rendering-data-attachment-v1-version=0.3.4
|
||||
fabric-rendering-fluids-v1-version=0.1.18
|
||||
fabric-rendering-v0-version=1.1.9
|
||||
fabric-rendering-v1-version=1.10.3
|
||||
fabric-rendering-v0-version=1.1.10
|
||||
fabric-rendering-v1-version=1.10.4
|
||||
fabric-resource-conditions-api-v1-version=1.0.1
|
||||
fabric-resource-loader-v0-version=0.4.11
|
||||
fabric-resource-loader-v0-version=0.4.12
|
||||
fabric-screen-api-v1-version=1.0.7
|
||||
fabric-screen-handler-api-v1-version=1.1.11
|
||||
fabric-structure-api-v1-version=2.1.0
|
||||
fabric-tag-extensions-v0-version=1.2.5
|
||||
fabric-structure-api-v1-version=2.1.1
|
||||
fabric-tag-extensions-v0-version=1.2.6
|
||||
fabric-textures-v0-version=1.0.9
|
||||
fabric-tool-attribute-api-v1-version=1.3.5
|
||||
fabric-transfer-api-v1-version=1.5.6
|
||||
fabric-tool-attribute-api-v1-version=1.3.6
|
||||
fabric-transfer-api-v1-version=1.5.7
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue