diff --git a/src/main/java/com/hexagram2021/emeraldcraft/common/ModVanillaCompat.java b/src/main/java/com/hexagram2021/emeraldcraft/common/ModVanillaCompat.java index 200c81ed..2f61158b 100644 --- a/src/main/java/com/hexagram2021/emeraldcraft/common/ModVanillaCompat.java +++ b/src/main/java/com/hexagram2021/emeraldcraft/common/ModVanillaCompat.java @@ -5,12 +5,12 @@ import com.hexagram2021.emeraldcraft.common.register.ECBlocks; import com.hexagram2021.emeraldcraft.common.register.ECItems; import net.minecraft.world.item.AxeItem; -import net.minecraft.world.level.block.Block; -import net.minecraft.world.level.block.Blocks; -import net.minecraft.world.level.block.ComposterBlock; -import net.minecraft.world.level.block.FireBlock; +import net.minecraft.world.level.block.*; import java.util.Map; +import java.util.function.Supplier; + +import static com.hexagram2021.emeraldcraft.common.util.RegistryHelper.getRegistryName; public class ModVanillaCompat { public static void setup() { @@ -78,11 +78,25 @@ public static void setup() { registerFlammable(ECBlocks.TO_STAIRS.get(ECBlocks.Plant.PEACH_PLANKS.getId()).get(), 5, 20); registerFlammable(ECBlocks.TO_FENCE.get(ECBlocks.Plant.PEACH_PLANKS.getId()).get(), 5, 20); registerFlammable(ECBlocks.TO_FENCE_GATE.get(ECBlocks.Plant.PEACH_PLANKS.getId()).get(), 5, 20); + registerFlammable(ECBlocks.Decoration.RESIN_BLOCK.get(), 5, 20); + + registerFlowerPot(ECBlocks.Plant.CYAN_PETUNIA.get(), ECBlocks.Plant.POTTED_CYAN_PETUNIA::get); + registerFlowerPot(ECBlocks.Plant.MAGENTA_PETUNIA.get(), ECBlocks.Plant.POTTED_MAGENTA_PETUNIA::get); + registerFlowerPot(ECBlocks.Plant.HIGAN_BANA.get(), ECBlocks.Plant.POTTED_HIGAN_BANA::get); + registerFlowerPot(ECBlocks.Plant.GINKGO_SAPLING.get(), ECBlocks.Plant.POTTED_GINKGO_SAPLING::get); + registerFlowerPot(ECBlocks.Plant.PALM_SAPLING.get(), ECBlocks.Plant.POTTED_PALM_SAPLING::get); + registerFlowerPot(ECBlocks.Plant.PEACH_SAPLING.get(), ECBlocks.Plant.POTTED_PEACH_SAPLING::get); + registerFlowerPot(ECBlocks.Plant.PURPURACEUS_FUNGUS.get(), ECBlocks.Plant.POTTED_PURPURACEUS_FUNGUS::get); + registerFlowerPot(ECBlocks.Plant.PURPURACEUS_ROOTS.get(), ECBlocks.Plant.POTTED_PURPURACEUS_ROOTS::get); } private static final FireBlock fireblock = (FireBlock)Blocks.FIRE; - public static void registerFlammable(Block blockIn, int encouragement, int flammability) { fireblock.setFlammable(blockIn, encouragement, flammability); } + + private static final FlowerPotBlock flowerpotblock = (FlowerPotBlock)Blocks.FLOWER_POT; + public static void registerFlowerPot(Block flower, Supplier pot) { + flowerpotblock.addPlant(getRegistryName(flower), pot); + } } diff --git a/src/main/java/com/hexagram2021/emeraldcraft/common/crafting/menu/IceMakerMenu.java b/src/main/java/com/hexagram2021/emeraldcraft/common/crafting/menu/IceMakerMenu.java index db0ab104..5e9e473a 100644 --- a/src/main/java/com/hexagram2021/emeraldcraft/common/crafting/menu/IceMakerMenu.java +++ b/src/main/java/com/hexagram2021/emeraldcraft/common/crafting/menu/IceMakerMenu.java @@ -42,7 +42,6 @@ public IceMakerMenu(int id, Inventory inventory, Container container, ContainerD checkContainerDataCount(data, DATA_COUNT); this.iceMaker = container; this.iceMakerData = data; - this.addSlot(new IceMakerMenu.IceMakerResultSlot(inventory.player, container, RESULT_SLOT, 134, 35)); this.ingredientInputSlot = this.addSlot(new Slot(container, INGREDIENT_INPUT_SLOT, 50, 18) { @Override public boolean mayPlace(@NotNull ItemStack itemStack) { @@ -76,6 +75,7 @@ public int getMaxStackSize() { return 1; } }); + this.addSlot(new IceMakerMenu.IceMakerResultSlot(inventory.player, container, RESULT_SLOT, 134, 35)); this.addDataSlots(data); for(int i = 0; i < 3; ++i) { diff --git a/src/main/java/com/hexagram2021/emeraldcraft/common/crafting/menu/MineralTableMenu.java b/src/main/java/com/hexagram2021/emeraldcraft/common/crafting/menu/MineralTableMenu.java index 037b0ac5..07c66221 100644 --- a/src/main/java/com/hexagram2021/emeraldcraft/common/crafting/menu/MineralTableMenu.java +++ b/src/main/java/com/hexagram2021/emeraldcraft/common/crafting/menu/MineralTableMenu.java @@ -41,9 +41,9 @@ public MineralTableMenu(int id, Inventory inventory, Container container, Contai this.mineralTable = container; this.mineralTableData = data; this.level = inventory.player.level; - this.addSlot(new MineralTableMenu.MineralResultSlot(inventory.player, container, RESULT_SLOT, 79, 58)); this.ingredientSlot = this.addSlot(new MineralTableMenu.IngredientSlot(this, container, INGREDIENT_SLOT, 79, 17)); this.addSlot(new MineralTableMenu.FuelSlot(container, FUEL_SLOT, 17, 17)); + this.addSlot(new MineralTableMenu.MineralResultSlot(inventory.player, container, RESULT_SLOT, 79, 58)); this.addDataSlots(data); for(int i = 0; i < 3; ++i) { diff --git a/src/main/java/com/hexagram2021/emeraldcraft/common/register/ECBlocks.java b/src/main/java/com/hexagram2021/emeraldcraft/common/register/ECBlocks.java index 13809f86..c6a9c00b 100644 --- a/src/main/java/com/hexagram2021/emeraldcraft/common/register/ECBlocks.java +++ b/src/main/java/com/hexagram2021/emeraldcraft/common/register/ECBlocks.java @@ -2,6 +2,7 @@ import static com.hexagram2021.emeraldcraft.EmeraldCraft.MODID; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -238,6 +239,38 @@ private static void registerSign(BlockEntry fullBlock, Wood ))); } + private static void addColoredBlockToList(List> list, DyeColor color, BlockEntry colorlessBlock, + Function> properties, + Function factory) { + list.add(new BlockEntry<>(color.getName() + "_" + colorlessBlock.getId().getPath(), properties.apply(color), factory)); + } + + @SuppressWarnings("SameParameterValue") + private static List> registerAllColors(BlockEntry colorlessBlock, + Function> properties, + Function factory) { + List> list = new ArrayList<>(); + /* 不会吧，不会真有mod会添加或修改原版DyeColor吧，我怕了还不行吗 */ + addColoredBlockToList(list, DyeColor.WHITE, colorlessBlock, properties, factory); + addColoredBlockToList(list, DyeColor.ORANGE, colorlessBlock, properties, factory); + addColoredBlockToList(list, DyeColor.MAGENTA, colorlessBlock, properties, factory); + addColoredBlockToList(list, DyeColor.LIGHT_BLUE, colorlessBlock, properties, factory); + addColoredBlockToList(list, DyeColor.YELLOW, colorlessBlock, properties, factory); + addColoredBlockToList(list, DyeColor.LIME, colorlessBlock, properties, factory); + addColoredBlockToList(list, DyeColor.PINK, colorlessBlock, properties, factory); + addColoredBlockToList(list, DyeColor.GRAY, colorlessBlock, properties, factory); + addColoredBlockToList(list, DyeColor.LIGHT_GRAY, colorlessBlock, properties, factory); + addColoredBlockToList(list, DyeColor.CYAN, colorlessBlock, properties, factory); + addColoredBlockToList(list, DyeColor.PURPLE, colorlessBlock, properties, factory); + addColoredBlockToList(list, DyeColor.BLUE, colorlessBlock, properties, factory); + addColoredBlockToList(list, DyeColor.BROWN, colorlessBlock, properties, factory); + addColoredBlockToList(list, DyeColor.GREEN, colorlessBlock, properties, factory); + addColoredBlockToList(list, DyeColor.RED, colorlessBlock, properties, factory); + addColoredBlockToList(list, DyeColor.BLACK, colorlessBlock, properties, factory); + TO_COLORS.put(colorlessBlock.getId(), list); + return list; + } + public static void init(IEventBus bus) { REGISTER.register(bus); @@ -290,6 +323,11 @@ public static void init(IEventBus bus) { blockSign.getValue().getA().get(), blockSign.getValue().getB().get())); } + for(Map.Entry>> colorBlock: ECBlocks.TO_COLORS.entrySet()) { + for(BlockEntry blockEntry: colorBlock.getValue()) { + ECItems.REGISTER.register(blockEntry.getId().getPath(), () -> new BlockItem(blockEntry.get(), new Item.Properties().tab(EmeraldCraft.ITEM_GROUP))); + } + } } public static final class MineralDecoration { @@ -618,6 +656,17 @@ public static final class Decoration { BlockBehaviour.Properties.of(Material.STONE, MaterialColor.STONE) .requiresCorrectToolForDrops().strength(1.5F, 6.0F); + public static final Supplier RESIN_PROPERTIES = () -> + BlockBehaviour.Properties.of(Material.DECORATION, MaterialColor.TERRACOTTA_YELLOW) + .strength(0.5F).sound(SoundType.FROGLIGHT); + public static final Supplier REINFORCED_RESIN_PROPERTIES = () -> + BlockBehaviour.Properties.of(Material.DECORATION, MaterialColor.TERRACOTTA_ORANGE) + .requiresCorrectToolForDrops().strength(30.0F, 600.0F).sound(SoundType.FROGLIGHT); + + public static final Function> COLORED_REINFORCED_RESIN_PROPERTIES = (color) -> + () -> BlockBehaviour.Properties.of(Material.DECORATION, color) + .requiresCorrectToolForDrops().strength(30.0F, 600.0F).sound(SoundType.FROGLIGHT); + public static final BlockEntry VITRIFIED_SAND = new BlockEntry<>( "vitrified_sand", SANDSTONE_PROPERTIES, Block::new ); @@ -710,6 +759,13 @@ public static final class Decoration { "mossy_stone", STONE_PROPERTIES, Block::new ); + public static final BlockEntry RESIN_BLOCK = new BlockEntry<>( + "resin_block", RESIN_PROPERTIES, Block::new + ); + public static final BlockEntry REINFORCED_RESIN_BLOCK = new BlockEntry<>( + "reinforced_resin_block", REINFORCED_RESIN_PROPERTIES, Block::new + ); + private static void init() { ECItems.REGISTER.register(VITRIFIED_SAND.getId().getPath(), () -> new BlockItem(VITRIFIED_SAND.get(), new Item.Properties().tab(EmeraldCraft.ITEM_GROUP))); @@ -747,6 +803,8 @@ private static void init() { ECItems.REGISTER.register(MOSSY_STONE.getId().getPath(), () -> new BlockItem(MOSSY_STONE.get(), new Item.Properties().tab(EmeraldCraft.ITEM_GROUP))); + ECItems.REGISTER.register(RESIN_BLOCK.getId().getPath(), () -> new BlockItem(RESIN_BLOCK.get(), new Item.Properties().tab(EmeraldCraft.ITEM_GROUP))); + ECItems.REGISTER.register(REINFORCED_RESIN_BLOCK.getId().getPath(), () -> new BlockItem(REINFORCED_RESIN_BLOCK.get(), new Item.Properties().tab(EmeraldCraft.ITEM_GROUP))); registerStairs(Decoration.AZURE_SANDSTONE); registerStairs(Decoration.QUARTZ_SANDSTONE); @@ -765,6 +823,7 @@ private static void init() { registerStairs(Decoration.WARPED_STONE); registerStairs(Decoration.WARPED_COBBLESTONE); registerStairs(Decoration.MOSSY_STONE); + registerStairs(Decoration.REINFORCED_RESIN_BLOCK); registerSlab(Decoration.AZURE_SANDSTONE); registerSlab(Decoration.QUARTZ_SANDSTONE); @@ -788,6 +847,7 @@ private static void init() { registerSlab(Decoration.WARPED_STONE); registerSlab(Decoration.WARPED_COBBLESTONE); registerSlab(Decoration.MOSSY_STONE); + registerSlab(Decoration.REINFORCED_RESIN_BLOCK); registerWall(Decoration.AZURE_SANDSTONE); registerWall(Decoration.QUARTZ_SANDSTONE); @@ -800,6 +860,12 @@ private static void init() { registerWall(Decoration.CRIMSON_COBBLESTONE); registerWall(Decoration.WARPED_STONE); registerWall(Decoration.WARPED_COBBLESTONE); + registerWall(Decoration.REINFORCED_RESIN_BLOCK); + + List> list = registerAllColors(Decoration.REINFORCED_RESIN_BLOCK, COLORED_REINFORCED_RESIN_PROPERTIES, Block::new); + list.forEach(ECBlocks::registerStairs); + list.forEach(ECBlocks::registerSlab); + list.forEach(ECBlocks::registerWall); } } @@ -900,19 +966,16 @@ public static final class Plant { "higan_bana", HIGAN_BANA_PROPERTIES, (props) -> new HiganBanaFlowerBlock(() -> MobEffects.LEVITATION, 12, props) ); public static final BlockEntry POTTED_CYAN_PETUNIA = new BlockEntry<>( - "potted_cyan_petunia", POTTED_FLOWER_PROPERTIES, (props) -> new FlowerPotBlock( - null, CYAN_PETUNIA, props - ) + "potted_cyan_petunia", POTTED_FLOWER_PROPERTIES, + (props) -> new FlowerPotBlock(() -> (FlowerPotBlock)Blocks.FLOWER_POT, CYAN_PETUNIA, props) ); public static final BlockEntry POTTED_MAGENTA_PETUNIA = new BlockEntry<>( - "potted_magenta_petunia", POTTED_FLOWER_PROPERTIES, (props) -> new FlowerPotBlock( - null, MAGENTA_PETUNIA, props - ) + "potted_magenta_petunia", POTTED_FLOWER_PROPERTIES, + (props) -> new FlowerPotBlock(() -> (FlowerPotBlock)Blocks.FLOWER_POT, MAGENTA_PETUNIA, props) ); public static final BlockEntry POTTED_HIGAN_BANA = new BlockEntry<>( - "potted_higan_bana", POTTED_FLOWER_PROPERTIES, (props) -> new FlowerPotBlock( - null, HIGAN_BANA, props - ) + "potted_higan_bana", POTTED_FLOWER_PROPERTIES, + (props) -> new FlowerPotBlock(() -> (FlowerPotBlock)Blocks.FLOWER_POT, HIGAN_BANA, props) ); //GINKGO @@ -920,9 +983,8 @@ public static final class Plant { "ginkgo_sapling", SAPLING_PROPERTIES, (props) -> new SaplingBlock(new GinkgoTreeGrower(), props) ); public static final BlockEntry POTTED_GINKGO_SAPLING = new BlockEntry<>( - "potted_ginkgo_sapling", POTTED_FLOWER_PROPERTIES, (props) -> new FlowerPotBlock( - null, GINKGO_SAPLING, props - ) + "potted_ginkgo_sapling", POTTED_FLOWER_PROPERTIES, + (props) -> new FlowerPotBlock(() -> (FlowerPotBlock)Blocks.FLOWER_POT, GINKGO_SAPLING, props) ); public static final BlockEntry GINKGO_LOG = new BlockEntry<>( "ginkgo_log", GINKGO_LOG_PROPERTIES, RotatedPillarBlock::new @@ -949,9 +1011,8 @@ public static final class Plant { "palm_sapling", SAPLING_PROPERTIES, (props) -> new SaplingBlock(new PalmTreeGrower(), props) ); public static final BlockEntry POTTED_PALM_SAPLING = new BlockEntry<>( - "potted_palm_sapling", POTTED_FLOWER_PROPERTIES, (props) -> new FlowerPotBlock( - null, PALM_SAPLING, props - ) + "potted_palm_sapling", POTTED_FLOWER_PROPERTIES, + (props) -> new FlowerPotBlock(() -> (FlowerPotBlock)Blocks.FLOWER_POT, PALM_SAPLING, props) ); public static final BlockEntry PALM_LOG = new BlockEntry<>( "palm_log", PALM_LOG_PROPERTIES, RotatedPillarBlock::new @@ -978,9 +1039,8 @@ public static final class Plant { "peach_sapling", SAPLING_PROPERTIES, (props) -> new SaplingBlock(new PeachTreeGrower(), props) ); public static final BlockEntry POTTED_PEACH_SAPLING = new BlockEntry<>( - "potted_peach_sapling", POTTED_FLOWER_PROPERTIES, (props) -> new FlowerPotBlock( - null, PEACH_SAPLING, props - ) + "potted_peach_sapling", POTTED_FLOWER_PROPERTIES, + (props) -> new FlowerPotBlock(() -> (FlowerPotBlock)Blocks.FLOWER_POT, PEACH_SAPLING, props) ); public static final BlockEntry PEACH_LOG = new BlockEntry<>( "peach_log", PEACH_LOG_PROPERTIES, RotatedPillarBlock::new @@ -1009,9 +1069,8 @@ public static final class Plant { (props) -> new FungusBlock(props, () -> ECConfiguredFeatures.TreeConfiguredFeatures.PURPURACEUS_FUNGUS_PLANTED) ); public static final BlockEntry POTTED_PURPURACEUS_FUNGUS = new BlockEntry<>( - "potted_purpuraceus_fungus", POTTED_FLOWER_PROPERTIES, (props) -> new FlowerPotBlock( - null, PURPURACEUS_FUNGUS, props - ) + "potted_purpuraceus_fungus", POTTED_FLOWER_PROPERTIES, + (props) -> new FlowerPotBlock(() -> (FlowerPotBlock)Blocks.FLOWER_POT, PURPURACEUS_FUNGUS, props) ); public static final BlockEntry PURPURACEUS_STEM = new BlockEntry<>( "purpuraceus_stem", PURPURACEUS_STEM_PROPERTIES, RotatedPillarBlock::new @@ -1047,9 +1106,8 @@ public static final class Plant { RootsBlock::new ); public static final BlockEntry POTTED_PURPURACEUS_ROOTS = new BlockEntry<>( - "potted_purpuraceus_roots", POTTED_FLOWER_PROPERTIES, (props) -> new FlowerPotBlock( - null, PURPURACEUS_ROOTS, props - ) + "potted_purpuraceus_roots", POTTED_FLOWER_PROPERTIES, + (props) -> new FlowerPotBlock(() -> (FlowerPotBlock)Blocks.FLOWER_POT, PURPURACEUS_ROOTS, props) ); @@ -1138,6 +1196,7 @@ private static void init() { public static final Map> TO_PRESSURE_PLATE = new HashMap<>(); public static final Map> TO_BUTTON = new HashMap<>(); public static final Map, BlockEntry>> TO_SIGN = new HashMap<>(); + public static final Map>> TO_COLORS = new HashMap<>(); public static final class BlockEntry implements Supplier, ItemLike { private final RegistryObject regObject; diff --git a/src/main/resources/assets/emeraldcraft/blockstates/mossy_stone.json b/src/main/resources/assets/emeraldcraft/blockstates/mossy_stone.json index 24ec8d63..51441a17 100644 --- a/src/main/resources/assets/emeraldcraft/blockstates/mossy_stone.json +++ b/src/main/resources/assets/emeraldcraft/blockstates/mossy_stone.json @@ -1,7 +1,21 @@ { "variants": { - "": { - "model": "emeraldcraft:block/mossy_stone" - } + "": [ + { + "model": "emeraldcraft:block/mossy_stone" + }, + { + "model": "emeraldcraft:block/mossy_stone", + "y": 90 + }, + { + "model": "emeraldcraft:block/mossy_stone", + "y": 180 + }, + { + "model": "emeraldcraft:block/mossy_stone", + "y": 270 + } + ] } } \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/blockstates/reinforced_resin_block.json b/src/main/resources/assets/emeraldcraft/blockstates/reinforced_resin_block.json new file mode 100644 index 00000000..b3420294 --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/blockstates/reinforced_resin_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "emeraldcraft:block/reinforced_resin_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/blockstates/reinforced_resin_slab.json b/src/main/resources/assets/emeraldcraft/blockstates/reinforced_resin_slab.json new file mode 100644 index 00000000..7190b473 --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/blockstates/reinforced_resin_slab.json @@ -0,0 +1,13 @@ +{ + "variants": { + "type=bottom": { + "model": "emeraldcraft:block/reinforced_resin_slab" + }, + "type=double": { + "model": "emeraldcraft:block/reinforced_resin_slab_double" + }, + "type=top": { + "model": "emeraldcraft:block/reinforced_resin_slab_top" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/blockstates/reinforced_resin_stairs.json b/src/main/resources/assets/emeraldcraft/blockstates/reinforced_resin_stairs.json new file mode 100644 index 00000000..9dfa8902 --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/blockstates/reinforced_resin_stairs.json @@ -0,0 +1,174 @@ +{ + "variants": { + "facing=east,half=bottom,shape=inner_left": { + "model": "emeraldcraft:block/reinforced_resin_stairs_inner", + "y": 270 + }, + "facing=east,half=bottom,shape=inner_right": { + "model": "emeraldcraft:block/reinforced_resin_stairs_inner" + }, + "facing=east,half=bottom,shape=outer_left": { + "model": "emeraldcraft:block/reinforced_resin_stairs_outer", + "y": 270 + }, + "facing=east,half=bottom,shape=outer_right": { + "model": "emeraldcraft:block/reinforced_resin_stairs_outer" + }, + "facing=east,half=bottom,shape=straight": { + "model": "emeraldcraft:block/reinforced_resin_stairs" + }, + "facing=east,half=top,shape=inner_left": { + "model": "emeraldcraft:block/reinforced_resin_stairs_inner", + "x": 180 + }, + "facing=east,half=top,shape=inner_right": { + "model": "emeraldcraft:block/reinforced_resin_stairs_inner", + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=outer_left": { + "model": "emeraldcraft:block/reinforced_resin_stairs_outer", + "x": 180 + }, + "facing=east,half=top,shape=outer_right": { + "model": "emeraldcraft:block/reinforced_resin_stairs_outer", + "x": 180, + "y": 90 + }, + "facing=east,half=top,shape=straight": { + "model": "emeraldcraft:block/reinforced_resin_stairs", + "x": 180 + }, + "facing=north,half=bottom,shape=inner_left": { + "model": "emeraldcraft:block/reinforced_resin_stairs_inner", + "y": 180 + }, + "facing=north,half=bottom,shape=inner_right": { + "model": "emeraldcraft:block/reinforced_resin_stairs_inner", + "y": 270 + }, + "facing=north,half=bottom,shape=outer_left": { + "model": "emeraldcraft:block/reinforced_resin_stairs_outer", + "y": 180 + }, + "facing=north,half=bottom,shape=outer_right": { + "model": "emeraldcraft:block/reinforced_resin_stairs_outer", + "y": 270 + }, + "facing=north,half=bottom,shape=straight": { + "model": "emeraldcraft:block/reinforced_resin_stairs", + "y": 270 + }, + "facing=north,half=top,shape=inner_left": { + "model": "emeraldcraft:block/reinforced_resin_stairs_inner", + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=inner_right": { + "model": "emeraldcraft:block/reinforced_resin_stairs_inner", + "x": 180 + }, + "facing=north,half=top,shape=outer_left": { + "model": "emeraldcraft:block/reinforced_resin_stairs_outer", + "x": 180, + "y": 270 + }, + "facing=north,half=top,shape=outer_right": { + "model": "emeraldcraft:block/reinforced_resin_stairs_outer", + "x": 180 + }, + "facing=north,half=top,shape=straight": { + "model": "emeraldcraft:block/reinforced_resin_stairs", + "x": 180, + "y": 270 + }, + "facing=south,half=bottom,shape=inner_left": { + "model": "emeraldcraft:block/reinforced_resin_stairs_inner" + }, + "facing=south,half=bottom,shape=inner_right": { + "model": "emeraldcraft:block/reinforced_resin_stairs_inner", + "y": 90 + }, + "facing=south,half=bottom,shape=outer_left": { + "model": "emeraldcraft:block/reinforced_resin_stairs_outer" + }, + "facing=south,half=bottom,shape=outer_right": { + "model": "emeraldcraft:block/reinforced_resin_stairs_outer", + "y": 90 + }, + "facing=south,half=bottom,shape=straight": { + "model": "emeraldcraft:block/reinforced_resin_stairs", + "y": 90 + }, + "facing=south,half=top,shape=inner_left": { + "model": "emeraldcraft:block/reinforced_resin_stairs_inner", + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=inner_right": { + "model": "emeraldcraft:block/reinforced_resin_stairs_inner", + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=outer_left": { + "model": "emeraldcraft:block/reinforced_resin_stairs_outer", + "x": 180, + "y": 90 + }, + "facing=south,half=top,shape=outer_right": { + "model": "emeraldcraft:block/reinforced_resin_stairs_outer", + "x": 180, + "y": 180 + }, + "facing=south,half=top,shape=straight": { + "model": "emeraldcraft:block/reinforced_resin_stairs", + "x": 180, + "y": 90 + }, + "facing=west,half=bottom,shape=inner_left": { + "model": "emeraldcraft:block/reinforced_resin_stairs_inner", + "y": 90 + }, + "facing=west,half=bottom,shape=inner_right": { + "model": "emeraldcraft:block/reinforced_resin_stairs_inner", + "y": 180 + }, + "facing=west,half=bottom,shape=outer_left": { + "model": "emeraldcraft:block/reinforced_resin_stairs_outer", + "y": 90 + }, + "facing=west,half=bottom,shape=outer_right": { + "model": "emeraldcraft:block/reinforced_resin_stairs_outer", + "y": 180 + }, + "facing=west,half=bottom,shape=straight": { + "model": "emeraldcraft:block/reinforced_resin_stairs", + "y": 180 + }, + "facing=west,half=top,shape=inner_left": { + "model": "emeraldcraft:block/reinforced_resin_stairs_inner", + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=inner_right": { + "model": "emeraldcraft:block/reinforced_resin_stairs_inner", + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=outer_left": { + "model": "emeraldcraft:block/reinforced_resin_stairs_outer", + "x": 180, + "y": 180 + }, + "facing=west,half=top,shape=outer_right": { + "model": "emeraldcraft:block/reinforced_resin_stairs_outer", + "x": 180, + "y": 270 + }, + "facing=west,half=top,shape=straight": { + "model": "emeraldcraft:block/reinforced_resin_stairs", + "x": 180, + "y": 180 + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/blockstates/reinforced_resin_wall.json b/src/main/resources/assets/emeraldcraft/blockstates/reinforced_resin_wall.json new file mode 100644 index 00000000..dedd54b3 --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/blockstates/reinforced_resin_wall.json @@ -0,0 +1,82 @@ +{ + "multipart": [ + { + "when": { + "up": "true" + }, + "apply": { + "model": "emeraldcraft:block/reinforced_resin_wall_post" + } + }, + { + "when": { + "north": "low" + }, + "apply": { + "model": "emeraldcraft:block/reinforced_resin_wall_side" + } + }, + { + "when": { + "east": "low" + }, + "apply": { + "model": "emeraldcraft:block/reinforced_resin_wall_side", + "y": 90 + } + }, + { + "when": { + "south": "low" + }, + "apply": { + "model": "emeraldcraft:block/reinforced_resin_wall_side", + "y": 180 + } + }, + { + "when": { + "west": "low" + }, + "apply": { + "model": "emeraldcraft:block/reinforced_resin_wall_side", + "y": 270 + } + }, + { + "when": { + "north": "tall" + }, + "apply": { + "model": "emeraldcraft:block/reinforced_resin_wall_side_tall" + } + }, + { + "when": { + "east": "tall" + }, + "apply": { + "model": "emeraldcraft:block/reinforced_resin_wall_side_tall", + "y": 90 + } + }, + { + "when": { + "south": "tall" + }, + "apply": { + "model": "emeraldcraft:block/reinforced_resin_wall_side_tall", + "y": 180 + } + }, + { + "when": { + "west": "tall" + }, + "apply": { + "model": "emeraldcraft:block/reinforced_resin_wall_side_tall", + "y": 270 + } + } + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/blockstates/resin_block.json b/src/main/resources/assets/emeraldcraft/blockstates/resin_block.json new file mode 100644 index 00000000..2741f492 --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/blockstates/resin_block.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "emeraldcraft:block/resin_block" + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/models/block/potted_palm_sapling.json b/src/main/resources/assets/emeraldcraft/models/block/potted_palm_sapling.json index 77b84c9a..65b59513 100644 --- a/src/main/resources/assets/emeraldcraft/models/block/potted_palm_sapling.json +++ b/src/main/resources/assets/emeraldcraft/models/block/potted_palm_sapling.json @@ -1,5 +1,6 @@ { "parent": "minecraft:block/flower_pot_cross", + "render_type": "cutout", "textures": { "plant": "emeraldcraft:block/palm_sapling" } diff --git a/src/main/resources/assets/emeraldcraft/models/block/potted_peach_sapling.json b/src/main/resources/assets/emeraldcraft/models/block/potted_peach_sapling.json index 35361425..5a9c9549 100644 --- a/src/main/resources/assets/emeraldcraft/models/block/potted_peach_sapling.json +++ b/src/main/resources/assets/emeraldcraft/models/block/potted_peach_sapling.json @@ -1,5 +1,6 @@ { "parent": "minecraft:block/flower_pot_cross", + "render_type": "cutout", "textures": { "plant": "emeraldcraft:block/peach_sapling" } diff --git a/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_block.json b/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_block.json new file mode 100644 index 00000000..dd7a9b6c --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_block.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "emeraldcraft:block/reinforced_resin_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_slab.json b/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_slab.json new file mode 100644 index 00000000..05badf6e --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_slab.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab", + "textures": { + "bottom": "emeraldcraft:block/reinforced_resin_block", + "top": "emeraldcraft:block/reinforced_resin_block", + "side": "emeraldcraft:block/reinforced_resin_slab_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_slab_double.json b/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_slab_double.json new file mode 100644 index 00000000..9f453196 --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_slab_double.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_column", + "textures": { + "end": "emeraldcraft:block/reinforced_resin_block", + "side": "emeraldcraft:block/reinforced_resin_slab_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_slab_top.json b/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_slab_top.json new file mode 100644 index 00000000..f5b8a0ac --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_slab_top.json @@ -0,0 +1,8 @@ +{ + "parent": "minecraft:block/slab_top", + "textures": { + "bottom": "emeraldcraft:block/reinforced_resin_block", + "top": "emeraldcraft:block/reinforced_resin_block", + "side": "emeraldcraft:block/reinforced_resin_slab_side" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_stairs.json b/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_stairs.json new file mode 100644 index 00000000..41e63448 --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_stairs.json @@ -0,0 +1,11 @@ +{ + "parent": "emeraldcraft:block/sided_stairs", + "textures": { + "bottom": "emeraldcraft:block/reinforced_resin_block", + "top": "emeraldcraft:block/reinforced_resin_vertical_slab_side", + "north": "emeraldcraft:block/reinforced_resin_stairs_1", + "south": "emeraldcraft:block/reinforced_resin_stairs_2", + "west": "emeraldcraft:block/reinforced_resin_slab_side", + "east": "emeraldcraft:block/reinforced_resin_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_stairs_inner.json b/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_stairs_inner.json new file mode 100644 index 00000000..a71a6b0c --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_stairs_inner.json @@ -0,0 +1,11 @@ +{ + "parent": "emeraldcraft:block/sided_inner_stairs", + "textures": { + "bottom": "emeraldcraft:block/reinforced_resin_block", + "top": "emeraldcraft:block/reinforced_resin_stairs_2", + "north": "emeraldcraft:block/reinforced_resin_stairs_1", + "south": "emeraldcraft:block/reinforced_resin_block", + "west": "emeraldcraft:block/reinforced_resin_stairs_2", + "east": "emeraldcraft:block/reinforced_resin_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_stairs_outer.json b/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_stairs_outer.json new file mode 100644 index 00000000..b35134ee --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_stairs_outer.json @@ -0,0 +1,11 @@ +{ + "parent": "emeraldcraft:block/sided_outer_stairs", + "textures": { + "bottom": "emeraldcraft:block/reinforced_resin_block", + "top": "emeraldcraft:block/reinforced_resin_stairs_3", + "north": "emeraldcraft:block/reinforced_resin_stairs_5", + "south": "emeraldcraft:block/reinforced_resin_stairs_2", + "west": "emeraldcraft:block/reinforced_resin_stairs_5", + "east": "emeraldcraft:block/reinforced_resin_stairs_1" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_wall_inventory.json b/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_wall_inventory.json new file mode 100644 index 00000000..e28717ab --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_wall_inventory.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/wall_inventory", + "textures": { + "wall": "emeraldcraft:block/reinforced_resin_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_wall_post.json b/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_wall_post.json new file mode 100644 index 00000000..6dfebf1c --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_wall_post.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_post", + "textures": { + "wall": "emeraldcraft:block/reinforced_resin_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_wall_side.json b/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_wall_side.json new file mode 100644 index 00000000..db37f6d5 --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_wall_side.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side", + "textures": { + "wall": "emeraldcraft:block/reinforced_resin_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_wall_side_tall.json b/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_wall_side_tall.json new file mode 100644 index 00000000..3a6fb209 --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/models/block/reinforced_resin_wall_side_tall.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_wall_side_tall", + "textures": { + "wall": "emeraldcraft:block/reinforced_resin_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/models/block/resin_block.json b/src/main/resources/assets/emeraldcraft/models/block/resin_block.json new file mode 100644 index 00000000..90c1bcd0 --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/models/block/resin_block.json @@ -0,0 +1,7 @@ +{ + "parent": "minecraft:block/cube_all", + "render_type": "translucent", + "textures": { + "all": "emeraldcraft:block/resin_block" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/models/block/sided_inner_stairs.json b/src/main/resources/assets/emeraldcraft/models/block/sided_inner_stairs.json new file mode 100644 index 00000000..611823aa --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/models/block/sided_inner_stairs.json @@ -0,0 +1,37 @@ +{ + "textures": { + "particle": "#bottom" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 8, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 8, 16, 16 ], "texture": "#north", "cullface": "north" }, + "south": { "uv": [ 0, 8, 16, 16 ], "texture": "#south", "cullface": "south" }, + "west": { "uv": [ 0, 8, 16, 16 ], "texture": "#west", "cullface": "west" }, + "east": { "uv": [ 0, 8, 16, 16 ], "texture": "#east", "cullface": "east" } + } + }, + { "from": [ 8, 8, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "up": { "uv": [ 8, 0, 16, 16 ], "texture": "#top", "cullface": "up" }, + "north": { "uv": [ 0, 0, 8, 8 ], "texture": "#north", "cullface": "north" }, + "south": { "uv": [ 8, 0, 16, 8 ], "texture": "#south", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 8 ], "texture": "#west" }, + "east": { "uv": [ 0, 0, 16, 8 ], "texture": "#east", "cullface": "east" } + } + }, + { "from": [ 0, 8, 8 ], + "to": [ 8, 16, 16 ], + "faces": { + "up": { "uv": [ 0, 8, 8, 16 ], "texture": "#top", "cullface": "up" }, + "north": { "uv": [ 8, 0, 16, 8 ], "texture": "#north" }, + "south": { "uv": [ 0, 0, 8, 8 ], "texture": "#south", "cullface": "south" }, + "west": { "uv": [ 8, 0, 16, 8 ], "texture": "#west", "cullface": "west" } + } + } + ] +} diff --git a/src/main/resources/assets/emeraldcraft/models/block/sided_outer_stairs.json b/src/main/resources/assets/emeraldcraft/models/block/sided_outer_stairs.json new file mode 100644 index 00000000..292f7658 --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/models/block/sided_outer_stairs.json @@ -0,0 +1,28 @@ +{ + "textures": { + "particle": "#bottom" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 8, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 8, 16, 16 ], "texture": "#north", "cullface": "north" }, + "south": { "uv": [ 0, 8, 16, 16 ], "texture": "#south", "cullface": "south" }, + "west": { "uv": [ 0, 8, 16, 16 ], "texture": "#west", "cullface": "west" }, + "east": { "uv": [ 0, 8, 16, 16 ], "texture": "#east", "cullface": "east" } + } + }, + { "from": [ 8, 8, 8 ], + "to": [ 16, 16, 16 ], + "faces": { + "up": { "uv": [ 8, 8, 16, 16 ], "texture": "#top", "cullface": "up" }, + "north": { "uv": [ 0, 0, 8, 8 ], "texture": "#north" }, + "south": { "uv": [ 8, 0, 16, 8 ], "texture": "#south", "cullface": "south" }, + "west": { "uv": [ 8, 0, 16, 8 ], "texture": "#west" }, + "east": { "uv": [ 0, 0, 8, 8 ], "texture": "#east", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/emeraldcraft/models/block/sided_stairs.json b/src/main/resources/assets/emeraldcraft/models/block/sided_stairs.json new file mode 100644 index 00000000..e6d1cd9d --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/models/block/sided_stairs.json @@ -0,0 +1,46 @@ +{ + "parent": "block/block", + "display": { + "gui": { + "rotation": [ 30, 135, 0 ], + "translation": [ 0, 0, 0], + "scale":[ 0.625, 0.625, 0.625 ] + }, + "head": { + "rotation": [ 0, -90, 0 ], + "translation": [ 0, 0, 0 ], + "scale": [ 1, 1, 1 ] + }, + "thirdperson_lefthand": { + "rotation": [ 75, -135, 0 ], + "translation": [ 0, 2.5, 0], + "scale": [ 0.375, 0.375, 0.375 ] + } + }, + "textures": { + "particle": "#bottom" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 8, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#bottom", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 8, 16, 16 ], "texture": "#north", "cullface": "north" }, + "south": { "uv": [ 0, 8, 16, 16 ], "texture": "#south", "cullface": "south" }, + "west": { "uv": [ 0, 8, 16, 16 ], "texture": "#west", "cullface": "west" }, + "east": { "uv": [ 0, 8, 16, 16 ], "texture": "#east", "cullface": "east" } + } + }, + { "from": [ 8, 8, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "up": { "uv": [ 8, 0, 16, 16 ], "texture": "#top", "cullface": "up" }, + "north": { "uv": [ 0, 0, 8, 8 ], "texture": "#north", "cullface": "north" }, + "south": { "uv": [ 8, 0, 16, 8 ], "texture": "#south", "cullface": "south" }, + "west": { "uv": [ 0, 0, 16, 8 ], "texture": "#west" }, + "east": { "uv": [ 0, 0, 16, 8 ], "texture": "#east", "cullface": "east" } + } + } + ] +} diff --git a/src/main/resources/assets/emeraldcraft/models/item/lumine_spawn_egg.json b/src/main/resources/assets/emeraldcraft/models/item/lumine_spawn_egg.json new file mode 100644 index 00000000..7a2c6da8 --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/models/item/lumine_spawn_egg.json @@ -0,0 +1,3 @@ +{ + "parent": "item/template_spawn_egg" +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/models/item/reinforced_resin_block.json b/src/main/resources/assets/emeraldcraft/models/item/reinforced_resin_block.json new file mode 100644 index 00000000..98fc499c --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/models/item/reinforced_resin_block.json @@ -0,0 +1,3 @@ +{ + "parent": "emeraldcraft:block/reinforced_resin_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/models/item/reinforced_resin_slab.json b/src/main/resources/assets/emeraldcraft/models/item/reinforced_resin_slab.json new file mode 100644 index 00000000..925a2e81 --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/models/item/reinforced_resin_slab.json @@ -0,0 +1,3 @@ +{ + "parent": "emeraldcraft:block/reinforced_resin_slab" +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/models/item/reinforced_resin_stairs.json b/src/main/resources/assets/emeraldcraft/models/item/reinforced_resin_stairs.json new file mode 100644 index 00000000..1fdde536 --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/models/item/reinforced_resin_stairs.json @@ -0,0 +1,3 @@ +{ + "parent": "emeraldcraft:block/reinforced_resin_stairs" +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/models/item/reinforced_resin_wall.json b/src/main/resources/assets/emeraldcraft/models/item/reinforced_resin_wall.json new file mode 100644 index 00000000..56779743 --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/models/item/reinforced_resin_wall.json @@ -0,0 +1,3 @@ +{ + "parent": "emeraldcraft:block/reinforced_resin_wall_inventory" +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/models/item/resin_block.json b/src/main/resources/assets/emeraldcraft/models/item/resin_block.json new file mode 100644 index 00000000..6c539089 --- /dev/null +++ b/src/main/resources/assets/emeraldcraft/models/item/resin_block.json @@ -0,0 +1,3 @@ +{ + "parent": "emeraldcraft:block/resin_block" +} \ No newline at end of file diff --git a/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_block.png b/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_block.png new file mode 100644 index 00000000..48fb52b7 Binary files /dev/null and b/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_block.png differ diff --git a/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_slab_side.png b/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_slab_side.png new file mode 100644 index 00000000..9fafa24c Binary files /dev/null and b/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_slab_side.png differ diff --git a/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_stairs_1.png b/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_stairs_1.png new file mode 100644 index 00000000..e71ea714 Binary files /dev/null and b/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_stairs_1.png differ diff --git a/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_stairs_2.png b/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_stairs_2.png new file mode 100644 index 00000000..38ae2216 Binary files /dev/null and b/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_stairs_2.png differ diff --git a/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_stairs_3.png b/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_stairs_3.png new file mode 100644 index 00000000..aa9627e5 Binary files /dev/null and b/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_stairs_3.png differ diff --git a/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_stairs_4.png b/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_stairs_4.png new file mode 100644 index 00000000..c8879e5e Binary files /dev/null and b/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_stairs_4.png differ diff --git a/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_stairs_5.png b/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_stairs_5.png new file mode 100644 index 00000000..6f4929c4 Binary files /dev/null and b/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_stairs_5.png differ diff --git a/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_stairs_6.png b/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_stairs_6.png new file mode 100644 index 00000000..34585b3e Binary files /dev/null and b/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_stairs_6.png differ diff --git a/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_vertical_slab_side.png b/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_vertical_slab_side.png new file mode 100644 index 00000000..73635ad7 Binary files /dev/null and b/src/main/resources/assets/emeraldcraft/textures/block/reinforced_resin_vertical_slab_side.png differ diff --git a/src/main/resources/assets/emeraldcraft/textures/block/resin_block.png b/src/main/resources/assets/emeraldcraft/textures/block/resin_block.png new file mode 100644 index 00000000..b57ec8ce Binary files /dev/null and b/src/main/resources/assets/emeraldcraft/textures/block/resin_block.png differ diff --git a/src/main/resources/data/emeraldcraft/loot_tables/blocks/reinforced_resin_block.json b/src/main/resources/data/emeraldcraft/loot_tables/blocks/reinforced_resin_block.json new file mode 100644 index 00000000..027c1e21 --- /dev/null +++ b/src/main/resources/data/emeraldcraft/loot_tables/blocks/reinforced_resin_block.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "emeraldcraft:reinforced_resin_block" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/emeraldcraft/loot_tables/blocks/reinforced_resin_slab.json b/src/main/resources/data/emeraldcraft/loot_tables/blocks/reinforced_resin_slab.json new file mode 100644 index 00000000..741a2e1a --- /dev/null +++ b/src/main/resources/data/emeraldcraft/loot_tables/blocks/reinforced_resin_slab.json @@ -0,0 +1,34 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "functions": [ + { + "function": "minecraft:set_count", + "conditions": [ + { + "condition": "minecraft:block_state_property", + "block": "emeraldcraft:reinforced_resin_slab", + "properties": { + "type": "double" + } + } + ], + "count": 2.0, + "add": false + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "emeraldcraft:reinforced_resin_slab" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/emeraldcraft/loot_tables/blocks/reinforced_resin_stairs.json b/src/main/resources/data/emeraldcraft/loot_tables/blocks/reinforced_resin_stairs.json new file mode 100644 index 00000000..127f7558 --- /dev/null +++ b/src/main/resources/data/emeraldcraft/loot_tables/blocks/reinforced_resin_stairs.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "emeraldcraft:reinforced_resin_stairs" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/emeraldcraft/loot_tables/blocks/reinforced_resin_wall.json b/src/main/resources/data/emeraldcraft/loot_tables/blocks/reinforced_resin_wall.json new file mode 100644 index 00000000..b0052141 --- /dev/null +++ b/src/main/resources/data/emeraldcraft/loot_tables/blocks/reinforced_resin_wall.json @@ -0,0 +1,20 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1.0, + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "name": "emeraldcraft:reinforced_resin_wall" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/emeraldcraft/loot_tables/blocks/resin_block.json b/src/main/resources/data/emeraldcraft/loot_tables/blocks/resin_block.json new file mode 100644 index 00000000..416dc8e1 --- /dev/null +++ b/src/main/resources/data/emeraldcraft/loot_tables/blocks/resin_block.json @@ -0,0 +1,68 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "enchantments": [ + { + "enchantment": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + ], + "name": "emeraldcraft:resin_block" + }, + { + "type": "minecraft:item", + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 4.0, + "min": 2.0 + }, + "function": "minecraft:set_count" + }, + { + "enchantment": "minecraft:fortune", + "formula": "minecraft:uniform_bonus_count", + "function": "minecraft:apply_bonus", + "parameters": { + "bonusMultiplier": 1 + } + }, + { + "function": "minecraft:limit_count", + "limit": { + "max": 4.0, + "min": 1.0 + } + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "emeraldcraft:resin_shard" + } + ] + } + ], + "rolls": 1.0 + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/stone.json b/src/main/resources/data/forge/tags/blocks/stone.json index 7b7a5b59..87671db0 100644 --- a/src/main/resources/data/forge/tags/blocks/stone.json +++ b/src/main/resources/data/forge/tags/blocks/stone.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "emeraldcraft:crimson_stone", - "emeraldcraft:warped_stone" + "emeraldcraft:warped_stone", + "emeraldcraft:mossy_stone" ] } \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/stone.json b/src/main/resources/data/forge/tags/items/stone.json index 7b7a5b59..87671db0 100644 --- a/src/main/resources/data/forge/tags/items/stone.json +++ b/src/main/resources/data/forge/tags/items/stone.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "emeraldcraft:crimson_stone", - "emeraldcraft:warped_stone" + "emeraldcraft:warped_stone", + "emeraldcraft:mossy_stone" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json index 87e90f5f..74d7e65c 100644 --- a/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json +++ b/src/main/resources/data/minecraft/tags/blocks/mineable/pickaxe.json @@ -107,6 +107,16 @@ "emeraldcraft:warped_cobblestone_wall", "emeraldcraft:purpuraceus_nylium", + + "emeraldcraft:mossy_stone", + "emeraldcraft:mossy_stone_slab", + "emeraldcraft:mossy_stone_stairs", + + "emeraldcraft:resin_block", + "emeraldcraft:reinforced_resin_block", + "emeraldcraft:reinforced_resin_slab", + "emeraldcraft:reinforced_resin_stairs", + "emeraldcraft:reinforced_resin_wall", "emeraldcraft:zinc_slab", "emeraldcraft:zinc_stairs", diff --git a/src/main/resources/data/minecraft/tags/blocks/slabs.json b/src/main/resources/data/minecraft/tags/blocks/slabs.json index 98e6e490..2b6a00d2 100644 --- a/src/main/resources/data/minecraft/tags/blocks/slabs.json +++ b/src/main/resources/data/minecraft/tags/blocks/slabs.json @@ -31,6 +31,9 @@ "emeraldcraft:palm_slab", "emeraldcraft:peach_slab", "emeraldcraft:purpuraceus_slab", + + "emeraldcraft:mossy_stone_slab", + "emeraldcraft:reinforced_resin_slab", "emeraldcraft:zinc_slab" ] diff --git a/src/main/resources/data/minecraft/tags/blocks/stairs.json b/src/main/resources/data/minecraft/tags/blocks/stairs.json index 07bf1dbf..640b60e5 100644 --- a/src/main/resources/data/minecraft/tags/blocks/stairs.json +++ b/src/main/resources/data/minecraft/tags/blocks/stairs.json @@ -26,6 +26,9 @@ "emeraldcraft:palm_stairs", "emeraldcraft:peach_stairs", "emeraldcraft:purpuraceus_stairs", + + "emeraldcraft:mossy_stone_stairs", + "emeraldcraft:reinforced_resin_stairs", "emeraldcraft:zinc_stairs", "emeraldcraft:aluminum_stairs", diff --git a/src/main/resources/data/minecraft/tags/blocks/walls.json b/src/main/resources/data/minecraft/tags/blocks/walls.json index b9b484ac..acaa65e0 100644 --- a/src/main/resources/data/minecraft/tags/blocks/walls.json +++ b/src/main/resources/data/minecraft/tags/blocks/walls.json @@ -17,6 +17,8 @@ "emeraldcraft:crimson_cobblestone_wall", "emeraldcraft:warped_stone_wall", "emeraldcraft:warped_cobblestone_wall", + + "emeraldcraft:reinforced_resin_wall", "emeraldcraft:zinc_wall", "emeraldcraft:aluminum_wall", diff --git a/src/main/resources/data/minecraft/tags/items/slabs.json b/src/main/resources/data/minecraft/tags/items/slabs.json index 98e6e490..2b6a00d2 100644 --- a/src/main/resources/data/minecraft/tags/items/slabs.json +++ b/src/main/resources/data/minecraft/tags/items/slabs.json @@ -31,6 +31,9 @@ "emeraldcraft:palm_slab", "emeraldcraft:peach_slab", "emeraldcraft:purpuraceus_slab", + + "emeraldcraft:mossy_stone_slab", + "emeraldcraft:reinforced_resin_slab", "emeraldcraft:zinc_slab" ] diff --git a/src/main/resources/data/minecraft/tags/items/stairs.json b/src/main/resources/data/minecraft/tags/items/stairs.json index 07bf1dbf..640b60e5 100644 --- a/src/main/resources/data/minecraft/tags/items/stairs.json +++ b/src/main/resources/data/minecraft/tags/items/stairs.json @@ -26,6 +26,9 @@ "emeraldcraft:palm_stairs", "emeraldcraft:peach_stairs", "emeraldcraft:purpuraceus_stairs", + + "emeraldcraft:mossy_stone_stairs", + "emeraldcraft:reinforced_resin_stairs", "emeraldcraft:zinc_stairs", "emeraldcraft:aluminum_stairs", diff --git a/src/main/resources/data/minecraft/tags/items/walls.json b/src/main/resources/data/minecraft/tags/items/walls.json index b9b484ac..acaa65e0 100644 --- a/src/main/resources/data/minecraft/tags/items/walls.json +++ b/src/main/resources/data/minecraft/tags/items/walls.json @@ -17,6 +17,8 @@ "emeraldcraft:crimson_cobblestone_wall", "emeraldcraft:warped_stone_wall", "emeraldcraft:warped_cobblestone_wall", + + "emeraldcraft:reinforced_resin_wall", "emeraldcraft:zinc_wall", "emeraldcraft:aluminum_wall",