Skip to content

Commit

Permalink
Merge pull request #3 from ErikSteiner/feature/2.0.0_1.19.2
Browse files Browse the repository at this point in the history
Update Items from Test to 1.19.2
  • Loading branch information
ErikSteiner authored Jan 3, 2024
2 parents 23bc6fa + 0bd85b9 commit d05b757
Show file tree
Hide file tree
Showing 26 changed files with 673 additions and 347 deletions.
21 changes: 12 additions & 9 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,24 +1,26 @@
plugins {
id 'fabric-loom' version '0.11-SNAPSHOT'
id 'fabric-loom' version '1.4-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
}

dependencies {
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
modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"

Set<String> apiModules = [
"fabric-api-base",
"fabric-command-api-v1",
"fabric-command-api-v2",
"fabric-lifecycle-events-v1",
"fabric-networking-api-v1",
"fabric-registry-sync-v0"
Expand All @@ -43,13 +45,14 @@ tasks.withType(JavaCompile).configureEach {

java {
withSourcesJar()

sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}

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

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

# Fabric Properties
minecraft_version=1.18.2
yarn_mappings=1.18.2+build.1
loader_version=0.13.3
minecraft_version=1.19.2
yarn_mappings=1.19.2+build.28
loader_version=0.15.3

# Mod Properties
mod_version = 1.6.3-1.18.2
mod_version = 2.0.0-1.19.2
maven_group = wothers.ift
archives_base_name = items-from-text

# Dependencies
fabric_version=0.47.8+1.18.2
fabric_version=0.77.0+1.19.2
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-7.3.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
10 changes: 5 additions & 5 deletions gradlew
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/sh

#
# Copyright © 2015-2021 the original authors.
# Copyright © 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -32,10 +32,10 @@
# Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features:
# * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit».
#
# Important for patching:
#
Expand Down
32 changes: 0 additions & 32 deletions src/main/java/wothers/hr/items/HyperFood.java

This file was deleted.

108 changes: 0 additions & 108 deletions src/main/java/wothers/hr/items/HyperTool.java

This file was deleted.

16 changes: 16 additions & 0 deletions src/main/java/wothers/ift/ItemLoadException.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package wothers.ift;

public class ItemLoadException extends RuntimeException {
public ItemLoadException(String namespaceName, String itemName) {
super(getErrorMessage(namespaceName, itemName, null));
}

public ItemLoadException(String namespaceName, String itemName, String reason) {
super(getErrorMessage(namespaceName, itemName, reason));
}

public static String getErrorMessage(String namespaceName, String itemName, String reason) {
if (reason == null) return String.format("Failed to load item: %s:%s", namespaceName, itemName);
return String.format("Failed to load item: %s:%s - %s", namespaceName, itemName, reason);
}
}
Loading

0 comments on commit d05b757

Please sign in to comment.