1.0.1

3 years ago · 7cb97d4bb6
parent a754b43b7c
commit 7cb97d4bb6
19 changed files with 289 additions and 13 deletions
--- 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

--- 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
--- 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);
--- 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"
 	},
--- 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": [
 		{
--- 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": [
 		{
--- a/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/gold_block.png
+++ b/src/main/resources/assets/energonrelics-azazelthedemonlord/textures/block/gold_block.png
--- 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"
 }
--- 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": [
--- a/src/main/resources/assets/energonrelics/textures/block/lightning_rod_base.png
+++ b/src/main/resources/assets/energonrelics/textures/block/lightning_rod_base.png
--- a/src/main/resources/data/energonrelics/advancements/craft_multimeter.json
+++ b/src/main/resources/data/energonrelics/advancements/craft_multimeter.json
@ -0,0 +1,26 @@
+{
+    "display": {
+        "icon": {
+            "item": "energonrelics:multimeter"
+        },
+        "title": {
+            "translate": "advancements.energonrelics.craft_multimeter.title"
+        },
+        "description": {
+            "translate": "advancements.energonrelics.craft_multimeter.description"
+        }
+    },
+    "parent": "energonrelics:craft_network_chip",
+    "criteria": {
+        "chest_boat": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [
+                    {
+                        "item": "energonrelics:multimeter"
+                    }
+                ]
+            }
+        }
+    }
+}
--- a/src/main/resources/data/energonrelics/advancements/craft_network_chip.json
+++ b/src/main/resources/data/energonrelics/advancements/craft_network_chip.json
@ -0,0 +1,26 @@
+{
+    "display": {
+        "icon": {
+            "item": "energonrelics:network_chip"
+        },
+        "title": {
+            "translate": "advancements.energonrelics.craft_network_chip.title"
+        },
+        "description": {
+            "translate": "advancements.energonrelics.craft_network_chip.description"
+        }
+    },
+    "parent": "energonrelics:find_circuit_board",
+    "criteria": {
+        "chest_boat": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [
+                    {
+                        "item": "energonrelics:network_chip"
+                    }
+                ]
+            }
+        }
+    }
+}
--- a/src/main/resources/data/energonrelics/advancements/craft_reactor_core.json
+++ b/src/main/resources/data/energonrelics/advancements/craft_reactor_core.json
@ -0,0 +1,30 @@
+{
+    "display": {
+        "icon": {
+            "item": "energonrelics:reactor_core"
+        },
+        "title": {
+            "translate": "advancements.energonrelics.craft_reactor_core.title"
+        },
+        "description": {
+            "translate": "advancements.energonrelics.craft_reactor_core.description"
+        },
+        "frame": "goal"
+    },
+    "parent": "energonrelics:smelt_veridium_ore",
+    "rewards": {
+        "experience": 100
+    },
+    "criteria": {
+        "chest_boat": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [
+                    {
+                        "item": "energonrelics:reactor_core"
+                    }
+                ]
+            }
+        }
+    }
+}
--- a/src/main/resources/data/energonrelics/advancements/craft_solar_panel.json
+++ b/src/main/resources/data/energonrelics/advancements/craft_solar_panel.json
@ -0,0 +1,26 @@
+{
+    "display": {
+        "icon": {
+            "item": "energonrelics:solar_panel"
+        },
+        "title": {
+            "translate": "advancements.energonrelics.craft_solar_panel.title"
+        },
+        "description": {
+            "translate": "advancements.energonrelics.craft_solar_panel.description"
+        }
+    },
+    "parent": "energonrelics:find_circuit_board",
+    "criteria": {
+        "chest_boat": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [
+                    {
+                        "item": "energonrelics:solar_panel"
+                    }
+                ]
+            }
+        }
+    }
+}
--- a/src/main/resources/data/energonrelics/advancements/craft_switch.json
+++ b/src/main/resources/data/energonrelics/advancements/craft_switch.json
@ -0,0 +1,26 @@
+{
+    "display": {
+        "icon": {
+            "item": "energonrelics:switch"
+        },
+        "title": {
+            "translate": "advancements.energonrelics.craft_switch.title"
+        },
+        "description": {
+            "translate": "advancements.energonrelics.craft_switch.description"
+        }
+    },
+    "parent": "energonrelics:craft_network_chip",
+    "criteria": {
+        "chest_boat": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [
+                    {
+                        "item": "energonrelics:switch"
+                    }
+                ]
+            }
+        }
+    }
+}
--- a/src/main/resources/data/energonrelics/advancements/find_circuit_board.json
+++ b/src/main/resources/data/energonrelics/advancements/find_circuit_board.json
@ -0,0 +1,57 @@
+{
+    "display": {
+        "icon": {
+            "item": "energonrelics:circuit_board"
+        },
+        "title": {
+            "translate": "advancements.energonrelics.find_circuit_board.title"
+        },
+        "description": {
+            "translate": "advancements.energonrelics.find_circuit_board.description"
+        },
+        "frame": "challenge"
+    },
+    "parent": "energonrelics:root",
+    "rewards": {
+        "experience": 100,
+        "recipes": [
+            "energonrelics:active_battery_controller",
+            "energonrelics:battery_core",
+            "energonrelics:block_breaker",
+            "energonrelics:defensive_laser_core",
+            "energonrelics:defensive_laser",
+            "energonrelics:duplicate_network_chip",
+            "energonrelics:energon_light",
+            "energonrelics:energy_projector",
+            "energonrelics:forcefield_projector",
+            "energonrelics:holographic_sky",
+            "energonrelics:industrial_laser_projector",
+            "energonrelics:infuser",
+            "energonrelics:lightning_rod_base",
+            "energonrelics:multimeter",
+            "energonrelics:network_chip",
+            "energonrelics:passive_battery_controller",
+            "energonrelics:phase_shifter",
+            "energonrelics:reactor_controller",
+            "energonrelics:reactor_core",
+            "energonrelics:reactor_input",
+            "energonrelics:solar_panel",
+            "energonrelics:switch",
+            "energonrelics:thermal_casing",
+            "energonrelics:thermal_glass",
+            "energonrelics:tractor_beam_projector"
+        ]
+    },
+    "criteria": {
+        "chest_boat": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [
+                    {
+                        "item": "energonrelics:circuit_board"
+                    }
+                ]
+            }
+        }
+    }
+}
--- a/src/main/resources/data/energonrelics/advancements/root.json
+++ b/src/main/resources/data/energonrelics/advancements/root.json
@ -0,0 +1,30 @@
+{
+    "display": {
+        "icon": {
+            "item": "energonrelics:network_chip"
+        },
+        "title": {
+            "translate": "advancements.energonrelics.root.title"
+        },
+        "description": {
+            "translate": "advancements.energonrelics.root.description"
+        },
+        "background": "minecraft:textures/block/blackstone.png",
+        "show_toast": false,
+        "announce_to_chat": false
+    },
+    "rewards": {
+        "recipes": [
+            "energonrelics:veridium_block",
+            "energonrelics:veridium_ingot_from_blasting",
+            "energonrelics:veridium_ingot_from_veridium_block",
+            "energonrelics:veridium_ingot",
+            "energonrelics:veridium_powder"
+        ]
+    },
+    "criteria": {
+        "tick": {
+            "trigger": "minecraft:tick"
+        }
+    }
+}
--- a/src/main/resources/data/energonrelics/advancements/smelt_veridium_ore.json
+++ b/src/main/resources/data/energonrelics/advancements/smelt_veridium_ore.json
@ -0,0 +1,26 @@
+{
+    "display": {
+        "icon": {
+            "item": "energonrelics:veridium_ingot"
+        },
+        "title": {
+            "translate": "advancements.energonrelics.smelt_veridium_ore.title"
+        },
+        "description": {
+            "translate": "advancements.energonrelics.smelt_veridium_ore.description"
+        }
+    },
+    "parent": "energonrelics:find_circuit_board",
+    "criteria": {
+        "chest_boat": {
+            "trigger": "minecraft:inventory_changed",
+            "conditions": {
+                "items": [
+                    {
+                        "item": "energonrelics:veridium_ingot"
+                    }
+                ]
+            }
+        }
+    }
+}
--- a/src/main/resources/data/energonrelics/recipes/network_chip.json
+++ b/src/main/resources/data/energonrelics/recipes/network_chip.json
@ -1,13 +1,18 @@
 {
-    "type": "minecraft:crafting_shapeless",
-    "ingredients": [
-        {
-            "item": "minecraft:iron_ingot"
+    "type": "minecraft:crafting_shaped",
+    "pattern": [
+        " I ",
+        "I#I",
+        " I "
+    ],
+    "key": {
+        "I": {
+            "item": "minecraft:iron_nugget"
        },
-        {
+        "#": {
            "item": "energonrelics:circuit_board"
        }
-    ],
+    },
    "result": {
        "item": "energonrelics:network_chip",
        "count": 1