I have defeated the elephant 👑

Layers-of-Railways · Aug 10, 2024 · 40e9f05 · 40e9f05
1 parent f0ebd95
commit 40e9f05
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 22 deletions.
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -65,7 +65,7 @@ dependencies {
     modCompileOnly("net.fabricmc.fabric-api:fabric-api:${"fabric_api_version"()}")
 
     // Steam 'n' Rails
-    modCompileOnly("com.railwayteam.railways:Steam_Rails-common-${"minecraft_version"()}:${"snr_version"()}+common-mc${"minecraft_version"()}")
+    modCompileOnly("com.railwayteam.railways:Steam_Rails-common-${"minecraft_version"()}:${"snr_version"()}+common-mc${"minecraft_version"()}") { isTransitive = false }
 
     // Carry On
     modCompileOnly("tschipp.carryon:carryon-fabric-${"minecraft_version"()}:${"carryon_fabric_version"()}")

diff --git a/common/src/main/java/dev/ithundxr/createnumismatics/config/NumismaticsConfig.java b/common/src/main/java/dev/ithundxr/createnumismatics/config/NumismaticsConfig.java
@@ -33,13 +33,13 @@ public class NumismaticsConfig {
     @ApiStatus.Internal
     public static final Map<ModConfig.Type, ConfigBase> CONFIGS = new EnumMap<>(ModConfig.Type.class);
 
-    //private static CClient client;
+    private static CClient client;
     private static CCommon common;
     private static CServer server;
 
-//    public static CClient client() {
-//        return client;
-//    }
+    public static CClient client() {
+        return client;
+    }
 
     public static CCommon common() {
         return common;
@@ -68,7 +68,7 @@ private static <T extends ConfigBase> T register(Supplier<T> factory, ModConfig.
 
     @ApiStatus.Internal
     public static void registerCommon() {
-        //client = register(CClient::new, ModConfig.Type.CLIENT);
+        client = register(CClient::new, ModConfig.Type.CLIENT);
         common = register(CCommon::new, ModConfig.Type.COMMON);
         server = register(CServer::new, ModConfig.Type.SERVER);
     }

diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -75,9 +75,6 @@ dependencies {
     // deprecated modules @ runtime only
     modLocalRuntime("net.fabricmc.fabric-api:fabric-api-deprecated:${"fabric_api_version"()}")
 
-    // because create fabric is a bit broken I think
-    modImplementation("net.minecraftforge:forgeconfigapiport-fabric:4.2.11")
-
     // Development QOL
     modLocalRuntime("maven.modrinth:lazydfu:${"lazydfu_version"()}")
     modLocalRuntime("com.terraformersmc:modmenu:${"modmenu_version"()}")
@@ -87,9 +84,9 @@ dependencies {
     modLocalRuntime("dev.emi:emi-fabric:${"emi_version"()}")
 
     // Steam 'n' Rails
-    modCompileOnly("com.railwayteam.railways:Steam_Rails-fabric-${"minecraft_version"()}:${"snr_version"()}+fabric-mc${"minecraft_version"()}")
+    modCompileOnly("com.railwayteam.railways:Steam_Rails-fabric-${"minecraft_version"()}:${"snr_version"()}+fabric-mc${"minecraft_version"()}") { isTransitive = false }
     if ("enable_snr"().toBoolean()) {
-        modLocalRuntime("com.railwayteam.railways:Steam_Rails-fabric-${"minecraft_version"()}:${"snr_version"()}+fabric-mc${"minecraft_version"()}")
+        modLocalRuntime("com.railwayteam.railways:Steam_Rails-fabric-${"minecraft_version"()}:${"snr_version"()}+fabric-mc${"minecraft_version"()}") { isTransitive = false }
     }
 
     // Carry On

diff --git a/...src/main/java/dev/ithundxr/createnumismatics/fabric/mixin/ItemHandlerWrapperAccessor.java b/...src/main/java/dev/ithundxr/createnumismatics/fabric/mixin/ItemHandlerWrapperAccessor.java
@@ -27,9 +27,9 @@
 @Mixin(ItemHandlerWrapper.class)
 @SuppressWarnings("UnstableApiUsage")
 public interface ItemHandlerWrapperAccessor {
-    @Accessor("wrapped")
+    @Accessor(value = "wrapped", remap = false)
     void setWrapped(Storage<ItemVariant> wrapped);
 
-    @Accessor("wrapped")
+    @Accessor(value = "wrapped", remap = false)
     Storage<ItemVariant> getWrapped();
 }
diff --git a/...a/dev/ithundxr/createnumismatics/fabric/mixin/PortableFluidInterfaceBlockEntityMixin.java b/...a/dev/ithundxr/createnumismatics/fabric/mixin/PortableFluidInterfaceBlockEntityMixin.java
@@ -51,7 +51,7 @@
 @SuppressWarnings("UnstableApiUsage")
 public abstract class PortableFluidInterfaceBlockEntityMixin extends PortableStorageInterfaceBlockEntity {
 
-    @Shadow protected InterfaceFluidHandler capability;
+    @Shadow(remap = false) protected InterfaceFluidHandler capability;
     @Unique
     private FluidSalepointTargetBehaviour railway$salepointBehaviour;
 

diff --git a/fabric/src/main/java/dev/ithundxr/createnumismatics/fabric/mixin/WrappedStorageAccessor.java b/fabric/src/main/java/dev/ithundxr/createnumismatics/fabric/mixin/WrappedStorageAccessor.java
@@ -26,9 +26,9 @@
 @Mixin(WrappedStorage.class)
 @SuppressWarnings("UnstableApiUsage")
 public interface WrappedStorageAccessor<T> extends Storage<T> {
-    @Accessor("wrapped")
+    @Accessor(value = "wrapped", remap = false)
     Storage<T> getWrapped();
 
-    @Accessor("wrapped")
+    @Accessor(value = "wrapped", remap = false)
     void setWrapped(Storage<T> wrapped);
 }
diff --git a/...hundxr/createnumismatics/fabric/mixin/compat/PortableEnergyInterfaceBlockEntityMixin.java b/...hundxr/createnumismatics/fabric/mixin/compat/PortableEnergyInterfaceBlockEntityMixin.java
@@ -53,7 +53,7 @@
 @Mixin(PortableEnergyInterfaceBlockEntity.class)
 @SuppressWarnings("UnstableApiUsage")
 public abstract class PortableEnergyInterfaceBlockEntityMixin extends PortableStorageInterfaceBlockEntity {
-    @Shadow
+    @Shadow(remap = false)
     protected InterfaceEnergyHandler capability;
 
     @Unique
@@ -225,10 +225,10 @@ public void write(@NotNull CompoundTag nbt, boolean clientPacket) {
     @ConditionalMixin(mods = Mods.CREATEADDITION)
     @Mixin(InterfaceEnergyHandler.class)
     private interface InterfaceEnergyHandlerAccessor {
-        @Accessor("wrapped")
+        @Accessor(value = "wrapped", remap = false)
         EnergyStorage getWrapped();
 
-        @Accessor("wrapped")
+        @Accessor(value = "wrapped", remap = false)
         void setWrapped(EnergyStorage wrapped);
     }
 }
diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
@@ -84,9 +84,9 @@ dependencies {
     modLocalRuntime("mezz.jei:jei-${"minecraft_version"()}-forge:${"jei_version"()}")
 
     // Steam 'n' Rails
-    modCompileOnly("com.railwayteam.railways:Steam_Rails-forge-${"minecraft_version"()}:${"snr_version"()}+forge-mc${"minecraft_version"()}")
+    modCompileOnly("com.railwayteam.railways:Steam_Rails-forge-${"minecraft_version"()}:${"snr_version"()}+forge-mc${"minecraft_version"()}") { isTransitive = false }
     if ("enable_snr"().toBoolean()) {
-        modLocalRuntime("com.railwayteam.railways:Steam_Rails-forge-${"minecraft_version"()}:${"snr_version"()}+forge-mc${"minecraft_version"()}")
+        modLocalRuntime("com.railwayteam.railways:Steam_Rails-forge-${"minecraft_version"()}:${"snr_version"()}+forge-mc${"minecraft_version"()}") { isTransitive = false }
     }
 
     // Carry On

diff --git a/gradle.properties b/gradle.properties
@@ -71,7 +71,7 @@ jade_version = 11.10.0+fabric
 
 # Steam 'n' Rails
 snr_version = 1.6.4
-enable_snr = true
+enable_snr = false
 
 # Carry On - https://github.com/Tschipp/CarryOn
 carryon_forge_version = 2.1.2.7