Fix bugs.

Add forge support. Signed-off-by: 秋雨落 <[email protected]>
CuteNekoOwO · Feb 23, 2024 · 2e84091 · 2e84091
1 parent fb7f640
commit 2e84091
Show file tree

Hide file tree

Showing 29 changed files with 616 additions and 88 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,8 +1,21 @@
 plugins {
     id 'architectury-plugin' version "${architect_plugin_version}"
-    id 'dev.architectury.loom' version "${architectury_loom_version}" apply false
+    id 'dev.architectury.loom' version "${architectury_loom_version}"
 }
 
+architectury {
+    minecraft = project.minecraft_version
+    common(project.enabled_platforms.split(','))
+}
+
+loom {
+    runConfigs.configureEach {
+        ideConfigGenerated = true
+    }
+}
+
+sourceSets.main.resources.srcDir 'src/main/generated'
+
 allprojects {
     apply plugin: 'architectury-plugin'
     apply plugin: 'dev.architectury.loom'
@@ -20,6 +33,12 @@ allprojects {
     }
 
     repositories {
+        repositories {
+            maven {
+                name = 'Mod Menu'
+                url = 'https://maven.terraformersmc.com/releases'
+            }
+        }
     }
 
     dependencies {
@@ -38,6 +57,7 @@ allprojects {
         developmentForge.extendsFrom common
         developmentFabric.extendsFrom common
         developmentNeoForge.extendsFrom common
+        developmentQuilt.extendsFrom common
     }
 
     def targetJavaVersion = 17
@@ -68,6 +88,7 @@ allprojects {
         var replaceTokens = [
                 minecraft_version: minecraft_version,
                 mod_version: mod_version,
+                forge_loader_version: forge_loader_version,
                 forge_version: forge_version,
                 fabric_loader_version: fabric_loader_version,
                 fabric_api_version: fabric_api_version,
@@ -104,9 +125,3 @@ allprojects {
         }
     }
 }
-
-architectury {
-    common(project.enabled_platforms.split(','))
-}
-
-sourceSets.main.resources.srcDir 'src/main/generated'
diff --git a/catsplus-fabric/build.gradle b/catsplus-fabric/build.gradle
@@ -31,6 +31,8 @@ dependencies {
     modApi "net.fabricmc.fabric-api:fabric-api:${project.fabric_api_version}"
     modApi "dev.architectury:architectury-fabric:${project.architectury_version}"
 
+    modRuntimeOnly "com.terraformersmc:modmenu:${project.mod_menu_version}"
+
     common(project(path: ':', configuration: 'namedElements')) { transitive = false }
     shadowCommon(project(path: ':', configuration: 'transformProductionFabric')) { transitive = false }
 }

diff --git a/catsplus-fabric/src/main/java/cuteneko/catsplus/fabric/CatsPlusFabric.java b/catsplus-fabric/src/main/java/cuteneko/catsplus/fabric/CatsPlusFabric.java
@@ -1,9 +1,13 @@
 package cuteneko.catsplus.fabric;
 
 import cuteneko.catsplus.CatsPlus;
+import cuteneko.catsplus.item.ModItems;
+import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
+import net.minecraft.item.DyeableItem;
 
-public class CatsPlusFabric implements ModInitializer {
+public class CatsPlusFabric implements ModInitializer, ClientModInitializer {
     private final CatsPlus mod;
 
     public CatsPlusFabric() {
@@ -14,4 +18,14 @@ public CatsPlusFabric() {
     public void onInitialize() {
         mod.init();
     }
+
+    @Override
+    public void onInitializeClient() {
+        mod.initClient();
+
+        ColorProviderRegistry.ITEM.register(
+                ((stack, tintIndex) -> tintIndex > 0 ? -1 : ((DyeableItem) stack.getItem()).getColor(stack)),
+                ModItems.CAT_BAG.get()
+        );
+    }
 }
diff --git a/catsplus-fabric/src/main/java/cuteneko/catsplus/fabric/client/CatsPlusFabricClient.java b/catsplus-fabric/src/main/java/cuteneko/catsplus/fabric/client/CatsPlusFabricClient.java
diff --git a/catsplus-fabric/src/main/java/cuteneko/catsplus/fabric/data/GeniusCatFabric.java b/catsplus-fabric/src/main/java/cuteneko/catsplus/fabric/data/GeniusCatFabric.java
@@ -26,11 +26,6 @@ public void setTotem(boolean totem) {
         ((ICatEntityMixin) cat).catsplus$setTotem(totem);
     }
 
-    @Override
-    public boolean canRespawn() {
-        return hasTotem() || getLives() > 0;
-    }
-
     @Override
     public int getFavorability(PlayerEntity player) {
         return ((ICatEntityMixin) cat).catsplus$getFavorability(player);
@@ -40,25 +35,18 @@ public int getFavorability(PlayerEntity player) {
     public void setFavorability(int favorability, PlayerEntity player) {
         ((ICatEntityMixin) cat).catsplus$setFavorability(favorability, player);
 
-        if (cat.isOwner(player) && getFavorability(player) <= 0) {
+        if (getFavorability(player) <= 0) {
             cat.tryAttack(player);
-            cat.setOwnerUuid(null);
-            cat.setTamed(false);
-            cat.setSitting(false);
-            setLives(0);
-            cat.onTamedChanged();
             cat.getWorld().sendEntityStatus(cat, EntityStatuses.ADD_VILLAGER_ANGRY_PARTICLES);
-        }
-    }
 
-    @Override
-    public void addFavorability(int value, PlayerEntity player) {
-        setFavorability(getFavorability(player) + value, player);
-    }
-
-    @Override
-    public void subFavorability(int value, PlayerEntity player) {
-        setFavorability(getFavorability(player) - value, player);
+            if (cat.isOwner(player)) {
+                cat.setOwnerUuid(null);
+                cat.setTamed(false);
+                cat.setSitting(false);
+                setLives(0);
+                cat.onTamedChanged();
+            }
+        }
     }
 
     @Override

diff --git a/catsplus-fabric/src/main/java/cuteneko/catsplus/fabric/mixins/mixin/CatEntityMixin.java b/catsplus-fabric/src/main/java/cuteneko/catsplus/fabric/mixins/mixin/CatEntityMixin.java
@@ -46,7 +46,7 @@ public abstract class CatEntityMixin implements ICatEntityMixin {
 
     @Override
     public int catsplus$getFavorability(PlayerEntity player) {
-        if (catsplus$favorability.containsKey(player.getUuid())) {
+        if (!catsplus$favorability.containsKey(player.getUuid())) {
             catsplus$favorability.put(player.getUuid(), 0);
         }
 
@@ -109,12 +109,12 @@ private void write(NbtCompound nbt, CallbackInfo ci) {
         }
         tag.put(Constants.TAG_GENIUS_CAT_FAVORABILITY, favorability);
 
-        nbt.put(Constants.TAG_GENIUS_CAT_DATA, tag);
+        nbt.put(Constants.CAP_GENIUS_CAT.toString(), tag);
     }
 
     @Inject(method = "readCustomDataFromNbt", at = @At("HEAD"))
     private void read(NbtCompound nbt, CallbackInfo ci) {
-        var tag = nbt.getCompound(Constants.TAG_GENIUS_CAT_DATA);
+        var tag = nbt.getCompound(Constants.CAP_GENIUS_CAT.toString());
 
         catsplus$lives = tag.getInt(Constants.TAG_GENIUS_CAT_LIVES);
         catsplus$hasTotem = tag.getBoolean(Constants.TAG_GENIUS_CAT_TOTEM);

diff --git a/catsplus-fabric/src/main/java/cuteneko/catsplus/fabric/mixins/mixin/PlayerEntityMixin.java b/catsplus-fabric/src/main/java/cuteneko/catsplus/fabric/mixins/mixin/PlayerEntityMixin.java
@@ -88,12 +88,12 @@ private void write(NbtCompound nbt, CallbackInfo ci) {
 
         tag.putBoolean(Constants.TAG_CAT_PLAYER_IS_CAT, catsplus$isCat);
 
-        nbt.put(Constants.TAG_CAT_PLAYER_DATA, tag);
+        nbt.put(Constants.CAP_CAT_PLAYER.toString(), tag);
     }
 
     @Inject(method = "readCustomDataFromNbt", at = @At("HEAD"))
     private void read(NbtCompound nbt, CallbackInfo ci) {
-        var tag = nbt.getCompound(Constants.TAG_CAT_PLAYER_DATA);
+        var tag = nbt.getCompound(Constants.CAP_CAT_PLAYER.toString());
 
         var catTag = tag.getCompound(Constants.TAG_CAT_PLAYER_INNER_CAT);
         catsplus$getCatEntity().readNbt(catTag);

diff --git a/catsplus-fabric/src/main/resources/fabric.mod.json b/catsplus-fabric/src/main/resources/fabric.mod.json
@@ -19,7 +19,7 @@
   "environment": "*",
   "entrypoints": {
     "client": [
-      "cuteneko.catsplus.fabric.client.CatsPlusFabricClient"
+      "cuteneko.catsplus.fabric.CatsPlusFabric"
     ],
     "main": [
       "cuteneko.catsplus.fabric.CatsPlusFabric"

diff --git a/catsplus-forge/build.gradle b/catsplus-forge/build.gradle
@@ -0,0 +1,62 @@
+plugins {
+    id 'com.github.johnrengelman.shadow' version "${shadow_plugin_version}"
+    id 'me.shedaniel.unified-publishing' version "${unified_publishing_version}"
+}
+
+architectury {
+    platformSetupLoomIde()
+    forge()
+}
+
+loom {
+    accessWidenerPath = project(':').loom.accessWidenerPath
+
+    forge {
+        convertAccessWideners = true
+        extraAccessWideners.add loom.accessWidenerPath.get().asFile.name
+    }
+}
+
+dependencies {
+    forge "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}"
+    modApi "dev.architectury:architectury-forge:${project.architectury_version}"
+
+    common(project(path: ':', configuration: 'namedElements')) { transitive = false }
+    shadowCommon(project(path: ':', configuration: 'transformProductionFabric')) { transitive = false }
+}
+
+shadowJar {
+    exclude 'fabric.mod.json'
+    exclude 'architectury.common.json'
+
+    configurations = [project.configurations.shadowCommon]
+    archiveClassifier = 'dev-shadow'
+}
+
+remapJar {
+    injectAccessWidener = true
+    input.set shadowJar.archiveFile
+    dependsOn shadowJar
+}
+
+sourcesJar {
+    def commonSources = project(':').sourcesJar
+    dependsOn commonSources
+    from commonSources.archiveFile.map { zipTree(it) }
+}
+
+components.java {
+    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
+        skip()
+    }
+}
+
+publishing {
+    publications {
+        mavenFabric(MavenPublication) {
+            artifactId = project.name
+            version = "true".equalsIgnoreCase(System.getenv("MOD_RELEASE")) ? version : "${version}-SNAPSHOT"
+            from components.java
+        }
+    }
+}
diff --git a/catsplus-forge/gradle.properties b/catsplus-forge/gradle.properties
@@ -0,0 +1 @@
+loom.platform=forge
diff --git a/catsplus-forge/src/main/java/cuteneko/catsplus/forge/CatsPlusDataImpl.java b/catsplus-forge/src/main/java/cuteneko/catsplus/forge/CatsPlusDataImpl.java
@@ -0,0 +1,17 @@
+package cuteneko.catsplus.forge;
+
+import cuteneko.catsplus.data.ICatPlayer;
+import cuteneko.catsplus.data.IGeniusCat;
+import cuteneko.catsplus.forge.capability.ModCapabilities;
+import net.minecraft.entity.passive.CatEntity;
+import net.minecraft.entity.player.PlayerEntity;
+
+public class CatsPlusDataImpl {
+    public static ICatPlayer getCatPlayer(PlayerEntity player) {
+        return player.getCapability(ModCapabilities.CAT_PLAYER).orElseThrow(RuntimeException::new);
+    }
+
+    public static IGeniusCat getGeniusCat(CatEntity cat) {
+        return cat.getCapability(ModCapabilities.GENIUS_CAT).orElseThrow(RuntimeException::new);
+    }
+}
diff --git a/catsplus-forge/src/main/java/cuteneko/catsplus/forge/CatsPlusForge.java b/catsplus-forge/src/main/java/cuteneko/catsplus/forge/CatsPlusForge.java
@@ -0,0 +1,33 @@
+package cuteneko.catsplus.forge;
+
+import cuteneko.catsplus.CatsPlus;
+import dev.architectury.platform.forge.EventBuses;
+import net.minecraftforge.common.capabilities.CapabilityManager;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+
+@Mod(CatsPlus.MODID)
+public class CatsPlusForge {
+    private final CatsPlus mod;
+
+    public CatsPlusForge() {
+        mod = new CatsPlus();
+
+        var bus = FMLJavaModLoadingContext.get().getModEventBus();
+
+        bus.addListener(this::onSetup);
+        bus.addListener(this::onClientSetup);
+
+        EventBuses.registerModEventBus(CatsPlus.MODID, bus);
+    }
+
+    public void onSetup(FMLCommonSetupEvent event) {
+        mod.init();
+    }
+
+    public void onClientSetup(FMLClientSetupEvent event) {
+        event.enqueueWork(mod::initClient);
+    }
+}