Skip to content

Commit 40e9f05

Browse files
committed
I have defeated the elephant 👑
1 parent f0ebd95 commit 40e9f05

File tree

9 files changed

+19
-22
lines changed

9 files changed

+19
-22
lines changed

common/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ dependencies {
6565
modCompileOnly("net.fabricmc.fabric-api:fabric-api:${"fabric_api_version"()}")
6666

6767
// Steam 'n' Rails
68-
modCompileOnly("com.railwayteam.railways:Steam_Rails-common-${"minecraft_version"()}:${"snr_version"()}+common-mc${"minecraft_version"()}")
68+
modCompileOnly("com.railwayteam.railways:Steam_Rails-common-${"minecraft_version"()}:${"snr_version"()}+common-mc${"minecraft_version"()}") { isTransitive = false }
6969

7070
// Carry On
7171
modCompileOnly("tschipp.carryon:carryon-fabric-${"minecraft_version"()}:${"carryon_fabric_version"()}")

common/src/main/java/dev/ithundxr/createnumismatics/config/NumismaticsConfig.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ public class NumismaticsConfig {
3333
@ApiStatus.Internal
3434
public static final Map<ModConfig.Type, ConfigBase> CONFIGS = new EnumMap<>(ModConfig.Type.class);
3535

36-
//private static CClient client;
36+
private static CClient client;
3737
private static CCommon common;
3838
private static CServer server;
3939

40-
// public static CClient client() {
41-
// return client;
42-
// }
40+
public static CClient client() {
41+
return client;
42+
}
4343

4444
public static CCommon common() {
4545
return common;
@@ -68,7 +68,7 @@ private static <T extends ConfigBase> T register(Supplier<T> factory, ModConfig.
6868

6969
@ApiStatus.Internal
7070
public static void registerCommon() {
71-
//client = register(CClient::new, ModConfig.Type.CLIENT);
71+
client = register(CClient::new, ModConfig.Type.CLIENT);
7272
common = register(CCommon::new, ModConfig.Type.COMMON);
7373
server = register(CServer::new, ModConfig.Type.SERVER);
7474
}

fabric/build.gradle.kts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,6 @@ dependencies {
7575
// deprecated modules @ runtime only
7676
modLocalRuntime("net.fabricmc.fabric-api:fabric-api-deprecated:${"fabric_api_version"()}")
7777

78-
// because create fabric is a bit broken I think
79-
modImplementation("net.minecraftforge:forgeconfigapiport-fabric:4.2.11")
80-
8178
// Development QOL
8279
modLocalRuntime("maven.modrinth:lazydfu:${"lazydfu_version"()}")
8380
modLocalRuntime("com.terraformersmc:modmenu:${"modmenu_version"()}")
@@ -87,9 +84,9 @@ dependencies {
8784
modLocalRuntime("dev.emi:emi-fabric:${"emi_version"()}")
8885

8986
// Steam 'n' Rails
90-
modCompileOnly("com.railwayteam.railways:Steam_Rails-fabric-${"minecraft_version"()}:${"snr_version"()}+fabric-mc${"minecraft_version"()}")
87+
modCompileOnly("com.railwayteam.railways:Steam_Rails-fabric-${"minecraft_version"()}:${"snr_version"()}+fabric-mc${"minecraft_version"()}") { isTransitive = false }
9188
if ("enable_snr"().toBoolean()) {
92-
modLocalRuntime("com.railwayteam.railways:Steam_Rails-fabric-${"minecraft_version"()}:${"snr_version"()}+fabric-mc${"minecraft_version"()}")
89+
modLocalRuntime("com.railwayteam.railways:Steam_Rails-fabric-${"minecraft_version"()}:${"snr_version"()}+fabric-mc${"minecraft_version"()}") { isTransitive = false }
9390
}
9491

9592
// Carry On

fabric/src/main/java/dev/ithundxr/createnumismatics/fabric/mixin/ItemHandlerWrapperAccessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
@Mixin(ItemHandlerWrapper.class)
2828
@SuppressWarnings("UnstableApiUsage")
2929
public interface ItemHandlerWrapperAccessor {
30-
@Accessor("wrapped")
30+
@Accessor(value = "wrapped", remap = false)
3131
void setWrapped(Storage<ItemVariant> wrapped);
3232

33-
@Accessor("wrapped")
33+
@Accessor(value = "wrapped", remap = false)
3434
Storage<ItemVariant> getWrapped();
3535
}

fabric/src/main/java/dev/ithundxr/createnumismatics/fabric/mixin/PortableFluidInterfaceBlockEntityMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
@SuppressWarnings("UnstableApiUsage")
5252
public abstract class PortableFluidInterfaceBlockEntityMixin extends PortableStorageInterfaceBlockEntity {
5353

54-
@Shadow protected InterfaceFluidHandler capability;
54+
@Shadow(remap = false) protected InterfaceFluidHandler capability;
5555
@Unique
5656
private FluidSalepointTargetBehaviour railway$salepointBehaviour;
5757

fabric/src/main/java/dev/ithundxr/createnumismatics/fabric/mixin/WrappedStorageAccessor.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
@Mixin(WrappedStorage.class)
2727
@SuppressWarnings("UnstableApiUsage")
2828
public interface WrappedStorageAccessor<T> extends Storage<T> {
29-
@Accessor("wrapped")
29+
@Accessor(value = "wrapped", remap = false)
3030
Storage<T> getWrapped();
3131

32-
@Accessor("wrapped")
32+
@Accessor(value = "wrapped", remap = false)
3333
void setWrapped(Storage<T> wrapped);
3434
}

fabric/src/main/java/dev/ithundxr/createnumismatics/fabric/mixin/compat/PortableEnergyInterfaceBlockEntityMixin.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
@Mixin(PortableEnergyInterfaceBlockEntity.class)
5454
@SuppressWarnings("UnstableApiUsage")
5555
public abstract class PortableEnergyInterfaceBlockEntityMixin extends PortableStorageInterfaceBlockEntity {
56-
@Shadow
56+
@Shadow(remap = false)
5757
protected InterfaceEnergyHandler capability;
5858

5959
@Unique
@@ -225,10 +225,10 @@ public void write(@NotNull CompoundTag nbt, boolean clientPacket) {
225225
@ConditionalMixin(mods = Mods.CREATEADDITION)
226226
@Mixin(InterfaceEnergyHandler.class)
227227
private interface InterfaceEnergyHandlerAccessor {
228-
@Accessor("wrapped")
228+
@Accessor(value = "wrapped", remap = false)
229229
EnergyStorage getWrapped();
230230

231-
@Accessor("wrapped")
231+
@Accessor(value = "wrapped", remap = false)
232232
void setWrapped(EnergyStorage wrapped);
233233
}
234234
}

forge/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,9 @@ dependencies {
8484
modLocalRuntime("mezz.jei:jei-${"minecraft_version"()}-forge:${"jei_version"()}")
8585

8686
// Steam 'n' Rails
87-
modCompileOnly("com.railwayteam.railways:Steam_Rails-forge-${"minecraft_version"()}:${"snr_version"()}+forge-mc${"minecraft_version"()}")
87+
modCompileOnly("com.railwayteam.railways:Steam_Rails-forge-${"minecraft_version"()}:${"snr_version"()}+forge-mc${"minecraft_version"()}") { isTransitive = false }
8888
if ("enable_snr"().toBoolean()) {
89-
modLocalRuntime("com.railwayteam.railways:Steam_Rails-forge-${"minecraft_version"()}:${"snr_version"()}+forge-mc${"minecraft_version"()}")
89+
modLocalRuntime("com.railwayteam.railways:Steam_Rails-forge-${"minecraft_version"()}:${"snr_version"()}+forge-mc${"minecraft_version"()}") { isTransitive = false }
9090
}
9191

9292
// Carry On

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jade_version = 11.10.0+fabric
7171

7272
# Steam 'n' Rails
7373
snr_version = 1.6.4
74-
enable_snr = true
74+
enable_snr = false
7575

7676
# Carry On - https://github.com/Tschipp/CarryOn
7777
carryon_forge_version = 2.1.2.7

0 commit comments

Comments
 (0)