From 56b01b9a19b110a66361d5c7336c7a33d55e334d Mon Sep 17 00:00:00 2001 From: Firestar311 Date: Mon, 11 Nov 2019 20:13:59 -0600 Subject: [PATCH] Added black_quartz and the block form including recipes and drops for the block when broken (#1294) --- .gitignore | 3 ++- .../mod/ActuallyAdditions.java | 18 ++++++++++++----- .../actuallyadditions/mod/block/AABlocks.java | 14 ++++++++----- .../actuallyadditions/mod/item/AAItems.java | 6 +++++- .../blockstates/block_black_quartz.json | 5 +++++ .../assets/actuallyadditions/lang/en_us.json | 10 ++++++++- .../models/block/block_black_quartz.json | 6 ++++++ .../models/item/black_quartz.json | 6 ++++++ .../models/item/block_black_quartz.json | 3 +++ .../textures/block/block_black_quartz.png | Bin 0 -> 431 bytes .../block/block_black_quartz_chiseled.png | Bin 0 -> 432 bytes .../block/block_black_quartz_pillar.png | Bin 0 -> 424 bytes .../textures/item/black_quartz.png | Bin 0 -> 549 bytes .../blocks/block_black_quartz.json | 19 ++++++++++++++++++ .../recipes/black_quartz_block.json | 15 ++++++++++++++ 15 files changed, 92 insertions(+), 13 deletions(-) create mode 100644 src/main/resources/assets/actuallyadditions/blockstates/block_black_quartz.json create mode 100644 src/main/resources/assets/actuallyadditions/models/block/block_black_quartz.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/black_quartz.json create mode 100644 src/main/resources/assets/actuallyadditions/models/item/block_black_quartz.json create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_black_quartz.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_black_quartz_chiseled.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/block/block_black_quartz_pillar.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/item/black_quartz.png create mode 100644 src/main/resources/data/actuallyadditions/loot_tables/blocks/block_black_quartz.json create mode 100644 src/main/resources/data/actuallyadditions/recipes/black_quartz_block.json 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 0000000000000000000000000000000000000000..bd2ad36f8efe6e209591dcabde9d2d637d30aa07 GIT binary patch literal 431 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDMfiPqHot61OL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ=4@yqg0@w3Z5>GAr}6nlcMvQ4Fp_oIxyGWZm9fcy5)C#-1{Fw$GbvaYHWHaSDohc zUBc#Ns6@%1SF#$nSDab#CPboIR{j*TAlqDyIg3u-YI$?KSz>zQw#$3$^BLILPA zWmpT{QD!>T5OsNNz+#`~r#oB@l$!F+e5ti(UcZ@+(t@2@EiYAiu9+M(dmr9@O!I+9 z$Q`cSSyPrx<(Xo-;q-r*FW;pYfh}i!O-y}+ XmTRW8``rh?@MQ3G^>bP0l+XkKZ6K%~ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8b6b869a28e61da3a2881643eaafb0b1ffc1a94d GIT binary patch literal 432 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sDMfiPqHot61OL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ=4@yqg0@wik>cxAr}6jlP=~p8}PV(-jm78smNJ!K}=39H$(sL|N7e-^-irQNwM6v z{w>R$rKb zVx73}OazO-WtADl98#;;blvh_i3pzFwOj96-3-m#-vPWl6B&Mgd#55Q%pVg27ed0k*x zqqo2Djlc#r-Y+6rhrAe0-7>tb`d>Yx`k;AMzq5>dTa`KE&V~0ZmKOy_>6%XF;0qJq z;9Z=-yJ79Ej&GeR0;jjlR_N!KHlNiX_s2jfboR=7DUnYEOax9m{C+Hc+kIi{Gq3-# YZ}SYvV6W>u0Sr(EPgg&ebxsLQ0E5@2OaK4? literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..9dfd4854457419a06cbb38e6f764c6e62a542eae GIT binary patch literal 424 zcmV;Z0ayNsP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGirT_pArU8fCsc!%P02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;VI^GGzb&0U1d|K~y+Tg_7$|gfJ9@c>xzn3+1w9xkNX* z_-o()-Tdm*in@u(kPKzMb9!2e^?E;5EyAFuvO)634#ti0W!;@j%oIfX@Qlv$+jx1+ zJ}fu+X?xH9yxbB%fzo)Xs(b4LYKIloZjgu(j$5K$P9K3BMaB)p;+A;msHpn>6`x?j zvPYmaot6Zo+RZ3wF@J?Am|aWc1hm7V{p4IWX$B5Qg#|SI45O_df$tdrat(FJO%RJB z6QJBfK#TyHY26EMpbsxc;FnUl82g%mW3An&8V?0v+d%m=1J3!$`3p>Cdv!a?`iU#& zABg}7YBb%90DeU4j$6lkp4&=n+V%v*mv!gglIPsAr!bOFGuS5hal`!YulElI6HuF$ SBNZk90000N2bZe?^J zG%heMHD!e|WdHyHqe(~bi_{ckoo895>526DNL^RS-al((@}5LWisCTgkdz=WVq^jVf?Hgrl`Qi(ipPII ztkWnpXE|FFg`;x{PjImyk>J^i?7>T`1(i0ejT&A=qvl-}pUS) zrIx)zpc7<{8z(p%WTFUQk9;|EQoCWEbiyhzYRUcYx>SU)jTDLBg0kS_4Ot}y1uh6& z=h4sO=;nx{I?)y$@P-(+``A1PoGL(wK}XmVZHppLRgQ$-Lac_p=*PDz;iI*_r_}x8 z)WsvfWDEY&vh{C5x0BpcTz>_az(oRP*XGy)VH3(*`W3i0;}&6}iXd>#j|i($l;3Xw z-XA>*ig1Det|)fA^@fp~MZoN{ErVx0JvgvCZX#x%C$IzFQq+;4!B|&V??H=EuW`T$ zm