Skip to content

Commit

Permalink
Removed FAPI Dependency
Browse files Browse the repository at this point in the history
Updated to 1.18.2
Removed Fabric API dependency
Support for DetailArmorBar
  • Loading branch information
yurisuika committed Mar 2, 2022
1 parent 42a2e35 commit d36b05d
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 33 deletions.
5 changes: 2 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,9 @@ dependencies {
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"

modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

modCompileOnly ("squeek.appleskin:appleskin-fabric:mc1.18-2.2.0") {transitive = false}
modCompileOnly ("squeek.appleskin:appleskin-fabric:mc1.18.1-2.3.0") {transitive = false}
modCompileOnly ("com.github.Lizard-Of-Oz.Inventorio:inventorio-1.18-fabric:1.18-SNAPSHOT") {transitive = false}
modCompileOnly ("com.github.RedLime:DetailArmorBar:2.6.1") {transitive = false}
}

processResources {
Expand Down
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G

# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.18.1
yarn_mappings=1.18.1+build.22
loader_version=0.12.12
minecraft_version=1.18.2
yarn_mappings=1.18.2+build.1
loader_version=0.13.3

# Mod Properties
mod_version = 1.0.2
mod_version = 1.0.3
maven_group = com.yurisuika.raised
archives_base_name = raised

# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
fabric_version=0.46.4+1.18
fabric_version=0.47.8+1.18.2
17 changes: 0 additions & 17 deletions src/main/java/com/yurisuika/raised/Raised.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package com.yurisuika.raised.mixin.mods.detailarmorbar;

import com.redlimerl.detailab.render.ArmorBarRenderer;
import net.minecraft.client.util.Window;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Redirect;

@Mixin(ArmorBarRenderer.class)
public class ArmorBarRendererMixin {

@Redirect(method = "render", at = @At(value = "INVOKE", target = "net/minecraft/client/util/Window.getScaledHeight()I"))
private int modifyAddonsScaledHeight(Window instance) {
return instance.getScaledHeight() - 1;
}

}
10 changes: 3 additions & 7 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
],
"contact": {
"homepage": "https://suikacraft.com",
"sources": "https://github.com/yurisuika/Raised"
"sources": "https://github.com/yurisuika/Raised",
"issues": "https://github.com/yurisuika/Raised/issues"
},

"license": "GNU General Public License 3.0",
"icon": "assets/raised/icon.png",

"environment": "*",
"environment": "client",
"entrypoints": {
"main": [
"com.yurisuika.raised.Raised"
]
},
"mixins": [
Expand All @@ -30,11 +30,7 @@

"depends": {
"fabricloader": ">=0.11.6",
"fabric": "*",
"minecraft": "1.18.x",
"java": ">=17"
},
"suggests": {
"another-mod": "*"
}
}
3 changes: 2 additions & 1 deletion src/main/resources/raised.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
"required": true,
"minVersion": "0.8",
"package": "com.yurisuika.raised.mixin",
"compatibilityLevel": "JAVA_16",
"compatibilityLevel": "JAVA_17",
"mixins": [
],
"client": [
"client.gui.hud.InGameHudMixin",
"mods.appleskin.HUDOverlayHandlerMixin",
"mods.detailarmorbar.ArmorBarRendererMixin",
"mods.inventorio.HotbarHUDRendererMixin"
],
"injectors": {
Expand Down

0 comments on commit d36b05d

Please sign in to comment.