Merge fixes IV

Fabricators-of-Create · Sep 24, 2024 · 8a21ee6 · 8a21ee6
1 parent bf592f9
commit 8a21ee6
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 41 deletions.
diff --git a/src/main/java/com/tterrag/registrate/mixin/accessor/FluidBlockAccessor.java b/src/main/java/com/tterrag/registrate/mixin/accessor/FluidBlockAccessor.java
diff --git a/src/main/java/com/tterrag/registrate/mixin/accessor/LootTableProviderAccessor.java b/src/main/java/com/tterrag/registrate/mixin/accessor/LootTableProviderAccessor.java
@@ -11,7 +11,6 @@
 
 @Mixin(LootTableProvider.class)
 public interface LootTableProviderAccessor {
-    @Mutable
     @Accessor
-    void setSubProviders(List<SubProviderEntry> entries);
+    List<SubProviderEntry> getSubProviders();
 }
diff --git a/src/main/java/com/tterrag/registrate/mixin/accessor/SpawnEggItemAccessor.java b/src/main/java/com/tterrag/registrate/mixin/accessor/SpawnEggItemAccessor.java
diff --git a/src/main/java/com/tterrag/registrate/providers/loot/RegistrateBlockLootTables.java b/src/main/java/com/tterrag/registrate/providers/loot/RegistrateBlockLootTables.java
@@ -1,11 +1,13 @@
 package com.tterrag.registrate.providers.loot;
 
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 
 import javax.annotation.processing.Generated;
 
 import com.tterrag.registrate.AbstractRegistrate;
 
+import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.data.loot.BlockLootSubProvider;
@@ -27,7 +29,7 @@ public class RegistrateBlockLootTables extends VanillaBlockLoot implements Regis
     private final AbstractRegistrate<?> parent;
     private final Consumer<RegistrateBlockLootTables> callback;
 
-    public RegistrateBlockLootTables(HolderLookup.Provider provider, AbstractRegistrate<?> parent, Consumer<RegistrateBlockLootTables> callback) {
+    public RegistrateBlockLootTables(HolderLookup.Provider provider, AbstractRegistrate<?> parent, Consumer<RegistrateBlockLootTables> callback, FabricDataOutput output) {
         super(provider);
         this.parent = parent;
         this.callback = callback;

diff --git a/src/main/java/com/tterrag/registrate/providers/loot/RegistrateEntityLootTables.java b/src/main/java/com/tterrag/registrate/providers/loot/RegistrateEntityLootTables.java
@@ -28,8 +28,8 @@ public class RegistrateEntityLootTables extends SimpleFabricLootTableProvider im
 
     private final Map<ResourceKey<LootTable>, Builder> entries = new HashMap<>();
 
-    public RegistrateEntityLootTables(AbstractRegistrate<?> parent, FabricDataOutput output, CompletableFuture<HolderLookup.Provider> provider, Consumer<RegistrateEntityLootTables> callback) {
-        super(output, provider, LootContextParamSets.ENTITY);
+    public RegistrateEntityLootTables(HolderLookup.Provider provider, AbstractRegistrate<?> parent, Consumer<RegistrateEntityLootTables> callback, FabricDataOutput output) {
+        super(output, CompletableFuture.supplyAsync(() -> provider), LootContextParamSets.ENTITY);
         this.parent = parent;
         this.callback = callback;
     }

diff --git a/src/main/java/com/tterrag/registrate/providers/loot/RegistrateLootTableProvider.java b/src/main/java/com/tterrag/registrate/providers/loot/RegistrateLootTableProvider.java
@@ -1,6 +1,8 @@
 package com.tterrag.registrate.providers.loot;
 
 import com.google.common.collect.*;
+import com.mojang.datafixers.util.Function4;
+import com.mojang.datafixers.util.Function5;
 import com.tterrag.registrate.AbstractRegistrate;
 import com.tterrag.registrate.fabric.CustomValidationLootProvider;
 import com.tterrag.registrate.fabric.NonNullTriFunction;
@@ -49,7 +51,7 @@ public interface LootType<T extends RegistrateLootTables> {
         T getLootCreator(HolderLookup.Provider provider, AbstractRegistrate<?> parent, Consumer<T> callback, FabricDataOutput output);
         LootContextParamSet getLootSet();
 
-        static <T extends RegistrateLootTables> LootType<T> register(String name, LootContextParamSet set, TriFunction<HolderLookup.Provider, AbstractRegistrate, Consumer<T>, T> factory) {
+        static <T extends RegistrateLootTables> LootType<T> register(String name, LootContextParamSet set, Function4<HolderLookup.Provider, AbstractRegistrate<?>, Consumer<T>, FabricDataOutput, T> factory) {
             LootType<T> type = new LootType<T>() {
                 @Override
                 public T getLootCreator(HolderLookup.Provider provider, AbstractRegistrate<?> parent, Consumer<T> callback, FabricDataOutput output) {
@@ -77,7 +79,7 @@ public LootContextParamSet getLootSet() {
     private CompletableFuture<HolderLookup.Provider> provider;
 
     public RegistrateLootTableProvider(AbstractRegistrate<?> parent, PackOutput packOutput, CompletableFuture<HolderLookup.Provider> provider) {
-        super(packOutput, Set.of(), VanillaLootTableProvider.create(packOutput, provider).getTables(), provider);
+        super(packOutput, Set.of(), ((LootTableProviderAccessor) VanillaLootTableProvider.create(packOutput, provider)).getSubProviders(), provider);
         this.parent = parent;
         this.provider = provider;
     }

diff --git a/src/main/resources/registrate-fabric.mixins.json b/src/main/resources/registrate-fabric.mixins.json
@@ -5,10 +5,8 @@
   "compatibilityLevel": "JAVA_8",
   "mixins": [
     "LootTableProviderMixin",
-    "accessor.FluidBlockAccessor",
     "accessor.LootContextParamSetsAccessor",
     "accessor.LootTableProviderAccessor",
-    "accessor.SpawnEggItemAccessor",
     "accessor.SpawnPlacementsAccessor"
   ],
   "client": [