From d9e62f35ad3a3c17676cab96d72d7c32f5bf6687 Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Wed, 2 Dec 2020 18:23:33 +0000 Subject: [PATCH] Removed snow block variant --- src/generated/resources/.cache/cache | 6 +----- .../blockstates/iron_casing_snow_block.json | 7 ------- .../assets/actuallyadditions/lang/en_us.json | 1 - .../models/block/iron_casing_snow_block.json | 6 ------ .../models/item/iron_casing_snow_block.json | 3 --- .../blocks/iron_casing_snow_block.json | 19 ------------------- .../common/blocks/ActuallyBlocks.java | 1 - .../data/GeneratorBlockStates.java | 3 ++- .../data/GeneratorLanguage.java | 5 ++--- .../actuallyadditions/data/GeneratorLoot.java | 1 - 10 files changed, 5 insertions(+), 47 deletions(-) delete mode 100644 src/generated/resources/assets/actuallyadditions/blockstates/iron_casing_snow_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/block/iron_casing_snow_block.json delete mode 100644 src/generated/resources/assets/actuallyadditions/models/item/iron_casing_snow_block.json delete mode 100644 src/generated/resources/data/actuallyadditions/loot_tables/blocks/iron_casing_snow_block.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index d2a57f0b3..7abd0d413 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -70,7 +70,6 @@ f54fe2d4ebaa81e1bef8ca575e40cabc72814d0e assets/actuallyadditions/blockstates/gr 7fa4f8d30b6afb1a1ef20862d2a3dda65d9cd040 assets/actuallyadditions/blockstates/heat_collector_block.json 6d3608a54573e2096bd36089163721b6b18fc8a7 assets/actuallyadditions/blockstates/hopping_item_interface_block.json e2782f6ef5da9a08d2ca997dd0975ec1c70e4872 assets/actuallyadditions/blockstates/iron_casing_block.json -ca449143d056ad64729043ad10ac444169752574 assets/actuallyadditions/blockstates/iron_casing_snow_block.json 78319cb5664292f412af2ff5d5f99bed4b2f9d0d assets/actuallyadditions/blockstates/item_interface_block.json 66c2062159dfa7743d3f567439be26cb4c708582 assets/actuallyadditions/blockstates/item_laser_relay_block.json 49437918199e264073ac399ca343bb7e13473408 assets/actuallyadditions/blockstates/lamp_black_block.json @@ -116,7 +115,7 @@ e2c81adfe240117fa0ce2e3dfcfd04f4e1034153 assets/actuallyadditions/blockstates/wh 3670535838b4c26d01afe7ee4807c53a6cbaba12 assets/actuallyadditions/blockstates/white_wall_block.json 78e89628e3c6e891f2994b2a1794672f69826516 assets/actuallyadditions/blockstates/wood_casing_block.json 207adf3d139369e983100a6002f6f77d36d40916 assets/actuallyadditions/blockstates/xp_solidifier_block.json -2a6c01438dd5bdc2071706c187ba13a39dc8ee10 assets/actuallyadditions/lang/en_us.json +3cb05cbdad628cca379116db0b49361364870d46 assets/actuallyadditions/lang/en_us.json 8ce3f2af3288773fb581a3668c2cb90b64c9ee2f assets/actuallyadditions/models/block/advanced_item_laser_relay_block.json de74eda6290d47ef2b26961693e537d7b8795a06 assets/actuallyadditions/models/block/atomic_reconstructor_block.json 16a76926a07fc8fa10e4a3949d15ad2ca6920bb8 assets/actuallyadditions/models/block/battery_box_block.json @@ -209,7 +208,6 @@ fb6a2fdf86c26ea81bcde867e259b25681b6c010 assets/actuallyadditions/models/block/g c5dd93f040f3e4fc68f10570262dccdd7a426244 assets/actuallyadditions/models/block/heat_collector_block.json d43971145be2910eefae6632306e4c36c1db54a5 assets/actuallyadditions/models/block/hopping_item_interface_block.json 9739b23c33c8d947fbd5144edc11c7f333de413b assets/actuallyadditions/models/block/iron_casing_block.json -7f3c845740543bddc867ed2f047e866dfffc6697 assets/actuallyadditions/models/block/iron_casing_snow_block.json f7f5a6ea0e799648572bf20802c49f59555c74a5 assets/actuallyadditions/models/block/item_interface_block.json e4ed24c971e1758b3e580211ef42c1e23579de5e assets/actuallyadditions/models/block/item_laser_relay_block.json b867c090a5382962a8873532ea824645e279d1f1 assets/actuallyadditions/models/block/lamp_black_block.json @@ -463,7 +461,6 @@ c6073044af8a741e3a90c90622d6e1272dab9482 assets/actuallyadditions/models/item/gr 66471a00731b2df91c36c59827f9e07444c9c301 assets/actuallyadditions/models/item/heat_collector_block.json 76ed4ff443bb3a205e1548283fb32a7be5cefde9 assets/actuallyadditions/models/item/hopping_item_interface_block.json cc05fca55e55883f67ceac4cb3415f66d5781839 assets/actuallyadditions/models/item/iron_casing_block.json -5d2d679627727fe3d72531c5385cef5349282f7a assets/actuallyadditions/models/item/iron_casing_snow_block.json 754a286167121413fb64334ef9735c108e43dfc8 assets/actuallyadditions/models/item/iron_paxel.json 1c851c6b2d694d8e78336b90389cd2a0719657b0 assets/actuallyadditions/models/item/item_filter.json bd1cb3ca86dfb9dfe128e207c067e95417fe7acc assets/actuallyadditions/models/item/item_interface_block.json @@ -760,7 +757,6 @@ e906482728edba1b6ec15f3313c0b0b9ceb38526 data/actuallyadditions/loot_tables/bloc c093309adf18eae12b6af39266f99e013141f233 data/actuallyadditions/loot_tables/blocks/heat_collector_block.json b94a7398bf764b4d4d4fb6483b42be4910a486d1 data/actuallyadditions/loot_tables/blocks/hopping_item_interface_block.json d4a0a25db99bf6e7cad5bb22cbaaa6396715d845 data/actuallyadditions/loot_tables/blocks/iron_casing_block.json -464799e55af9ab462d90de9747f6855ada8d49e6 data/actuallyadditions/loot_tables/blocks/iron_casing_snow_block.json 258c1b47250411a490856b24573f8305224d4674 data/actuallyadditions/loot_tables/blocks/item_interface_block.json cf55cc4a0cd4068930d9dba33bc90ff93ba9dbe7 data/actuallyadditions/loot_tables/blocks/item_laser_relay_block.json 349b82741b9b3baecf9fca1ff472cf82364c8faa data/actuallyadditions/loot_tables/blocks/lamp_black_block.json diff --git a/src/generated/resources/assets/actuallyadditions/blockstates/iron_casing_snow_block.json b/src/generated/resources/assets/actuallyadditions/blockstates/iron_casing_snow_block.json deleted file mode 100644 index 3b56d7434..000000000 --- a/src/generated/resources/assets/actuallyadditions/blockstates/iron_casing_snow_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "actuallyadditions:block/iron_casing_snow_block" - } - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/lang/en_us.json b/src/generated/resources/assets/actuallyadditions/lang/en_us.json index edd9022c7..e66cd2d0a 100644 --- a/src/generated/resources/assets/actuallyadditions/lang/en_us.json +++ b/src/generated/resources/assets/actuallyadditions/lang/en_us.json @@ -75,7 +75,6 @@ "block.actuallyadditions.heat_collector_block": "Heat Collector", "block.actuallyadditions.hopping_item_interface_block": "Hopping Item Interface", "block.actuallyadditions.iron_casing_block": "Iron Casing", - "block.actuallyadditions.iron_casing_snow_block": "?", "block.actuallyadditions.item_interface_block": "Item Interface", "block.actuallyadditions.item_laser_relay_block": "Item Laser Relay", "block.actuallyadditions.lamp_black_block": "Black Lamp", diff --git a/src/generated/resources/assets/actuallyadditions/models/block/iron_casing_snow_block.json b/src/generated/resources/assets/actuallyadditions/models/block/iron_casing_snow_block.json deleted file mode 100644 index bc9116c9f..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/block/iron_casing_snow_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "actuallyadditions:block/iron_casing_snow_block" - } -} \ No newline at end of file diff --git a/src/generated/resources/assets/actuallyadditions/models/item/iron_casing_snow_block.json b/src/generated/resources/assets/actuallyadditions/models/item/iron_casing_snow_block.json deleted file mode 100644 index 9fc5cba3c..000000000 --- a/src/generated/resources/assets/actuallyadditions/models/item/iron_casing_snow_block.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parent": "actuallyadditions:block/iron_casing_snow_block" -} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/loot_tables/blocks/iron_casing_snow_block.json b/src/generated/resources/data/actuallyadditions/loot_tables/blocks/iron_casing_snow_block.json deleted file mode 100644 index 11f0022fe..000000000 --- a/src/generated/resources/data/actuallyadditions/loot_tables/blocks/iron_casing_snow_block.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "actuallyadditions:iron_casing_snow_block" - } - ], - "conditions": [ - { - "condition": "minecraft:survives_explosion" - } - ] - } - ] -} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java index 16037459d..93d3acdeb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java @@ -160,7 +160,6 @@ public class ActuallyBlocks { public static final RegistryObject ORE_BLACK_QUARTZ = BLOCKS.register("ore_black_quartz_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK))); public static final RegistryObject ENDER_CASING = BLOCKS.register("ender_casing_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK))); public static final RegistryObject IRON_CASING = BLOCKS.register("iron_casing_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK))); - public static final RegistryObject IRON_CASING_SNOW = BLOCKS.register("iron_casing_snow_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK))); public static final RegistryObject LAVA_FACTORY_CASE = BLOCKS.register("lava_factory_case_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK))); public static final RegistryObject WOOD_CASING = BLOCKS.register("wood_casing_block", () -> new ActuallyBlock(Block.Properties.create(Material.ROCK))); diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java index c5f489278..98deb6ddd 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java @@ -114,7 +114,6 @@ public class GeneratorBlockStates extends BlockStateProvider { buildCubeAll(ActuallyBlocks.ENDER_CASING); buildCubeAll(ActuallyBlocks.ENDERPEARL); buildCubeAll(ActuallyBlocks.IRON_CASING); - buildCubeAll(ActuallyBlocks.IRON_CASING_SNOW); buildCubeAll(ActuallyBlocks.LAVA_FACTORY_CASE); buildCubeAll(ActuallyBlocks.ORE_BLACK_QUARTZ); buildCubeAll(ActuallyBlocks.WOOD_CASING); @@ -143,6 +142,8 @@ public class GeneratorBlockStates extends BlockStateProvider { slabBlock((SlabBlock) ActuallyBlocks.BLACK_QUARTZ_SLAB.get(), modLoc("block/black_quartz_block"), modLoc("block/black_quartz_block")); slabBlock((SlabBlock) ActuallyBlocks.BLACK_CHISELED_QUARTZ_SLAB.get(), modLoc("block/black_quartz_chiseled_block"), modLoc("block/black_quartz_chiseled_block")); slabBlock((SlabBlock) ActuallyBlocks.BLACK_PILLAR_QUARTZ_SLAB.get(), modLoc("block/black_quartz_pillar_block"), modLoc("block/black_quartz_pillar_block")); + + } private void buildCubeAll(Supplier block) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java index bf11f571c..40eeeecab 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java @@ -14,7 +14,7 @@ public class GeneratorLanguage extends LanguageProvider { @Override protected void addTranslations() { - // Blocks (kill me) + // Blocks addBlock(ActuallyBlocks.RICE, "Rice"); addBlock(ActuallyBlocks.CANOLA, "Canola"); addBlock(ActuallyBlocks.FLAX, "Flax"); @@ -130,7 +130,6 @@ public class GeneratorLanguage extends LanguageProvider { addBlock(ActuallyBlocks.ORE_BLACK_QUARTZ, "Black Quartz Ore"); addBlock(ActuallyBlocks.ENDER_CASING, "Ender Casing"); addBlock(ActuallyBlocks.IRON_CASING, "Iron Casing"); - addBlock(ActuallyBlocks.IRON_CASING_SNOW, "?"); addBlock(ActuallyBlocks.LAVA_FACTORY_CASE, "Casing"); addBlock(ActuallyBlocks.WOOD_CASING, "Wood Casing"); @@ -169,7 +168,7 @@ public class GeneratorLanguage extends LanguageProvider { addItem(ActuallyItems.EMERADIC_EMPOWERED_CRYSTAL, "Empowered Emeradic Crystal"); addItem(ActuallyItems.ENORI_EMPOWERED_CRYSTAL, "Empowered Enori Crystal"); - // Remaining Items? + // Remaining Items addItem(ActuallyItems.RED_CRYSTAL_SHARD, "Red Crystal Shard"); addItem(ActuallyItems.BLUE_CRYSTAL_SHARD, "Blue Crystal Shard"); addItem(ActuallyItems.LIGHT_BLUE_CRYSTAL_SHARD, "Light Blue Crystal"); diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLoot.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLoot.java index 682a5d63a..379657562 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLoot.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLoot.java @@ -138,7 +138,6 @@ public class GeneratorLoot extends LootTableProvider { this.registerDropSelfLootTable(ActuallyBlocks.CHARCOAL.get()); this.registerDropSelfLootTable(ActuallyBlocks.ENDER_CASING.get()); this.registerDropSelfLootTable(ActuallyBlocks.IRON_CASING.get()); - this.registerDropSelfLootTable(ActuallyBlocks.IRON_CASING_SNOW.get()); this.registerDropSelfLootTable(ActuallyBlocks.LAVA_FACTORY_CASE.get()); this.registerDropSelfLootTable(ActuallyBlocks.WOOD_CASING.get());