mirror of
https://github.com/Ellpeck/ActuallyAdditions.git
synced 2024-11-24 08:08:34 +01:00
Add the rest of the black quartz
This commit is contained in:
Brennan Ward
parent
56b01b9a19
commit
f7dd5d11e1
38 changed files with 292 additions and 44 deletions
|
|
@ -10,6 +10,9 @@
|
|||
|
||||
package de.ellpeck.actuallyadditions.mod;
|
||||
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import de.ellpeck.actuallyadditions.mod.item.AAItems;
|
||||
import net.minecraft.item.ItemGroup;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
|
@ -17,29 +20,26 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
|
|||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
@Mod(ActuallyAdditions.MODID)
|
||||
public class ActuallyAdditions {
|
||||
|
||||
public static final String MODID = "actuallyadditions";
|
||||
public static final Logger LOGGER = LogManager.getLogger(MODID);
|
||||
|
||||
public static ItemGroup itemGroup = new ItemGroup("actuallyadditions") {
|
||||
public ItemStack createIcon() {
|
||||
return new ItemStack(AAItems.black_quartz);
|
||||
}
|
||||
};
|
||||
public static final ItemGroup GROUP = new ItemGroup("actuallyadditions") {
|
||||
@Override
|
||||
public ItemStack createIcon() {
|
||||
return new ItemStack(AAItems.BLACK_QUARTZ);
|
||||
}
|
||||
};
|
||||
|
||||
public ActuallyAdditions() {
|
||||
FMLJavaModLoadingContext ctx = FMLJavaModLoadingContext.get();
|
||||
ctx.getModEventBus().register(this);
|
||||
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void setup(FMLCommonSetupEvent e) {
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,8 +3,12 @@ package de.ellpeck.actuallyadditions.mod.block;
|
|||
import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.Block.Properties;
|
||||
import net.minecraft.block.RotatedPillarBlock;
|
||||
import net.minecraft.block.SlabBlock;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.item.*;
|
||||
import net.minecraft.block.material.MaterialColor;
|
||||
import net.minecraft.item.BlockItem;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraftforge.event.RegistryEvent.Register;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
|
||||
|
|
@ -14,17 +18,36 @@ import net.minecraftforge.registries.ObjectHolder;
|
|||
@EventBusSubscriber(modid = ActuallyAdditions.MODID, bus = Bus.MOD)
|
||||
@ObjectHolder(ActuallyAdditions.MODID)
|
||||
public class AABlocks {
|
||||
|
||||
@ObjectHolder(ActuallyAdditions.MODID + ":block_black_quartz")
|
||||
public static Block BLACK_QUARTZ;
|
||||
|
||||
public static final Block BLACK_QUARTZ_ORE = null;
|
||||
public static final Block BLACK_QUARTZ_BLOCK = null;
|
||||
public static final Block CHISELED_BLACK_QUARTZ_BLOCK = null;
|
||||
public static final Block BLACK_QUARTZ_PILLAR = null;
|
||||
public static final Block BLACK_QUARTZ_SLAB = null;
|
||||
|
||||
@SubscribeEvent
|
||||
public static void register(Register<Block> e) {
|
||||
e.getRegistry().register(new Block(Properties.create(Material.ROCK).hardnessAndResistance(0.8F)).setRegistryName("block_black_quartz")); //Values from the QUARTZ_BLOCK
|
||||
//Formatter::off
|
||||
e.getRegistry().registerAll(
|
||||
new Block(Properties.create(Material.ROCK, MaterialColor.STONE).hardnessAndResistance(3.0F)).setRegistryName("black_quartz_ore"),
|
||||
new Block(Properties.create(Material.ROCK, MaterialColor.BLACK).hardnessAndResistance(0.8F)).setRegistryName("black_quartz_block"),
|
||||
new Block(Properties.create(Material.ROCK, MaterialColor.BLACK).hardnessAndResistance(0.8F)).setRegistryName("chiseled_black_quartz_block"),
|
||||
new RotatedPillarBlock(Block.Properties.create(Material.ROCK, MaterialColor.BLACK).hardnessAndResistance(0.8F)).setRegistryName("black_quartz_pillar"),
|
||||
new SlabBlock(Block.Properties.create(Material.ROCK, MaterialColor.BLACK).hardnessAndResistance(0.8F)).setRegistryName("black_quartz_slab")
|
||||
);
|
||||
//Formatter::on
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public static void registerItemBlocks(Register<Item> e) {
|
||||
e.getRegistry().register(new BlockItem(BLACK_QUARTZ, new Item.Properties().group(ActuallyAdditions.itemGroup)).setRegistryName(BLACK_QUARTZ.getRegistryName()));
|
||||
//Formatter::off
|
||||
e.getRegistry().registerAll(
|
||||
new BlockItem(BLACK_QUARTZ_ORE, new Item.Properties().group(ActuallyAdditions.GROUP)).setRegistryName(BLACK_QUARTZ_ORE.getRegistryName()),
|
||||
new BlockItem(BLACK_QUARTZ_BLOCK, new Item.Properties().group(ActuallyAdditions.GROUP)).setRegistryName(BLACK_QUARTZ_BLOCK.getRegistryName()),
|
||||
new BlockItem(CHISELED_BLACK_QUARTZ_BLOCK, new Item.Properties().group(ActuallyAdditions.GROUP)).setRegistryName(CHISELED_BLACK_QUARTZ_BLOCK.getRegistryName()),
|
||||
new BlockItem(BLACK_QUARTZ_PILLAR, new Item.Properties().group(ActuallyAdditions.GROUP)).setRegistryName(BLACK_QUARTZ_PILLAR.getRegistryName()),
|
||||
new BlockItem(BLACK_QUARTZ_SLAB, new Item.Properties().group(ActuallyAdditions.GROUP)).setRegistryName(BLACK_QUARTZ_SLAB.getRegistryName())
|
||||
);
|
||||
//Formatter::on
|
||||
}
|
||||
}
|
||||
|
|
@ -13,12 +13,15 @@ import net.minecraftforge.registries.ObjectHolder;
|
|||
@ObjectHolder(ActuallyAdditions.MODID)
|
||||
public class AAItems {
|
||||
|
||||
@ObjectHolder(ActuallyAdditions.MODID + ":black_quartz")
|
||||
public static Item black_quartz = new Item(new Properties().group(ActuallyAdditions.itemGroup)).setRegistryName("black_quartz");
|
||||
|
||||
public static final Item BLACK_QUARTZ = null;
|
||||
|
||||
@SubscribeEvent
|
||||
public static void register(Register<Item> e) {
|
||||
e.getRegistry().register(black_quartz);
|
||||
//Formatter::off
|
||||
e.getRegistry().registerAll(
|
||||
new Item(new Properties().group(ActuallyAdditions.GROUP)).setRegistryName("black_quartz")
|
||||
);
|
||||
//Formatter::on
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "actuallyadditions:block/black_quartz_block" }
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "actuallyadditions:block/black_quartz_ore" }
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"variants": {
|
||||
"axis=y": { "model": "actuallyadditions:block/black_quartz_pillar" },
|
||||
"axis=z": { "model": "actuallyadditions:block/black_quartz_pillar", "x": 90 },
|
||||
"axis=x": { "model": "actuallyadditions:block/black_quartz_pillar", "x": 90, "y": 90 }
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"variants": {
|
||||
"type=bottom": { "model": "actuallyadditions:block/black_quartz_slab" },
|
||||
"type=top": { "model": "actuallyadditions:block/black_quartz_slab_top" },
|
||||
"type=double": { "model": "actuallyadditions:block/black_quartz_block" }
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "actuallyadditions:block/block_black_quartz" }
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"variants": {
|
||||
"": { "model": "actuallyadditions:block/chiseled_black_quartz_block" }
|
||||
}
|
||||
}
|
||||
|
|
@ -1,11 +1,9 @@
|
|||
{
|
||||
"testkey": "testvalue",
|
||||
|
||||
"itemGroup.actuallyadditions": "Actually Additions",
|
||||
"item.actuallyadditions.black_quartz": "Black Quartz",
|
||||
|
||||
|
||||
"block.actuallyadditions.block_black_quartz": "Black Quarts Block",
|
||||
|
||||
|
||||
"itemGroup.actuallyadditions": "Actually Additions"
|
||||
"block.actuallyadditions.black_quartz_block": "Black Quartz Block",
|
||||
"block.actuallyadditions.chiseled_black_quartz_block": "Chiseled Black Quartz Block",
|
||||
"block.actuallyadditions.black_quartz_pillar": "Black Quartz Pillar",
|
||||
"block.actuallyadditions.black_quartz_slab": "Black Quartz Slab",
|
||||
"block.actuallyadditions.black_quartz_ore": "Black Quartz Ore"
|
||||
}
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "block/cube_all",
|
||||
"textures": {
|
||||
"all": "actuallyadditions:block/black_quartz"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "block/cube_all",
|
||||
"textures": {
|
||||
"all": "actuallyadditions:block/black_quartz_ore"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"parent": "block/cube_column",
|
||||
"textures": {
|
||||
"end": "actuallyadditions:block/black_quartz_pillar",
|
||||
"side": "actuallyadditions:block/black_quartz_pillar"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"parent": "block/slab",
|
||||
"textures": {
|
||||
"bottom": "actuallyadditions:block/black_quartz",
|
||||
"top": "actuallyadditions:block/black_quartz",
|
||||
"side": "actuallyadditions:block/black_quartz"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"parent": "block/slab_top",
|
||||
"textures": {
|
||||
"bottom": "actuallyadditions:block/black_quartz",
|
||||
"top": "actuallyadditions:block/black_quartz",
|
||||
"side": "actuallyadditions:block/black_quartz"
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
{
|
||||
"parent": "block/cube_all",
|
||||
"textures": {
|
||||
"all": "actuallyadditions:block/block_black_quartz"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"parent": "block/cube_all",
|
||||
"textures": {
|
||||
"all": "actuallyadditions:block/chiseled_black_quartz"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"parent": "actuallyadditions:block/black_quartz_block"
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"parent": "actuallyadditions:block/black_quartz_ore"
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"parent": "actuallyadditions:block/black_quartz_pillar"
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"parent": "actuallyadditions:block/black_quartz_slab"
|
||||
}
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
{
|
||||
"parent": "actuallyadditions:block/block_black_quartz"
|
||||
}
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
{
|
||||
"parent": "actuallyadditions:block/chiseled_black_quartz_block"
|
||||
}
|
||||
|
Before Width: | Height: | Size: 431 B After Width: | Height: | Size: 431 B |
Binary file not shown.
|
After Width: | Height: | Size: 591 B |
|
Before Width: | Height: | Size: 424 B After Width: | Height: | Size: 424 B |
|
Before Width: | Height: | Size: 432 B After Width: | Height: | Size: 432 B |
|
|
@ -6,7 +6,7 @@
|
|||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "actuallyadditions:block_black_quartz"
|
||||
"name": "actuallyadditions:black_quartz_block"
|
||||
}
|
||||
],
|
||||
"conditions": [
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
{
|
||||
"type": "minecraft:block",
|
||||
"pools": [
|
||||
{
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "actuallyadditions:black_quartz_ore"
|
||||
}
|
||||
],
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "minecraft:survives_explosion"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
{
|
||||
"type": "minecraft:block",
|
||||
"pools": [
|
||||
{
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "actuallyadditions:black_quartz_pillar"
|
||||
}
|
||||
],
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "minecraft:survives_explosion"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,32 @@
|
|||
{
|
||||
"type": "minecraft:block",
|
||||
"pools": [
|
||||
{
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"functions": [
|
||||
{
|
||||
"function": "minecraft:set_count",
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "minecraft:block_state_property",
|
||||
"block": "actuallyadditions:black_quartz_slab",
|
||||
"properties": {
|
||||
"type": "double"
|
||||
}
|
||||
}
|
||||
],
|
||||
"count": 2
|
||||
},
|
||||
{
|
||||
"function": "minecraft:explosion_decay"
|
||||
}
|
||||
],
|
||||
"name": "actuallyadditions:black_quartz_slab"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
{
|
||||
"type": "minecraft:block",
|
||||
"pools": [
|
||||
{
|
||||
"rolls": 1,
|
||||
"entries": [
|
||||
{
|
||||
"type": "minecraft:item",
|
||||
"name": "actuallyadditions:chiseled_black_quartz_block"
|
||||
}
|
||||
],
|
||||
"conditions": [
|
||||
{
|
||||
"condition": "minecraft:survives_explosion"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"type": "minecraft:smelting",
|
||||
"ingredient": {
|
||||
"item": "actuallyadditions:black_quartz_ore"
|
||||
},
|
||||
"result": "actuallyadditions:black_quartz",
|
||||
"experience": 0.7,
|
||||
"cookingtime": 200
|
||||
}
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
{
|
||||
"type": "minecraft:blasting",
|
||||
"ingredient": {
|
||||
"item": "actuallyadditions:black_quartz_ore"
|
||||
},
|
||||
"result": "actuallyadditions:black_quartz",
|
||||
"experience": 0.7,
|
||||
"cookingtime": 100
|
||||
}
|
||||
|
|
@ -10,6 +10,6 @@
|
|||
}
|
||||
},
|
||||
"result": {
|
||||
"item": "actuallyadditions:block_black_quartz"
|
||||
"item": "actuallyadditions:black_quartz_block"
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"pattern": [
|
||||
"#",
|
||||
"#"
|
||||
],
|
||||
"key": {
|
||||
"#": {
|
||||
"item": "actuallyadditions:black_quartz_block"
|
||||
}
|
||||
},
|
||||
"result": {
|
||||
"item": "actuallyadditions:black_quartz_pillar",
|
||||
"count": 2
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"pattern": [
|
||||
"###"
|
||||
],
|
||||
"key": {
|
||||
"#": {
|
||||
"item": "actuallyadditions:black_quartz_block"
|
||||
}
|
||||
},
|
||||
"result": {
|
||||
"item": "actuallyadditions:black_quartz_slab",
|
||||
"count": 6
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"type": "minecraft:crafting_shaped",
|
||||
"pattern": [
|
||||
"#",
|
||||
"#"
|
||||
],
|
||||
"key": {
|
||||
"#": {
|
||||
"item": "actuallyadditions:black_quartz_slab"
|
||||
}
|
||||
},
|
||||
"result": {
|
||||
"item": "actuallyadditions:chiseled_black_quartz_block"
|
||||
}
|
||||
}
|
||||
Loading…
Reference in a new issue