Metal lanterns
|
@ -1,5 +1,10 @@
|
||||||
package ru.betterend.blocks;
|
package ru.betterend.blocks;
|
||||||
|
|
||||||
|
import java.io.Reader;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
|
import com.google.common.collect.Maps;
|
||||||
|
|
||||||
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
|
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
|
||||||
import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
|
import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
|
@ -8,14 +13,18 @@ import net.minecraft.block.Material;
|
||||||
import net.minecraft.block.MaterialColor;
|
import net.minecraft.block.MaterialColor;
|
||||||
import net.minecraft.block.ShapeContext;
|
import net.minecraft.block.ShapeContext;
|
||||||
import net.minecraft.sound.BlockSoundGroup;
|
import net.minecraft.sound.BlockSoundGroup;
|
||||||
|
import net.minecraft.util.Identifier;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
|
import net.minecraft.util.registry.Registry;
|
||||||
import net.minecraft.util.shape.VoxelShape;
|
import net.minecraft.util.shape.VoxelShape;
|
||||||
import net.minecraft.world.BlockView;
|
import net.minecraft.world.BlockView;
|
||||||
import ru.betterend.blocks.basis.EndLanternBlock;
|
import ru.betterend.blocks.basis.EndLanternBlock;
|
||||||
import ru.betterend.client.render.ERenderLayer;
|
import ru.betterend.client.render.ERenderLayer;
|
||||||
import ru.betterend.interfaces.IRenderTypeable;
|
import ru.betterend.interfaces.IRenderTypeable;
|
||||||
|
import ru.betterend.patterns.BlockPatterned;
|
||||||
|
import ru.betterend.patterns.Patterns;
|
||||||
|
|
||||||
public class BulbVineLanternBlock extends EndLanternBlock implements IRenderTypeable {
|
public class BulbVineLanternBlock extends EndLanternBlock implements IRenderTypeable, BlockPatterned {
|
||||||
private static final VoxelShape SHAPE_CEIL = Block.createCuboidShape(4, 4, 4, 12, 16, 12);
|
private static final VoxelShape SHAPE_CEIL = Block.createCuboidShape(4, 4, 4, 12, 16, 12);
|
||||||
private static final VoxelShape SHAPE_FLOOR = Block.createCuboidShape(4, 0, 4, 12, 12, 12);
|
private static final VoxelShape SHAPE_FLOOR = Block.createCuboidShape(4, 0, 4, 12, 12, 12);
|
||||||
|
|
||||||
|
@ -43,4 +52,39 @@ public class BulbVineLanternBlock extends EndLanternBlock implements IRenderType
|
||||||
public ERenderLayer getRenderLayer() {
|
public ERenderLayer getRenderLayer() {
|
||||||
return ERenderLayer.CUTOUT;
|
return ERenderLayer.CUTOUT;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getStatesPattern(Reader data) {
|
||||||
|
Identifier blockId = Registry.BLOCK.getId(this);
|
||||||
|
return Patterns.createJson(data, blockId.getPath(), blockId.getPath());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getModelPattern(String block) {
|
||||||
|
Identifier blockId = Registry.BLOCK.getId(this);
|
||||||
|
Map<String, String> map = Maps.newHashMap();
|
||||||
|
map.put("%glow%", getGlowTexture());
|
||||||
|
map.put("%metal%", getMetalTexture(blockId));
|
||||||
|
if (block.contains("item") || block.contains("ceil")) {
|
||||||
|
return Patterns.createJson(Patterns.BLOCK_BULB_LANTERN_CEIL, map);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
return Patterns.createJson(Patterns.BLOCK_BULB_LANTERN_FLOOR, map);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
protected String getMetalTexture(Identifier blockId) {
|
||||||
|
String name = blockId.getPath();
|
||||||
|
name = name.substring(0, name.indexOf('_'));
|
||||||
|
return name + "_bulb_vine_lantern_metal";
|
||||||
|
}
|
||||||
|
|
||||||
|
protected String getGlowTexture() {
|
||||||
|
return "bulb_vine_lantern_bulb";
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Identifier statePatternId() {
|
||||||
|
return Patterns.STATE_BULB_LANTERN;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,16 +1,11 @@
|
||||||
package ru.betterend.blocks;
|
package ru.betterend.blocks;
|
||||||
|
|
||||||
import java.io.Reader;
|
|
||||||
|
|
||||||
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
|
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
|
||||||
import net.minecraft.client.color.block.BlockColorProvider;
|
import net.minecraft.client.color.block.BlockColorProvider;
|
||||||
import net.minecraft.client.color.item.ItemColorProvider;
|
import net.minecraft.client.color.item.ItemColorProvider;
|
||||||
import net.minecraft.util.Identifier;
|
|
||||||
import ru.betterend.interfaces.IColorProvider;
|
import ru.betterend.interfaces.IColorProvider;
|
||||||
import ru.betterend.patterns.BlockPatterned;
|
|
||||||
import ru.betterend.patterns.Patterns;
|
|
||||||
|
|
||||||
public class BulbVineLanternColoredBlock extends BulbVineLanternBlock implements IColorProvider, BlockPatterned {
|
public class BulbVineLanternColoredBlock extends BulbVineLanternBlock implements IColorProvider {
|
||||||
public BulbVineLanternColoredBlock(FabricBlockSettings settings) {
|
public BulbVineLanternColoredBlock(FabricBlockSettings settings) {
|
||||||
super(settings);
|
super(settings);
|
||||||
}
|
}
|
||||||
|
@ -30,24 +25,7 @@ public class BulbVineLanternColoredBlock extends BulbVineLanternBlock implements
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getStatesPattern(Reader data) {
|
protected String getGlowTexture() {
|
||||||
String path = "betterend:block/bulb_lantern_colored";
|
return "bulb_vine_lantern_overlay";
|
||||||
return Patterns.createJson(data, path, path);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String getModelPattern(String block) {
|
|
||||||
String path = "betterend:block/bulb_lantern_colored";
|
|
||||||
if (block.contains("item") || block.contains("ceil")) {
|
|
||||||
return Patterns.createJson(Patterns.BLOCK_BULB_LANTERN_COLORED_CEIL, path, path);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
return Patterns.createJson(Patterns.BLOCK_BULB_LANTERN_COLORED_FLOOR, path, path);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Identifier statePatternId() {
|
|
||||||
return Patterns.STATE_BULB_LANTERN;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,8 +7,6 @@ import com.google.common.collect.Maps;
|
||||||
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
|
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
|
||||||
import net.minecraft.block.Block;
|
import net.minecraft.block.Block;
|
||||||
import net.minecraft.block.BlockState;
|
import net.minecraft.block.BlockState;
|
||||||
import net.minecraft.block.Blocks;
|
|
||||||
import net.minecraft.block.MaterialColor;
|
|
||||||
import net.minecraft.block.ShapeContext;
|
import net.minecraft.block.ShapeContext;
|
||||||
import net.minecraft.util.math.BlockPos;
|
import net.minecraft.util.math.BlockPos;
|
||||||
import net.minecraft.util.math.Direction;
|
import net.minecraft.util.math.Direction;
|
||||||
|
@ -19,11 +17,11 @@ import ru.betterend.blocks.basis.AttachedBlock;
|
||||||
import ru.betterend.client.render.ERenderLayer;
|
import ru.betterend.client.render.ERenderLayer;
|
||||||
import ru.betterend.interfaces.IRenderTypeable;
|
import ru.betterend.interfaces.IRenderTypeable;
|
||||||
|
|
||||||
public class ThallasiumChandelierBlock extends AttachedBlock implements IRenderTypeable {
|
public class ChandelierBlock extends AttachedBlock implements IRenderTypeable {
|
||||||
private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);
|
private static final EnumMap<Direction, VoxelShape> BOUNDING_SHAPES = Maps.newEnumMap(Direction.class);
|
||||||
|
|
||||||
public ThallasiumChandelierBlock() {
|
public ChandelierBlock(FabricBlockSettings settings) {
|
||||||
super(FabricBlockSettings.copyOf(Blocks.IRON_BLOCK).materialColor(MaterialColor.BLUE).noCollision().nonOpaque().requiresTool().luminance(15));
|
super(settings.noCollision().nonOpaque().requiresTool().luminance(15));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
|
@ -7,7 +7,11 @@ import net.minecraft.block.MaterialColor;
|
||||||
import net.minecraft.item.Item;
|
import net.minecraft.item.Item;
|
||||||
import net.minecraft.item.Items;
|
import net.minecraft.item.Items;
|
||||||
import net.minecraft.item.ToolMaterial;
|
import net.minecraft.item.ToolMaterial;
|
||||||
|
import net.minecraft.sound.BlockSoundGroup;
|
||||||
import net.minecraft.tag.BlockTags;
|
import net.minecraft.tag.BlockTags;
|
||||||
|
import ru.betterend.blocks.BulbVineLanternBlock;
|
||||||
|
import ru.betterend.blocks.BulbVineLanternColoredBlock;
|
||||||
|
import ru.betterend.blocks.ChandelierBlock;
|
||||||
import ru.betterend.blocks.basis.BlockBase;
|
import ru.betterend.blocks.basis.BlockBase;
|
||||||
import ru.betterend.blocks.basis.EndAnvilBlock;
|
import ru.betterend.blocks.basis.EndAnvilBlock;
|
||||||
import ru.betterend.blocks.basis.EndChainBlock;
|
import ru.betterend.blocks.basis.EndChainBlock;
|
||||||
|
@ -42,6 +46,11 @@ public class MetalMaterial {
|
||||||
public final Block stairs;
|
public final Block stairs;
|
||||||
public final Block slab;
|
public final Block slab;
|
||||||
|
|
||||||
|
public final Block chandelier;
|
||||||
|
public final Block bulb_lantern;
|
||||||
|
public final ColoredMaterial bulb_lantern_colored;
|
||||||
|
|
||||||
|
public final Item nugget;
|
||||||
public final Item ingot;
|
public final Item ingot;
|
||||||
public final Item shovel;
|
public final Item shovel;
|
||||||
public final Item sword;
|
public final Item sword;
|
||||||
|
@ -51,19 +60,25 @@ public class MetalMaterial {
|
||||||
|
|
||||||
public MetalMaterial(String name, MaterialColor color, ToolMaterial material) {
|
public MetalMaterial(String name, MaterialColor color, ToolMaterial material) {
|
||||||
FabricBlockSettings materialBlock = FabricBlockSettings.copyOf(Blocks.IRON_BLOCK).materialColor(color);
|
FabricBlockSettings materialBlock = FabricBlockSettings.copyOf(Blocks.IRON_BLOCK).materialColor(color);
|
||||||
|
FabricBlockSettings lantern = FabricBlockSettings.copyOf(materialBlock).sounds(BlockSoundGroup.LANTERN).hardness(1).resistance(1).luminance(15);
|
||||||
|
|
||||||
ore = EndBlocks.registerBlock(name + "_ore", new BlockBase(FabricBlockSettings.copyOf(Blocks.END_STONE)));
|
ore = EndBlocks.registerBlock(name + "_ore", new BlockBase(FabricBlockSettings.copyOf(Blocks.END_STONE)));
|
||||||
block = EndBlocks.registerBlock(name + "_block", new BlockBase(materialBlock));
|
block = EndBlocks.registerBlock(name + "_block", new BlockBase(materialBlock));
|
||||||
tile = EndBlocks.registerBlock(name + "_tile", new BlockBase(materialBlock));
|
tile = EndBlocks.registerBlock(name + "_tile", new BlockBase(materialBlock));
|
||||||
bars = EndBlocks.registerBlock(name + "_bars", new EndMetalPaneBlock(block));
|
stairs = EndBlocks.registerBlock(name + "_stairs", new EndStairsBlock(tile));
|
||||||
plate = EndBlocks.registerBlock(name + "_plate", new EndWoodenPlateBlock(block));
|
slab = EndBlocks.registerBlock(name + "_slab", new EndSlabBlock(tile));
|
||||||
door = EndBlocks.registerBlock(name + "_door", new EndDoorBlock(block));
|
door = EndBlocks.registerBlock(name + "_door", new EndDoorBlock(block));
|
||||||
trapdoor = EndBlocks.registerBlock(name + "_trapdoor", new EndTrapdoorBlock(block));
|
trapdoor = EndBlocks.registerBlock(name + "_trapdoor", new EndTrapdoorBlock(block));
|
||||||
anvil = EndBlocks.registerBlock(name + "_anvil", new EndAnvilBlock(color));
|
anvil = EndBlocks.registerBlock(name + "_anvil", new EndAnvilBlock(color));
|
||||||
|
bars = EndBlocks.registerBlock(name + "_bars", new EndMetalPaneBlock(block));
|
||||||
chain = EndBlocks.registerBlock(name + "_chain", new EndChainBlock(color));
|
chain = EndBlocks.registerBlock(name + "_chain", new EndChainBlock(color));
|
||||||
stairs = EndBlocks.registerBlock(name + "_stairs", new EndStairsBlock(tile));
|
plate = EndBlocks.registerBlock(name + "_plate", new EndWoodenPlateBlock(block));
|
||||||
slab = EndBlocks.registerBlock(name + "_slab", new EndSlabBlock(tile));
|
|
||||||
|
|
||||||
|
chandelier = EndBlocks.registerBlock(name + "_chandelier", new ChandelierBlock(materialBlock));
|
||||||
|
bulb_lantern = EndBlocks.registerBlock(name + "_bulb_lantern", new BulbVineLanternBlock(lantern));
|
||||||
|
bulb_lantern_colored = new ColoredMaterial(BulbVineLanternColoredBlock::new, bulb_lantern, false);
|
||||||
|
|
||||||
|
nugget = EndItems.registerItem(name + "_nugget");
|
||||||
ingot = EndItems.registerItem(name + "_ingot");
|
ingot = EndItems.registerItem(name + "_ingot");
|
||||||
shovel = EndItems.registerTool(name + "_shovel", new EndShovelItem(material, 1.5F, -3.0F, EndItems.makeItemSettings()));
|
shovel = EndItems.registerTool(name + "_shovel", new EndShovelItem(material, 1.5F, -3.0F, EndItems.makeItemSettings()));
|
||||||
sword = EndItems.registerTool(name + "_sword", new EndSwordItem(material, 3, -2.4F, EndItems.makeItemSettings()));
|
sword = EndItems.registerTool(name + "_sword", new EndSwordItem(material, 3, -2.4F, EndItems.makeItemSettings()));
|
||||||
|
@ -71,9 +86,10 @@ public class MetalMaterial {
|
||||||
axe = EndItems.registerTool(name + "_axe", new EndAxeItem(material, 6.0F, -3.0F, EndItems.makeItemSettings()));
|
axe = EndItems.registerTool(name + "_axe", new EndAxeItem(material, 6.0F, -3.0F, EndItems.makeItemSettings()));
|
||||||
hoe = EndItems.registerTool(name + "_hoe", new EndHoeItem(material, -3, 0.0F, EndItems.makeItemSettings()));
|
hoe = EndItems.registerTool(name + "_hoe", new EndHoeItem(material, -3, 0.0F, EndItems.makeItemSettings()));
|
||||||
|
|
||||||
FurnaceRecipe.make("thallasium_ingot_furnace", ore, ingot).build();
|
FurnaceRecipe.make("thallasium_ingot_furnace", ore, ingot).build(true);
|
||||||
AlloyingRecipe.Builder.create("thallasium_ingot").setInput(ore, ore).setOutput(ingot, 3).setExpiriense(2.1F).build();
|
AlloyingRecipe.Builder.create("thallasium_ingot").setInput(ore, ore).setOutput(ingot, 3).setExpiriense(2.1F).build();
|
||||||
|
|
||||||
|
GridRecipe.make(name + "_ingot_from_nuggets", ingot).setShape("###", "###", "###").addMaterial('#', nugget).setGroup("end_metal_ingots_nug").build();
|
||||||
GridRecipe.make(name + "_block", block).setShape("###", "###", "###").addMaterial('#', ingot).setGroup("end_metal_blocks").build();
|
GridRecipe.make(name + "_block", block).setShape("###", "###", "###").addMaterial('#', ingot).setGroup("end_metal_blocks").build();
|
||||||
GridRecipe.make(name + "_ingot_from_block", ingot).setOutputCount(9).setList("#").addMaterial('#', block).setGroup("end_metal_ingots").build();
|
GridRecipe.make(name + "_ingot_from_block", ingot).setOutputCount(9).setList("#").addMaterial('#', block).setGroup("end_metal_ingots").build();
|
||||||
|
|
||||||
|
@ -82,14 +98,24 @@ public class MetalMaterial {
|
||||||
GridRecipe.make(name + "_plate", plate).setShape("##").addMaterial('#', ingot).setGroup("end_metal_plates").build();
|
GridRecipe.make(name + "_plate", plate).setShape("##").addMaterial('#', ingot).setGroup("end_metal_plates").build();
|
||||||
GridRecipe.make(name + "_door", door).setOutputCount(3).setOutputCount(16).setShape("##", "##", "##").addMaterial('#', ingot).setGroup("end_metal_doors").build();
|
GridRecipe.make(name + "_door", door).setOutputCount(3).setOutputCount(16).setShape("##", "##", "##").addMaterial('#', ingot).setGroup("end_metal_doors").build();
|
||||||
GridRecipe.make(name + "_trapdoor", trapdoor).setShape("##", "##").addMaterial('#', ingot).setGroup("end_metal_trapdoors").build();
|
GridRecipe.make(name + "_trapdoor", trapdoor).setShape("##", "##").addMaterial('#', ingot).setGroup("end_metal_trapdoors").build();
|
||||||
GridRecipe.make(name + "_stairs", stairs).setOutputCount(4).setShape("# ", "## ", "###").addMaterial('#', block).setGroup("end_metal_stairs").build();
|
GridRecipe.make(name + "_stairs", stairs).setOutputCount(4).setShape("# ", "## ", "###").addMaterial('#', block, tile).setGroup("end_metal_stairs").build();
|
||||||
GridRecipe.make(name + "_slab", slab).setOutputCount(6).setShape("###").addMaterial('#', block).setGroup("end_metal_slabs").build();
|
GridRecipe.make(name + "_slab", slab).setOutputCount(6).setShape("###").addMaterial('#', block, tile).setGroup("end_metal_slabs").build();
|
||||||
|
GridRecipe.make(name + "_chain", chain).setShape("N", "#", "N").addMaterial('#', ingot).addMaterial('N', nugget).setGroup("end_metal_chain").build();
|
||||||
|
GridRecipe.make(name + "_anvil", anvil).setOutputCount(3).setShape("###", " I ", "III").addMaterial('#', block, tile).addMaterial('I', ingot).setGroup("end_metal_anvil").build();
|
||||||
|
GridRecipe.make(name + "bulb_lantern", bulb_lantern).setShape("C", "I", "#").addMaterial('C', chain).addMaterial('I', ingot).addMaterial('#', EndItems.GLOWING_BULB).build();
|
||||||
|
|
||||||
GridRecipe.make(name + "_axe", axe).setShape("##", "#I", " I").addMaterial('#', ingot).addMaterial('I', Items.STICK).build();
|
GridRecipe.make(name + "_axe", axe).setShape("##", "#I", " I").addMaterial('#', ingot).addMaterial('I', Items.STICK).build();
|
||||||
GridRecipe.make(name + "_hoe", hoe).setShape("##", " I", " I").addMaterial('#', ingot).addMaterial('I', Items.STICK).build();
|
GridRecipe.make(name + "_hoe", hoe).setShape("##", " I", " I").addMaterial('#', ingot).addMaterial('I', Items.STICK).build();
|
||||||
GridRecipe.make(name + "_pickaxe", pickaxe).setShape("###", " I ", " I ").addMaterial('#', ingot).addMaterial('I', Items.STICK).build();
|
GridRecipe.make(name + "_pickaxe", pickaxe).setShape("###", " I ", " I ").addMaterial('#', ingot).addMaterial('I', Items.STICK).build();
|
||||||
GridRecipe.make(name + "_sword", sword).setShape("#", "#", "I").addMaterial('#', ingot).addMaterial('I', Items.STICK).build();
|
GridRecipe.make(name + "_sword", sword).setShape("#", "#", "I").addMaterial('#', ingot).addMaterial('I', Items.STICK).build();
|
||||||
|
|
||||||
|
GridRecipe.make(name + "_chandelier", chandelier).setShape("I#I", " # ").addMaterial('#', ingot).addMaterial('I', EndItems.LUMECORN_ROD).setGroup("end_metal_chandelier").build();
|
||||||
|
|
||||||
|
FurnaceRecipe.make(name + "_axe_ingot", axe, nugget).build(true);
|
||||||
|
FurnaceRecipe.make(name + "_hoe_ingot", hoe, nugget).build(true);
|
||||||
|
FurnaceRecipe.make(name + "_pickaxe_ingot", pickaxe, nugget).build(true);
|
||||||
|
FurnaceRecipe.make(name + "_sword_ingot", sword, nugget).build(true);
|
||||||
|
|
||||||
TagHelper.addTag(BlockTags.ANVIL, anvil);
|
TagHelper.addTag(BlockTags.ANVIL, anvil);
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -82,8 +82,8 @@ public class Patterns {
|
||||||
public final static Identifier BLOCK_BOOKSHELF = BetterEnd.makeID("patterns/block/bookshelf.json");
|
public final static Identifier BLOCK_BOOKSHELF = BetterEnd.makeID("patterns/block/bookshelf.json");
|
||||||
public final static Identifier BLOCK_STONE_LANTERN_CEIL = BetterEnd.makeID("patterns/block/stone_lantern_ceil.json");
|
public final static Identifier BLOCK_STONE_LANTERN_CEIL = BetterEnd.makeID("patterns/block/stone_lantern_ceil.json");
|
||||||
public final static Identifier BLOCK_STONE_LANTERN_FLOOR = BetterEnd.makeID("patterns/block/stone_lantern_floor.json");
|
public final static Identifier BLOCK_STONE_LANTERN_FLOOR = BetterEnd.makeID("patterns/block/stone_lantern_floor.json");
|
||||||
public final static Identifier BLOCK_BULB_LANTERN_COLORED_FLOOR = BetterEnd.makeID("models/block/bulb_lantern_colored_floor.json");
|
public final static Identifier BLOCK_BULB_LANTERN_FLOOR = BetterEnd.makeID("patterns/block/bulb_lantern_floor.json");
|
||||||
public final static Identifier BLOCK_BULB_LANTERN_COLORED_CEIL = BetterEnd.makeID("models/block/bulb_lantern_colored_ceil.json");
|
public final static Identifier BLOCK_BULB_LANTERN_CEIL = BetterEnd.makeID("patterns/block/bulb_lantern_ceil.json");
|
||||||
public final static Identifier BLOCK_PETAL_COLORED = BetterEnd.makeID("models/block/block_petal_colored.json");
|
public final static Identifier BLOCK_PETAL_COLORED = BetterEnd.makeID("models/block/block_petal_colored.json");
|
||||||
public final static Identifier BLOCK_COMPOSTER = BetterEnd.makeID("patterns/block/composter.json");
|
public final static Identifier BLOCK_COMPOSTER = BetterEnd.makeID("patterns/block/composter.json");
|
||||||
public final static Identifier BLOCK_COLORED = BetterEnd.makeID("patterns/block/block_colored.json");
|
public final static Identifier BLOCK_COLORED = BetterEnd.makeID("patterns/block/block_colored.json");
|
||||||
|
|
|
@ -117,7 +117,7 @@ public class CraftingRecipes {
|
||||||
|
|
||||||
GridRecipe.make("amber_gem", EndItems.AMBER_GEM).setShape("##", "##").addMaterial('#', EndItems.RAW_AMBER).build();
|
GridRecipe.make("amber_gem", EndItems.AMBER_GEM).setShape("##", "##").addMaterial('#', EndItems.RAW_AMBER).build();
|
||||||
GridRecipe.make("amber_block", EndBlocks.AMBER_BLOCK).setShape("###", "###", "###").addMaterial('#', EndItems.AMBER_GEM).build();
|
GridRecipe.make("amber_block", EndBlocks.AMBER_BLOCK).setShape("###", "###", "###").addMaterial('#', EndItems.AMBER_GEM).build();
|
||||||
GridRecipe.make("bulb_lantern", EndBlocks.BULB_LANTERN).addMaterial('C', Items.CHAIN).addMaterial('I', Items.IRON_INGOT).setShape("C", "I", "#").addMaterial('#', EndItems.GLOWING_BULB).build();
|
GridRecipe.make("bulb_lantern", EndBlocks.IRON_BULB_LANTERN).setShape("C", "I", "#").addMaterial('C', Items.CHAIN).addMaterial('I', Items.IRON_INGOT).addMaterial('#', EndItems.GLOWING_BULB).build();
|
||||||
GridRecipe.make("twisted_moss_dye", Items.PINK_DYE).setList("#").addMaterial('#', EndBlocks.TWISTED_MOSS).build();
|
GridRecipe.make("twisted_moss_dye", Items.PINK_DYE).setList("#").addMaterial('#', EndBlocks.TWISTED_MOSS).build();
|
||||||
GridRecipe.make("byshy_grass_dye", Items.MAGENTA_DYE).setList("#").addMaterial('#', EndBlocks.BUSHY_GRASS).build();
|
GridRecipe.make("byshy_grass_dye", Items.MAGENTA_DYE).setList("#").addMaterial('#', EndBlocks.BUSHY_GRASS).build();
|
||||||
GridRecipe.make("tail_moss_dye", Items.GRAY_DYE).setList("#").addMaterial('#', EndBlocks.TAIL_MOSS).build();
|
GridRecipe.make("tail_moss_dye", Items.GRAY_DYE).setList("#").addMaterial('#', EndBlocks.TAIL_MOSS).build();
|
||||||
|
@ -190,9 +190,6 @@ public class CraftingRecipes {
|
||||||
|
|
||||||
GridRecipe.make("fiber_string", Items.STRING).setOutputCount(6).setShape("#", "#", "#").addMaterial('#', EndItems.SILK_FIBER).build();
|
GridRecipe.make("fiber_string", Items.STRING).setOutputCount(6).setShape("#", "#", "#").addMaterial('#', EndItems.SILK_FIBER).build();
|
||||||
|
|
||||||
GridRecipe.make("thallasium_chandelier", EndBlocks.THALLASIUM_CHANDELIER).setShape("I#I", " # ")
|
|
||||||
.addMaterial('#', EndBlocks.THALLASIUM.ingot).addMaterial('I', EndItems.LUMECORN_ROD).build();
|
|
||||||
|
|
||||||
GridRecipe.make("ender_eye_amber", Items.ENDER_EYE)
|
GridRecipe.make("ender_eye_amber", Items.ENDER_EYE)
|
||||||
.setShape("SAS", "APA", "SAS")
|
.setShape("SAS", "APA", "SAS")
|
||||||
.addMaterial('S', EndItems.CRYSTAL_SHARDS)
|
.addMaterial('S', EndItems.CRYSTAL_SHARDS)
|
||||||
|
|
|
@ -2,6 +2,7 @@ package ru.betterend.recipe.builders;
|
||||||
|
|
||||||
import net.minecraft.item.ItemConvertible;
|
import net.minecraft.item.ItemConvertible;
|
||||||
import net.minecraft.item.ItemStack;
|
import net.minecraft.item.ItemStack;
|
||||||
|
import net.minecraft.recipe.BlastingRecipe;
|
||||||
import net.minecraft.recipe.Ingredient;
|
import net.minecraft.recipe.Ingredient;
|
||||||
import net.minecraft.recipe.RecipeType;
|
import net.minecraft.recipe.RecipeType;
|
||||||
import net.minecraft.recipe.SmeltingRecipe;
|
import net.minecraft.recipe.SmeltingRecipe;
|
||||||
|
@ -58,10 +59,19 @@ public class FurnaceRecipe {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void build() {
|
public void build() {
|
||||||
|
build(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void build(boolean blasting) {
|
||||||
if (exist) {
|
if (exist) {
|
||||||
Identifier id = BetterEnd.makeID(name);
|
Identifier id = BetterEnd.makeID(name);
|
||||||
SmeltingRecipe recipe = new SmeltingRecipe(id, group, Ingredient.ofItems(input), new ItemStack(output, count), xp, time);
|
SmeltingRecipe recipe = new SmeltingRecipe(id, group, Ingredient.ofItems(input), new ItemStack(output, count), xp, time);
|
||||||
EndRecipeManager.addRecipe(RecipeType.SMELTING, recipe);
|
EndRecipeManager.addRecipe(RecipeType.SMELTING, recipe);
|
||||||
|
|
||||||
|
if (blasting) {
|
||||||
|
BlastingRecipe recipe2 = new BlastingRecipe(id, group, Ingredient.ofItems(input), new ItemStack(output, count), xp, time / 2);
|
||||||
|
EndRecipeManager.addRecipe(RecipeType.BLASTING, recipe2);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
BetterEnd.LOGGER.debug("Smelting recipe {} couldn't be added", name);
|
BetterEnd.LOGGER.debug("Smelting recipe {} couldn't be added", name);
|
||||||
|
|
|
@ -78,7 +78,6 @@ import ru.betterend.blocks.TenaneaFlowersBlock;
|
||||||
import ru.betterend.blocks.TenaneaSaplingBlock;
|
import ru.betterend.blocks.TenaneaSaplingBlock;
|
||||||
import ru.betterend.blocks.TerminiteBlock;
|
import ru.betterend.blocks.TerminiteBlock;
|
||||||
import ru.betterend.blocks.TerrainPlantBlock;
|
import ru.betterend.blocks.TerrainPlantBlock;
|
||||||
import ru.betterend.blocks.ThallasiumChandelierBlock;
|
|
||||||
import ru.betterend.blocks.TwistedUmbrellaMossBlock;
|
import ru.betterend.blocks.TwistedUmbrellaMossBlock;
|
||||||
import ru.betterend.blocks.TwistedUmbrellaMossTallBlock;
|
import ru.betterend.blocks.TwistedUmbrellaMossTallBlock;
|
||||||
import ru.betterend.blocks.UmbrellaMossBlock;
|
import ru.betterend.blocks.UmbrellaMossBlock;
|
||||||
|
@ -305,10 +304,8 @@ public class EndBlocks {
|
||||||
public static final Block END_STONE_LANTERN = registerBlock("end_stone_lantern", new StoneLanternBlock(Blocks.END_STONE));
|
public static final Block END_STONE_LANTERN = registerBlock("end_stone_lantern", new StoneLanternBlock(Blocks.END_STONE));
|
||||||
public static final Block BLACKSTONE_LANTERN = registerBlock("blackstone_lantern", new StoneLanternBlock(Blocks.BLACKSTONE));
|
public static final Block BLACKSTONE_LANTERN = registerBlock("blackstone_lantern", new StoneLanternBlock(Blocks.BLACKSTONE));
|
||||||
|
|
||||||
public static final Block BULB_LANTERN = registerBlock("bulb_lantern", new BulbVineLanternBlock());
|
public static final Block IRON_BULB_LANTERN = registerBlock("iron_bulb_lantern", new BulbVineLanternBlock());
|
||||||
public static final ColoredMaterial BULB_LANTERN_COLORED = new ColoredMaterial(BulbVineLanternColoredBlock::new, BULB_LANTERN, false);
|
public static final ColoredMaterial IRON_BULB_LANTERN_COLORED = new ColoredMaterial(BulbVineLanternColoredBlock::new, IRON_BULB_LANTERN, false);
|
||||||
|
|
||||||
public static final Block THALLASIUM_CHANDELIER = registerBlock("thallasium_chandelier", new ThallasiumChandelierBlock());
|
|
||||||
|
|
||||||
// Blocks With Entity //
|
// Blocks With Entity //
|
||||||
public static final Block END_STONE_SMELTER = registerBlock("end_stone_smelter", new EndStoneSmelter());
|
public static final Block END_STONE_SMELTER = registerBlock("end_stone_smelter", new EndStoneSmelter());
|
||||||
|
|
|
@ -0,0 +1,19 @@
|
||||||
|
{
|
||||||
|
"variants": {
|
||||||
|
"facing=east": {
|
||||||
|
"model": "betterend:block/thallasium_anvil",
|
||||||
|
"y": 270
|
||||||
|
},
|
||||||
|
"facing=north": {
|
||||||
|
"model": "betterend:block/thallasium_anvil",
|
||||||
|
"y": 180
|
||||||
|
},
|
||||||
|
"facing=south": {
|
||||||
|
"model": "betterend:block/thallasium_anvil"
|
||||||
|
},
|
||||||
|
"facing=west": {
|
||||||
|
"model": "betterend:block/thallasium_anvil",
|
||||||
|
"y": 90
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -358,26 +358,44 @@
|
||||||
"block.betterend.twisted_moss": "Twisted Moss",
|
"block.betterend.twisted_moss": "Twisted Moss",
|
||||||
|
|
||||||
"block.betterend.bulb_vine": "Bulb Vine",
|
"block.betterend.bulb_vine": "Bulb Vine",
|
||||||
"block.betterend.bulb_lantern": "Bulb Lantern",
|
|
||||||
"block.betterend.bulb_vine_seed": "Bulb Vine Seed",
|
"block.betterend.bulb_vine_seed": "Bulb Vine Seed",
|
||||||
"item.betterend.glowing_bulb": "Glowing Bulb",
|
"item.betterend.glowing_bulb": "Glowing Bulb",
|
||||||
|
|
||||||
"block.betterend.bulb_lantern_black": "Black Bulb Lantern",
|
"block.betterend.iron_bulb_lantern": "Iron Bulb Lantern",
|
||||||
"block.betterend.bulb_lantern_blue": "Blue Bulb Lantern",
|
"block.betterend.iron_bulb_lantern_black": "Black Iron Bulb Lantern",
|
||||||
"block.betterend.bulb_lantern_brown": "Brown Bulb Lantern",
|
"block.betterend.iron_bulb_lantern_blue": "Blue Iron Bulb Lantern",
|
||||||
"block.betterend.bulb_lantern_cyan": "Cyan Bulb Lantern",
|
"block.betterend.iron_bulb_lantern_brown": "Brown Iron Bulb Lantern",
|
||||||
"block.betterend.bulb_lantern_gray": "Gray Bulb Lantern",
|
"block.betterend.iron_bulb_lantern_cyan": "Cyan Iron Bulb Lantern",
|
||||||
"block.betterend.bulb_lantern_green": "Green Bulb Lantern",
|
"block.betterend.iron_bulb_lantern_gray": "Gray Iron Bulb Lantern",
|
||||||
"block.betterend.bulb_lantern_light_blue": "Light Blue Bulb Lantern",
|
"block.betterend.iron_bulb_lantern_green": "Green Iron Bulb Lantern",
|
||||||
"block.betterend.bulb_lantern_light_gray": "Light Gray Bulb Lantern",
|
"block.betterend.iron_bulb_lantern_light_blue": "Light Blue Iron Bulb Lantern",
|
||||||
"block.betterend.bulb_lantern_lime": "Lime Bulb Lantern",
|
"block.betterend.iron_bulb_lantern_light_gray": "Light Gray Iron Bulb Lantern",
|
||||||
"block.betterend.bulb_lantern_magenta": "Magenta Bulb Lantern",
|
"block.betterend.iron_bulb_lantern_lime": "Lime Iron Bulb Lantern",
|
||||||
"block.betterend.bulb_lantern_orange": "Orange Bulb Lantern",
|
"block.betterend.iron_bulb_lantern_magenta": "Magenta Iron Bulb Lantern",
|
||||||
"block.betterend.bulb_lantern_pink": "Pink Bulb Lantern",
|
"block.betterend.iron_bulb_lantern_orange": "Orange Iron Bulb Lantern",
|
||||||
"block.betterend.bulb_lantern_purple": "Purple Bulb Lantern",
|
"block.betterend.iron_bulb_lantern_pink": "Pink Iron Bulb Lantern",
|
||||||
"block.betterend.bulb_lantern_red": "Red Bulb Lantern",
|
"block.betterend.iron_bulb_lantern_purple": "Purple Iron Bulb Lantern",
|
||||||
"block.betterend.bulb_lantern_white": "White Bulb Lantern",
|
"block.betterend.iron_bulb_lantern_red": "Red Iron Bulb Lantern",
|
||||||
"block.betterend.bulb_lantern_yellow": "Yellow Bulb Lantern",
|
"block.betterend.iron_bulb_lantern_white": "White Iron Bulb Lantern",
|
||||||
|
"block.betterend.iron_bulb_lantern_yellow": "Yellow Iron Bulb Lantern",
|
||||||
|
|
||||||
|
"block.betterend.thallasium_bulb_lantern": "Thallasium Bulb Lantern",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_black": "Black Thallasium Bulb Lantern",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_blue": "Blue Thallasium Bulb Lantern",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_brown": "Brown Thallasium Bulb Lantern",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_cyan": "Cyan Thallasium Bulb Lantern",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_gray": "Gray Thallasium Bulb Lantern",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_green": "Green Thallasium Bulb Lantern",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_light_blue": "Light Blue Thallasium Bulb Lantern",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_light_gray": "Light Gray Thallasium Bulb Lantern",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_lime": "Lime Thallasium Bulb Lantern",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_magenta": "Magenta Thallasium Bulb Lantern",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_orange": "Orange Thallasium Bulb Lantern",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_pink": "Pink Thallasium Bulb Lantern",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_purple": "Purple Thallasium Bulb Lantern",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_red": "Red Thallasium Bulb Lantern",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_white": "White Thallasium Bulb Lantern",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_yellow": "Yellow Thallasium Bulb Lantern",
|
||||||
|
|
||||||
"block.betterend.bushy_grass": "Bushy Grass",
|
"block.betterend.bushy_grass": "Bushy Grass",
|
||||||
|
|
||||||
|
|
|
@ -360,26 +360,44 @@
|
||||||
"block.betterend.twisted_moss": "Закрученный мох",
|
"block.betterend.twisted_moss": "Закрученный мох",
|
||||||
|
|
||||||
"block.betterend.bulb_vine": "Луковичная лоза",
|
"block.betterend.bulb_vine": "Луковичная лоза",
|
||||||
"block.betterend.bulb_lantern": "Луковичный фонарь",
|
|
||||||
"block.betterend.bulb_vine_seed": "Семя луковичной лозы",
|
"block.betterend.bulb_vine_seed": "Семя луковичной лозы",
|
||||||
"item.betterend.glowing_bulb": "Светящаяся луковица",
|
"item.betterend.glowing_bulb": "Светящаяся луковица",
|
||||||
|
|
||||||
"block.betterend.bulb_lantern_black": "Чёрный луковичный фонарь",
|
"block.betterend.iron_bulb_lantern": "Железный луковичный фонарь",
|
||||||
"block.betterend.bulb_lantern_blue": "Синий луковичный фонарь",
|
"block.betterend.iron_bulb_lantern_black": "Чёрный железный луковичный фонарь",
|
||||||
"block.betterend.bulb_lantern_brown": "Коричневый луковичный фонарь",
|
"block.betterend.iron_bulb_lantern_blue": "Синий железный луковичный фонарь",
|
||||||
"block.betterend.bulb_lantern_cyan": "Циановый луковичный фонарь",
|
"block.betterend.iron_bulb_lantern_brown": "Коричневый железный луковичный фонарь",
|
||||||
"block.betterend.bulb_lantern_gray": "Серый луковичный фонарь",
|
"block.betterend.iron_bulb_lantern_cyan": "Циановый железный луковичный фонарь",
|
||||||
"block.betterend.bulb_lantern_green": "Зелёный луковичный фонарь",
|
"block.betterend.iron_bulb_lantern_gray": "Серый железный луковичный фонарь",
|
||||||
"block.betterend.bulb_lantern_light_blue": "Голубой луковичный фонарь",
|
"block.betterend.iron_bulb_lantern_green": "Зелёный железный луковичный фонарь",
|
||||||
"block.betterend.bulb_lantern_light_gray": "Светло-серый луковичный фонарь",
|
"block.betterend.iron_bulb_lantern_light_blue": "Голубой железный луковичный фонарь",
|
||||||
"block.betterend.bulb_lantern_lime": "Лаймовый луковичный фонарь",
|
"block.betterend.iron_bulb_lantern_light_gray": "Светло-серый железный луковичный фонарь",
|
||||||
"block.betterend.bulb_lantern_magenta": "Фиолетовый луковичный фонарь",
|
"block.betterend.iron_bulb_lantern_lime": "Лаймовый железный луковичный фонарь",
|
||||||
"block.betterend.bulb_lantern_orange": "Оранжевый луковичный фонарь",
|
"block.betterend.iron_bulb_lantern_magenta": "Фиолетовый железный луковичный фонарь",
|
||||||
"block.betterend.bulb_lantern_pink": "Розовый луковичный фонарь",
|
"block.betterend.iron_bulb_lantern_orange": "Оранжевый железный луковичный фонарь",
|
||||||
"block.betterend.bulb_lantern_purple": "Пурпурный луковичный фонарь",
|
"block.betterend.iron_bulb_lantern_pink": "Розовый железный луковичный фонарь",
|
||||||
"block.betterend.bulb_lantern_red": "Красный луковичный фонарь",
|
"block.betterend.iron_bulb_lantern_purple": "Пурпурный железный луковичный фонарь",
|
||||||
"block.betterend.bulb_lantern_white": "Белый луковичный фонарь",
|
"block.betterend.iron_bulb_lantern_red": "Красный железный луковичный фонарь",
|
||||||
"block.betterend.bulb_lantern_yellow": "Жёлтый луковичный фонарь",
|
"block.betterend.iron_bulb_lantern_white": "Белый железный луковичный фонарь",
|
||||||
|
"block.betterend.iron_bulb_lantern_yellow": "Жёлтый железный луковичный фонарь",
|
||||||
|
|
||||||
|
"block.betterend.thallasium_bulb_lantern": "Талласиевый луковичный фонарь",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_black": "Чёрный талласиевый луковичный фонарь",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_blue": "Синий талласиевый луковичный фонарь",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_brown": "Коричневый талласиевый луковичный фонарь",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_cyan": "Циановый талласиевый луковичный фонарь",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_gray": "Серый талласиевый луковичный фонарь",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_green": "Зелёный талласиевый луковичный фонарь",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_light_blue": "Голубой талласиевый луковичный фонарь",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_light_gray": "Светло-серый талласиевый луковичный фонарь",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_lime": "Лаймовый талласиевый луковичный фонарь",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_magenta": "Фиолетовый талласиевый луковичный фонарь",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_orange": "Оранжевый талласиевый луковичный фонарь",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_pink": "Розовый талласиевый луковичный фонарь",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_purple": "Пурпурный талласиевый луковичный фонарь",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_red": "Красный талласиевый луковичный фонарь",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_white": "Белый талласиевый луковичный фонарь",
|
||||||
|
"block.betterend.thallasium_bulb_lantern_yellow": "Жёлтый талласиевый луковичный фонарь",
|
||||||
|
|
||||||
"block.betterend.bushy_grass": "Густая трава",
|
"block.betterend.bushy_grass": "Густая трава",
|
||||||
|
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
{
|
|
||||||
"defaultMaterial": "betterend:glow_inc"
|
|
||||||
}
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"defaultMap": {
|
||||||
|
"spriteMap": [
|
||||||
|
{
|
||||||
|
"sprite": "betterend:block/bulb_vine_lantern_bulb",
|
||||||
|
"material": "betterend:glow_all"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"defaultMap": {
|
||||||
|
"spriteMap": [
|
||||||
|
{
|
||||||
|
"sprite": "betterend:block/bulb_vine_lantern_bulb",
|
||||||
|
"material": "betterend:glow_all"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"defaultMap": {
|
||||||
|
"spriteMap": [
|
||||||
|
{
|
||||||
|
"sprite": "betterend:block/bulb_vine_lantern_overlay",
|
||||||
|
"material": "betterend:glow_all"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"defaultMap": {
|
||||||
|
"spriteMap": [
|
||||||
|
{
|
||||||
|
"sprite": "betterend:block/bulb_vine_lantern_overlay",
|
||||||
|
"material": "betterend:glow_all"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"defaultMap": {
|
||||||
|
"spriteMap": [
|
||||||
|
{
|
||||||
|
"sprite": "betterend:block/bulb_vine_lantern_overlay",
|
||||||
|
"material": "betterend:glow_all"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"defaultMap": {
|
||||||
|
"spriteMap": [
|
||||||
|
{
|
||||||
|
"sprite": "betterend:block/bulb_vine_lantern_overlay",
|
||||||
|
"material": "betterend:glow_all"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"defaultMap": {
|
||||||
|
"spriteMap": [
|
||||||
|
{
|
||||||
|
"sprite": "betterend:block/bulb_vine_lantern_overlay",
|
||||||
|
"material": "betterend:glow_all"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"defaultMap": {
|
||||||
|
"spriteMap": [
|
||||||
|
{
|
||||||
|
"sprite": "betterend:block/bulb_vine_lantern_overlay",
|
||||||
|
"material": "betterend:glow_all"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"defaultMap": {
|
||||||
|
"spriteMap": [
|
||||||
|
{
|
||||||
|
"sprite": "betterend:block/bulb_vine_lantern_overlay",
|
||||||
|
"material": "betterend:glow_all"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"defaultMap": {
|
||||||
|
"spriteMap": [
|
||||||
|
{
|
||||||
|
"sprite": "betterend:block/bulb_vine_lantern_overlay",
|
||||||
|
"material": "betterend:glow_all"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"defaultMap": {
|
||||||
|
"spriteMap": [
|
||||||
|
{
|
||||||
|
"sprite": "betterend:block/bulb_vine_lantern_overlay",
|
||||||
|
"material": "betterend:glow_all"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"defaultMap": {
|
||||||
|
"spriteMap": [
|
||||||
|
{
|
||||||
|
"sprite": "betterend:block/bulb_vine_lantern_overlay",
|
||||||
|
"material": "betterend:glow_all"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"defaultMap": {
|
||||||
|
"spriteMap": [
|
||||||
|
{
|
||||||
|
"sprite": "betterend:block/bulb_vine_lantern_overlay",
|
||||||
|
"material": "betterend:glow_all"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"defaultMap": {
|
||||||
|
"spriteMap": [
|
||||||
|
{
|
||||||
|
"sprite": "betterend:block/bulb_vine_lantern_overlay",
|
||||||
|
"material": "betterend:glow_all"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"defaultMap": {
|
||||||
|
"spriteMap": [
|
||||||
|
{
|
||||||
|
"sprite": "betterend:block/bulb_vine_lantern_overlay",
|
||||||
|
"material": "betterend:glow_all"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"defaultMap": {
|
||||||
|
"spriteMap": [
|
||||||
|
{
|
||||||
|
"sprite": "betterend:block/bulb_vine_lantern_overlay",
|
||||||
|
"material": "betterend:glow_all"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"defaultMap": {
|
||||||
|
"spriteMap": [
|
||||||
|
{
|
||||||
|
"sprite": "betterend:block/bulb_vine_lantern_overlay",
|
||||||
|
"material": "betterend:glow_all"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,10 @@
|
||||||
|
{
|
||||||
|
"defaultMap": {
|
||||||
|
"spriteMap": [
|
||||||
|
{
|
||||||
|
"sprite": "betterend:block/bulb_vine_lantern_overlay",
|
||||||
|
"material": "betterend:glow_all"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,58 +0,0 @@
|
||||||
{
|
|
||||||
"__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio",
|
|
||||||
"parent": "block/block",
|
|
||||||
"textures": {
|
|
||||||
"particle": "betterend:block/bulb_vine_lantern",
|
|
||||||
"texture": "betterend:block/bulb_vine_lantern"
|
|
||||||
},
|
|
||||||
"elements": [
|
|
||||||
{
|
|
||||||
"__comment": "Box1",
|
|
||||||
"from": [ 4, 4, 4 ],
|
|
||||||
"to": [ 12, 12, 12 ],
|
|
||||||
"shade": false,
|
|
||||||
"faces": {
|
|
||||||
"down": { "uv": [ 8, 0, 16, 8 ], "texture": "#texture" },
|
|
||||||
"up": { "uv": [ 0, 0, 8, 8 ], "texture": "#texture" },
|
|
||||||
"north": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" },
|
|
||||||
"south": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" },
|
|
||||||
"west": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" },
|
|
||||||
"east": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"__comment": "Box11",
|
|
||||||
"from": [ 6, 12, 6 ],
|
|
||||||
"to": [ 10, 13, 10 ],
|
|
||||||
"faces": {
|
|
||||||
"up": { "uv": [ 10, 8, 14, 12 ], "texture": "#texture" },
|
|
||||||
"north": { "uv": [ 10, 12, 14, 13 ], "texture": "#texture" },
|
|
||||||
"south": { "uv": [ 10, 12, 14, 13 ], "texture": "#texture" },
|
|
||||||
"west": { "uv": [ 10, 12, 14, 13 ], "texture": "#texture" },
|
|
||||||
"east": { "uv": [ 10, 12, 14, 13 ], "texture": "#texture" }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"__comment": "PlaneX15",
|
|
||||||
"from": [ 7, 13, 7 ],
|
|
||||||
"to": [ 7.001, 16, 10 ],
|
|
||||||
"rotation": { "origin": [ 7, 13, 7 ], "axis": "y", "angle": 45 },
|
|
||||||
"shade": false,
|
|
||||||
"faces": {
|
|
||||||
"west": { "uv": [ 10, 13, 13, 16 ], "texture": "#texture" },
|
|
||||||
"east": { "uv": [ 10, 13, 13, 16 ], "texture": "#texture" }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"__comment": "PlaneX15",
|
|
||||||
"from": [ 9, 13, 7 ],
|
|
||||||
"to": [ 9.001, 16, 10 ],
|
|
||||||
"rotation": { "origin": [ 9, 13, 7 ], "axis": "y", "angle": -45 },
|
|
||||||
"shade": false,
|
|
||||||
"faces": {
|
|
||||||
"west": { "uv": [ 10, 13, 13, 16 ], "texture": "#texture" },
|
|
||||||
"east": { "uv": [ 10, 13, 13, 16 ], "texture": "#texture" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
|
@ -1,56 +0,0 @@
|
||||||
{
|
|
||||||
"__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio",
|
|
||||||
"parent": "block/block",
|
|
||||||
"textures": {
|
|
||||||
"particle": "betterend:block/bulb_vine_lantern",
|
|
||||||
"texture": "betterend:block/bulb_vine_lantern"
|
|
||||||
},
|
|
||||||
"elements": [
|
|
||||||
{
|
|
||||||
"from": [ 4, 0, 4 ],
|
|
||||||
"to": [ 12, 8, 12 ],
|
|
||||||
"shade": false,
|
|
||||||
"faces": {
|
|
||||||
"down": { "uv": [ 8, 0, 16, 8 ], "texture": "#texture" },
|
|
||||||
"up": { "uv": [ 0, 0, 8, 8 ], "texture": "#texture" },
|
|
||||||
"north": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" },
|
|
||||||
"south": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" },
|
|
||||||
"west": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" },
|
|
||||||
"east": { "uv": [ 0, 8, 8, 16 ], "texture": "#texture" }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"from": [ 6, 8, 6 ],
|
|
||||||
"to": [ 10, 9, 10 ],
|
|
||||||
"faces": {
|
|
||||||
"up": { "uv": [ 10, 8, 14, 12 ], "texture": "#texture" },
|
|
||||||
"north": { "uv": [ 10, 12, 14, 13 ], "texture": "#texture" },
|
|
||||||
"south": { "uv": [ 10, 12, 14, 13 ], "texture": "#texture" },
|
|
||||||
"west": { "uv": [ 10, 12, 14, 13 ], "texture": "#texture" },
|
|
||||||
"east": { "uv": [ 10, 12, 14, 13 ], "texture": "#texture" }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"__comment": "PlaneX15",
|
|
||||||
"from": [ 7, 9, 7 ],
|
|
||||||
"to": [ 7.001, 12, 10 ],
|
|
||||||
"rotation": { "origin": [ 7, 13, 7 ], "axis": "y", "angle": 45 },
|
|
||||||
"shade": false,
|
|
||||||
"faces": {
|
|
||||||
"west": { "uv": [ 10, 13, 13, 16 ], "texture": "#texture" },
|
|
||||||
"east": { "uv": [ 10, 13, 13, 16 ], "texture": "#texture" }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"__comment": "PlaneX15",
|
|
||||||
"from": [ 9, 9, 7 ],
|
|
||||||
"to": [ 9.001, 12, 10 ],
|
|
||||||
"rotation": { "origin": [ 9, 13, 7 ], "axis": "y", "angle": -45 },
|
|
||||||
"shade": false,
|
|
||||||
"faces": {
|
|
||||||
"west": { "uv": [ 10, 13, 13, 16 ], "texture": "#texture" },
|
|
||||||
"east": { "uv": [ 10, 13, 13, 16 ], "texture": "#texture" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
|
@ -0,0 +1,69 @@
|
||||||
|
{
|
||||||
|
"__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio",
|
||||||
|
"parent": "block/block",
|
||||||
|
"textures": {
|
||||||
|
"particle": "betterend:block/thallasium_anvil_front",
|
||||||
|
"front": "betterend:block/thallasium_anvil_front",
|
||||||
|
"back": "betterend:block/thallasium_anvil_back",
|
||||||
|
"top": "betterend:block/thallasium_anvil_top",
|
||||||
|
"panel": "betterend:block/thallasium_anvil_panel",
|
||||||
|
"bottom": "betterend:block/thallasium_anvil_bottom"
|
||||||
|
},
|
||||||
|
"elements": [
|
||||||
|
{
|
||||||
|
"__comment": "Bottom",
|
||||||
|
"from": [ 2, 0, 2 ],
|
||||||
|
"to": [ 14, 4, 14 ],
|
||||||
|
"faces": {
|
||||||
|
"down": { "uv": [ 2, 2, 14, 14 ], "texture": "#bottom", "cullface": "down" },
|
||||||
|
"up": { "uv": [ 2, 2, 14, 14 ], "texture": "#panel" },
|
||||||
|
"north": { "uv": [ 2, 12, 14, 16 ], "texture": "#back" },
|
||||||
|
"south": { "uv": [ 2, 12, 14, 16 ], "texture": "#back" },
|
||||||
|
"west": { "uv": [ 2, 12, 14, 16 ], "texture": "#front" },
|
||||||
|
"east": { "uv": [ 2, 12, 14, 16 ], "texture": "#front" }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"__comment": "Plate",
|
||||||
|
"from": [ 4, 4, 3 ],
|
||||||
|
"to": [ 12, 5, 13 ],
|
||||||
|
"faces": {
|
||||||
|
"up": { "uv": [ 4, 3, 12, 13 ], "texture": "#panel" },
|
||||||
|
"north": { "uv": [ 4, 11, 12, 12 ], "texture": "#back" },
|
||||||
|
"south": { "uv": [ 4, 11, 12, 12 ], "texture": "#back" },
|
||||||
|
"west": { "uv": [ 3, 11, 13, 12 ], "texture": "#front" },
|
||||||
|
"east": { "uv": [ 3, 11, 13, 12 ], "texture": "#front" }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"__comment": "Support",
|
||||||
|
"from": [ 6, 5, 4 ],
|
||||||
|
"to": [ 10, 10, 12 ],
|
||||||
|
"faces": {
|
||||||
|
"north": { "uv": [ 6, 6, 10, 11 ], "texture": "#back" },
|
||||||
|
"south": { "uv": [ 6, 6, 10, 11 ], "texture": "#back" },
|
||||||
|
"west": { "uv": [ 4, 6, 12, 11 ], "texture": "#front" },
|
||||||
|
"east": { "uv": [ 4, 6, 12, 11 ], "texture": "#front" }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"__comment": "Top",
|
||||||
|
"from": [ 3, 10, 0 ],
|
||||||
|
"to": [ 13, 16, 16 ],
|
||||||
|
"faces": {
|
||||||
|
"down": { "uv": [ 3, 0, 13, 16 ], "texture": "#top" },
|
||||||
|
"up": { "uv": [ 3, 0, 13, 16 ], "texture": "#top" },
|
||||||
|
"north": { "uv": [ 3, 0, 13, 6 ], "texture": "#back" },
|
||||||
|
"south": { "uv": [ 3, 0, 13, 6 ], "texture": "#back" },
|
||||||
|
"west": { "uv": [ 0, 0, 16, 6 ], "texture": "#front" },
|
||||||
|
"east": { "uv": [ 0, 0, 16, 6 ], "texture": "#front" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"display": {
|
||||||
|
"fixed": {
|
||||||
|
"rotation": [ 0, 90, 0 ],
|
||||||
|
"scale": [ 0.5, 0.5, 0.5 ]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,3 @@
|
||||||
|
{
|
||||||
|
"parent": "betterend:block/thallasium_anvil"
|
||||||
|
}
|
|
@ -2,8 +2,8 @@
|
||||||
"__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio",
|
"__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio",
|
||||||
"parent": "block/block",
|
"parent": "block/block",
|
||||||
"textures": {
|
"textures": {
|
||||||
"overlay": "betterend:block/bulb_vine_lantern_overlay",
|
"overlay": "betterend:block/%glow%",
|
||||||
"metal": "betterend:block/bulb_vine_lantern_metal",
|
"metal": "betterend:block/%metal%",
|
||||||
"particle": "#overlay"
|
"particle": "#overlay"
|
||||||
},
|
},
|
||||||
"elements": [
|
"elements": [
|
|
@ -2,8 +2,8 @@
|
||||||
"__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio",
|
"__comment": "Designed by Paulevs with Cubik Studio - https://cubik.studio",
|
||||||
"parent": "block/block",
|
"parent": "block/block",
|
||||||
"textures": {
|
"textures": {
|
||||||
"overlay": "betterend:block/bulb_vine_lantern_overlay",
|
"overlay": "betterend:block/%glow%",
|
||||||
"metal": "betterend:block/bulb_vine_lantern_metal",
|
"metal": "betterend:block/%metal%",
|
||||||
"particle": "#overlay"
|
"particle": "#overlay"
|
||||||
},
|
},
|
||||||
"elements": [
|
"elements": [
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"variants": {
|
"variants": {
|
||||||
"is_floor=false": { "model": "%block%_ceil" },
|
"is_floor=false": { "model": "betterend:pattern/%block%/%block%_ceil" },
|
||||||
"is_floor=true": { "model": "%block%_floor" }
|
"is_floor=true": { "model": "betterend:pattern/%block%/%block%_floor" }
|
||||||
}
|
}
|
||||||
}
|
}
|
Before Width: | Height: | Size: 422 B |
After Width: | Height: | Size: 766 B |
Before Width: | Height: | Size: 232 B After Width: | Height: | Size: 232 B |
Before Width: | Height: | Size: 380 B |
After Width: | Height: | Size: 423 B |
After Width: | Height: | Size: 328 B |
After Width: | Height: | Size: 456 B |
After Width: | Height: | Size: 561 B |
Before Width: | Height: | Size: 316 B After Width: | Height: | Size: 329 B |
After Width: | Height: | Size: 402 B |
Before Width: | Height: | Size: 138 B After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 150 B After Width: | Height: | Size: 1.4 KiB |
After Width: | Height: | Size: 1.5 KiB |
Before Width: | Height: | Size: 274 B After Width: | Height: | Size: 274 B |