From 1e5c26879e2de31ded967e1d43dc99a18effd977 Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Thu, 2 Jul 2015 01:39:15 +0200 Subject: [PATCH] Version 0.0.6.3! & Crafting Recipes for Lamps --- build.gradle | 2 +- .../config/values/ConfigCrafting.java | 3 ++- .../actuallyadditions/crafting/BlockCrafting.java | 11 +++++++++++ .../java/ellpeck/actuallyadditions/util/ModUtil.java | 2 +- update/changelog.txt | 2 +- update/newestVersion.txt | 2 +- 6 files changed, 17 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index df88062ee..0e4a9f207 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { apply plugin: 'forge' apply plugin: 'maven' -version = "1.7.10-0.0.6.2" +version = "1.7.10-0.0.6.3" group = "ellpeck.actuallyadditions" archivesBaseName = "ActuallyAdditions" diff --git a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java index 912dccd6c..ee1dacf8d 100644 --- a/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/config/values/ConfigCrafting.java @@ -106,7 +106,8 @@ public enum ConfigCrafting{ ENERGIZER("Energizer", ConfigCategories.BLOCKS_CRAFTING), ENERVATOR("Enervator", ConfigCategories.BLOCKS_CRAFTING), - QUARTZ("Black Quartz in a Crafting Table (as a Backup if there's no Ores to be found anywhere)", ConfigCategories.ITEMS_CRAFTING); + QUARTZ("Black Quartz in a Crafting Table (as a Backup if there's no Ores to be found anywhere)", ConfigCategories.ITEMS_CRAFTING), + LAMPS("Lamps", ConfigCategories.BLOCKS_CRAFTING); public final String name; public final String category; diff --git a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java index b8e39898e..a9a2d3677 100644 --- a/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java +++ b/src/main/java/ellpeck/actuallyadditions/crafting/BlockCrafting.java @@ -1,6 +1,7 @@ package ellpeck.actuallyadditions.crafting; import cpw.mods.fml.common.registry.GameRegistry; +import ellpeck.actuallyadditions.blocks.BlockColoredLamp; import ellpeck.actuallyadditions.blocks.InitBlocks; import ellpeck.actuallyadditions.blocks.metalists.TheMiscBlocks; import ellpeck.actuallyadditions.config.values.ConfigCrafting; @@ -339,6 +340,16 @@ public class BlockCrafting{ 'D', Blocks.dropper, 'R', TheMiscItems.COIL_ADVANCED.getOredictName())); + if(ConfigCrafting.LAMPS.isEnabled()){ + for(int i = 0; i < BlockColoredLamp.allLampTypes.length; i++){ + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(InitBlocks.blockColoredLamp, 6, i), + "GGG", "DQD", "GGG", + 'G', "glowstone", + 'D', "dye"+BlockColoredLamp.allLampTypes[i].name, + 'Q', TheMiscItems.QUARTZ.getOredictName())); + } + } + } } diff --git a/src/main/java/ellpeck/actuallyadditions/util/ModUtil.java b/src/main/java/ellpeck/actuallyadditions/util/ModUtil.java index 311925da6..228441c60 100644 --- a/src/main/java/ellpeck/actuallyadditions/util/ModUtil.java +++ b/src/main/java/ellpeck/actuallyadditions/util/ModUtil.java @@ -5,7 +5,7 @@ import org.apache.logging.log4j.Logger; public class ModUtil{ - public static final String VERSION = "1.7.10-0.0.6.2"; + public static final String VERSION = "1.7.10-0.0.6.3"; public static final String MOD_ID = "ActuallyAdditions"; public static final String NAME = "Actually Additions"; diff --git a/update/changelog.txt b/update/changelog.txt index cb483726c..ef3608e81 100644 --- a/update/changelog.txt +++ b/update/changelog.txt @@ -1 +1 @@ -Really Important Fix for the Drill! \ No newline at end of file +LAMPS! and major and minor tweaks and changes, lots of bugs fixed \ No newline at end of file diff --git a/update/newestVersion.txt b/update/newestVersion.txt index 469a92910..c3b5a6067 100644 --- a/update/newestVersion.txt +++ b/update/newestVersion.txt @@ -1 +1 @@ -1.7.10-0.0.6.2 \ No newline at end of file +1.7.10-0.0.6.3 \ No newline at end of file