mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-11-04 23:53:01 +00:00
Code Issues Releases Wiki Activity

Switch away from Forge's loot modifiers

Browse Source 
We switched to Forge's loot modifier system in the 1.20 update, as
LootTable.addPool had been removed. Turns out this was by accident, and
so we switch back to the previous implementation, as it's much simpler
and efficient.
This commit is contained in:
Jonathan Coates
2023-07-07 10:18:16 +01:00
parent a98f3b2a4c
commit 915b6f9d81
11 changed files with 24 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
projects/forge/src/generated/resources/data/computercraft/loot_modifiers/treasure_disk.json generated
View File

@@ -1,21 +0,0 @@
{
"type": "computercraft:inject_loot_table",
"conditions": [
{
"condition": "minecraft:any_of",
"terms": [
{"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/stronghold_library"},
{"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/woodland_mansion"},
{"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/stronghold_corridor"},
{"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/abandoned_mineshaft"},
{"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/simple_dungeon"},
{"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/village/village_cartographer"},
{"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/igloo_chest"},
{"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/jungle_temple"},
{"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/desert_pyramid"},
{"condition": "forge:loot_table_id", "loot_table_id": "minecraft:chests/stronghold_crossing"}
]
}
],
"loot_table": "computercraft:treasure_disk"
}

1
projects/forge/src/generated/resources/data/forge/loot_modifiers/global_loot_modifiers.json generated
View File

@@ -1 +0,0 @@
{"entries": ["computercraft:treasure_disk"], "replace": false}

2
projects/forge/src/main/java/dan200/computercraft/ComputerCraft.java
View File

@@ -12,7 +12,6 @@ import dan200.computercraft.api.network.wired.WiredElement;
import dan200.computercraft.api.peripheral.IPeripheral;
import dan200.computercraft.api.pocket.PocketUpgradeSerialiser;
import dan200.computercraft.api.turtle.TurtleUpgradeSerialiser;
import dan200.computercraft.shared.ForgeModRegistry;
import dan200.computercraft.shared.ModRegistry;
import dan200.computercraft.shared.config.ConfigSpec;
import dan200.computercraft.shared.details.FluidData;
@@ -37,7 +36,6 @@ import net.minecraftforge.registries.RegistryBuilder;
public final class ComputerCraft {
public ComputerCraft() {
ModRegistry.register();
ForgeModRegistry.register();
ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, ((ForgeConfigFile) ConfigSpec.serverSpec).spec());
ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, ((ForgeConfigFile) ConfigSpec.clientSpec).spec());

2
projects/forge/src/main/java/dan200/computercraft/data/Generators.java
View File

@@ -42,8 +42,6 @@ public class Generators {
public static void gather(GatherDataEvent event) {
var generator = event.getGenerator();
DataProviders.add(new GeneratorFactoryImpl(generator.getVanillaPack(true), event.getExistingFileHelper(), event.getLookupProvider()));
generator.<LootModifierProvider>addProvider(event.includeServer(), LootModifierProvider::new);
}
private record GeneratorFactoryImpl(

32
projects/forge/src/main/java/dan200/computercraft/data/LootModifierProvider.java
View File

@@ -1,32 +0,0 @@
// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
//
// SPDX-License-Identifier: MPL-2.0
package dan200.computercraft.data;
import dan200.computercraft.api.ComputerCraftAPI;
import dan200.computercraft.shared.CommonHooks;
import dan200.computercraft.shared.loot.InjectLootTableModifier;
import net.minecraft.data.PackOutput;
import net.minecraft.world.level.storage.loot.predicates.AnyOfCondition;
import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
import net.minecraftforge.common.data.GlobalLootModifierProvider;
import net.minecraftforge.common.loot.LootTableIdCondition;
final class LootModifierProvider extends GlobalLootModifierProvider {
LootModifierProvider(PackOutput output) {
super(output, ComputerCraftAPI.MOD_ID);
}
@Override
protected void start() {
add("treasure_disk", new InjectLootTableModifier(
new LootItemCondition[]{
AnyOfCondition.anyOf(
CommonHooks.TREASURE_DISK_LOOT_TABLES.stream().map(LootTableIdCondition::builder).toArray(LootItemCondition.Builder[]::new)
).build(),
},
CommonHooks.TREASURE_DISK_LOOT
));
}
}

6
projects/forge/src/main/java/dan200/computercraft/shared/ForgeCommonHooks.java
View File

@@ -138,6 +138,12 @@ public class ForgeCommonHooks {
}
}
@SubscribeEvent
public static void lootLoad(LootTableLoadEvent event) {
var pool = CommonHooks.getExtraLootPool(event.getName());
if (pool != null) event.getTable().addPool(pool.build());
}
@SubscribeEvent(priority = EventPriority.HIGHEST)
public static void onEntitySpawn(EntityJoinLevelEvent event) {
if (CommonHooks.onEntitySpawn(event.getEntity())) event.setCanceled(true);

31
projects/forge/src/main/java/dan200/computercraft/shared/ForgeModRegistry.java
View File

@@ -1,31 +0,0 @@
// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
//
// SPDX-License-Identifier: MPL-2.0
package dan200.computercraft.shared;
import com.mojang.serialization.Codec;
import dan200.computercraft.shared.loot.InjectLootTableModifier;
import dan200.computercraft.shared.platform.PlatformHelper;
import dan200.computercraft.shared.platform.RegistrationHelper;
import dan200.computercraft.shared.platform.RegistryEntry;
import net.minecraftforge.common.loot.IGlobalLootModifier;
import net.minecraftforge.registries.ForgeRegistries;
/**
* {@link ModRegistry} equivalent for Forge-specific content.
*/
public final class ForgeModRegistry {
private ForgeModRegistry() {
}
public static final class Codecs {
static final RegistrationHelper<Codec<? extends IGlobalLootModifier>> REGISTRY = PlatformHelper.get().createRegistrationHelper(ForgeRegistries.Keys.GLOBAL_LOOT_MODIFIER_SERIALIZERS);
public static final RegistryEntry<Codec<InjectLootTableModifier>> INJECT_LOOT_TABLE = REGISTRY.register("inject_loot_table", InjectLootTableModifier::createCodec);
}
public static void register() {
Codecs.REGISTRY.register();
}
}

45
projects/forge/src/main/java/dan200/computercraft/shared/loot/InjectLootTableModifier.java
View File

@@ -1,45 +0,0 @@
// SPDX-FileCopyrightText: 2023 The CC: Tweaked Developers
//
// SPDX-License-Identifier: MPL-2.0
package dan200.computercraft.shared.loot;
import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import dan200.computercraft.shared.ForgeModRegistry;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.storage.loot.LootContext;
import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
import net.minecraftforge.common.loot.LootModifier;
/**
* A {@link LootModifier} which adds a new loot pool to a piece of loot.
*/
public final class InjectLootTableModifier extends LootModifier {
private final ResourceLocation location;
public InjectLootTableModifier(LootItemCondition[] conditionsIn, ResourceLocation location) {
super(conditionsIn);
this.location = location;
}
public static Codec<InjectLootTableModifier> createCodec() {
return RecordCodecBuilder.create(inst -> LootModifier.codecStart(inst).and(
ResourceLocation.CODEC.fieldOf("loot_table").forGetter(m -> m.location)
).apply(inst, InjectLootTableModifier::new)
);
}
@Override
protected ObjectArrayList<ItemStack> doApply(ObjectArrayList<ItemStack> generatedLoot, LootContext context) {
context.getResolver().getLootTable(location).getRandomItemsRaw(context, generatedLoot::add);
return generatedLoot;
}
@Override
public Codec<InjectLootTableModifier> codec() {
return ForgeModRegistry.Codecs.INJECT_LOOT_TABLE.get();
}
}