diff --git a/build.gradle b/build.gradle index 510a371..1043260 100644 --- a/build.gradle +++ b/build.gradle @@ -36,9 +36,6 @@ repositories { maven { url 'https://jitpack.io' } maven { url "https://api.modrinth.com/maven" } maven { url 'https://maven.quiltmc.org/repository/release'} - flatDir { - dirs("localMaven") - } } configurations { diff --git a/gradle.properties b/gradle.properties index 236061a..8e8a213 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ curseforge_id = 621768 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api fabric_version=0.100.1+1.21 sodium_version=mc1.19.2-0.4.4 -obsidianui_version=0.2.5+1.21 +obsidianui_version=0.2.6+mc1.21-fabric midnightlib_version=1.5.7-fabric modmenu_version=10.0.0-beta.1 emotecraft_version=2.1.3-SNAPSHOT-build.29-MC1.19-fabric diff --git a/localMaven/obsidianui-0.2.5+1.21.jar b/localMaven/obsidianui-0.2.5+1.21.jar deleted file mode 100644 index 1bfe21a..0000000 Binary files a/localMaven/obsidianui-0.2.5+1.21.jar and /dev/null differ diff --git a/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ControlsOptionsScreenMixin.java b/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ControlsOptionsScreenMixin.java index b806400..bac962d 100644 --- a/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ControlsOptionsScreenMixin.java +++ b/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/ControlsOptionsScreenMixin.java @@ -36,8 +36,9 @@ public abstract class ControlsOptionsScreenMixin extends GameOptionsScreen { @Unique TextIconButtonWidget button = TextIconButtonWidget.builder(Text.translatable("midnightcontrols.menu.title.controller"), (button -> this.client.setScreen(new MidnightControlsSettingsScreen(this, false))), true) .dimension(20,20).texture(Identifier.of("midnightcontrols", "icon/controller"), 20, 20).build(); - @Inject(at = @At("TAIL"), method = "addOptions") - public void midnightcontrols$onInit(CallbackInfo ci) { + @Override + public void init() { + super.init(); this.midnightcontrols$setupButton(); this.addDrawableChild(button); } diff --git a/src/main/resources/resourcepacks/bedrock/pack.mcmeta b/src/main/resources/resourcepacks/bedrock/pack.mcmeta index efe6bc9..e19eb0d 100644 --- a/src/main/resources/resourcepacks/bedrock/pack.mcmeta +++ b/src/main/resources/resourcepacks/bedrock/pack.mcmeta @@ -1,6 +1,7 @@ { "pack": { - "pack_format": 13, + "pack_format": 15, + "supported_formats": [15, 999], "description": "Makes controller tooltips use similar icons to Bedrock Edition" } } diff --git a/src/main/resources/resourcepacks/legacy/pack.mcmeta b/src/main/resources/resourcepacks/legacy/pack.mcmeta index d0c7878..c37549f 100644 --- a/src/main/resources/resourcepacks/legacy/pack.mcmeta +++ b/src/main/resources/resourcepacks/legacy/pack.mcmeta @@ -1,6 +1,7 @@ { "pack": { - "pack_format": 13, + "pack_format": 15, + "supported_formats": [15, 999], "description": "Makes controller icons look similar to Legacy Console Edit." } }