Skip to content

Commit

Permalink
Fix compatibility with REI on Forge
Browse files Browse the repository at this point in the history
  • Loading branch information
Pyrofab committed Mar 18, 2024
1 parent 57af5b5 commit 5069d53
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 3 deletions.
14 changes: 11 additions & 3 deletions build.gradle
Expand Up @@ -3,7 +3,6 @@ import net.fabricmc.loom.task.RemapJarTask
plugins {
id 'fabric-loom' version "1.4.+"
id 'io.github.ladysnake.chenille' version '0.12.0'
id 'io.github.juuxel.loom-quiltflower' version "1.6.0"
}

archivesBaseName = project.archives_base_name
Expand All @@ -19,6 +18,10 @@ chenille {
javaVersion = project.java_version.toInteger()
}

sourceSets {
reiDummy
}

repositories {
chenille.repositories.allCommonRepositories()
maven {
Expand All @@ -43,7 +46,8 @@ dependencies {
modIncludeImplementation(libs.cca.entity)
modIncludeImplementation(libs.permissionsApi)
modLocalImplementation(libs.rei.api)
modLocalImplementation(libs.emi)
compileOnly(sourceSets.reiDummy.output)
modLocalImplementation(libs.emi)

compileOnly(libs.mcAnnotations)

Expand All @@ -65,6 +69,10 @@ test {
}
}

license {
exclude 'me/shedaniel/**/*'
}

processResources {
inputs.property "version", project.version

Expand Down Expand Up @@ -129,4 +137,4 @@ publishing {
}
}
}
}
}
3 changes: 3 additions & 0 deletions changelog.md
Expand Up @@ -7,6 +7,9 @@ Version 1.5.0
- Added 3 default illustration types : in-world entities, fake entities, and items
- Illustrations can also be added to individual choices, in which case they are positioned relative to the corresponding choice

**Mod Interactions**
- Fixed compatibility with REI when loaded through Sinytra Connector

------------------------------------------------------
Version 1.4.0
------------------------------------------------------
Expand Down
Expand Up @@ -19,7 +19,9 @@

import me.shedaniel.rei.api.client.plugins.REIClientPlugin;
import me.shedaniel.rei.api.client.registry.screen.ScreenRegistry;
import me.shedaniel.rei.forge.REIPluginClient;

@REIPluginClient
public class BlabberReiClientPlugin implements REIClientPlugin {
@Override
public void registerScreens(ScreenRegistry registry) {
Expand Down
17 changes: 17 additions & 0 deletions src/reiDummy/java/me/shedaniel/rei/forge/REIPluginClient.java
@@ -0,0 +1,17 @@
package me.shedaniel.rei.forge;

import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

/**
* Dummy annotation to allow our plugin to be loaded on Forge
* (annotation classes do not need to exist on the classpath at runtime)
*
* @author shedaniel
*/
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.TYPE})
public @interface REIPluginClient {
}

0 comments on commit 5069d53

Please sign in to comment.