From c81c703d766451cf9a2aa9552b14bf8656e5d5f0 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Sat, 1 Apr 2023 22:13:14 +0800 Subject: [PATCH] 23w13a_or_b --- .github/workflows/1.20_push.yml | 1 + .../registry/level/entity/trade/SimpleTrade.java | 3 ++- common/src/main/resources/architectury.accessWidener | 5 +++++ .../dev/architectury/mixin/fabric/MixinLivingEntity.java | 2 +- .../dev/architectury/mixin/fabric/PlayerAttackInvoker.java | 2 +- .../mixin/fabric/client/ClientPlayerAttackInvoker.java | 2 +- .../architectury/mixin/fabric/client/MixinGameRenderer.java | 5 +++-- gradle.properties | 6 +++--- 8 files changed, 17 insertions(+), 9 deletions(-) diff --git a/.github/workflows/1.20_push.yml b/.github/workflows/1.20_push.yml index c2feec6b..1b0b40c3 100644 --- a/.github/workflows/1.20_push.yml +++ b/.github/workflows/1.20_push.yml @@ -8,6 +8,7 @@ on: - '**/src/**' branches: - "1.20" + - "1.20-23w13ab" workflow_dispatch: inputs: norelease: diff --git a/common/src/main/java/dev/architectury/registry/level/entity/trade/SimpleTrade.java b/common/src/main/java/dev/architectury/registry/level/entity/trade/SimpleTrade.java index c21daa33..5a70a4ad 100644 --- a/common/src/main/java/dev/architectury/registry/level/entity/trade/SimpleTrade.java +++ b/common/src/main/java/dev/architectury/registry/level/entity/trade/SimpleTrade.java @@ -22,6 +22,7 @@ package dev.architectury.registry.level.entity.trade; import net.minecraft.util.RandomSource; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.npc.VillagerTrades; +import net.minecraft.world.item.Item; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.trading.MerchantOffer; import org.jetbrains.annotations.Nullable; @@ -55,7 +56,7 @@ public record SimpleTrade(ItemStack primaryPrice, ItemStack secondaryPrice, @Nullable @Override - public MerchantOffer getOffer(Entity entity, RandomSource random) { + public MerchantOffer getOffer(Entity entity, RandomSource random, Item gemItem) { return new MerchantOffer(this.primaryPrice, this.secondaryPrice, this.sale, this.maxTrades, this.experiencePoints, this.priceMultiplier); } } diff --git a/common/src/main/resources/architectury.accessWidener b/common/src/main/resources/architectury.accessWidener index 9038956c..e347941c 100644 --- a/common/src/main/resources/architectury.accessWidener +++ b/common/src/main/resources/architectury.accessWidener @@ -170,6 +170,7 @@ transitive-accessible method net/minecraft/world/level/block/CakeBlock (L transitive-accessible method net/minecraft/world/level/block/CandleCakeBlock (Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/CartographyTableBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/CarvedPumpkinBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V +transitive-accessible method net/minecraft/world/level/block/CheeseBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/ChestBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;Ljava/util/function/Supplier;)V transitive-accessible method net/minecraft/world/level/block/ChorusFlowerBlock (Lnet/minecraft/world/level/block/ChorusPlantBlock;Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/ChorusPlantBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V @@ -211,8 +212,11 @@ transitive-accessible method net/minecraft/world/level/block/MangroveRootsBlock transitive-accessible method net/minecraft/world/level/block/MelonBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/NetherWartBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/NyliumBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V +transitive-accessible method net/minecraft/world/level/block/PackedAirBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V +transitive-accessible method net/minecraft/world/level/block/PickaxeBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/PinkPetalsBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/PipeBlock (FLnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V +transitive-accessible method net/minecraft/world/level/block/PlaceBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/PlayerHeadBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/PlayerWallHeadBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V transitive-accessible method net/minecraft/world/level/block/PoweredRailBlock (Lnet/minecraft/world/level/block/state/BlockBehaviour$Properties;)V @@ -332,6 +336,7 @@ transitive-accessible field net/minecraft/client/renderer/RenderStateShard LEQUA transitive-accessible field net/minecraft/client/renderer/RenderStateShard COLOR_DEPTH_WRITE Lnet/minecraft/client/renderer/RenderStateShard$WriteMaskStateShard; transitive-accessible field net/minecraft/client/renderer/RenderStateShard COLOR_WRITE Lnet/minecraft/client/renderer/RenderStateShard$WriteMaskStateShard; transitive-accessible field net/minecraft/client/renderer/RenderStateShard DEPTH_WRITE Lnet/minecraft/client/renderer/RenderStateShard$WriteMaskStateShard; +transitive-accessible field net/minecraft/client/renderer/RenderStateShard NO_WRITE Lnet/minecraft/client/renderer/RenderStateShard$WriteMaskStateShard; transitive-accessible field net/minecraft/client/renderer/RenderStateShard NO_LAYERING Lnet/minecraft/client/renderer/RenderStateShard$LayeringStateShard; transitive-accessible field net/minecraft/client/renderer/RenderStateShard POLYGON_OFFSET_LAYERING Lnet/minecraft/client/renderer/RenderStateShard$LayeringStateShard; transitive-accessible field net/minecraft/client/renderer/RenderStateShard VIEW_OFFSET_Z_LAYERING Lnet/minecraft/client/renderer/RenderStateShard$LayeringStateShard; diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/MixinLivingEntity.java b/fabric/src/main/java/dev/architectury/mixin/fabric/MixinLivingEntity.java index 7d31bae6..7a9541e0 100644 --- a/fabric/src/main/java/dev/architectury/mixin/fabric/MixinLivingEntity.java +++ b/fabric/src/main/java/dev/architectury/mixin/fabric/MixinLivingEntity.java @@ -33,7 +33,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(LivingEntity.class) public class MixinLivingEntity { - @Inject(method = "hurt", at = @At("HEAD"), cancellable = true) + @Inject(method = "hurtInternal", at = @At("HEAD"), cancellable = true) private void hurt(DamageSource damageSource, float f, CallbackInfoReturnable cir) { if ((Object) this instanceof Player) return; if (EntityEvent.LIVING_HURT.invoker().hurt((LivingEntity) (Object) this, damageSource, f).isFalse()) { diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/PlayerAttackInvoker.java b/fabric/src/main/java/dev/architectury/mixin/fabric/PlayerAttackInvoker.java index 8b5a0a8a..7979e57b 100644 --- a/fabric/src/main/java/dev/architectury/mixin/fabric/PlayerAttackInvoker.java +++ b/fabric/src/main/java/dev/architectury/mixin/fabric/PlayerAttackInvoker.java @@ -30,7 +30,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(value = {Player.class}) public class PlayerAttackInvoker { - @Inject(method = "hurt", at = @At("HEAD"), cancellable = true) + @Inject(method = "hurtInternal", at = @At("HEAD"), cancellable = true) private void hurt(DamageSource damageSource, float f, CallbackInfoReturnable cir) { if (EntityEvent.LIVING_HURT.invoker().hurt((LivingEntity) (Object) this, damageSource, f).isFalse() && (Object) this instanceof Player) { cir.setReturnValue(false); diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/client/ClientPlayerAttackInvoker.java b/fabric/src/main/java/dev/architectury/mixin/fabric/client/ClientPlayerAttackInvoker.java index 9800a67a..36d1b372 100644 --- a/fabric/src/main/java/dev/architectury/mixin/fabric/client/ClientPlayerAttackInvoker.java +++ b/fabric/src/main/java/dev/architectury/mixin/fabric/client/ClientPlayerAttackInvoker.java @@ -32,7 +32,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; @Mixin(value = {LocalPlayer.class, RemotePlayer.class}) public class ClientPlayerAttackInvoker { - @Inject(method = "hurt", at = @At("HEAD"), cancellable = true) + @Inject(method = "hurtInternal", at = @At("HEAD"), cancellable = true) private void hurt(DamageSource damageSource, float f, CallbackInfoReturnable cir) { if (EntityEvent.LIVING_HURT.invoker().hurt((LivingEntity) (Object) this, damageSource, f).isFalse() && (Object) this instanceof Player) { cir.setReturnValue(false); diff --git a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinGameRenderer.java b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinGameRenderer.java index 91ff77bf..57615d57 100644 --- a/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinGameRenderer.java +++ b/fabric/src/main/java/dev/architectury/mixin/fabric/client/MixinGameRenderer.java @@ -29,6 +29,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.ShaderInstance; import net.minecraft.server.packs.resources.ResourceProvider; +import net.minecraft.voting.rules.Rules; import org.joml.Matrix4f; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; @@ -50,7 +51,7 @@ public abstract class MixinGameRenderer { @Inject(method = "render(FJZ)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;renderWithTooltip(Lcom/mojang/blaze3d/vertex/PoseStack;IIF)V", ordinal = 0), locals = LocalCapture.CAPTURE_FAILEXCEPTION, cancellable = true) - public void renderScreenPre(float tickDelta, long startTime, boolean tick, CallbackInfo ci, int mouseX, int mouseY, Window window, Matrix4f matrix, PoseStack matrices, PoseStack matrices2) { + public void renderScreenPre(float tickDelta, long startTime, boolean tick, CallbackInfo ci, boolean hasBloomRule, boolean hasBloomEffect, int mouseX, int mouseY, Window window, Matrix4f matrix, PoseStack matrices, PoseStack matrices2) { if (ClientGuiEvent.RENDER_PRE.invoker().render(minecraft.screen, matrices2, mouseX, mouseY, minecraft.getDeltaFrameTime()).isFalse()) { ci.cancel(); } @@ -59,7 +60,7 @@ public abstract class MixinGameRenderer { @Inject(method = "render(FJZ)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;renderWithTooltip(Lcom/mojang/blaze3d/vertex/PoseStack;IIF)V", shift = At.Shift.AFTER, ordinal = 0), locals = LocalCapture.CAPTURE_FAILEXCEPTION) - public void renderScreenPost(float tickDelta, long startTime, boolean tick, CallbackInfo ci, int mouseX, int mouseY, Window window, Matrix4f matrix, PoseStack matrices, PoseStack matrices2) { + public void renderScreenPost(float tickDelta, long startTime, boolean tick, CallbackInfo ci, boolean hasBloomRule, boolean hasBloomEffect, int mouseX, int mouseY, Window window, Matrix4f matrix, PoseStack matrices, PoseStack matrices2) { ClientGuiEvent.RENDER_POST.invoker().render(minecraft.screen, matrices2, mouseX, mouseY, minecraft.getDeltaFrameTime()); } diff --git a/gradle.properties b/gradle.properties index 5cf78586..c3be1eb3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ org.gradle.daemon=false platforms=fabric -minecraft_version=23w13a -supported_version=23w13a +minecraft_version=23w13a_or_b +supported_version=23w13a_or_b artifact_type=beta @@ -14,7 +14,7 @@ base_version=9.0 maven_group=dev.architectury fabric_loader_version=0.14.19 -fabric_api_version=0.76.2+1.20 +fabric_api_version=0.76.3+23w13a_or_b mod_menu_version=5.0.2 forge_version=45.0.24