1.20.4 -> 1.21

.github/workflows/gradle-build.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
       - name: Build Gradle
         uses: eskatos/gradle-command-action@v1
         with:

.github/workflows/gradle-check.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
       - name: Build Gradle
         uses: eskatos/gradle-command-action@v1
         with:

.github/workflows/gradle-publish.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
       - name: Publish Maven Jar
         env:
           ACCESS_KEY: ${{ secrets.ACCESS_KEY }}

build.gradle

@@ -1,19 +1,19 @@
 buildscript {
     dependencies {
-        classpath 'com.github.dexman545:Outlet:1.3.10'
+        classpath 'com.github.dexman545:Outlet:1.6.1'
     }
 }
 plugins {
-    id 'fabric-loom' version '1.3-SNAPSHOT'
+    id 'fabric-loom' version '1.6-SNAPSHOT'
     id 'maven-publish'
     id 'com.modrinth.minotaur' version '2.+'
-    id 'org.ajoberstar.reckon' version '0.13.0'
+    id 'org.ajoberstar.reckon' version '0.13.1'
 }
-apply plugin: 'dex.plugins.outlet'
+apply plugin: 'io.github.dexman545.outlet'
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
+        languageVersion = JavaLanguageVersion.of(21)
     }
     withSourcesJar()
 }
@@ -35,6 +35,7 @@ reckon {
 }
 
 repositories {
+    mavenLocal()
     maven { name 'modmenu'; url 'https://maven.terraformersmc.com/releases' }
     maven { name 'minelp'; url 'https://repo.minelittlepony-mod.com/maven/snapshot' }
     maven { name 'minelp-release'; url 'https://repo.minelittlepony-mod.com/maven/release' }
@@ -50,7 +51,10 @@ dependencies {
 
     modApi "com.minelittlepony:kirin:${project.kirin_version}"
     include "com.minelittlepony:kirin:${project.kirin_version}"
-
+
+    modApi "com.sollace:fabwork:${project.fabwork_version}"
+    include "com.sollace:fabwork:${project.fabwork_version}"
+
     modCompileOnly "com.minelittlepony:hdskins:${project.hd_skins_version}"
     modCompileOnly "com.terraformersmc:modmenu:${project.modmenu_version}"
 }

gradle.properties

@@ -3,10 +3,10 @@ org.gradle.daemon=false
 
 # Fabric Properties
   # check these on https://fabricmc.net/develop
-  minecraft_version=1.20.4
-  yarn_mappings=1.20.4+build.1
-  loader_version=0.15.1
-  fabric_version=0.91.2+1.20.4
+  minecraft_version=1.21
+  yarn_mappings=1.21+build.9
+  loader_version=0.15.11
+  fabric_version=0.100.7+1.21
 
 # Mod Properties
   group=com.minelittlepony
@@ -15,12 +15,13 @@ org.gradle.daemon=false
   description=Ah am a big pony!
 
 # Publishing
-  minecraft_version_range=1.20.4
+  minecraft_version_range=1.21
   modrinth_loader_type=fabric
   modrinth_project_id=h9pJxJR9
 
 # Dependencies
-  modmenu_version=9.0.0-pre.1
-  kirin_version=1.17.0+1.20.4
-  hd_skins_version=6.12.1+1.20.4
-  minelp_version=4.11.6+1.20.2
+  modmenu_version=11.0.0-beta.1
+  kirin_version=1.19.0+1.21
+  hd_skins_version=6.13.0+1.21
+  minelp_version=4.12.1-beta.1+1.21
+  fabwork_version=1.3.0+1.21

gradle/wrapper/gradle-wrapper.properties

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

src/main/java/com/minelittlepony/bigpony/BigPony.java

@@ -3,9 +3,11 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import com.minelittlepony.bigpony.network.Network;
 import com.minelittlepony.common.util.GamePaths;
 
 import net.fabricmc.api.ModInitializer;
+import net.minecraft.util.Identifier;
 
 public class BigPony implements ModInitializer {
 
@@ -17,6 +19,10 @@ public static BigPony getInstance() {
         return instance;
     }
 
+    public static Identifier id(String name) {
+        return Identifier.of("minebp", name);
+    }
+
     private final BigPonyConfig config = new BigPonyConfig(GamePaths.getConfigDirectory().resolve("bigpony.json"));
 
     public BigPony() {
@@ -27,10 +33,6 @@ public BigPonyConfig getConfig() {
         return config;
     }
 
-    public Scaling getScaling() {
-        return config.scale.get();
-    }
-
     @Override
     public void onInitialize() {
         config.load();

src/main/java/com/minelittlepony/bigpony/BigPonyConfig.java

@@ -2,17 +2,24 @@
 
 import java.nio.file.Path;
 
+import com.minelittlepony.bigpony.data.EntityScale;
 import com.minelittlepony.common.util.settings.Config;
 import com.minelittlepony.common.util.settings.Setting;
 
 public class BigPonyConfig extends Config {
-    public final Setting<Scaling> scale = value("scale", new Scaling(new Triple(1), new Cam(1)));
+    public final Setting<EntityScale> scale = value("common", "scale", EntityScale.DEFAULT);
 
-    public final Setting<Boolean> allowHitboxChanges = value("allowHitboxChanges", true);
-    public final Setting<Boolean> allowCameraChanges = value("allowCameraChanges", true);
-    public final Setting<Boolean> allowFreeformResizing = value("allowFreeformResizing", true);
+    public final Setting<Boolean> useDetectedPonyScaling = value("client", "useDetectedPonyScaling", false);
+    public final Setting<Float> maxScalingMultiplier = value("server", "maxScalingMultiplier", 2F);
+    public final Setting<Boolean> allowHitboxChanges = value("server", "allowHitboxChanges", true);
+    public final Setting<Boolean> allowCameraChanges = value("server", "allowCameraChanges", true);
+    public final Setting<Boolean> allowFreeformResizing = value("server", "allowFreeformResizing", true);
 
     public BigPonyConfig(Path path) {
-        super(FLATTENED_JSON_ADAPTER, path);
+        super(HEIRARCHICAL_JSON_ADAPTER, path);
+    }
+
+    public long getPermissions() {
+        return Permissions.pack(allowHitboxChanges.get(), allowCameraChanges.get(), allowFreeformResizing.get());
     }
 }

src/main/java/com/minelittlepony/bigpony/InteractionManager.java

@@ -0,0 +1,27 @@
+package com.minelittlepony.bigpony;
+
+public class InteractionManager {
+    private static InteractionManager INSTANCE = new InteractionManager();
+
+    protected float maxMultiplier = 2;
+
+    public static InteractionManager getInstance() {
+        return INSTANCE;
+    }
+
+    protected InteractionManager() {
+        INSTANCE = this;
+    }
+
+    public long getPermissions() {
+        return BigPony.getInstance().getConfig().getPermissions();
+    }
+
+    public float getMaxMultiplier() {
+        return BigPony.getInstance().getConfig().maxScalingMultiplier.get();
+    }
+
+    public long getLastSettingsUpdateTime() {
+        return 0;
+    }
+}