Skip to content

Commit

Permalink
Add WoodTypes for livingwood/dreamwood fence gates
Browse files Browse the repository at this point in the history
  • Loading branch information
@artemisSystem
artemisSystem committed Jun 5, 2023
1 parent a6ade76 commit d260d6e
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 3 deletions.
16 changes: 16 additions & 0 deletions Fabric/src/main/java/vazkii/botania/fabric/xplat/FabricXplatImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
import net.fabricmc.fabric.api.networking.v1.PlayerLookup;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder;
import net.fabricmc.fabric.api.object.builder.v1.block.type.BlockSetTypeRegistry;
import net.fabricmc.fabric.api.object.builder.v1.block.type.WoodTypeRegistry;
import net.fabricmc.fabric.api.registry.FuelRegistry;
import net.fabricmc.fabric.api.registry.StrippableBlockRegistry;
import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener;
Expand Down Expand Up @@ -40,6 +42,7 @@
import net.minecraft.server.packs.PackType;
import net.minecraft.server.packs.resources.PreparableReloadListener;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.tags.TagKey;
import net.minecraft.util.Unit;
import net.minecraft.util.profiling.ProfilerFiller;
Expand All @@ -65,12 +68,15 @@
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.FlowerBlock;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BlockSetType;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.level.block.state.properties.WoodType;
import net.minecraft.world.level.material.Fluid;
import net.minecraft.world.phys.AABB;

Expand Down Expand Up @@ -625,4 +631,14 @@ public boolean isRedStringContainerTarget(BlockEntity be) {
public RedStringContainerBlockEntity newRedStringContainer(BlockPos pos, BlockState state) {
return new FabricRedStringContainerBlockEntity(pos, state);
}

@Override
public BlockSetType registerBlockSetType(String name, SoundType soundType, SoundEvent doorClose, SoundEvent doorOpen, SoundEvent trapdoorClose, SoundEvent trapdoorOpen, SoundEvent pressurePlateClickOff, SoundEvent pressurePlateClickOn, SoundEvent buttonClickOff, SoundEvent buttonClickOn) {
return BlockSetTypeRegistry.register(prefix(name), soundType, doorClose, doorOpen, trapdoorClose, trapdoorOpen, pressurePlateClickOff, pressurePlateClickOn, buttonClickOff, buttonClickOn);
}

@Override
public WoodType registerWoodType(String name, BlockSetType setType, SoundType soundType, SoundType hangingSignSoundType, SoundEvent fenceGateClose, SoundEvent fenceGateOpen) {
return WoodTypeRegistry.register(prefix(name), setType, soundType, hangingSignSoundType, fenceGateClose, fenceGateOpen);
}
}
14 changes: 14 additions & 0 deletions Xplat/src/main/java/vazkii/botania/common/block/BotaniaBlockSetTypes.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package vazkii.botania.common.block;

import net.minecraft.world.level.block.state.properties.BlockSetType;
import net.minecraft.world.level.block.state.properties.WoodType;

import vazkii.botania.xplat.XplatAbstractions;

public class BotaniaBlockSetTypes {
public static final BlockSetType LIVINGWOOD_BLOCK_SET = XplatAbstractions.INSTANCE.registerWoodBlockSetType("livingwood");
public static final BlockSetType DREAMWOOD_BLOCK_SET = XplatAbstractions.INSTANCE.registerWoodBlockSetType("dreamwood");

public static final WoodType LIVINGWOOD = XplatAbstractions.INSTANCE.registerWoodType("livingwood", LIVINGWOOD_BLOCK_SET);
public static final WoodType DREAMWOOD = XplatAbstractions.INSTANCE.registerWoodType("dreamwood", DREAMWOOD_BLOCK_SET);
}
5 changes: 2 additions & 3 deletions Xplat/src/main/java/vazkii/botania/common/block/BotaniaFluffBlocks.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block;
Expand Down Expand Up @@ -41,7 +40,7 @@ public final class BotaniaFluffBlocks {
public static final Block livingwoodSlab = new SlabBlock(BlockBehaviour.Properties.copy(livingwood));
public static final Block livingwoodWall = new WallBlock(BlockBehaviour.Properties.copy(livingwood));
public static final Block livingwoodFence = new FenceBlock(BlockBehaviour.Properties.copy(livingwood));
public static final Block livingwoodFenceGate = new FenceGateBlock(BlockBehaviour.Properties.copy(livingwood), SoundEvents.FENCE_GATE_CLOSE, SoundEvents.FENCE_GATE_OPEN);
public static final Block livingwoodFenceGate = new FenceGateBlock(BlockBehaviour.Properties.copy(livingwood), BotaniaBlockSetTypes.LIVINGWOOD);
public static final Block livingwoodStrippedStairs = new BotaniaStairBlock(livingwoodStripped.defaultBlockState(), BlockBehaviour.Properties.copy(livingwood));
public static final Block livingwoodStrippedSlab = new SlabBlock(BlockBehaviour.Properties.copy(livingwood));
public static final Block livingwoodStrippedWall = new WallBlock(BlockBehaviour.Properties.copy(livingwood));
Expand All @@ -65,7 +64,7 @@ public final class BotaniaFluffBlocks {
public static final Block dreamwoodSlab = new SlabBlock(BlockBehaviour.Properties.copy(dreamwood));
public static final Block dreamwoodWall = new WallBlock(BlockBehaviour.Properties.copy(dreamwood));
public static final Block dreamwoodFence = new FenceBlock(BlockBehaviour.Properties.copy(dreamwood));
public static final Block dreamwoodFenceGate = new FenceGateBlock(BlockBehaviour.Properties.copy(dreamwood), SoundEvents.FENCE_GATE_CLOSE, SoundEvents.FENCE_GATE_OPEN);
public static final Block dreamwoodFenceGate = new FenceGateBlock(BlockBehaviour.Properties.copy(dreamwood), BotaniaBlockSetTypes.DREAMWOOD);
public static final Block dreamwoodStrippedStairs = new BotaniaStairBlock(dreamwoodStripped.defaultBlockState(), BlockBehaviour.Properties.copy(dreamwood));
public static final Block dreamwoodStrippedSlab = new SlabBlock(BlockBehaviour.Properties.copy(dreamwood));
public static final Block dreamwoodStrippedWall = new WallBlock(BlockBehaviour.Properties.copy(dreamwood));
Expand Down
17 changes: 17 additions & 0 deletions Xplat/src/main/java/vazkii/botania/xplat/XplatAbstractions.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.server.packs.PackType;
import net.minecraft.server.packs.resources.PreparableReloadListener;
import net.minecraft.sounds.SoundEvent;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.tags.TagKey;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.MenuProvider;
Expand All @@ -34,11 +36,14 @@
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.FlowerBlock;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.entity.AbstractFurnaceBlockEntity;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.BlockSetType;
import net.minecraft.world.level.block.state.properties.WoodType;
import net.minecraft.world.level.material.Fluid;
import net.minecraft.world.phys.AABB;

Expand Down Expand Up @@ -203,5 +208,17 @@ default Item.Properties noRepairOnForge(Item.Properties builder) {
boolean isRedStringContainerTarget(BlockEntity be);
RedStringContainerBlockEntity newRedStringContainer(BlockPos pos, BlockState state);

default BlockSetType registerWoodBlockSetType(String name) {
return registerBlockSetType(name, SoundType.WOOD, SoundEvents.WOODEN_DOOR_CLOSE, SoundEvents.WOODEN_DOOR_OPEN, SoundEvents.WOODEN_TRAPDOOR_CLOSE, SoundEvents.WOODEN_TRAPDOOR_OPEN, SoundEvents.WOODEN_PRESSURE_PLATE_CLICK_OFF, SoundEvents.WOODEN_PRESSURE_PLATE_CLICK_ON, SoundEvents.WOODEN_BUTTON_CLICK_OFF, SoundEvents.WOODEN_BUTTON_CLICK_ON);
}

BlockSetType registerBlockSetType(String name, SoundType soundType, SoundEvent doorClose, SoundEvent doorOpen, SoundEvent trapdoorClose, SoundEvent trapdoorOpen, SoundEvent pressurePlateClickOff, SoundEvent pressurePlateClickOn, SoundEvent buttonClickOff, SoundEvent buttonClickOn);

default WoodType registerWoodType(String name, BlockSetType blockSetType) {
return registerWoodType(name, blockSetType, SoundType.WOOD, SoundType.HANGING_SIGN, SoundEvents.FENCE_GATE_CLOSE, SoundEvents.FENCE_GATE_OPEN);
}

WoodType registerWoodType(String name, BlockSetType setType, SoundType soundType, SoundType hangingSignSoundType, SoundEvent fenceGateClose, SoundEvent fenceGateOpen);

XplatAbstractions INSTANCE = ServiceUtil.findService(XplatAbstractions.class, null);
}

0 comments on commit d260d6e

Please sign in to comment.