Anvilcraft/HexCasting
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added BlockSetType for edified wood, fixed HexAxtionTagProvider

Browse source
This commit is contained in:
Talia-12 2023-06-21 17:01:36 +10:00
parent 76ba2f5f8a
commit 36b631eadb
7 changed files with 51 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Common/src/main/java/at/petrak/hexcasting/common/blocks/decoration/BlockHexDoor.java
View file

@ -1,6 +1,7 @@
package at.petrak.hexcasting.common.blocks.decoration;
import at.petrak.hexcasting.annotations.SoftImplement;
import at.petrak.hexcasting.common.lib.HexBlockSetTypes;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.world.level.BlockGetter;
@ -9,7 +10,7 @@ import net.minecraft.world.level.block.state.BlockState;
public class BlockHexDoor extends DoorBlock {
public BlockHexDoor(Properties $$0) {
super($$0);
super($$0, HexBlockSetTypes.EDIFIED_WOOD);
}

3
Common/src/main/java/at/petrak/hexcasting/common/blocks/decoration/BlockHexPressurePlate.java
View file

@ -1,6 +1,7 @@
package at.petrak.hexcasting.common.blocks.decoration;
import at.petrak.hexcasting.annotations.SoftImplement;
import at.petrak.hexcasting.common.lib.HexBlockSetTypes;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.world.level.BlockGetter;
@ -9,7 +10,7 @@ import net.minecraft.world.level.block.state.BlockState;
public class BlockHexPressurePlate extends PressurePlateBlock {
public BlockHexPressurePlate(Sensitivity $$0, Properties $$1) {
super($$0, $$1);
super($$0, $$1, HexBlockSetTypes.EDIFIED_WOOD);
}

3
Common/src/main/java/at/petrak/hexcasting/common/blocks/decoration/BlockHexTrapdoor.java
View file

@ -1,6 +1,7 @@
package at.petrak.hexcasting.common.blocks.decoration;
import at.petrak.hexcasting.annotations.SoftImplement;
import at.petrak.hexcasting.common.lib.HexBlockSetTypes;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.world.level.BlockGetter;
@ -9,7 +10,7 @@ import net.minecraft.world.level.block.state.BlockState;
public class BlockHexTrapdoor extends TrapDoorBlock {
public BlockHexTrapdoor(Properties $$0) {
super($$0);
super($$0, HexBlockSetTypes.EDIFIED_WOOD);
}
@SoftImplement("forge")

26
Common/src/main/java/at/petrak/hexcasting/common/lib/HexBlockSetTypes.java Normal file
View file

@ -0,0 +1,26 @@
package at.petrak.hexcasting.common.lib;
import net.minecraft.world.level.block.state.properties.BlockSetType;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
public class HexBlockSetTypes {
public static void registerBlocks(Consumer<BlockSetType> r) {
for (var type : TYPES) {
r.accept(type);
}
}
private static final List<BlockSetType> TYPES = new ArrayList<>();
public static final BlockSetType EDIFIED_WOOD = register(
new BlockSetType("edified_wood")
);
private static BlockSetType register(BlockSetType type) {
TYPES.add(type);
return type;
}
}

2
Common/src/main/java/at/petrak/hexcasting/datagen/tag/HexActionTagProvider.java
View file

@ -14,7 +14,7 @@ import static at.petrak.hexcasting.api.HexAPI.modLoc;
public class HexActionTagProvider extends TagsProvider<ActionRegistryEntry> {
public HexActionTagProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> provider) {
super(output, IXplatAbstractions.INSTANCE.getActionRegistry(), provider);
super(output, IXplatAbstractions.INSTANCE.getActionRegistry().key(), provider);
}
@Override

27
Fabric/src/main/java/at/petrak/hexcasting/fabric/FabricHexInitializer.kt
View file

@ -48,6 +48,7 @@ import net.fabricmc.fabric.api.loot.v2.LootTableEvents
import net.fabricmc.fabric.api.registry.FlammableBlockRegistry
import net.minecraft.commands.synchronization.SingletonArgumentInfo
import net.minecraft.core.Registry
import net.minecraft.core.registries.BuiltInRegistries
import net.minecraft.resources.ResourceLocation
import net.minecraft.world.InteractionResult
import net.minecraft.world.entity.player.Player
@ -119,26 +120,26 @@ object FabricHexInitializer : ModInitializer {
private fun initRegistries() {
fabricOnlyRegistration()
HexSounds.registerSounds(bind(Registry.SOUND_EVENT))
HexBlocks.registerBlocks(bind(Registry.BLOCK))
HexBlocks.registerBlockItems(bind(Registry.ITEM))
HexBlockEntities.registerTiles(bind(Registry.BLOCK_ENTITY_TYPE))
HexItems.registerItems(bind(Registry.ITEM))
HexSounds.registerSounds(bind(BuiltInRegistries.SOUND_EVENT))
HexBlocks.registerBlocks(bind(BuiltInRegistries.BLOCK))
HexBlocks.registerBlockItems(bind(BuiltInRegistries.ITEM))
HexBlockEntities.registerTiles(bind(BuiltInRegistries.BLOCK_ENTITY_TYPE))
HexItems.registerItems(bind(BuiltInRegistries.ITEM))
// Registry.register(IngredientDeserializer.REGISTRY, FabricUnsealedIngredient.ID, FabricUnsealedIngredient.Deserializer.INSTANCE)
Registry.register(IngredientDeserializer.REGISTRY, FabricModConditionalIngredient.ID, FabricModConditionalIngredient.Deserializer.INSTANCE)
HexEntities.registerEntities(bind(Registry.ENTITY_TYPE))
HexAttributes.register(bind(Registry.ATTRIBUTE))
HexMobEffects.register(bind(Registry.MOB_EFFECT))
HexPotions.register(bind(Registry.POTION))
HexEntities.registerEntities(bind(BuiltInRegistries.ENTITY_TYPE))
HexAttributes.register(bind(BuiltInRegistries.ATTRIBUTE))
HexMobEffects.register(bind(BuiltInRegistries.MOB_EFFECT))
HexPotions.register(bind(BuiltInRegistries.POTION))
HexPotions.addRecipes()
HexRecipeStuffRegistry.registerSerializers(bind(Registry.RECIPE_SERIALIZER))
HexRecipeStuffRegistry.registerTypes(bind(Registry.RECIPE_TYPE))
HexRecipeStuffRegistry.registerSerializers(bind(BuiltInRegistries.RECIPE_SERIALIZER))
HexRecipeStuffRegistry.registerTypes(bind(BuiltInRegistries.RECIPE_TYPE))
HexParticles.registerParticles(bind(Registry.PARTICLE_TYPE))
HexParticles.registerParticles(bind(BuiltInRegistries.PARTICLE_TYPE))
HexLootFunctions.registerSerializers(bind(Registry.LOOT_FUNCTION_TYPE))
HexLootFunctions.registerSerializers(bind(BuiltInRegistries.LOOT_FUNCTION_TYPE))
HexIotaTypes.registerTypes(bind(IXplatAbstractions.INSTANCE.iotaTypeRegistry))
HexActions.register(bind(IXplatAbstractions.INSTANCE.actionRegistry))

4
Forge/src/main/java/at/petrak/hexcasting/forge/ForgeHexInitializer.java
View file

@ -44,6 +44,7 @@ import net.minecraft.world.entity.Mob;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BlockSetType;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.common.ForgeConfigSpec;
import net.minecraftforge.common.MinecraftForge;
@ -95,6 +96,9 @@ public class ForgeHexInitializer {
private static void initRegistry() {
bind(Registries.SOUND_EVENT, HexSounds::registerSounds);
HexBlockSetTypes.registerBlocks(BlockSetType::register);
bind(Registries.BLOCK, HexBlocks::registerBlocks);
bind(Registries.ITEM, HexBlocks::registerBlockItems);
bind(Registries.BLOCK_ENTITY_TYPE, HexBlockEntities::registerTiles);