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 6d95a1206..3703b6aac 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/item/AAItems.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/item/AAItems.java @@ -3,6 +3,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.minecraft.util.ResourceLocation; import net.minecraftforge.event.RegistryEvent.Register; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod.EventBusSubscriber; @@ -14,12 +15,18 @@ import net.minecraftforge.registries.ObjectHolder; public class AAItems { public static final Item BLACK_QUARTZ = null; + public static final BurnableItem TINY_COAL = null; + public static final BurnableItem TINY_CHARCOAL = null; + public static final BurnableItem BIOCOAL = null; @SubscribeEvent public static void register(Register e) { //Formatter::off e.getRegistry().registerAll( - new Item(new Properties().group(ActuallyAdditions.GROUP)).setRegistryName("black_quartz") + new Item(new Properties().group(ActuallyAdditions.GROUP)).setRegistryName("black_quartz"), + new BurnableItem(new ResourceLocation(ActuallyAdditions.MODID, "tiny_coal"), 200), + new BurnableItem(new ResourceLocation(ActuallyAdditions.MODID, "tiny_charcoal"), 200), + new BurnableItem(new ResourceLocation(ActuallyAdditions.MODID, "biocoal"), 800) ); //Formatter::on } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/item/BurnableItem.java b/src/main/java/de/ellpeck/actuallyadditions/mod/item/BurnableItem.java new file mode 100644 index 000000000..18c76a89c --- /dev/null +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/item/BurnableItem.java @@ -0,0 +1,26 @@ +package de.ellpeck.actuallyadditions.mod.item; + +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; + +public class BurnableItem extends Item { + + private static final Properties PROPERTIES = new Properties().group(ActuallyAdditions.GROUP); + + private final int burnTime; + + public BurnableItem(ResourceLocation registryName, int burnTime){ + super(PROPERTIES); + + this.burnTime = burnTime; + + this.setRegistryName(registryName); + } + + @Override + public int getBurnTime(ItemStack itemStack){ + return this.burnTime; + } +} diff --git a/src/main/resources/assets/actuallyadditions/lang/en_us.json b/src/main/resources/assets/actuallyadditions/lang/en_us.json index cc9f0a921..47fb7cfc3 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_us.json +++ b/src/main/resources/assets/actuallyadditions/lang/en_us.json @@ -1,6 +1,9 @@ { "itemGroup.actuallyadditions": "Actually Additions", "item.actuallyadditions.black_quartz": "Black Quartz", + "item.actuallyadditions.tiny_coal": "Tiny Coal", + "item.actuallyadditions.tiny_charcoal": "Tiny Charcoal", + "item.actuallyadditions.biocoal": "Biocoal", "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", @@ -23,5 +26,4 @@ "block.actuallyadditions.red_lamp": "Red Lamp", "block.actuallyadditions.black_lamp": "Black Lamp", "block.actuallyadditions.tiny_torch": "Tiny Torch" - } \ No newline at end of file diff --git a/src/main/resources/assets/actuallyadditions/models/item/biocoal.json b/src/main/resources/assets/actuallyadditions/models/item/biocoal.json new file mode 100644 index 000000000..701a942ca --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/biocoal.json @@ -0,0 +1,6 @@ +{ + "parent": "actuallyadditions:item/standard_item", + "textures": { + "layer0": "actuallyadditions:item/biocoal" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/tiny_charcoal.json b/src/main/resources/assets/actuallyadditions/models/item/tiny_charcoal.json new file mode 100644 index 000000000..42933e466 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/tiny_charcoal.json @@ -0,0 +1,6 @@ +{ + "parent": "actuallyadditions:item/standard_item", + "textures": { + "layer0": "actuallyadditions:item/tiny_charcoal" + } +} diff --git a/src/main/resources/assets/actuallyadditions/models/item/tiny_coal.json b/src/main/resources/assets/actuallyadditions/models/item/tiny_coal.json new file mode 100644 index 000000000..65c9fc333 --- /dev/null +++ b/src/main/resources/assets/actuallyadditions/models/item/tiny_coal.json @@ -0,0 +1,6 @@ +{ + "parent": "actuallyadditions:item/standard_item", + "textures": { + "layer0": "actuallyadditions:item/tiny_coal" + } +} diff --git a/src/main/resources/oldassets/actuallyadditions/textures/items/item_misc_biocoal.png b/src/main/resources/assets/actuallyadditions/textures/item/biocoal.png similarity index 100% rename from src/main/resources/oldassets/actuallyadditions/textures/items/item_misc_biocoal.png rename to src/main/resources/assets/actuallyadditions/textures/item/biocoal.png diff --git a/src/main/resources/oldassets/actuallyadditions/textures/items/item_misc_tiny_charcoal.png b/src/main/resources/assets/actuallyadditions/textures/item/tiny_charcoal.png similarity index 100% rename from src/main/resources/oldassets/actuallyadditions/textures/items/item_misc_tiny_charcoal.png rename to src/main/resources/assets/actuallyadditions/textures/item/tiny_charcoal.png diff --git a/src/main/resources/oldassets/actuallyadditions/textures/items/item_misc_tiny_coal.png b/src/main/resources/assets/actuallyadditions/textures/item/tiny_coal.png similarity index 100% rename from src/main/resources/oldassets/actuallyadditions/textures/items/item_misc_tiny_coal.png rename to src/main/resources/assets/actuallyadditions/textures/item/tiny_coal.png diff --git a/src/main/resources/data/actuallyadditions/recipes/tiny_charcoal.json b/src/main/resources/data/actuallyadditions/recipes/tiny_charcoal.json new file mode 100644 index 000000000..b530d2bda --- /dev/null +++ b/src/main/resources/data/actuallyadditions/recipes/tiny_charcoal.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:charcoal" + } + ], + "result": { + "item": "actuallyadditions:tiny_charcoal", + "count": 9 + } +} \ No newline at end of file diff --git a/src/main/resources/data/actuallyadditions/recipes/tiny_coal.json b/src/main/resources/data/actuallyadditions/recipes/tiny_coal.json new file mode 100644 index 000000000..261afb5b9 --- /dev/null +++ b/src/main/resources/data/actuallyadditions/recipes/tiny_coal.json @@ -0,0 +1,12 @@ +{ + "type": "minecraft:crafting_shapeless", + "ingredients": [ + { + "item": "minecraft:coal" + } + ], + "result": { + "item": "actuallyadditions:tiny_coal", + "count": 9 + } +} \ No newline at end of file