Update to 1.17

Probably need to clean up some of the Origins references but this will work.

build.gradle

@@ -1,10 +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
@@ -16,6 +16,7 @@ repositories {
     maven {
         url 'http://maven.fabricmc.net/'
         name 'Fabric'
+        allowInsecureProtocol = true
     }
     maven {
         url 'https://jitpack.io'
@@ -31,6 +32,18 @@ repositories {
         name = "cloth config"
         url = "https://maven.shedaniel.me/"
     }
+    maven {
+        name "mod menu"
+        url "https://maven.terraformersmc.com/"
+    }
+    maven {
+        name "fall flying lib"
+        url "https://maven.cafeteria.dev"
+    }
+    maven {
+        name = 'Ladysnake Mods'
+        url = 'https://ladysnake.jfrog.io/artifactory/mods'
+    }
 }
 
 dependencies {
@@ -40,10 +53,11 @@ dependencies {
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
     modImplementation "com.github.apace100:origins-fabric:${project.origins_version}"
-    modImplementation 'com.github.Virtuoel:Pehkui:2.0.0'
+    modImplementation("com.github.virtuoel:pehkui:${pehkui_version}")
 
-    // Fabric API. This is technically optional, but you probably want it anyway.
+            // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+
     // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
     // You may need to force-disable transitiveness on them.
 }
@@ -52,14 +66,9 @@ dependencies {
 processResources {
     inputs.property "version", project.version
 
-    from(sourceSets.main.resources.srcDirs) {
-        include "fabric.mod.json"
+    filesMatching("fabric.mod.json") {
         expand "version": project.version
     }
-
-    from(sourceSets.main.resources.srcDirs) {
-        exclude "fabric.mod.json"
-    }
 }
 
 // ensure that the encoding is set to UTF-8, no matter what the system default is

gradle.properties

@@ -3,18 +3,20 @@ org.gradle.jvmargs=-Xmx4G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
 # Mod Properties
-mod_version=3.0.0-1.16.x
+mod_version=4.0.0-1.17.x
 maven_group=dev.jacksibley.slimeorigin
 archives_base_name=slimeorigin
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-origins_version=v0.6.1
-pehkui_commit= fcda193
+origins_version=v1.0.0
+pehkui_version=2.2.1
+cardinal_version=3.0.0-nightly.1.17-pre1
 
-minecraft_version=1.16.5
-yarn_mappings=1.16.5+build.4
-loader_version=0.11.1
+minecraft_version=1.17
+yarn_mappings=1.17+build.11
+loader_version=0.11.6
 
 #Fabric api
-fabric_version=0.30.0+1.16
+fabric_version=0.35.1+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.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/dev/jacksibley/slimeorigin/Slimeorigin.java

@@ -1,8 +1,8 @@
 package dev.jacksibley.slimeorigin;
 
-import io.github.apace100.origins.power.Power;
-import io.github.apace100.origins.power.PowerType;
-import io.github.apace100.origins.power.PowerTypeReference;
+import io.github.apace100.apoli.power.Power;
+import io.github.apace100.apoli.power.PowerType;
+import io.github.apace100.apoli.power.PowerTypeReference;
 import net.fabricmc.api.ModInitializer;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.attribute.ClampedEntityAttribute;

src/main/java/dev/jacksibley/slimeorigin/mixin/MixinBlock.java

@@ -1,7 +1,7 @@
 package dev.jacksibley.slimeorigin.mixin;
 
 import dev.jacksibley.slimeorigin.Slimeorigin;
-import io.github.apace100.origins.power.PowerTypeReference;
+import io.github.apace100.apoli.power.PowerTypeReference;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.SlimeBlock;

src/main/java/dev/jacksibley/slimeorigin/mixin/MixinLivingEntity.java

@@ -21,7 +21,6 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-import sun.tools.jstat.Scale;
 import virtuoel.pehkui.api.PehkuiConfig;
 import virtuoel.pehkui.api.ScaleType;
 //import virtuoel.pehkui.api.ScaleData;

src/main/resources/fabric.mod.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "id": "slimeorigin",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "name": "Slimeorigin",
   "description": "",
   "authors": [],
@@ -23,6 +23,6 @@
   "depends": {
     "fabricloader": ">=0.11.1",
     "fabric": "*",
-    "minecraft": "1.16.x"
+    "minecraft": "1.17.x"
   }
 }