Skip to content

Commit f0a462c

Browse files
neoforge
broken cause I guess it wants to load all the targets for the mixin? dunno no datagen for neoforge tho cause yeah wtf idk how this shit works
1 parent 3b27bbe commit f0a462c

File tree

27 files changed

+1009
-31
lines changed

27 files changed

+1009
-31
lines changed

fabric/1.20.5/src/main/java/top/offsetmonkey538/loottablemodifier/fabric/v1205/datagen/LootTableModifierDatagen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import java.util.concurrent.CompletableFuture;
4040
import java.util.function.BiConsumer;
4141

42-
import static top.offsetmonkey538.loottablemodifier.modded.platform.FabricPlatformMain.id;
42+
import static top.offsetmonkey538.loottablemodifier.modded.platform.ModdedPlatformMain.id;
4343
/**
4444
* Datagen for loot modifiers used for testing.
4545
*/

fabric/1.21.2/src/main/java/top/offsetmonkey538/loottablemodifier/fabric/v1212/datagen/LootTableModifierDatagen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import java.util.concurrent.CompletableFuture;
4141
import java.util.function.BiConsumer;
4242

43-
import static top.offsetmonkey538.loottablemodifier.modded.platform.FabricPlatformMain.id;
43+
import static top.offsetmonkey538.loottablemodifier.modded.platform.ModdedPlatformMain.id;
4444

4545
/**
4646
* Datagen for loot modifiers used for testing.

fabric/1.21/src/main/java/top/offsetmonkey538/loottablemodifier/fabric/v121/datagen/LootTableModifierDatagen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import java.util.concurrent.CompletableFuture;
4040
import java.util.function.BiConsumer;
4141

42-
import static top.offsetmonkey538.loottablemodifier.modded.platform.FabricPlatformMain.id;
42+
import static top.offsetmonkey538.loottablemodifier.modded.platform.ModdedPlatformMain.id;
4343

4444
/**
4545
* Datagen for loot modifiers used for testing.

fabric/build.gradle

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,6 @@ loom {
1414
}
1515
}
1616

17-
dependencies {
18-
compileOnly project(":modded")
19-
commonJava project(path: ":modded", configuration: "commonJava")
20-
commonResources project(path: ":modded", configuration: "commonResources")
21-
}
22-
2317
allprojects {
2418
apply plugin: "multiloader-modded"
2519
apply plugin: "fabric-loom"
@@ -36,6 +30,13 @@ allprojects {
3630
}
3731

3832
dependencies {
33+
compileOnly project(":common")
34+
commonJava project(path: ":common", configuration: "commonJava")
35+
commonResources project(path: ":common", configuration: "commonResources")
36+
compileOnly project(":modded")
37+
commonJava project(path: ":modded", configuration: "commonJava")
38+
commonResources project(path: ":modded", configuration: "commonResources")
39+
3940
minecraft "com.mojang:minecraft:${project.minecraft_version}"
4041
mappings loom.officialMojangMappings()
4142
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"

fabric/src/main/java/top/offsetmonkey538/loottablemodifier/fabric/platform/FabricPlatformMain.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import static top.offsetmonkey538.loottablemodifier.common.LootTableModifierCommon.IS_DEV;
1111
import static top.offsetmonkey538.loottablemodifier.common.LootTableModifierCommon.MOD_ID;
12-
import static top.offsetmonkey538.loottablemodifier.modded.platform.FabricPlatformMain.id;
12+
import static top.offsetmonkey538.loottablemodifier.modded.platform.ModdedPlatformMain.id;
1313

1414
public class FabricPlatformMain implements ModInitializer {
1515
@Override

modded/1.20.5/src/main/java/top/offsetmonkey538/loottablemodifier/modded/v1205/impl/RegistryUtilImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
import net.minecraft.core.Registry;
55
import net.minecraft.resources.ResourceKey;
66
import org.jetbrains.annotations.NotNull;
7-
import top.offsetmonkey538.loottablemodifier.modded.platform.FabricPlatformMain;
7+
import top.offsetmonkey538.loottablemodifier.modded.platform.ModdedPlatformMain;
88

99
//TODO: move into monkeylib? no idea what version this actually changed in so maybe some version is currenly using the wrong stuff
10-
public final class RegistryUtilImpl implements FabricPlatformMain.RegistryUtil {
10+
public final class RegistryUtilImpl implements ModdedPlatformMain.RegistryUtil {
1111
@Override
1212
public <T> HolderLookup<T> getRegistryAsLookupImpl(@NotNull Registry<T> registry) {
1313
return registry.asLookup();

modded/1.21.2/src/main/java/top/offsetmonkey538/loottablemodifier/modded/v1212/impl/RegistryUtilImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import net.minecraft.core.Registry;
55
import net.minecraft.resources.ResourceKey;
66
import org.jetbrains.annotations.NotNull;
7-
import top.offsetmonkey538.loottablemodifier.modded.platform.FabricPlatformMain;
7+
import top.offsetmonkey538.loottablemodifier.modded.platform.ModdedPlatformMain;
88

9-
public final class RegistryUtilImpl implements FabricPlatformMain.RegistryUtil {
9+
public final class RegistryUtilImpl implements ModdedPlatformMain.RegistryUtil {
1010
@Override
1111
public <T> HolderLookup<T> getRegistryAsLookupImpl(@NotNull Registry<T> registry) {
1212
return registry;

modded/1.21.2/src/main/resources/META-INF/services/top.offsetmonkey538.loottablemodifier.modded.platform.FabricPlatformMain$RegistryUtil renamed to modded/1.21.2/src/main/resources/META-INF/services/top.offsetmonkey538.loottablemodifier.modded.platform.ModdedPlatformMain$RegistryUtil

File renamed without changes.

modded/1.21/src/main/java/top/offsetmonkey538/loottablemodifier/modded/v121/impl/RegistryUtilImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
import net.minecraft.core.Registry;
55
import net.minecraft.resources.ResourceKey;
66
import org.jetbrains.annotations.NotNull;
7-
import top.offsetmonkey538.loottablemodifier.modded.platform.FabricPlatformMain;
7+
import top.offsetmonkey538.loottablemodifier.modded.platform.ModdedPlatformMain;
88

9-
public final class RegistryUtilImpl implements FabricPlatformMain.RegistryUtil {
9+
public final class RegistryUtilImpl implements ModdedPlatformMain.RegistryUtil {
1010
@Override
1111
public <T> HolderLookup<T> getRegistryAsLookupImpl(@NotNull Registry<T> registry) {
1212
return registry.asLookup();

modded/src/main/java/top/offsetmonkey538/loottablemodifier/modded/impl/resource/action/LootModifierActionTypeImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import top.offsetmonkey538.loottablemodifier.common.api.wrapper.Identifier;
1212
import top.offsetmonkey538.loottablemodifier.modded.impl.wrapper.IdentifierWrapper;
1313

14-
import static top.offsetmonkey538.loottablemodifier.modded.platform.FabricPlatformMain.id;
14+
import static top.offsetmonkey538.loottablemodifier.modded.platform.ModdedPlatformMain.id;
1515

1616
public final class LootModifierActionTypeImpl {
1717
private LootModifierActionTypeImpl() {

0 commit comments

Comments
 (0)