Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 26 additions & 19 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,32 +1,38 @@
plugins {
id 'fabric-loom' version '0.2.7-SNAPSHOT'
id 'java-library'
id "org.jetbrains.kotlin.jvm"
id 'fabric-loom' version '0.9-SNAPSHOT'
id 'maven-publish'
}

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
java {
toolchain {
languageVersion = JavaLanguageVersion.of(16)
}
}

archivesBaseName = project.mod_archive_base_name
version = project.mod_version

archivesBaseName = project.mod_name + "-" + project.mod_version + "+" + project.version_meta
group = project.mod_group

repositories() {
// modmuss50
maven {
name = "modmuss50"
url = "https://maven.fabricmc.net/io/github/prospector/modmenu/"
url = "https://maven.terraformersmc.com/releases/"
}

// Cotton
maven {
name = "Cotton"
url = "https://server.bbkr.space/artifactory/libs-release/"
}
maven { url "https://maven.shedaniel.me/" }
}

dependencies {
// Minecraft
minecraft "tcom.mojang:minecraft:${minecraft_version}"
minecraft "com.mojang:minecraft:${minecraft_version}"

// Yarn
mappings "net.fabricmc:yarn:${yarn_mappings}:v2"
Expand All @@ -38,28 +44,27 @@ dependencies {
modImplementation "net.fabricmc.fabric-api:fabric-api:${api_version}"

// ClotConfig
modApi "me.shedaniel.cloth:config-2:${clothconfig_version}"
// modApi "me.shedaniel.cloth:config-2:${clothconfig_version}"

// AutoConfig
modApi "me.sargunvohra.mcmods:autoconfig1u:${autoconfig_version}"
// https://mvnrepository.com/artifact/me.sargunvohra.mcmods/autoconfig1u
modImplementation group: "me.sargunvohra.mcmods", name: 'autoconfig1u', version: '3.3.1'


//"me.sargunvohra.mcmods:autoconfig1u:${autoconfig_version}"

// ModMenu
modImplementation "io.github.prospector:modmenu:${modmenu_version}"
modImplementation "com.terraformersmc:modmenu:${modmenu_version}"

// LibCD
modImplementation "io.github.cottonmc:LibCD:${libcd_version}"
// modImplementation "io.github.cottonmc:LibCD:${libcd_version}"
}

processResources {
inputs.property "version", project.version

from(sourceSets.main.resources.srcDirs) {
include "fabric.mod.json"
expand "version": project.version
}
inputs.property "version", project.version.toString()

from(sourceSets.main.resources.srcDirs) {
exclude "fabric.mod.json"
filesMatching("fabric.mod.json") {
expand "version": project.version.toString()
}
}

Expand Down Expand Up @@ -92,3 +97,5 @@ publishing {
mavenLocal()
}
}

compileKotlin.kotlinOptions.jvmTarget = "16"
31 changes: 19 additions & 12 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
# Gradle
org.gradle.jvmargs=-Xmx4G

# Fabric
minecraft_version=1.15.2
yarn_mappings=1.15.2+build.15
loader_version=0.8.2+build.194
api_version=0.5.1+build.294-1.15

minecraft_version=1.17.1
yarn_mappings=1.17.1+build.63
loader_version=0.12.3

#Fabric api
api_version=0.41.0+1.17
loom_version=0.9-SNAPSHOT

# Kotlin
kotlin_version=1.5.30
fabric_kotlin_version=1.6.4+kotlin.1.5.30


# Mod
mod_name = linkart
mod_version = 1.2.4
mod_version = 1.3.3
mod_group = com.gitub.vini2003
mod_archive_base_name = linkart
version_meta = fabric-1.16.3

# Dependencies
clothconfig_version = 2.14.1
autoconfig_version = 2.2.0
modmenu_version = 1.10.0+build.28
libcd_version = 2.4.1+1.15.2
clothconfig_version = 4.8.2
autoconfig_version = 3.2.2
modmenu_version = 2.0.14
# libcd_version = 2.5.0+1.16.1
Empty file modified gradle/wrapper/gradle-wrapper.jar
100644 → 100755
Empty file.
5 changes: 2 additions & 3 deletions gradle/wrapper/gradle-wrapper.properties
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Wed May 13 17:42:25 BRT 2020
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
9 changes: 8 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
pluginManagement {
repositories {
jcenter()
mavenCentral()
maven {
name = 'Fabric'
url = 'https://maven.fabricmc.net/'
}

gradlePluginPortal()
}

plugins {
id 'fabric-loom' version loom_version
id "org.jetbrains.kotlin.jvm" version kotlin_version
}

}
Empty file modified src/main/java/com/github/vini2003/linkart/Linkart.java
100644 → 100755
Empty file.
Empty file.
2 changes: 1 addition & 1 deletion src/main/java/com/github/vini2003/linkart/configuration/LinkartConfiguration.java
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class LinkartConfiguration implements ConfigData {
public boolean enableLinker = true;

@ConfigEntry.Gui.Tooltip
public boolean enableChain = true;
public boolean enableChain = false;

@ConfigEntry.Gui.Tooltip
public int pathfindingDistance = 8;
Expand Down
15 changes: 9 additions & 6 deletions src/main/java/com/github/vini2003/linkart/integration/LinkartModMenuIntegration.java
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,24 @@

import com.github.vini2003.linkart.Linkart;
import com.github.vini2003.linkart.configuration.LinkartConfiguration;
import io.github.prospector.modmenu.api.ConfigScreenFactory;
import io.github.prospector.modmenu.api.ModMenuApi;
import me.sargunvohra.mcmods.autoconfig1u.AutoConfig;
import net.minecraft.client.MinecraftClient;
import net.minecraft.client.gui.screen.Screen;

import java.util.Optional;
import java.util.function.Supplier;

public class LinkartModMenuIntegration implements ModMenuApi {
@Override
public String getModId() {
return Linkart.ID;
}

// @Override
// public String getModId() {
// return Linkart.ID;
// }

@Override
public Optional<Supplier<Screen>> getConfigScreen(Screen screen) {
return Optional.of(AutoConfig.getConfigScreen(LinkartConfiguration.class, screen));
public ConfigScreenFactory<?> getModConfigScreenFactory() {
return (ConfigScreenFactory<Screen>) screen -> AutoConfig.getConfigScreen(LinkartConfiguration.class, screen).get();
}
}
Empty file modified src/main/java/com/github/vini2003/linkart/item/LinkerItem.java
100644 → 100755
Empty file.

This file was deleted.

Loading