diff options
Diffstat (limited to 'src/main')
19 files changed, 115 insertions, 103 deletions
diff --git a/src/main/java/com/sosnitzka/ztic_addon/Blocks.java b/src/main/java/com/sosnitzka/ztic_addon/Blocks.java index 15dd376..5e37393 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Blocks.java +++ b/src/main/java/com/sosnitzka/ztic_addon/Blocks.java @@ -58,6 +58,23 @@ public class Blocks { public static Block vibraniumBlock = new BasicBlock("vibranium_block", Material.ROCK, 70.0f, 800.0f, 4, PREFIX_BLOCK); public static Block yrdeanBlock = new BasicBlock("yrdean_block", Material.ROCK, 13.0f, 15.0f, 3, PREFIX_BLOCK); + public static Block astriumBlock = new BasicBlock("astrium_block", Material.ROCK, 55.0f, 400.0f, 3, PREFIX_BLOCK); + public static Block blazingXylititeBlock = new BasicBlock("blazing_xylitite_block", Material.ROCK, 80.0f, 1000.0f, 4, PREFIX_BLOCK); + public static Block cryptogenBlock = new BasicBlock("cryptogen_block", Material.ROCK, 23.0f, 25.0f, 2, PREFIX_BLOCK); + public static Block dysprosaniumBlock = new BasicBlock("dysprosanium_block", Material.ROCK, 13.0f, 13.0f, 3, PREFIX_BLOCK); + public static Block fractoryteBlock = new BasicBlock("fractoryte_block", Material.ROCK, 8.0f, 8.0f, 1, PREFIX_BLOCK); + public static Block imperomiteBlock = new BasicBlock("imperomite_block", Material.ROCK, 24.0f, 25.0f, 3, PREFIX_BLOCK); + public static Block instableDyoniteBlock = new BasicBlock("instable_dyonite_block", Material.ROCK, 23.0f, 25.0f, 3, PREFIX_BLOCK); + public static Block instableNitroniteBlock = new BasicBlock("instable_nitronite_block", Material.ROCK, 13.0f, 15.0f, 1, PREFIX_BLOCK); + public static Block instablePolyniumBlock = new BasicBlock("instable_polynium_block", Material.ROCK, 60.0f, 500.0f, 4, PREFIX_BLOCK); + public static Block instablePrysociteBlock = new BasicBlock("instable_prysocite_block", Material.ROCK, 12.0f, 12.0f, 2, PREFIX_BLOCK); + public static Block proxideumBlock = new BasicBlock("proxideum_block", Material.ROCK, 25.0f, 25.0f, 4, PREFIX_BLOCK); + public static Block radiantPliniumBlock = new BasicBlock("radiant_plinium_block", Material.ROCK, 25.0f, 25.0f, 3, PREFIX_BLOCK); + public static Block refractiveBysmuidBlock = new BasicBlock("refractive_bysmuid_block", Material.ROCK, 35.0f, 35.0f, 4, 0.25f, PREFIX_BLOCK); + public static Block seismodiumBlock = new BasicBlock("seismodium_block", Material.ROCK, 30.0f, 30.0f, 3, 1f, PREFIX_BLOCK); + public static Block terramiteBlock = new BasicBlock("terramite_block", Material.ROCK, 70.0f, 800.0f, 4, PREFIX_BLOCK); + public static Block ultraniteBlock = new BasicBlock("ultranite_block", Material.ROCK, 13.0f, 15.0f, 3, PREFIX_BLOCK); + public static void register() { Field[] declaredFields = Blocks.class.getDeclaredFields(); diff --git a/src/main/java/com/sosnitzka/ztic_addon/Items.java b/src/main/java/com/sosnitzka/ztic_addon/Items.java index 85d04ae..d2ccb40 100644 --- a/src/main/java/com/sosnitzka/ztic_addon/Items.java +++ b/src/main/java/com/sosnitzka/ztic_addon/Items.java @@ -16,6 +16,7 @@ import java.lang.reflect.Field; import java.util.Arrays; import static com.sosnitzka.ztic_addon.util.Utils.PREFIX_INGOT; +import static com.sosnitzka.ztic_addon.util.Utils.PREFIX_NUGGET; public class Items { public static ItemSlagironIngot slagironIngot = new ItemSlagironIngot(); @@ -42,24 +43,24 @@ public class Items { public static Item yrdeanIngot = new BasicItem("yrdean_ingot", PREFIX_INGOT); public static Item astriumIngot = new BasicItem("astrium_ingot", PREFIX_INGOT); - public static Item instableNitroniteIngot = new BasicItem("instable_nitronite_ingot"); - public static Item proxideumIngot = new BasicItem("proxideum_ingot"); - public static Item instablePolyniumIngot = new BasicItem("instable_polyniumingot"); - public static Item imperomiteIngot = new BasicItem("imperomite_ingot"); - public static Item cryptogenIngot = new BasicItem("cryptogen_ingot"); - public static Item fractoryteIngot = new BasicItem("fractoryte_ingot"); - public static Item seismodiumIngot = new BasicItem("seismodium_ingot"); - public static Item terramiteIngot = new BasicItem("terramite_ingot"); - public static Item instablePrysociteIngot = new BasicItem("instable_prysocite_ingot"); - public static Item blazingXylititeIngot = new BasicItem("blazing_xylitite_ingot"); - public static Item instableDyoniteIngot = new BasicItem("instable_dyonite_ingot"); - public static Item ultraniteIngot = new BasicItem("ultranite_ingot"); - public static Item radiantPliniumIngot = new BasicItem("radiant_plinium_ingot"); - public static Item dysprosaniumIngot = new BasicItem("dysprosanium_ingot"); - public static Item refractiveBysumIngot = new BasicItem("refractive_bysum_ingot"); + public static Item instableNitroniteIngot = new BasicItem("instable_nitronite_ingot", PREFIX_INGOT); + public static Item proxideumIngot = new BasicItem("proxideum_ingot", PREFIX_INGOT); + public static Item instablePolyniumIngot = new BasicItem("instable_polyniumingot", PREFIX_INGOT); + public static Item imperomiteIngot = new BasicItem("imperomite_ingot", PREFIX_INGOT); + public static Item cryptogenIngot = new BasicItem("cryptogen_ingot", PREFIX_INGOT); + public static Item fractoryteIngot = new BasicItem("fractoryte_ingot", PREFIX_INGOT); + public static Item seismodiumIngot = new BasicItem("seismodium_ingot", PREFIX_INGOT); + public static Item terramiteIngot = new BasicItem("terramite_ingot", PREFIX_INGOT); + public static Item instablePrysociteIngot = new BasicItem("instable_prysocite_ingot", PREFIX_INGOT); + public static Item blazingXylititeIngot = new BasicItem("blazing_xylitite_ingot", PREFIX_INGOT); + public static Item instableDyoniteIngot = new BasicItem("instable_dyonite_ingot", PREFIX_INGOT); + public static Item ultraniteIngot = new BasicItem("ultranite_ingot", PREFIX_INGOT); + public static Item radiantPliniumIngot = new BasicItem("radiant_plinium_ingot", PREFIX_INGOT); + public static Item dysprosaniumIngot = new BasicItem("dysprosanium_ingot", PREFIX_INGOT); + public static Item refractiveBysumIngot = new BasicItem("refractive_bysum_ingot", PREFIX_INGOT); - public static Item tiberiumShardInstable = new BasicItem("tiberium_shard_instable"); - public static Item tiberiumShardStable = new BasicItem("tiberium_shard_stable"); + public static Item tiberiumShardInstable = new BasicItem("tiberium_shard_instable", PREFIX_NUGGET); + public static Item tiberiumShardStable = new BasicItem("tiberium_shard_stable", PREFIX_NUGGET); public static void register() { Field[] declaredFields = Items.class.getDeclaredFields(); diff --git a/src/main/resources/assets/ztic_addon/models/item/aardium_ingot.json b/src/main/resources/assets/ztic_addon/models/item/aardium_ingot.json index f4f92af..4d9bc33 100644 --- a/src/main/resources/assets/ztic_addon/models/item/aardium_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/aardium_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "ztic_addon:items/tic/aardium_ingot" - } -}
\ No newline at end of file + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/aardium_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/adamantite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/adamantite_ingot.json index f4a9e64..617ebc5 100644 --- a/src/main/resources/assets/ztic_addon/models/item/adamantite_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/adamantite_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "ztic_addon:items/tic/adamantite_ingot" - } -}
\ No newline at end of file + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/adamantite_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/arcanite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/arcanite_ingot.json index d4558b3..2b68898 100644 --- a/src/main/resources/assets/ztic_addon/models/item/arcanite_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/arcanite_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "ztic_addon:items/tic/arcanite_ingot" - } -}
\ No newline at end of file + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/arcanite_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/astrite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/astrite_ingot.json deleted file mode 100644 index 974a76b..0000000 --- a/src/main/resources/assets/ztic_addon/models/item/astrite_ingot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "item/generated", - "textures": { - "layer0": "ztic_addon:items/tic/astrium_ingot" - } -}
\ No newline at end of file diff --git a/src/main/resources/assets/ztic_addon/models/item/axiidian_ingot.json b/src/main/resources/assets/ztic_addon/models/item/axiidian_ingot.json index eaee705..9a7ad18 100644 --- a/src/main/resources/assets/ztic_addon/models/item/axiidian_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/axiidian_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "ztic_addon:items/tic/axiidian_ingot" - } -}
\ No newline at end of file + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/axiidian_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/bismuth_ingot.json b/src/main/resources/assets/ztic_addon/models/item/bismuth_ingot.json index 7373050..86405ad 100644 --- a/src/main/resources/assets/ztic_addon/models/item/bismuth_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/bismuth_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "ztic_addon:items/tic/bismuth_ingot" - } -}
\ No newline at end of file + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/bismuth_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/eternite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/eternite_ingot.json index 0a75e5c..8097894 100644 --- a/src/main/resources/assets/ztic_addon/models/item/eternite_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/eternite_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "ztic_addon:items/tic/eternite_ingot" - } -}
\ No newline at end of file + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/eternite_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/ignitite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/ignitite_ingot.json index 353251e..0f7c741 100644 --- a/src/main/resources/assets/ztic_addon/models/item/ignitite_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/ignitite_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "ztic_addon:items/tic/ignitite_ingot" - } -}
\ No newline at end of file + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/ignitite_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/karmesine_ingot.json b/src/main/resources/assets/ztic_addon/models/item/karmesine_ingot.json index ba63bab..dc76e7b 100644 --- a/src/main/resources/assets/ztic_addon/models/item/karmesine_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/karmesine_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "ztic_addon:items/tic/karmesine_ingot" - } -}
\ No newline at end of file + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/karmesine_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/meteorite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/meteorite_ingot.json index 318b34e..aea1f7f 100644 --- a/src/main/resources/assets/ztic_addon/models/item/meteorite_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/meteorite_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "ztic_addon:items/tic/meteorite_ingot" - } -}
\ No newline at end of file + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/meteorite_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/mindorite_ingot.json b/src/main/resources/assets/ztic_addon/models/item/mindorite_ingot.json index 27dac70..2f0d138 100644 --- a/src/main/resources/assets/ztic_addon/models/item/mindorite_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/mindorite_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "ztic_addon:items/tic/mindorite_ingot" - } -}
\ No newline at end of file + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/mindorite_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/mythril_ingot.json b/src/main/resources/assets/ztic_addon/models/item/mythril_ingot.json index 7edd8ec..1f1178f 100644 --- a/src/main/resources/assets/ztic_addon/models/item/mythril_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/mythril_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "ztic_addon:items/tic/mythril_ingot" - } -}
\ No newline at end of file + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/mythril_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/palladium_ingot.json b/src/main/resources/assets/ztic_addon/models/item/palladium_ingot.json index 161af8a..e08f521 100644 --- a/src/main/resources/assets/ztic_addon/models/item/palladium_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/palladium_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "ztic_addon:items/tic/palladium_ingot" - } -}
\ No newline at end of file + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/palladium_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/prometheum_ingot.json b/src/main/resources/assets/ztic_addon/models/item/prometheum_ingot.json index 70768a7..7449e1f 100644 --- a/src/main/resources/assets/ztic_addon/models/item/prometheum_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/prometheum_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "ztic_addon:items/tic/prometheum_ingot" - } -}
\ No newline at end of file + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/prometheum_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/tiberium_ingot.json b/src/main/resources/assets/ztic_addon/models/item/tiberium_ingot.json index 1c252be..92913be 100644 --- a/src/main/resources/assets/ztic_addon/models/item/tiberium_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/tiberium_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "ztic_addon:items/tic/tiberium_ingot" - } -}
\ No newline at end of file + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/tiberium_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/vibranium_ingot.json b/src/main/resources/assets/ztic_addon/models/item/vibranium_ingot.json index c5ac984..75ec2bf 100644 --- a/src/main/resources/assets/ztic_addon/models/item/vibranium_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/vibranium_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "ztic_addon:items/tic/vibranium_ingot" - } -}
\ No newline at end of file + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/vibranium_ingot" + } +} diff --git a/src/main/resources/assets/ztic_addon/models/item/yrdean_ingot.json b/src/main/resources/assets/ztic_addon/models/item/yrdean_ingot.json index 10591a3..b607473 100644 --- a/src/main/resources/assets/ztic_addon/models/item/yrdean_ingot.json +++ b/src/main/resources/assets/ztic_addon/models/item/yrdean_ingot.json @@ -1,6 +1,6 @@ { - "parent": "item/generated", - "textures": { - "layer0": "ztic_addon:items/tic/yrdean_ingot" - } -}
\ No newline at end of file + "parent": "item/generated", + "textures": { + "layer0": "ztic_addon:items/tic/yrdean_ingot" + } +} |