From 7cb97d4bb6a6073a736ad3403951821ef5d98b90 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Sun, 30 Aug 2020 17:18:29 -0400 Subject: [PATCH] 1.0.1 --- CHANGELOG.md | 5 ++ gradle.properties | 2 +- .../laser/IndustrialLaserRegistry.java | 5 +- .../models/block/lightning_rod_base.json | 2 +- .../models/block/lightning_rod_lower.json | 2 +- .../models/block/lightning_rod_upper.json | 2 +- .../textures/block/gold_block.png | Bin 416 -> 0 bytes .../assets/energonrelics/lang/en_us.json | 18 +++++- .../models/block/lightning_rod_base.json | 2 +- .../textures/block/lightning_rod_base.png | Bin 282 -> 0 bytes .../advancements/craft_multimeter.json | 26 ++++++++ .../advancements/craft_network_chip.json | 26 ++++++++ .../advancements/craft_reactor_core.json | 30 +++++++++ .../advancements/craft_solar_panel.json | 26 ++++++++ .../advancements/craft_switch.json | 26 ++++++++ .../advancements/find_circuit_board.json | 57 ++++++++++++++++++ .../data/energonrelics/advancements/root.json | 30 +++++++++ .../advancements/smelt_veridium_ore.json | 26 ++++++++ .../energonrelics/recipes/network_chip.json | 17 ++++-- 19 files changed, 289 insertions(+), 13 deletions(-) delete mode 100644 src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/gold_block.png delete mode 100644 src/main/resources/assets/energonrelics/textures/block/lightning_rod_base.png create mode 100644 src/main/resources/data/energonrelics/advancements/craft_multimeter.json create mode 100644 src/main/resources/data/energonrelics/advancements/craft_network_chip.json create mode 100644 src/main/resources/data/energonrelics/advancements/craft_reactor_core.json create mode 100644 src/main/resources/data/energonrelics/advancements/craft_solar_panel.json create mode 100644 src/main/resources/data/energonrelics/advancements/craft_switch.json create mode 100644 src/main/resources/data/energonrelics/advancements/find_circuit_board.json create mode 100644 src/main/resources/data/energonrelics/advancements/root.json create mode 100644 src/main/resources/data/energonrelics/advancements/smelt_veridium_ore.json diff --git a/CHANGELOG.md b/CHANGELOG.md index fb07cc8..432693e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +**1.0.1** +* Add Advancements +* Industrial Laser Can Smelt Nether Gold Ore +* Rework Network Chip Recipe + **1.0.8** * Update Textures diff --git a/gradle.properties b/gradle.properties index f1b6845..7899a0c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ org.gradle.jvmargs = -Xmx1G fabric_loader_version = 0.9.2+build.206 # Mod Properties - mod_version = 1.0.0 + mod_version = 1.0.1 maven_group = com.thebrokenrail # Dependencies diff --git a/src/main/java/com/thebrokenrail/energonrelics/registry/laser/IndustrialLaserRegistry.java b/src/main/java/com/thebrokenrail/energonrelics/registry/laser/IndustrialLaserRegistry.java index 325a572..bdde735 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/registry/laser/IndustrialLaserRegistry.java +++ b/src/main/java/com/thebrokenrail/energonrelics/registry/laser/IndustrialLaserRegistry.java @@ -34,7 +34,9 @@ public class IndustrialLaserRegistry { return new ItemStack(ingot, count); }); - map.put(storage, random -> new ItemStack(ingot, HardcodedConfig.INDUSTRIAL_LASER_INGOTS_FROM_STORAGE)); + if (storage != null) { + map.put(storage, random -> new ItemStack(ingot, HardcodedConfig.INDUSTRIAL_LASER_INGOTS_FROM_STORAGE)); + } } /** @@ -62,6 +64,7 @@ public class IndustrialLaserRegistry { add(Blocks.COAL_ORE, Items.COAL, Blocks.COAL_BLOCK); add(Blocks.IRON_ORE, Items.IRON_INGOT, Blocks.IRON_BLOCK); add(Blocks.GOLD_ORE, Items.GOLD_INGOT, Blocks.GOLD_BLOCK); + add(Blocks.NETHER_GOLD_ORE, Items.GOLD_INGOT, null); add(Blocks.DIAMOND_ORE, Items.DIAMOND, Blocks.DIAMOND_BLOCK); add(Blocks.EMERALD_ORE, Items.EMERALD, Blocks.EMERALD_BLOCK); add(EnergonRelics.Blocks.VERIDIUM_ORE, EnergonRelics.Items.VERIDIUM_INGOT, EnergonRelics.Blocks.VERIDIUM_BLOCK); diff --git a/src/main/resources/assets/energonrelics-azazelthedemonlord/models/block/lightning_rod_base.json b/src/main/resources/assets/energonrelics-azazelthedemonlord/models/block/lightning_rod_base.json index 1ced6c3..d045ed1 100644 --- a/src/main/resources/assets/energonrelics-azazelthedemonlord/models/block/lightning_rod_base.json +++ b/src/main/resources/assets/energonrelics-azazelthedemonlord/models/block/lightning_rod_base.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/block", "textures": { - "0": "energonrelics:block/gold_block", + "0": "minecraft:block/gold_block", "1": "energonrelics:block/lightning_rod_base", "particle": "#1" }, diff --git a/src/main/resources/assets/energonrelics-azazelthedemonlord/models/block/lightning_rod_lower.json b/src/main/resources/assets/energonrelics-azazelthedemonlord/models/block/lightning_rod_lower.json index 2236fd6..de1e675 100644 --- a/src/main/resources/assets/energonrelics-azazelthedemonlord/models/block/lightning_rod_lower.json +++ b/src/main/resources/assets/energonrelics-azazelthedemonlord/models/block/lightning_rod_lower.json @@ -2,7 +2,7 @@ "credit": "Made by Azazelthedemonlord", "textures": { "0": "energonrelics:block/lightning_rod", - "particle": "energonrelics:block/gold_block" + "particle": "minecraft:block/gold_block" }, "elements": [ { diff --git a/src/main/resources/assets/energonrelics-azazelthedemonlord/models/block/lightning_rod_upper.json b/src/main/resources/assets/energonrelics-azazelthedemonlord/models/block/lightning_rod_upper.json index 6c6e4c4..00fe18e 100644 --- a/src/main/resources/assets/energonrelics-azazelthedemonlord/models/block/lightning_rod_upper.json +++ b/src/main/resources/assets/energonrelics-azazelthedemonlord/models/block/lightning_rod_upper.json @@ -3,7 +3,7 @@ "textures": { "0": "energonrelics:block/lightning_rod", "1": "energonrelics:block/lightning_rod_base", - "particle": "energonrelics:block/gold_block" + "particle": "minecraft:block/gold_block" }, "elements": [ { diff --git a/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/gold_block.png b/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/gold_block.png deleted file mode 100644 index 289618fe2b1df15b2a4f3c4525bac43a2218ba11..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 416 zcmV;R0bl-!P)^i#E+vDZAs7^4gTWnS zD^h;?Ew+B1SMT>qV)uU25tOW20NRN>nj30Z`+gfE0o2_ST`~tiY!(1qOz-!^cIm#q zTeo)o=*Dj^PM}NXh}AOyU8WG14-sTd895vMyt+NW-scIpGY#Uv_9&l4uB5D5#Ae}O zoyKr&v8Dt->4Gj(uFcwlPGbk6pEw7TPo0~grS+PomL%;&LJ(MI8sCo6g@;e&ahyR9 zdz-xw2adu_5?QsdU7m-7aR@72kY-~N4(dNx=>iCD0(yb|f%wh&6rt0jlL6G#EdbV( zH1*C2SW`yuAZktN`?jX^YoTxy;<>afC8K;6U9Zc)I00F;ba|Y1_;i&npg(nRZ~zW3Qs|VX-XT9$69AfeN1BcO|4?aW`nhmy{GLBt^4h1VxtNgv0000< KMNUMnLSTZ~3bxV! diff --git a/src/main/resources/assets/energonrelics/lang/en_us.json b/src/main/resources/assets/energonrelics/lang/en_us.json index b903fe5..db52335 100644 --- a/src/main/resources/assets/energonrelics/lang/en_us.json +++ b/src/main/resources/assets/energonrelics/lang/en_us.json @@ -65,5 +65,21 @@ "block.energonrelics.phase_shifter": "Phase Shifter", "text.energonrelics.phase_shifter_extra": "Phased Items: %s", "category.rei.energonrelics.information.structure_generation.title": "Structures", - "category.rei.energonrelics.information.structure_generation.research_complex": "Found In The Research Complex Underground Structure" + "category.rei.energonrelics.information.structure_generation.research_complex": "Found In The Research Complex Underground Structure", + "advancements.energonrelics.root.title": "EnergonRelics", + "advancements.energonrelics.root.description": "A Simple Technology Mod", + "advancements.energonrelics.find_circuit_board.title": "Mysterious Machines", + "advancements.energonrelics.find_circuit_board.description": "Find a Circuit Board", + "advancements.energonrelics.craft_solar_panel.title": "Power of The Sun", + "advancements.energonrelics.craft_solar_panel.description": "Craft a Solar Panel", + "advancements.energonrelics.craft_network_chip.title": "Invisible Wires", + "advancements.energonrelics.craft_network_chip.description": "Craft a Network Chip", + "advancements.energonrelics.smelt_veridium_ore.title": "Hidden Power", + "advancements.energonrelics.smelt_veridium_ore.description": "Smelt Veridium Ore", + "advancements.energonrelics.craft_switch.title": "Logical Constellations", + "advancements.energonrelics.craft_switch.description": "Craft a Switch", + "advancements.energonrelics.craft_multimeter.title": "Measuring Madness", + "advancements.energonrelics.craft_multimeter.description": "Craft a Multimeter", + "advancements.energonrelics.craft_reactor_core.title": "Artificial Star", + "advancements.energonrelics.craft_reactor_core.description": "Craft a Reactor Core" } \ No newline at end of file diff --git a/src/main/resources/assets/energonrelics/models/block/lightning_rod_base.json b/src/main/resources/assets/energonrelics/models/block/lightning_rod_base.json index 5cf475f..6e7ea93 100644 --- a/src/main/resources/assets/energonrelics/models/block/lightning_rod_base.json +++ b/src/main/resources/assets/energonrelics/models/block/lightning_rod_base.json @@ -1,7 +1,7 @@ { "parent": "minecraft:block/block", "textures": { - "1": "energonrelics:block/lightning_rod_base", + "1": "minecraft:block/blackstone", "particle": "#1" }, "elements": [ diff --git a/src/main/resources/assets/energonrelics/textures/block/lightning_rod_base.png b/src/main/resources/assets/energonrelics/textures/block/lightning_rod_base.png deleted file mode 100644 index 265aa349a44a1f8389b87df8007642ed4ad4278a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 282 zcmV+#0piiM4WU}IxrBMA0a2v+|8ubj-nJ7$Lzx!b*D zX0n;Rx?RufHF4bSSI;TluVuV1htmkHOAi$*NU-k+oMaF<5Oqir2-s_?Q=%vd zzMtPDrgzawDyhJM3P2Nq7iEh%*p?uNlf~(fgSR833NB