Skip to content

Commit

Permalink
1.20.6 First Steps
Browse files Browse the repository at this point in the history
 - Updated to Java 21
 - Changed project organisation from `chronosacaria\mcdw` to `dev\timefall\mcdw`
 - Temporarily disabled A LOT of classes
 - Completely rewrote the `bases`, removing no longer necessary methods and changing their names to follow appropriate convention (ex. `McdwAxe` -> `McdwAxeItem`)
 - Starting moving everything that is configurable away from `Cloth Config` and to `Fzzy Config`
 - Added Datagen for Tags and (potentially) Enchantments
 - Converted the `XEnum`s to `XStats` and `XItemRegistry`s
 - Disabled Mixins until necessary
 - Removed `Reach Entity Attributes` dependency
 - Removed `mixin\reach\...` directories
 - Added Copyright Headers to classes
 - Likely much more than I have missed
  • Loading branch information
chronosacaria committed May 24, 2024
1 parent 1699090 commit 04a20d0
Show file tree
Hide file tree
Showing 350 changed files with 9,676 additions and 11,307 deletions.
86 changes: 46 additions & 40 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
plugins {
id 'fabric-loom' version '1.2-SNAPSHOT'
id 'fabric-loom' version '1.6-SNAPSHOT'
id 'maven-publish'
}

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17

archivesBaseName = project.archives_base_name
version = project.mod_version
group = project.maven_group

base {
archivesName = project.archives_base_name
}

repositories {
mavenLocal()
maven {
url "https://maven.shedaniel.me/"
}
maven {
url "https://maven.terraformersmc.com/"
}
Expand All @@ -24,12 +21,6 @@ repositories {
maven {
url 'https://jitpack.io'
}
maven {
url "https://maven.jamieswhiteshirt.com/libs-release"
content {
includeGroup "com.jamieswhiteshirt"
}
}
maven {
name = 'Modrinth'
url = 'https://api.modrinth.com/maven'
Expand All @@ -39,12 +30,29 @@ repositories {
}
}

loom {
splitEnvironmentSourceSets()

mods {
"modid" {
sourceSet sourceSets.main
sourceSet sourceSets.client
}
}

accessWidenerPath = file("src/main/resources/mcdw.accesswidener")

}


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}"
modImplementation "net.fabricmc:fabric-loader:${project.fabric_loader_version}"
// TODO REMOVE WHEN NOT NEEDED ANYMORE
modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabricKotlinVersion}"
modImplementation "net.peanuuutz.tomlkt:tomlkt:0.3.7"

// Fabric API. This is technically optional, but you probably want it anyway.
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
Expand All @@ -53,59 +61,53 @@ dependencies {
modImplementation "com.blamejared.clumps:Clumps-fabric-${project.minecraft_version}:${project.clumps_version}"

// Ranged Weapon API
modImplementation "maven.modrinth:ranged-weapon-api:${project.ranged_weapon_api_version}"

// Cloth Config
modApi("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") {
exclude(group: "net.fabricmc.fabric-api")
}

// Reach Entity Attributes
modImplementation "com.jamieswhiteshirt:reach-entity-attributes:${project.reach_entity_attributes_version}"

// Pehkui
//modApi("com.github.Virtuoel:Pehkui:${project.pehkui_version}", {
// exclude group: "net.fabricmc.fabric-api"
//})

// Mixin Extras
include(implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-fabric:${project.mixin_extras_version}")))
//modImplementation "maven.modrinth:ranged-weapon-api:${project.ranged_weapon_api_version}"

// Fzzy Config
modImplementation "maven.modrinth:fzzy-config:${project.fzzy_config}"
}

processResources {
inputs.property "version", project.version
inputs.property "fabric_loader", project.fabric_loader_version
inputs.property "fzzy_config", project.fzzy_config


filesMatching("fabric.mod.json") {
expand "version": project.version
expand (
"version": project.version,
"fabric_loader": project.fabric_loader_version,
"fzzy_config": project.fzzy_config
)
}
}

loom {
accessWidenerPath = file("src/main/resources/mcdw.accesswidener")
}

tasks.withType(JavaCompile).configureEach {
it.options.release = 17
it.options.release = 21
}


java {
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
// if it is present.
// If you remove this line, sources will not be generated.
withSourcesJar()

sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}

jar {
from("LICENSE") {
rename { "${it}_${project.archivesBaseName}"}
rename { "${it}_${project.base.archivesName.get()}"}
}
}

// configure the maven publication
publishing {
publications {
mavenJava(MavenPublication) {
create("mavenJava", MavenPublication) {
artifactId = project.archives_base_name
from components.java
}
}
Expand All @@ -117,4 +119,8 @@ publishing {
// The repositories here will be used for publishing your artifact, not for
// retrieving dependencies.
}
}

fabricApi {
configureDataGeneration()
}
27 changes: 13 additions & 14 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,25 +1,24 @@
# Done to increase the memory available to gradle.
org.gradle.jvmargs=-Xmx1G
org.gradle.parallel=true

# Fabric Properties
# check these on https://fabricmc.net/develop/
minecraft_version=1.20.1
yarn_mappings=1.20.1+build.10
loader_version=0.14.21
# check these on https://fabricmc.net/develop/
minecraft_version=1.20.6
yarn_mappings=1.20.6+build.1
fabric_loader_version=0.15.11

# Mod Properties
mod_version=9.0.4
maven_group=chronosacaria
mod_version=10.0.0
maven_group=dev.timefall
archives_base_name=mcdw

# Dependencies
# check this on https://fabricmc.net/develop/
fabric_version=0.87.0+1.20.1
cloth_config_version=11.0.99
mixin_extras_version=0.2.0-beta.8
# check this on https://fabricmc.net/develop/
fabricKotlinVersion = 1.10.18+kotlin.1.9.22
fabric_version=0.98.0+1.20.6
fzzy_config=0.3.3+1.20.6

# Compatibility
clumps_version=12.0.0.3
ranged_weapon_api_version=1.1.1+1.20.1
reach_entity_attributes_version=2.4.0
#pehkui_version=3.7.8
clumps_version=17.0.0.1
#ranged_weapon_api_version=1.1.1+1.20.1
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// 1.20.6 2024-05-22T04:06:22.8729685 MC Dungeons Weapons/Tags for minecraft:item
d3f4ba6f586f4c10eeafea7712b6f5f9ba4361de data\mcdw\tags\items\common_loot_pool_items.json
df466930bc13339ef4fecdb815abd8b765e4fa4b data\mcdw\tags\items\epic_loot_pool_items.json
faa37962168aa936470d45d7ff03ec01e0fb1a5f data\mcdw\tags\items\rare_loot_pool_items.json
5bb7136f7ca9b0c40bc7b349457e107e491e9f94 data\mcdw\tags\items\uncommon_loot_pool_items.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
{
"values": [
{
"id": "mcdw:axe_anchor",
"required": false
},
{
"id": "mcdw:axe_axe",
"required": false
},
{
"id": "mcdw:dagger_dagger",
"required": false
},
{
"id": "mcdw:double_axe_double",
"required": false
},
{
"id": "mcdw:gauntlet_gauntlet",
"required": false
},
{
"id": "mcdw:glaive_glaive",
"required": false
},
{
"id": "mcdw:hammer_great_hammer",
"required": false
},
{
"id": "mcdw:hammer_mace",
"required": false
},
{
"id": "mcdw:longbow_longbow",
"required": false
},
{
"id": "mcdw:pickaxe_howling_pick",
"required": false
},
{
"id": "mcdw:pickaxe_mountineer_pick",
"required": false
},
{
"id": "mcdw:shortbow_shortbow",
"required": false
},
{
"id": "mcdw:sickle_sickle",
"required": false
},
{
"id": "mcdw:spear_spear",
"required": false
},
{
"id": "mcdw:staff_battlestaff",
"required": false
},
{
"id": "mcdw:sword_cutlass",
"required": false
},
{
"id": "mcdw:sword_iron_sword_var",
"required": false
},
{
"id": "mcdw:sword_katana",
"required": false
},
{
"id": "mcdw:sword_rapier",
"required": false
}
]
}
92 changes: 92 additions & 0 deletions src/main/generated/data/mcdw/tags/items/epic_loot_pool_items.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
{
"values": [
{
"id": "mcdw:bow_ancient_bow",
"required": false
},
{
"id": "mcdw:bow_haunted_bow",
"required": false
},
{
"id": "mcdw:bow_lost_souls",
"required": false
},
{
"id": "mcdw:crossbow_corrupted_crossbow",
"required": false
},
{
"id": "mcdw:crossbow_doom_crossbow",
"required": false
},
{
"id": "mcdw:crossbow_pride_of_the_piglins",
"required": false
},
{
"id": "mcdw:dagger_backstabber_",
"required": false
},
{
"id": "mcdw:dagger_swift_striker",
"required": false
},
{
"id": "mcdw:dagger_the_beginning",
"required": false
},
{
"id": "mcdw:dagger_the_end",
"required": false
},
{
"id": "mcdw:dagger_void_touched_blade",
"required": false
},
{
"id": "mcdw:gauntlet_soul_fist",
"required": false
},
{
"id": "mcdw:hammer_gravity",
"required": false
},
{
"id": "mcdw:hammer_stormlander",
"required": false
},
{
"id": "mcdw:hammer_suns_grace",
"required": false
},
{
"id": "mcdw:scythe_soul_scythe",
"required": false
},
{
"id": "mcdw:soul_dagger_eternal_knife",
"required": false
},
{
"id": "mcdw:soul_dagger_soul_knife",
"required": false
},
{
"id": "mcdw:soul_dagger_truthseeker",
"required": false
},
{
"id": "mcdw:sword_dark_katana",
"required": false
},
{
"id": "mcdw:sword_obsidian_claymore",
"required": false
},
{
"id": "mcdw:sword_the_starless_night",
"required": false
}
]
}
Loading

0 comments on commit 04a20d0

Please sign in to comment.