diff --git a/.gitignore b/.gitignore index 45a3bec5d..771e78b6f 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,5 @@ .settings/org.eclipse.buildship.core.prefs *.launch .settings/org.eclipse.jdt.core.prefs -*.prefs \ No newline at end of file +*.prefs +/run/ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java index fc581ec09..4a7490a31 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/ActuallyAdditions.java @@ -10,28 +10,36 @@ 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; 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 ActuallyAdditions() { FMLJavaModLoadingContext ctx = FMLJavaModLoadingContext.get(); ctx.getModEventBus().register(this); + } @SubscribeEvent public void setup(FMLCommonSetupEvent e) { - + } - } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/block/AABlocks.java b/src/main/java/de/ellpeck/actuallyadditions/mod/block/AABlocks.java index 9e86a2651..b854446cd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/block/AABlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/block/AABlocks.java @@ -2,7 +2,9 @@ package de.ellpeck.actuallyadditions.mod.block; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import net.minecraft.block.Block; -import net.minecraft.item.Item; +import net.minecraft.block.Block.Properties; +import net.minecraft.block.material.Material; +import net.minecraft.item.*; import net.minecraftforge.event.RegistryEvent.Register; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; @@ -12,15 +14,17 @@ 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; @SubscribeEvent public static void register(Register e) { - + e.getRegistry().register(new Block(Properties.create(Material.ROCK).hardnessAndResistance(0.8F)).setRegistryName("block_black_quartz")); //Values from the QUARTZ_BLOCK } @SubscribeEvent public static void registerItemBlocks(Register e) { - + e.getRegistry().register(new BlockItem(BLACK_QUARTZ, new Item.Properties().group(ActuallyAdditions.itemGroup)).setRegistryName(BLACK_QUARTZ.getRegistryName())); } - -} +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/item/AAItems.java b/src/main/java/de/ellpeck/actuallyadditions/mod/item/AAItems.java index 8ff27d9bc..9887b8151 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/item/AAItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/item/AAItems.java @@ -2,6 +2,7 @@ package de.ellpeck.actuallyadditions.mod.item; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import net.minecraft.item.Item; +import net.minecraft.item.Item.Properties; import net.minecraftforge.event.RegistryEvent.Register; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; @@ -12,9 +13,12 @@ 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"); + @SubscribeEvent public static void register(Register e) { - + e.getRegistry().register(black_quartz); } } diff --git a/src/main/resources/assets/actuallyadditions/blockstates/block_black_quartz.json b/src/main/resources/assets/actuallyadditions/blockstates/block_black_quartz.json new file mode 100644 index 000000000..653809d0e --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/blockstates/block_black_quartz.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "actuallyadditions:block/block_black_quartz" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/lang/en_us.json b/src/main/resources/assets/actuallyadditions/lang/en_us.json index a2c634aa7..10c99ed00 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_us.json +++ b/src/main/resources/assets/actuallyadditions/lang/en_us.json @@ -1,3 +1,11 @@ { - "testkey": "testvalue" + "testkey": "testvalue", + + "item.actuallyadditions.black_quartz": "Black Quartz", + + + "block.actuallyadditions.block_black_quartz": "Black Quarts Block", + + + "itemGroup.actuallyadditions": "Actually Additions" } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/block/block_black_quartz.json b/src/main/resources/assets/actuallyadditions/models/block/block_black_quartz.json new file mode 100644 index 000000000..37c7f20bc --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/block/block_black_quartz.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "actuallyadditions:block/block_black_quartz" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/black_quartz.json b/src/main/resources/assets/actuallyadditions/models/item/black_quartz.json new file mode 100644 index 000000000..5e4ad0e1b --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/black_quartz.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "actuallyadditions:item/black_quartz" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/block_black_quartz.json b/src/main/resources/assets/actuallyadditions/models/item/block_black_quartz.json new file mode 100644 index 000000000..790c90993 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/block_black_quartz.json @@ -0,0 +1,3 @@ +{ + "parent": "actuallyadditions:block/block_black_quartz" +} diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_black_quartz.png b/src/main/resources/assets/actuallyadditions/textures/block/block_black_quartz.png new file mode 100644 index 000000000..bd2ad36f8 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/block/block_black_quartz.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_black_quartz_chiseled.png b/src/main/resources/assets/actuallyadditions/textures/block/block_black_quartz_chiseled.png new file mode 100644 index 000000000..8b6b869a2 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/block/block_black_quartz_chiseled.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/block/block_black_quartz_pillar.png b/src/main/resources/assets/actuallyadditions/textures/block/block_black_quartz_pillar.png new file mode 100644 index 000000000..9dfd48544 Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/block/block_black_quartz_pillar.png differ diff --git a/src/main/resources/assets/actuallyadditions/textures/item/black_quartz.png b/src/main/resources/assets/actuallyadditions/textures/item/black_quartz.png new file mode 100644 index 000000000..d87546eee Binary files /dev/null and b/src/main/resources/assets/actuallyadditions/textures/item/black_quartz.png differ diff --git a/src/main/resources/data/actuallyadditions/loot_tables/blocks/block_black_quartz.json b/src/main/resources/data/actuallyadditions/loot_tables/blocks/block_black_quartz.json new file mode 100644 index 000000000..8c47df04a --- /dev/null +++ b/src/main/resources/data/actuallyadditions/loot_tables/blocks/block_black_quartz.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "actuallyadditions:block_black_quartz" + } + ], + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ] + } + ] +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/recipes/black_quartz_block.json b/src/main/resources/data/actuallyadditions/recipes/black_quartz_block.json new file mode 100644 index 000000000..5369d40ea --- /dev/null +++ b/src/main/resources/data/actuallyadditions/recipes/black_quartz_block.json @@ -0,0 +1,15 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "##", + "##" + ], + "key": { + "#": { + "item": "actuallyadditions:black_quartz" + } + }, + "result": { + "item": "actuallyadditions:block_black_quartz" + } +} \ No newline at end of file