-
Notifications
You must be signed in to change notification settings - Fork 71
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
b0fc5ec
commit d1c7147
Showing
9 changed files
with
169 additions
and
171 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
108 changes: 57 additions & 51 deletions
108
neoforge-datagen/src/main/java/dev.compactmods.machines.datagen/loot/BlockLootGenerator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,51 +1,57 @@ | ||
| package dev.compactmods.machines.datagen.loot; | ||
|
|
||
| import dev.compactmods.machines.data.functions.CopyRoomBindingFunction; | ||
| import dev.compactmods.machines.machine.Machines; | ||
| import dev.compactmods.machines.room.Rooms; | ||
| import net.minecraft.core.HolderLookup; | ||
| import net.minecraft.data.loot.BlockLootSubProvider; | ||
| import net.minecraft.world.flag.FeatureFlags; | ||
| import net.minecraft.world.level.block.Block; | ||
| import net.minecraft.world.level.storage.loot.LootPool; | ||
| import net.minecraft.world.level.storage.loot.LootTable; | ||
| import net.minecraft.world.level.storage.loot.entries.LootItem; | ||
| import net.minecraft.world.level.storage.loot.predicates.ExplosionCondition; | ||
| import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.Set; | ||
|
|
||
| public class BlockLootGenerator extends BlockLootSubProvider { | ||
|
|
||
| public BlockLootGenerator(HolderLookup.Provider holderLookup) { | ||
| super(Collections.emptySet(), FeatureFlags.REGISTRY.allFlags(), holderLookup); | ||
| } | ||
|
|
||
| @Override | ||
| protected Iterable<Block> getKnownBlocks() { | ||
| return Set.of(Rooms.Blocks.BREAKABLE_WALL.get(), Machines.Blocks.BOUND_MACHINE.get()); | ||
| } | ||
|
|
||
| @Override | ||
| protected void generate() { | ||
| this.add(Rooms.Blocks.BREAKABLE_WALL.get(), LootTable.lootTable().withPool(LootPool | ||
| .lootPool() | ||
| .name(Rooms.Blocks.BREAKABLE_WALL.getId().toString()) | ||
| .setRolls(ConstantValue.exactly(1)) | ||
| .when(ExplosionCondition.survivesExplosion()) | ||
| .add(LootItem.lootTableItem(Rooms.Items.BREAKABLE_WALL.get())))); | ||
|
|
||
| var drop = LootItem.lootTableItem(Machines.Items.BOUND_MACHINE.get()); | ||
|
|
||
| final var lootPoolCM = LootPool.lootPool() | ||
| .setRolls(ConstantValue.exactly(1)) | ||
| .when(ExplosionCondition.survivesExplosion()) | ||
| .apply(CopyRoomBindingFunction::new) | ||
| .add(drop); | ||
|
|
||
| final var cmLootTable = LootTable.lootTable().withPool(lootPoolCM); | ||
|
|
||
| this.add(Machines.Blocks.BOUND_MACHINE.get(), cmLootTable); | ||
| } | ||
| } | ||
| package dev.compactmods.machines.datagen.loot; | ||
|
|
||
| import dev.compactmods.machines.machine.Machines; | ||
| import dev.compactmods.machines.room.Rooms; | ||
| import net.minecraft.core.HolderLookup; | ||
| import net.minecraft.data.loot.BlockLootSubProvider; | ||
| import net.minecraft.world.flag.FeatureFlags; | ||
| import net.minecraft.world.level.block.Block; | ||
| import net.minecraft.world.level.storage.loot.LootPool; | ||
| import net.minecraft.world.level.storage.loot.LootTable; | ||
| import net.minecraft.world.level.storage.loot.entries.LootItem; | ||
| import net.minecraft.world.level.storage.loot.functions.CopyComponentsFunction; | ||
| import net.minecraft.world.level.storage.loot.predicates.ExplosionCondition; | ||
| import net.minecraft.world.level.storage.loot.providers.number.ConstantValue; | ||
|
|
||
| import java.util.Collections; | ||
| import java.util.Set; | ||
|
|
||
| public class BlockLootGenerator extends BlockLootSubProvider { | ||
|
|
||
| public BlockLootGenerator(HolderLookup.Provider holderLookup) { | ||
| super(Collections.emptySet(), FeatureFlags.REGISTRY.allFlags(), holderLookup); | ||
| } | ||
|
|
||
| @Override | ||
| protected Iterable<Block> getKnownBlocks() { | ||
| return Set.of(Rooms.Blocks.BREAKABLE_WALL.get(), | ||
| Machines.Blocks.BOUND_MACHINE.get(), | ||
| Machines.Blocks.UNBOUND_MACHINE.get()); | ||
| } | ||
|
|
||
| @Override | ||
| protected void generate() { | ||
| this.add(Rooms.Blocks.BREAKABLE_WALL.get(), LootTable.lootTable().withPool(LootPool | ||
| .lootPool() | ||
| .name(Rooms.Blocks.BREAKABLE_WALL.getId().toString()) | ||
| .setRolls(ConstantValue.exactly(1)) | ||
| .when(ExplosionCondition.survivesExplosion()) | ||
| .add(LootItem.lootTableItem(Rooms.Items.BREAKABLE_WALL.get())))); | ||
|
|
||
| this.add(Machines.Blocks.UNBOUND_MACHINE.get(), LootTable.lootTable().withPool(LootPool.lootPool() | ||
| .setRolls(ConstantValue.exactly(1)) | ||
| .when(ExplosionCondition.survivesExplosion()) | ||
| .apply(CopyComponentsFunction.copyComponents(CopyComponentsFunction.Source.BLOCK_ENTITY) | ||
| .include(Machines.DataComponents.MACHINE_COLOR.get()) | ||
| .include(Machines.DataComponents.ROOM_TEMPLATE_ID.get())) | ||
| .add(LootItem.lootTableItem(Machines.Items.UNBOUND_MACHINE.get())))); | ||
|
|
||
| this.add(Machines.Blocks.BOUND_MACHINE.get(), LootTable.lootTable().withPool(LootPool.lootPool() | ||
| .setRolls(ConstantValue.exactly(1)) | ||
| .when(ExplosionCondition.survivesExplosion()) | ||
| .apply(CopyComponentsFunction.copyComponents(CopyComponentsFunction.Source.BLOCK_ENTITY) | ||
| .include(Machines.DataComponents.MACHINE_COLOR.get()) | ||
| .include(Machines.DataComponents.BOUND_ROOM_CODE.get())) | ||
| .add(LootItem.lootTableItem(Machines.Items.BOUND_MACHINE.get())))); | ||
| } | ||
| } |
130 changes: 64 additions & 66 deletions
130
neoforge-main/src/main/java/dev/compactmods/machines/CompactMachinesCommon.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,66 +1,64 @@ | ||
| package dev.compactmods.machines; | ||
|
|
||
| import dev.compactmods.machines.api.CompactMachines; | ||
| import dev.compactmods.machines.command.Commands; | ||
| import dev.compactmods.machines.compat.InterModCompat; | ||
| import dev.compactmods.machines.config.CommonConfig; | ||
| import dev.compactmods.machines.config.ServerConfig; | ||
| import dev.compactmods.machines.data.functions.LootFunctions; | ||
| import dev.compactmods.machines.dimension.Dimension; | ||
| import dev.compactmods.machines.dimension.WorldBorderFixer; | ||
| import dev.compactmods.machines.machine.Machines; | ||
| import dev.compactmods.machines.network.CMNetworks; | ||
| import dev.compactmods.machines.room.Rooms; | ||
| import dev.compactmods.machines.room.block.ProtectedBlockEventHandler; | ||
| import dev.compactmods.machines.room.upgrade.RoomUpgrades; | ||
| import dev.compactmods.machines.shrinking.Shrinking; | ||
| import dev.compactmods.machines.villager.Villagers; | ||
| import net.minecraft.util.FastColor; | ||
| import net.neoforged.bus.api.IEventBus; | ||
| import net.neoforged.fml.ModContainer; | ||
| import net.neoforged.fml.common.Mod; | ||
| import net.neoforged.fml.config.ModConfig; | ||
| import net.neoforged.neoforge.common.NeoForge; | ||
|
|
||
| @Mod(CompactMachines.MOD_ID) | ||
| public class CompactMachinesCommon { | ||
|
|
||
| public static final int BRAND_MACHINE_COLOR = FastColor.ARGB32.color(255, 248, 246, 76); | ||
|
|
||
| @SuppressWarnings("unused") | ||
| public CompactMachinesCommon(IEventBus modBus, ModContainer modContainer) { | ||
| initConfigs(modContainer); | ||
| prepare(); | ||
| registerEvents(modBus); | ||
|
|
||
| CMRegistries.setup(modBus); | ||
| } | ||
|
|
||
| private static void initConfigs(ModContainer modContainer) { | ||
| modContainer.registerConfig(ModConfig.Type.COMMON, CommonConfig.CONFIG); | ||
| modContainer.registerConfig(ModConfig.Type.SERVER, ServerConfig.CONFIG); | ||
| } | ||
|
|
||
| private static void prepare() { | ||
| Machines.prepare(); | ||
| Shrinking.prepare(); | ||
| Rooms.prepare(); | ||
| RoomUpgrades.prepare(); | ||
| Dimension.prepare(); | ||
| Commands.prepare(); | ||
| LootFunctions.prepare(); | ||
| Villagers.prepare(); | ||
| } | ||
|
|
||
| private static void registerEvents(IEventBus modBus) { | ||
| Rooms.registerEvents(modBus); | ||
| RoomUpgrades.registerEvents(modBus); | ||
| WorldBorderFixer.registerEvents(); | ||
|
|
||
| modBus.addListener(CMNetworks::onPacketRegistration); | ||
| modBus.addListener(InterModCompat::enqueueCompatMessages); | ||
|
|
||
| NeoForge.EVENT_BUS.addListener(Commands::onCommandsRegister); | ||
| NeoForge.EVENT_BUS.addListener(ProtectedBlockEventHandler::leftClickBlock); | ||
| } | ||
| } | ||
| package dev.compactmods.machines; | ||
|
|
||
| import dev.compactmods.machines.api.CompactMachines; | ||
| import dev.compactmods.machines.command.Commands; | ||
| import dev.compactmods.machines.compat.InterModCompat; | ||
| import dev.compactmods.machines.config.CommonConfig; | ||
| import dev.compactmods.machines.config.ServerConfig; | ||
| import dev.compactmods.machines.dimension.Dimension; | ||
| import dev.compactmods.machines.dimension.WorldBorderFixer; | ||
| import dev.compactmods.machines.machine.Machines; | ||
| import dev.compactmods.machines.network.CMNetworks; | ||
| import dev.compactmods.machines.room.Rooms; | ||
| import dev.compactmods.machines.room.block.ProtectedBlockEventHandler; | ||
| import dev.compactmods.machines.room.upgrade.RoomUpgrades; | ||
| import dev.compactmods.machines.shrinking.Shrinking; | ||
| import dev.compactmods.machines.villager.Villagers; | ||
| import net.minecraft.util.FastColor; | ||
| import net.neoforged.bus.api.IEventBus; | ||
| import net.neoforged.fml.ModContainer; | ||
| import net.neoforged.fml.common.Mod; | ||
| import net.neoforged.fml.config.ModConfig; | ||
| import net.neoforged.neoforge.common.NeoForge; | ||
|
|
||
| @Mod(CompactMachines.MOD_ID) | ||
| public class CompactMachinesCommon { | ||
|
|
||
| public static final int BRAND_MACHINE_COLOR = FastColor.ARGB32.color(255, 248, 246, 76); | ||
|
|
||
| @SuppressWarnings("unused") | ||
| public CompactMachinesCommon(IEventBus modBus, ModContainer modContainer) { | ||
| initConfigs(modContainer); | ||
| prepare(); | ||
| registerEvents(modBus); | ||
|
|
||
| CMRegistries.setup(modBus); | ||
| } | ||
|
|
||
| private static void initConfigs(ModContainer modContainer) { | ||
| modContainer.registerConfig(ModConfig.Type.COMMON, CommonConfig.CONFIG); | ||
| modContainer.registerConfig(ModConfig.Type.SERVER, ServerConfig.CONFIG); | ||
| } | ||
|
|
||
| private static void prepare() { | ||
| Machines.prepare(); | ||
| Shrinking.prepare(); | ||
| Rooms.prepare(); | ||
| RoomUpgrades.prepare(); | ||
| Dimension.prepare(); | ||
| Commands.prepare(); | ||
| Villagers.prepare(); | ||
| } | ||
|
|
||
| private static void registerEvents(IEventBus modBus) { | ||
| Rooms.registerEvents(modBus); | ||
| RoomUpgrades.registerEvents(modBus); | ||
| WorldBorderFixer.registerEvents(); | ||
|
|
||
| modBus.addListener(CMNetworks::onPacketRegistration); | ||
| modBus.addListener(InterModCompat::enqueueCompatMessages); | ||
|
|
||
| NeoForge.EVENT_BUS.addListener(Commands::onCommandsRegister); | ||
| NeoForge.EVENT_BUS.addListener(ProtectedBlockEventHandler::leftClickBlock); | ||
| } | ||
| } |
36 changes: 0 additions & 36 deletions
36
...e-main/src/main/java/dev/compactmods/machines/data/functions/CopyRoomBindingFunction.java
This file was deleted.
Oops, something went wrong.
15 changes: 0 additions & 15 deletions
15
neoforge-main/src/main/java/dev/compactmods/machines/data/functions/LootFunctions.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters