FabricMC/fabric
1
0
Fork 1
mirror of https://github.com/FabricMC/fabric.git synced 2025-02-17 04:01:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

1.21.2-pre2

Browse source 
Just mappings
This commit is contained in:
modmuss50 2024-10-10 15:29:13 +01:00
parent 57632285fa
commit 488720f071
4 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/SimpleFabricLootTableProvider.java
View file

@ -20,9 +20,9 @@ import java.util.Objects;
import java.util.concurrent.CompletableFuture;
import net.minecraft.data.DataWriter;
import net.minecraft.loot.context.LootContextType;
import net.minecraft.loot.context.LootContextTypes;
import net.minecraft.registry.RegistryWrapper;
import net.minecraft.util.context.ContextType;
import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator;
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
@ -34,21 +34,21 @@ import net.fabricmc.fabric.impl.datagen.loot.FabricLootTableProviderImpl;
public abstract class SimpleFabricLootTableProvider implements FabricLootTableProvider {
protected final FabricDataOutput output;
private final CompletableFuture<RegistryWrapper.WrapperLookup> registryLookup;
protected final LootContextType lootContextType;
protected final ContextType contextType;
public SimpleFabricLootTableProvider(FabricDataOutput output, CompletableFuture<RegistryWrapper.WrapperLookup> registryLookup, LootContextType lootContextType) {
public SimpleFabricLootTableProvider(FabricDataOutput output, CompletableFuture<RegistryWrapper.WrapperLookup> registryLookup, ContextType contextType) {
this.output = output;
this.registryLookup = registryLookup;
this.lootContextType = lootContextType;
this.contextType = contextType;
}
@Override
public CompletableFuture<?> run(DataWriter writer) {
return FabricLootTableProviderImpl.run(writer, this, lootContextType, output, registryLookup);
return FabricLootTableProviderImpl.run(writer, this, contextType, output, registryLookup);
}
@Override
public String getName() {
return Objects.requireNonNull(LootContextTypes.MAP.inverse().get(lootContextType), "Could not get id for loot context type") + " Loot Table";
return Objects.requireNonNull(LootContextTypes.MAP.inverse().get(contextType), "Could not get id for loot context type") + " Loot Table";
}
}

6
fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/impl/datagen/loot/FabricLootTableProviderImpl.java
View file

@ -31,11 +31,11 @@ import com.mojang.serialization.JsonOps;
import net.minecraft.data.DataProvider;
import net.minecraft.data.DataWriter;
import net.minecraft.loot.LootTable;
import net.minecraft.loot.context.LootContextType;
import net.minecraft.registry.RegistryKeys;
import net.minecraft.registry.RegistryOps;
import net.minecraft.registry.RegistryWrapper;
import net.minecraft.util.Identifier;
import net.minecraft.util.context.ContextType;
import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput;
import net.fabricmc.fabric.api.datagen.v1.provider.FabricBlockLootTableProvider;
@ -51,7 +51,7 @@ public final class FabricLootTableProviderImpl {
public static CompletableFuture<?> run(
DataWriter writer,
FabricLootTableProvider provider,
LootContextType lootContextType,
ContextType contextType,
FabricDataOutput fabricDataOutput,
CompletableFuture<RegistryWrapper.WrapperLookup> registryLookup) {
HashMap<Identifier, LootTable> builders = Maps.newHashMap();
@ -62,7 +62,7 @@ public final class FabricLootTableProviderImpl {
ResourceCondition[] conditions = FabricDataGenHelper.consumeConditions(builder);
conditionMap.put(registryKey.getValue(), conditions);
if (builders.put(registryKey.getValue(), builder.type(lootContextType).build()) != null) {
if (builders.put(registryKey.getValue(), builder.type(contextType).build()) != null) {
throw new IllegalStateException("Duplicate loot table " + registryKey.getValue());
}
});

2
fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/impl/registry/sync/FabricRegistryInit.java
View file

@ -217,7 +217,7 @@ public class FabricRegistryInit implements ModInitializer {
.addAttribute(RegistryAttribute.SYNCED);
// Synced via PacketCodecs.registryValue
RegistryAttributeHolder.get(Registries.field_54927)
RegistryAttributeHolder.get(Registries.RECIPE_BOOK_CATEGORY)
.addAttribute(RegistryAttribute.SYNCED);
}
}

2
gradle.properties
View file

@ -3,7 +3,7 @@ org.gradle.parallel=true
fabric.loom.multiProjectOptimisation=true
version=0.105.3
minecraft_version=1.21.2-pre1
minecraft_version=1.21.2-pre2
yarn_version=+build.1
loader_version=0.16.4
installer_version=1.0.1