Skip to content

Commit

Permalink
Update to 1.17
Browse files Browse the repository at this point in the history
It doesn't work yet but I got it to compile without errors
  • Loading branch information
Andrew6rant committed Sep 16, 2021
1 parent 0977db0 commit 6f79142
Show file tree
Hide file tree
Showing 60 changed files with 1,053 additions and 29 deletions.
14 changes: 7 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
plugins {
id 'fabric-loom' version '0.5-SNAPSHOT'
id 'fabric-loom' version '0.8-SNAPSHOT'
id 'maven-publish'
}

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
sourceCompatibility = JavaVersion.VERSION_16
targetCompatibility = JavaVersion.VERSION_16

archivesBaseName = project.archives_base_name
version = project.mod_version + "-" + project.minecraft_version
Expand All @@ -22,12 +22,12 @@ repositories {
dependencies {
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
modCompileOnly "net.fabricmc:fabric-loader:${project.loader_version}"
modCompileOnly "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

modCompile "io.github.prospector:modmenu:${project.mod_menu_version}"
modCompileOnly "io.github.prospector:modmenu:${project.mod_menu_version}"

modCompile ("com.github.Draylar:reach-entity-attributes:1.0.2") {
modCompileOnly ("com.github.Draylar:reach-entity-attributes:1.0.2") {
exclude group: "net.fabricmc.fabric-api"
}

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

# Fabric Properties
minecraft_version=1.16.4
yarn_mappings=1.16.4+build.7
loader_version=0.10.8
minecraft_version=1.17.1
yarn_mappings=1.17.1+build.46
loader_version=0.11.6

# Mod Properties
mod_version=1.2.2-beta
maven_group=draylar
maven_group=io.github.Andrew6rant
archives_base_name=tiered

# Dependencies
fabric_version=0.32.5+1.16
fabric_version=0.39.2+1.17
cardinal_version=2.7.4
reach_entity_attributes_version=1.0.1
mod_menu_version=1.14+
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Binary file added out/production/tiered.main/assets/tiered/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions out/production/tiered.main/assets/tiered/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"generic.dig_speed": "Dig Speed",
"generic.crit_chance": "Crit Chance",

"tiered:common.label": "Common",
"tiered:rare.label": "Rare",
"tiered:epic.label": "Epic",
"tiered:legendary.label": "Legendary",

"tiered:dented.label": "Dented",
"tiered:fortified.label": "Fortified",
"tiered:heavy.label": "Heavy",
"tiered:reinforced.label": "Reinforced",
"tiered:resilient.label": "Resilient",
"tiered:unchained.label": "Unchained",

"tiered:extended.label": "Extended",

"tiered:lucky.label": "Lucky",

"tiered:hasteful.label": "Hasteful",
"tiered:swift.label": "Swift",

"tiered:berserk.label": "Berserk",
"tiered:critical.label": "Critical",
"tiered:dull.label": "Dull",
"tiered:keen.label": "Keen",
"tiered:sharp.label": "Sharp"
}
29 changes: 29 additions & 0 deletions out/production/tiered.main/assets/tiered/lang/tr_tr.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"generic.dig_speed": "Kazma hızı",
"generic.crit_chance": "Kritikal şansı",

"tiered:common.label": "Yaygın",
"tiered:rare.label": "Nadir",
"tiered:epic.label": "Epik",
"tiered:legendary.label": "Efsanevi",

"tiered:dented.label": "Girintili",
"tiered:fortified.label": "Takviye edilmiş",
"tiered:heavy.label": "Ağır",
"tiered:reinforced.label": "Takviyeli",
"tiered:resilient.label": "Esnek",
"tiered:unchained.label": "Zincirsiz",

"tiered:extended.label": "Genişletilmiş",

"tiered:lucky.label": "Şanslı",

"tiered:hasteful.label": "Aceleci",
"tiered:swift.label": "Hızlı",

"tiered:berserk.label": "Çılgın",
"tiered:critical.label": "Kritikal",
"tiered:dull.label": "Donuk",
"tiered:keen.label": "Şahane",
"tiered:sharp.label": "Keskin"
}
11 changes: 11 additions & 0 deletions out/production/tiered.main/data/fabric/tags/items/boots.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"replace": false,
"values": [
"minecraft:leather_boots",
"minecraft:chainmail_boots",
"minecraft:iron_boots",
"minecraft:golden_boots",
"minecraft:diamond_boots",
"minecraft:netherite_boots"
]
}
11 changes: 11 additions & 0 deletions out/production/tiered.main/data/fabric/tags/items/chestplates.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"replace": false,
"values": [
"minecraft:leather_chestplate",
"minecraft:chainmail_chestplate",
"minecraft:iron_chestplate",
"minecraft:golden_chestplate",
"minecraft:diamond_chestplate",
"minecraft:netherite_chestplate"
]
}
12 changes: 12 additions & 0 deletions out/production/tiered.main/data/fabric/tags/items/helmets.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"replace": false,
"values": [
"minecraft:leather_helmet",
"minecraft:chainmail_helmet",
"minecraft:iron_helmet",
"minecraft:golden_helmet",
"minecraft:diamond_helmet",
"minecraft:turtle_helmet",
"minecraft:netherite_helmet"
]
}
11 changes: 11 additions & 0 deletions out/production/tiered.main/data/fabric/tags/items/leggings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"replace": false,
"values": [
"minecraft:leather_leggings",
"minecraft:chainmail_leggings",
"minecraft:iron_leggings",
"minecraft:golden_leggings",
"minecraft:diamond_leggings",
"minecraft:netherite_leggings"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:shield"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"id": "tiered:common",
"verifiers": [
{
"tag": "fabric:helmets"
},
{
"tag": "fabric:chestplates"
},
{
"tag": "fabric:leggings"
},
{
"tag": "fabric:boots"
},
{
"tag": "fabric:swords"
},
{
"tag": "fabric:shovels"
},
{
"tag": "fabric:pickaxes"
},
{
"tag": "fabric:hoes"
},
{
"tag": "fabric:axes"
}
],
"style": {
"color": "gray"
},
"attributes": [
{
"type": "generic.max_health",
"modifier": {
"name": "tiered:common",
"operation": "ADDITION",
"amount": 2
},
"optional_equipment_slots": [
"MAINHAND",
"FEET",
"LEGS",
"CHEST",
"HEAD"
]
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
{
"id": "tiered:epic",
"verifiers": [
{
"tag": "fabric:helmets"
},
{
"tag": "fabric:chestplates"
},
{
"tag": "fabric:leggings"
},
{
"tag": "fabric:boots"
},
{
"tag": "fabric:swords"
},
{
"tag": "fabric:shovels"
},
{
"tag": "fabric:pickaxes"
},
{
"tag": "fabric:hoes"
},
{
"tag": "fabric:axes"
}
],
"style": {
"color": "dark_purple"
},
"attributes": [
{
"type": "generic.max_health",
"modifier": {
"name": "tiered:epic",
"operation": "ADDITION",
"amount": 6
},
"optional_equipment_slots": [
"MAINHAND",
"FEET",
"LEGS",
"CHEST",
"HEAD"
]
},
{
"type": "generic.armor",
"modifier": {
"name": "tiered:epic",
"operation": "ADDITION",
"amount": 2
},
"optional_equipment_slots": [
"MAINHAND",
"FEET",
"LEGS",
"CHEST",
"HEAD"
]
},
{
"type": "generic.armor_toughness",
"modifier": {
"name": "tiered:legendary",
"operation": "ADDITION",
"amount": 1
},
"optional_equipment_slots": [
"MAINHAND",
"FEET",
"LEGS",
"CHEST",
"HEAD"
]
}
]
}
Loading

0 comments on commit 6f79142

Please sign in to comment.