Skip to content

Commit

Permalink
Updated to 23w40a
Browse files Browse the repository at this point in the history
Signed-off-by: shedaniel <[email protected]>
  • Loading branch information
shedaniel committed Oct 8, 2023
1 parent 74f7fb3 commit 731a772
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 35 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- '**.properties'
- '**/src/**'
branches:
- "1.20.2"
- "1.20.3"
types: [ opened, synchronize, reopened ]
jobs:
validate-gradle:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
- '**.properties'
- '**/src/**'
branches:
- "1.20.2"
- "1.20.3"
workflow_dispatch:
inputs:
norelease:
Expand Down
32 changes: 12 additions & 20 deletions common/src/main/resources/architectury.accessWidener

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ unifiedPublishing {
curseforge {
token = CURSE_API_KEY
id = rootProject.curseforge_id
gameVersions.addAll "Java 17", "1.20.2-Snapshot", project.minecraft_version
gameVersions.addAll "Java 17", "1.20.3-Snapshot"//, project.minecraft_version
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import net.minecraft.server.level.ServerLevel;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.level.ServerPlayerGameMode;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
Expand All @@ -46,7 +47,7 @@ public class MixinServerPlayerGameMode {
target = "Lnet/minecraft/world/level/block/state/BlockState;getBlock()Lnet/minecraft/world/level/block/Block;",
ordinal = 0),
locals = LocalCapture.CAPTURE_FAILHARD, cancellable = true)
private void onBreak(BlockPos blockPos, CallbackInfoReturnable<Boolean> cir, BlockState state) {
private void onBreak(BlockPos blockPos, CallbackInfoReturnable<Boolean> cir, BlockEntity entity, BlockState state) {
if (BlockEvent.BREAK.invoker().breakBlock(this.level, blockPos, state, this.player, null).isFalse()) {
cir.setReturnValue(false);
}
Expand Down
2 changes: 1 addition & 1 deletion fabric/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"icon": "icon.png",
"depends": {
"minecraft": "~1.20.2-",
"minecraft": "~1.20.3-",
"fabricloader": ">=0.14.0",
"fabric-api": ">=0.66.0"
},
Expand Down
2 changes: 1 addition & 1 deletion forge/src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ license = "LGPL-3"
[[dependencies.architectury]]
modId = "minecraft"
mandatory = true
versionRange = "[1.20.2,)"
versionRange = "[1.20.3,)"
ordering = "NONE"
side = "BOTH"

Expand Down
14 changes: 7 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
org.gradle.jvmargs=-Xmx6G
org.gradle.daemon=false

platforms=fabric,forge
platforms=fabric

minecraft_version=1.20.2
supported_version=1.20.2
minecraft_version=23w40a
supported_version=23w40a

artifact_type=release
artifact_type=beta

archives_base_name=architectury
archives_base_name_snapshot=architectury-snapshot
base_version=10.0
base_version=11.0
maven_group=dev.architectury

fabric_loader_version=0.14.22
fabric_api_version=0.89.1+1.20.2
fabric_loader_version=0.14.23
fabric_api_version=0.89.4+1.20.3
mod_menu_version=7.0.0

forge_version=48.0.1
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ if (JavaVersion.current().ordinal() + 1 < 17) {

include("common")
include("fabric")
include("forge")
//include("forge")
include("testmod-common")
include("testmod-fabric")
include("testmod-forge")
//include("testmod-forge")

rootProject.name = "architectury"

0 comments on commit 731a772

Please sign in to comment.