Skip to content

Commit

Permalink
Attempt at adding custom shields
Browse files Browse the repository at this point in the history
  • Loading branch information
Leronus committed Feb 17, 2024
1 parent 1703c11 commit 8c998ec
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 21 deletions.
31 changes: 13 additions & 18 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
plugins {
id 'fabric-loom' version '1.5-SNAPSHOT'
id 'fabric-loom' version '1.4-SNAPSHOT'
id 'maven-publish'
}

Expand All @@ -14,25 +14,17 @@ repositories {
maven {
url = 'https://maven.minecraftforge.net/'
}
maven {
url = 'https://api.modrinth.com/maven'
}
maven {
url = 'https://maven.kyrptonaught.dev'
}
maven {
url = 'https://jitpack.io'
}
maven {
url = 'https://maven.terraformersmc.com/releases/'
}
maven {
url = "https://api.modrinth.com/maven"
}
maven {
name = 'ParchmentMC'
url = 'https://maven.parchmentmc.org'
}
maven { url = 'https://jitpack.io' }
maven {url = 'https://jitpack.io'}
maven {url "https://maven.terraformersmc.com/releases/"}
maven {url = "https://api.modrinth.com/maven"}
}

loom {
Expand All @@ -54,14 +46,14 @@ fabricApi {
dependencies {
// To change the versions see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"



// Fabric API. This is technically optional, but you probably want it anyway.
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

mappings loom.layered() {
officialMojangMappings()
parchment("org.parchmentmc.data:parchment-1.20.1:2023.09.03@zip")
}

modImplementation "maven.modrinth:sodium:mc1.20.1-0.5.3"
modImplementation "maven.modrinth:lithium:mc1.20.1-0.11.2"

Expand Down Expand Up @@ -89,6 +81,7 @@ dependencies {
include 'net.kyrptonaught:customportalapi:0.0.1-beta64-1.20'

modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
implementation(annotationProcessor("io.github.llamalad7:mixinextras-fabric:${mixin_extras_version}"))
}

processResources {
Expand All @@ -97,6 +90,8 @@ processResources {
filesMatching("fabric.mod.json") {
expand "version": project.version
}

exclude('**/*.bbmodel')
}

tasks.withType(JavaCompile).configureEach {
Expand Down
7 changes: 5 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,18 @@ org.gradle.parallel=true
# check these on https://fabricmc.net/develop
minecraft_version=1.20.1
yarn_mappings=1.20.1+build.10
loader_version=0.15.3
loader_version=0.15.0

# Mod Properties
mod_version=1.0.0
maven_group=mod.leronus.mores
archives_base_name=mores

#mixinextras
mixin_extras_version=0.2.2

# Dependencies
fabric_version=0.91.0+1.20.1
fabric_version=0.90.7+1.20.1
sodium_version=mc1.20.1-0.5.3

fabric_shield_lib_version=1.7.2-1.20.1
Expand Down
1 change: 1 addition & 0 deletions src/main/java/mod/leronus/mores/MoresClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import net.minecraft.client.resources.model.Material;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.item.ShieldItem;

import static com.github.crimsondawn45.fabricshieldlib.initializers.FabricShieldLibClient.renderBanner;

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"mores.mixins.json"
],
"depends": {
"fabricloader": ">=0.15.3",
"fabricloader": ">=0.15",
"minecraft": "~1.20.1",
"java": ">=17",
"fabric-api": "*"
Expand Down

0 comments on commit 8c998ec

Please sign in to comment.