fix: Make it so you can actually boot dev

This commit is contained in:
Ampflower 🌺 2025-03-12 18:38:29 -07:00
parent de6dc09899
commit 92e790dabc
No known key found for this signature in database
GPG Key ID: FC0397C90D508D7F
7 changed files with 76 additions and 13 deletions

View File

@ -10,6 +10,7 @@ dependencies {
clientCompileOnly(xplatClient.output) clientCompileOnly(xplatClient.output)
modCompileOnly(variantOf(rootProject.libs.emi.fabric) { classifier("api") }) modCompileOnly(variantOf(rootProject.libs.emi.fabric) { classifier("api") })
modCompileOnly(libs.bundles.fabric.compile)
include(libs.bundles.fabric.bundle) include(libs.bundles.fabric.bundle)
modImplementation(libs.bundles.fabric.bundle) modImplementation(libs.bundles.fabric.bundle)

View File

@ -0,0 +1,50 @@
package gay.pridecraft.joy.fabric.client;
import net.fabricmc.loader.api.FabricLoader;
import org.objectweb.asm.tree.ClassNode;
import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
import java.util.List;
import java.util.Set;
/**
* @author Ampflower
* @since ${version}
**/
public class MixinPlugin implements IMixinConfigPlugin {
@Override
public void onLoad(final String mixinPackage) {
}
@Override
public String getRefMapperConfig() {
return null;
}
@Override
public boolean shouldApplyMixin(final String targetClassName, final String mixinClassName) {
return FabricLoader.getInstance().isModLoaded(mixinClassName.split("\\.")[0]);
}
@Override
public void acceptTargets(final Set<String> myTargets, final Set<String> otherTargets) {
}
@Override
public List<String> getMixins() {
return null;
}
@Override
public void preApply(final String targetClassName, final ClassNode targetClass, final String mixinClassName, final IMixinInfo mixinInfo) {
}
@Override
public void postApply(final String targetClassName, final ClassNode targetClass, final String mixinClassName, final IMixinInfo mixinInfo) {
}
}

View File

@ -28,7 +28,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
package gay.pridecraft.joy.fabric.client.mixin.fix.mavapi; package gay.pridecraft.joy.fabric.client.mixin.mavapi;
import io.github.akashiikun.mavapi.v1.impl.AxolotlTypeExtension; import io.github.akashiikun.mavapi.v1.impl.AxolotlTypeExtension;
import io.github.akashiikun.mavapi.v1.impl.MoreAxolotlVariant; import io.github.akashiikun.mavapi.v1.impl.MoreAxolotlVariant;

View File

@ -2,9 +2,10 @@
"required": true, "required": true,
"minVersion": "0.8", "minVersion": "0.8",
"package": "gay.pridecraft.joy.fabric.client.mixin", "package": "gay.pridecraft.joy.fabric.client.mixin",
"plugin": "gay.pridecraft.joy.fabric.client.MixinPlugin",
"compatibilityLevel": "JAVA_21", "compatibilityLevel": "JAVA_21",
"client": [ "client": [
"fix.mavapi.EntityBucketItemMixin" "mavapi.EntityBucketItemMixin"
], ],
"injectors": { "injectors": {
"defaultRequire": 1 "defaultRequire": 1

View File

@ -1,12 +1,17 @@
package gay.pridecraft.joy.registry; package gay.pridecraft.joy.registry;
import com.mojang.logging.LogUtils;
import gay.pridecraft.joy.JoyUtil; import gay.pridecraft.joy.JoyUtil;
import io.github.akashiikun.mavapi.v1.api.ModdedAxolotlVariant; import io.github.akashiikun.mavapi.v1.api.ModdedAxolotlVariant;
import org.slf4j.Logger;
public final class JoyAxolotlVariants { public final class JoyAxolotlVariants {
private static final Logger logger = LogUtils.getLogger();
public static void init() { public static void init() {
// Joy.LOGGER.info("Registering Axolotl Variants for {} via MoreAxolotlVariantsAPI", Joy.MOD_ID); // Joy.LOGGER.info("Registering Axolotl Variants for {} via MoreAxolotlVariantsAPI", Joy.MOD_ID);
try {
register("bi"); register("bi");
register("ace"); register("ace");
register("aro"); register("aro");
@ -16,6 +21,9 @@ public final class JoyAxolotlVariants {
register("trans"); register("trans");
register("aroace"); register("aroace");
register("pan"); register("pan");
} catch (LinkageError yKnowItIsCursed) {
logger.error("[Joy] Unable to gay our axolotls, :(", yKnowItIsCursed);
}
} }
private static void register(String name) { private static void register(String name) {

View File

@ -63,7 +63,9 @@
"fabricloader": "*", "fabricloader": "*",
"minecraft": "${minecraftRequired}", "minecraft": "${minecraftRequired}",
"fabric-api": "*", "fabric-api": "*",
"midnightlib": "*", "midnightlib": "*"
},
"suggests": {
"mavapi": "*" "mavapi": "*"
} }
} }

View File

@ -81,8 +81,9 @@ mixin-squared = { module = "com.github.bawnorton.mixinsquared:mixinsquared-fabri
testng = { module = "org.testng:testng", version.ref = "testng" } testng = { module = "org.testng:testng", version.ref = "testng" }
[bundles] [bundles]
fabric = ["fabric-loader", "fabric-api", "trinkets", "mavapi", "midnight-fabric"] fabric = ["fabric-loader", "fabric-api", "trinkets", "midnight-fabric"]
fabric-bundle = ["modmenu-badges"] fabric-bundle = ["modmenu-badges"]
fabric-compile = ["mavapi"]
fabric-runtime = ["emi-fabric"] fabric-runtime = ["emi-fabric"]
fabric-client-runtime = ["modmenu"] fabric-client-runtime = ["modmenu"]