Update JDK

Update Logs.md

@@ -50,4 +50,3 @@
 
 添加铁三脚架
 
-预计明天发布

build.gradle

@@ -1,11 +1,10 @@
 plugins {
-	id 'fabric-loom' version '0.6-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
@@ -47,13 +46,8 @@ tasks.withType(JavaCompile).configureEach {
 	// If Javadoc is generated, this must be specified in that task too.
 	it.options.encoding = "UTF-8"
 
-	// The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
-	// JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
-	// We'll use that if it's available, but otherwise we'll use the older option.
-	def targetVersion = 8
-	if (JavaVersion.current().isJava9Compatible()) {
-		 it.options.release = targetVersion
-	}
+	// Minecraft 1.17 (21w19a) upwards uses Java 16.
+	it.options.release = 16
 }
 
 java {
@@ -90,4 +84,4 @@ publishing {
 		// The repositories here will be used for publishing your artifact, not for
 		// retrieving dependencies.
 	}
-}
+}

gradle.properties

@@ -1,17 +1,16 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs=-Xmx4G
 
 # Fabric Properties
-	# check these on https://fabricmc.net/use
-	minecraft_version=1.16.5
-	yarn_mappings=1.16.5+build.6
-	loader_version=0.11.3
+# check these on https://fabricmc.net/versions.html
+minecraft_version=1.17
+yarn_mappings=1.17+build.13
+loader_version=0.11.6
 
 # Mod Properties
-	mod_version = 1.0.0
-	maven_group = io.github.chemiscraft
-	archives_base_name = chemiscraft
+mod_version = 1.0.0
+maven_group = com.example
+archives_base_name = fabric-example-mod
 
 # Dependencies
-	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.32.5+1.16
+fabric_version=0.36.0+1.17

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

gradlew

@@ -93,14 +93,12 @@ if [ -n "$JAVA_HOME" ] ; then
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
     JAVACMD="java"
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
 fi
@@ -182,4 +180,4 @@ APP_ARGS=`save "$@"`
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -86,4 +86,4 @@ exit /b 1
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-:omega
+:omega

src/main/resources/assets/chemiscraft/lang/zh_tw.json

@@ -0,0 +1,29 @@
+{
+  "block.chemiscraft.iron_stand": "鐵架台",
+
+  "item.chemiscraft.iron_stand_ring": "鐵架台-鐵圈",
+  "item.chemiscraft.iron_stand_base": "鐵架台-底座",
+  "item.chemiscraft.iron_stand_clip": "鐵架台-鉄夾",
+  "item.chemiscraft.iron_stand_rod": "鐵架台-鐵桿",
+  "item.chemiscraft.iron_ring": "鐵圈",
+
+  "item.chemiscraft.hydrogen_1": "氫-1",
+  "item.chemiscraft.hydrogen_2": "氫-2",
+  "item.chemiscraft.hydrogen_3": "氫-3",
+  "item.chemiscraft.hydrogen_4": "氫-4",
+  "item.chemiscraft.hydrogen_5": "氫-5",
+  "item.chemiscraft.hydrogen_6": "氫-6",
+  "item.chemiscraft.hydrogen_7": "氫-7",
+
+  "item.chemiscraft.helium_3": "氦-3",
+  "item.chemiscraft.helium_4": "氦-4",
+  "item.chemiscraft.helium_5": "氦-5",
+  "item.chemiscraft.helium_6": "氦-6",
+  "item.chemiscraft.helium_7": "氦-7",
+  "item.chemiscraft.helium_8": "氦-8",
+  "item.chemiscraft.helium_9": "氦-9",
+  "item.chemiscraft.helium_10": "氦-10",
+
+  "itemGroup.chemiscraft.element_group": "化學工藝-元素",
+  "itemGroup.chemiscraft.equipment_group": "化學工藝-設備"
+}

src/main/resources/chemiscraft.mixins.json

@@ -2,7 +2,7 @@
   "required": true,
   "minVersion": "0.8",
   "package": "io.github.chemiscraft.mixin",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_16",
   "mixins": [
   ],
   "client": [

src/main/resources/data/chemiscraft/loot_tables/blocks/iron_stand.json

@@ -2,23 +2,11 @@
   "type": "minecraft:block",
   "pools":[
     {
-      "rolls": 4,
+      "rolls": 1,
       "entries":[
         {
           "type": "minecraft:item",
-          "name": "chemiscraft:iron_stand_base"
-        },
-        {
-          "type": "minecraft:item",
-          "name": "chemiscraft:iron_stand_rod"
-        },
-        {
-          "type": "minecraft:item",
-          "name": "chemiscraft:iron_stand_clip"
-        },
-        {
-          "type": "minecraft:item",
-          "name": "chemiscraft:iron_stand_ring"
+          "name": "chemiscraft:iron_stand"
         }
       ],
       "conditions": [

src/main/resources/data/chemiscraft/loot_tables/blocks/iron_trivet.json

@@ -6,7 +6,7 @@
       "entries":[
         {
           "type": "minecraft:item",
-          "name": "chemiscraft:iron_trivete"
+          "name": "chemiscraft:iron_trivet"
         }
       ],
       "conditions": [

src/main/resources/fabric.mod.json

@@ -29,7 +29,7 @@
   "depends": {
     "fabricloader": ">=0.7.4",
     "fabric": "*",
-    "minecraft": "1.16.x"
+    "minecraft": "1.17.x"
   },
   "suggests": {
     "another-mod": "*"