Add Livingwood and Dreamwood Fences and Fencegates (#3105)

* Replace Livingwood and Dreamwood Walls with Fences and Fencegates

* Redo one change that didn't get saved

idk why it didn't get saved.

* oops

Fix an copy-paste error, luckily that was the only stuff i copy-pasted :)

* Delete en_us.json

WTF how could this file get here?

* Reupload en_us.json that somehow got into the...

... base dir of the repo.

* Add Livingwood and Dreamwood walls back.
This commit is contained in:
ToMe25 authored and Vincent Lee committed 2020-01-06 13:09:31 -06:00
1 parent 4e91268474
commit 72a985c8c9
37 files changed
+374 -1

No files matched your search

@@ -12,6 +12,8 @@ package vazkii.botania.common.block;
import net.minecraft.block.Block;
import net.minecraft.block.Blocks;
import net.minecraft.block.FenceBlock;
import net.minecraft.block.FenceGateBlock;
import net.minecraft.block.RotatedPillarBlock;
import net.minecraft.block.SlabBlock;
import net.minecraft.block.SoundType;
@@ -35,6 +37,8 @@ import static vazkii.botania.common.block.ModBlocks.register;
import static vazkii.botania.common.lib.LibBlockNames.SLAB_SUFFIX;
import static vazkii.botania.common.lib.LibBlockNames.STAIR_SUFFIX;
import static vazkii.botania.common.lib.LibBlockNames.WALL_SUFFIX;
import static vazkii.botania.common.lib.LibBlockNames.FENCE_SUFFIX;
import static vazkii.botania.common.lib.LibBlockNames.FENCE_GATE_SUFFIX;
import static vazkii.botania.common.lib.ResourceLocationHelper.prefix;
@Mod.EventBusSubscriber(modid = LibMisc.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
@@ -44,6 +48,8 @@ public final class ModFluffBlocks {
@ObjectHolder(LibBlockNames.LIVING_WOOD + STAIR_SUFFIX) public static Block livingwoodStairs;
@ObjectHolder(LibBlockNames.LIVING_WOOD + SLAB_SUFFIX) public static Block livingwoodSlab;
@ObjectHolder(LibBlockNames.LIVING_WOOD + WALL_SUFFIX) public static Block livingwoodWall;
@ObjectHolder(LibBlockNames.LIVING_WOOD + FENCE_SUFFIX) public static Block livingwoodFence;
@ObjectHolder(LibBlockNames.LIVING_WOOD + FENCE_GATE_SUFFIX) public static Block livingwoodFenceGate;
@ObjectHolder(LibBlockNames.LIVING_WOOD_PLANKS + STAIR_SUFFIX) public static Block livingwoodPlankStairs;
@ObjectHolder(LibBlockNames.LIVING_WOOD_PLANKS + SLAB_SUFFIX) public static Block livingwoodPlankSlab;
@ObjectHolder(LibBlockNames.LIVING_ROCK + STAIR_SUFFIX) public static Block livingrockStairs;
@@ -54,6 +60,8 @@ public final class ModFluffBlocks {
@ObjectHolder(LibBlockNames.DREAM_WOOD + STAIR_SUFFIX) public static Block dreamwoodStairs;
@ObjectHolder(LibBlockNames.DREAM_WOOD + SLAB_SUFFIX) public static Block dreamwoodSlab;
@ObjectHolder(LibBlockNames.DREAM_WOOD + WALL_SUFFIX) public static Block dreamwoodWall;
@ObjectHolder(LibBlockNames.DREAM_WOOD + FENCE_SUFFIX) public static Block dreamwoodFence;
@ObjectHolder(LibBlockNames.DREAM_WOOD + FENCE_GATE_SUFFIX) public static Block dreamwoodFenceGate;
@ObjectHolder(LibBlockNames.DREAM_WOOD_PLANKS + STAIR_SUFFIX) public static Block dreamwoodPlankStairs;
@ObjectHolder(LibBlockNames.DREAM_WOOD_PLANKS + SLAB_SUFFIX) public static Block dreamwoodPlankSlab;
@@ -233,6 +241,8 @@ public final class ModFluffBlocks {
register(r, new BlockModStairs(base.getDefaultState(), Block.Properties.from(base)), LibBlockNames.LIVING_WOOD + STAIR_SUFFIX);
register(r, new SlabBlock(Block.Properties.from(base)), LibBlockNames.LIVING_WOOD + SLAB_SUFFIX);
register(r, new WallBlock(Block.Properties.from(base)), LibBlockNames.LIVING_WOOD + WALL_SUFFIX);
register(r, new FenceBlock(Block.Properties.from(base)), LibBlockNames.LIVING_WOOD + FENCE_SUFFIX);
register(r, new FenceGateBlock(Block.Properties.from(base)), LibBlockNames.LIVING_WOOD + FENCE_GATE_SUFFIX);
base = r.getValue(prefix(LibBlockNames.LIVING_WOOD_PLANKS));
register(r, new BlockModStairs(base.getDefaultState(), Block.Properties.from(base)), LibBlockNames.LIVING_WOOD_PLANKS + STAIR_SUFFIX);
@@ -251,6 +261,8 @@ public final class ModFluffBlocks {
register(r, new BlockModStairs(base.getDefaultState(), Block.Properties.from(base)), LibBlockNames.DREAM_WOOD + STAIR_SUFFIX);
register(r, new SlabBlock(Block.Properties.from(base)), LibBlockNames.DREAM_WOOD + SLAB_SUFFIX);
register(r, new WallBlock(Block.Properties.from(base)), LibBlockNames.DREAM_WOOD + WALL_SUFFIX);
register(r, new FenceBlock(Block.Properties.from(base)), LibBlockNames.DREAM_WOOD + FENCE_SUFFIX);
register(r, new FenceGateBlock(Block.Properties.from(base)), LibBlockNames.DREAM_WOOD + FENCE_GATE_SUFFIX);
base = r.getValue(prefix(LibBlockNames.DREAM_WOOD_PLANKS));
register(r, new BlockModStairs(base.getDefaultState(), Block.Properties.from(base)), LibBlockNames.DREAM_WOOD_PLANKS + STAIR_SUFFIX);
@@ -321,6 +333,8 @@ public final class ModFluffBlocks {
r.register(new ItemBlockMod(livingwoodStairs, props).setRegistryName(livingwoodStairs.getRegistryName()));
r.register(new ItemBlockMod(livingwoodSlab, props).setRegistryName(livingwoodSlab.getRegistryName()));
r.register(new ItemBlockMod(livingwoodWall, props).setRegistryName(livingwoodWall.getRegistryName()));
r.register(new ItemBlockMod(livingwoodFence, props).setRegistryName(livingwoodFence.getRegistryName()));
r.register(new ItemBlockMod(livingwoodFenceGate, props).setRegistryName(livingwoodFenceGate.getRegistryName()));
r.register(new ItemBlockMod(livingwoodPlankStairs, props).setRegistryName(livingwoodPlankStairs.getRegistryName()));
r.register(new ItemBlockMod(livingwoodPlankSlab, props).setRegistryName(livingwoodPlankSlab.getRegistryName()));
@@ -335,6 +349,8 @@ public final class ModFluffBlocks {
r.register(new ItemBlockMod(dreamwoodStairs, props).setRegistryName(dreamwoodStairs.getRegistryName()));
r.register(new ItemBlockMod(dreamwoodSlab, props).setRegistryName(dreamwoodSlab.getRegistryName()));
r.register(new ItemBlockMod(dreamwoodWall, props).setRegistryName(dreamwoodWall.getRegistryName()));
r.register(new ItemBlockMod(dreamwoodFence, props).setRegistryName(dreamwoodFence.getRegistryName()));
r.register(new ItemBlockMod(dreamwoodFenceGate, props).setRegistryName(dreamwoodFenceGate.getRegistryName()));
r.register(new ItemBlockMod(dreamwoodPlankStairs, props).setRegistryName(dreamwoodPlankStairs.getRegistryName()));
r.register(new ItemBlockMod(dreamwoodPlankSlab, props).setRegistryName(dreamwoodPlankSlab.getRegistryName()));
@@ -481,6 +481,8 @@ public final class BotaniaCreativeTab extends ItemGroup {
addItem(ModFluffBlocks.livingwoodStairs);
addItem(ModFluffBlocks.livingwoodSlab);
addItem(ModFluffBlocks.livingwoodWall);
addItem(ModFluffBlocks.livingwoodFence);
addItem(ModFluffBlocks.livingwoodFenceGate);
addItem(ModFluffBlocks.livingwoodPlankStairs);
addItem(ModFluffBlocks.livingwoodPlankSlab);
addItem(ModBlocks.livingrockBrick);
@@ -495,6 +497,8 @@ public final class BotaniaCreativeTab extends ItemGroup {
addItem(ModFluffBlocks.dreamwoodStairs);
addItem(ModFluffBlocks.dreamwoodSlab);
addItem(ModFluffBlocks.dreamwoodWall);
addItem(ModFluffBlocks.dreamwoodFence);
addItem(ModFluffBlocks.dreamwoodFenceGate);
addItem(ModFluffBlocks.dreamwoodPlankStairs);
addItem(ModFluffBlocks.dreamwoodPlankSlab);
addItem(ModFluffBlocks.shimmerwoodPlankStairs);
@@ -149,6 +149,8 @@ public final class LibBlockNames {
public static final String SLAB_SUFFIX = "_slab";
public static final String STAIR_SUFFIX = "_stairs";
public static final String WALL_SUFFIX = "_wall";
public static final String FENCE_SUFFIX = "_fence";
public static final String FENCE_GATE_SUFFIX = "_fence_gate";
public static final ResourceLocation SUBTILE_PUREDAISY = prefix("pure_daisy");
public static final ResourceLocation SUBTILE_MANASTAR = prefix("manastar");
@@ -1,6 +1,7 @@
package vazkii.botania.data;
import net.minecraft.block.Block;
import net.minecraft.block.FenceBlock;
import net.minecraft.block.SlabBlock;
import net.minecraft.block.StairsBlock;
import net.minecraft.block.WallBlock;
@@ -8,7 +9,6 @@ import net.minecraft.data.BlockTagsProvider;
import net.minecraft.data.DataGenerator;
import net.minecraft.item.DyeColor;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.Tag;
import vazkii.botania.common.block.BlockFloatingSpecialFlower;
import vazkii.botania.common.block.ModBlocks;
import vazkii.botania.common.lib.LibMisc;
@@ -45,6 +45,10 @@ public class BlockTagProvider extends BlockTagsProvider {
.sorted(Comparator.comparing(Block::getRegistryName))
.toArray(Block[]::new));
getBuilder(BlockTags.FENCES).add(registry.stream().filter(botania)
.filter(b -> b instanceof FenceBlock)
.sorted(Comparator.comparing(Block::getRegistryName))
.toArray(Block[]::new));
getBuilder(ModTags.Blocks.MUNDANE_FLOATING_FLOWERS).add(
Arrays.stream(DyeColor.values())
@@ -25,6 +25,7 @@ public class ItemTagProvider extends ItemTagsProvider {
this.copy(BlockTags.SLABS, ItemTags.SLABS);
this.copy(BlockTags.STAIRS, ItemTags.STAIRS);
this.copy(BlockTags.WALLS, ItemTags.WALLS);
this.copy(BlockTags.FENCES, ItemTags.FENCES);
this.copy(ModTags.Blocks.MUNDANE_FLOATING_FLOWERS, ModTags.Items.MUNDANE_FLOATING_FLOWERS);
this.copy(ModTags.Blocks.SPECIAL_FLOATING_FLOWERS, ModTags.Items.SPECIAL_FLOATING_FLOWERS);