From 9393ceabc1641aac45d78663c1686eb017b74ca7 Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Sat, 28 Nov 2020 15:32:47 +0000 Subject: [PATCH] Removed blocks as per spec --- .../common/blocks/ActuallyBlocks.java | 5 ----- .../common/blocks/functional/FishingNetBlock.java | 10 ---------- .../common/blocks/functional/FurnaceSolarBlock.java | 10 ---------- .../common/blocks/functional/ItemRepairerBlock.java | 10 ---------- .../common/blocks/functional/SmileyCloudBlock.java | 10 ---------- .../common/blocks/functional/TreasureChestBlock.java | 10 ---------- .../actuallyadditions/data/GeneratorBlockStates.java | 5 ----- .../actuallyadditions/data/GeneratorLanguage.java | 5 ----- .../ellpeck/actuallyadditions/data/GeneratorLoot.java | 5 ----- 9 files changed, 70 deletions(-) delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FishingNetBlock.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FurnaceSolarBlock.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemRepairerBlock.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/SmileyCloudBlock.java delete mode 100644 src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/TreasureChestBlock.java 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 45ccd858d..7bf9316f6 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/ActuallyBlocks.java @@ -47,7 +47,6 @@ public class ActuallyBlocks { public static final RegistryObject FIREWORK_BOX = BLOCKS.register("firework_box_block", FireworkBoxBlock::new); public static final RegistryObject MINER = BLOCKS.register("miner_block", MinerBlock::new); public static final RegistryObject ATOMIC_RECONSTRUCTOR = BLOCKS.register("atomic_reconstructor_block", AtomicReconstructorBlock::new); - public static final RegistryObject TREASURE_CHEST = BLOCKS.register("treasure_chest_block", TreasureChestBlock::new); public static final RegistryObject ENERGIZER = BLOCKS.register("energizer_block", () -> new EnergizerBlock(true)); public static final RegistryObject ENERVATOR = BLOCKS.register("enervator_block", () -> new EnergizerBlock(false)); public static final RegistryObject LAVA_FACTORY_CONTROLLER = BLOCKS.register("lava_factory_controller_block", LavaFactoryControllerBlock::new); @@ -67,10 +66,7 @@ public class ActuallyBlocks { public static final RegistryObject POWERED_FURNACE = BLOCKS.register("powered_furnace_block", FurnaceDoubleBlock::new); public static final RegistryObject ESD = BLOCKS.register("esd_block", () -> new InputterBlock(false)); public static final RegistryObject ESD_ADVANCED = BLOCKS.register("esd_advanced_block", () -> new InputterBlock(true)); - public static final RegistryObject FISHING_NET = BLOCKS.register("fishing_net_block", FishingNetBlock::new); - public static final RegistryObject SOLAR_PANEL = BLOCKS.register("solar_panel_block", FurnaceSolarBlock::new); public static final RegistryObject HEAT_COLLECTOR = BLOCKS.register("heat_collector_block", HeatCollectorBlock::new); - public static final RegistryObject ITEM_REPAIRER = BLOCKS.register("item_repairer_block", ItemRepairerBlock::new); public static final RegistryObject GREENHOUSE_GLASS = BLOCKS.register("greenhouse_glass_block", GreenhouseGlassBlock::new); public static final RegistryObject BREAKER = BLOCKS.register("breaker_block", () -> new BreakerBlock(false)); public static final RegistryObject PLACER = BLOCKS.register("placer_block", () -> new BreakerBlock(true)); @@ -82,7 +78,6 @@ public class ActuallyBlocks { public static final RegistryObject RANGED_COLLECTOR = BLOCKS.register("ranged_collector_block", RangedCollectorBlock::new); public static final RegistryObject DIRECTIONAL_BREAKER = BLOCKS.register("directional_breaker_block", DirectionalBreakerBlock::new); public static final RegistryObject LEAF_GENERATOR = BLOCKS.register("leaf_generator_block", LeafGeneratorBlock::new); - public static final RegistryObject SMILEY_CLOUD = BLOCKS.register("smiley_cloud_block", SmileyCloudBlock::new); public static final RegistryObject XP_SOLIDIFIER = BLOCKS.register("xp_solidifier_block", XPSolidifierBlock::new); // CRYSTALS diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FishingNetBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FishingNetBlock.java deleted file mode 100644 index e40a0b091..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FishingNetBlock.java +++ /dev/null @@ -1,10 +0,0 @@ -package de.ellpeck.actuallyadditions.common.blocks.functional; - -import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; -import net.minecraft.block.material.Material; - -public class FishingNetBlock extends ActuallyBlock { - public FishingNetBlock() { - super(Properties.create(Material.ROCK)); - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FurnaceSolarBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FurnaceSolarBlock.java deleted file mode 100644 index 933250916..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/FurnaceSolarBlock.java +++ /dev/null @@ -1,10 +0,0 @@ -package de.ellpeck.actuallyadditions.common.blocks.functional; - -import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; -import net.minecraft.block.material.Material; - -public class FurnaceSolarBlock extends ActuallyBlock { - public FurnaceSolarBlock() { - super(Properties.create(Material.ROCK)); - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemRepairerBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemRepairerBlock.java deleted file mode 100644 index 6eac1a4d3..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/ItemRepairerBlock.java +++ /dev/null @@ -1,10 +0,0 @@ -package de.ellpeck.actuallyadditions.common.blocks.functional; - -import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; -import net.minecraft.block.material.Material; - -public class ItemRepairerBlock extends ActuallyBlock { - public ItemRepairerBlock() { - super(Properties.create(Material.ROCK)); - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/SmileyCloudBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/SmileyCloudBlock.java deleted file mode 100644 index 49e08cfd0..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/SmileyCloudBlock.java +++ /dev/null @@ -1,10 +0,0 @@ -package de.ellpeck.actuallyadditions.common.blocks.functional; - -import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; -import net.minecraft.block.material.Material; - -public class SmileyCloudBlock extends ActuallyBlock { - public SmileyCloudBlock() { - super(Properties.create(Material.ROCK)); - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/TreasureChestBlock.java b/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/TreasureChestBlock.java deleted file mode 100644 index ca8778561..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/common/blocks/functional/TreasureChestBlock.java +++ /dev/null @@ -1,10 +0,0 @@ -package de.ellpeck.actuallyadditions.common.blocks.functional; - -import de.ellpeck.actuallyadditions.common.blocks.ActuallyBlock; -import net.minecraft.block.material.Material; - -public class TreasureChestBlock extends ActuallyBlock { - public TreasureChestBlock() { - super(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 29384d44b..ae2840e52 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorBlockStates.java @@ -63,7 +63,6 @@ public class GeneratorBlockStates extends BlockStateProvider { buildCubeAll(ActuallyBlocks.RANGED_COLLECTOR); buildCubeAll(ActuallyBlocks.DIRECTIONAL_BREAKER); buildCubeAll(ActuallyBlocks.LEAF_GENERATOR); - buildCubeAll(ActuallyBlocks.SMILEY_CLOUD); buildCubeAll(ActuallyBlocks.XP_SOLIDIFIER); buildCubeAll(ActuallyBlocks.GREEN_BLOCK); buildCubeAll(ActuallyBlocks.WHITE_BLOCK); @@ -90,7 +89,6 @@ public class GeneratorBlockStates extends BlockStateProvider { buildLitState(ActuallyBlocks.LAMP_RED); buildLitState(ActuallyBlocks.LAMP_BLACK); buildCubeAll(ActuallyBlocks.LAMP_CONTROLLER); - buildCubeAll(ActuallyBlocks.TREASURE_CHEST); buildCubeAll(ActuallyBlocks.ENERGIZER); buildCubeAll(ActuallyBlocks.ENERVATOR); buildCubeAll(ActuallyBlocks.LAVA_FACTORY_CONTROLLER); @@ -125,10 +123,7 @@ public class GeneratorBlockStates extends BlockStateProvider { buildCubeAll(ActuallyBlocks.POWERED_FURNACE); buildCubeAll(ActuallyBlocks.ESD); buildCubeAll(ActuallyBlocks.ESD_ADVANCED); - buildCubeAll(ActuallyBlocks.FISHING_NET); - buildCubeAll(ActuallyBlocks.SOLAR_PANEL); buildCubeAll(ActuallyBlocks.HEAT_COLLECTOR); - buildCubeAll(ActuallyBlocks.ITEM_REPAIRER); buildCubeAll(ActuallyBlocks.GREENHOUSE_GLASS); buildCubeAll(ActuallyBlocks.BREAKER); buildCubeAll(ActuallyBlocks.PLACER); diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java index 5c8c1aeae..68e1019f1 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLanguage.java @@ -32,7 +32,6 @@ public class GeneratorLanguage extends LanguageProvider { addBlock(ActuallyBlocks.FIREWORK_BOX, "Firework Box"); addBlock(ActuallyBlocks.MINER, "Miner"); addBlock(ActuallyBlocks.ATOMIC_RECONSTRUCTOR, "Atomic Reconstructor"); - addBlock(ActuallyBlocks.TREASURE_CHEST, "Treasure Chest"); addBlock(ActuallyBlocks.ENERGIZER, "Energizer"); addBlock(ActuallyBlocks.ENERVATOR, "Enervator"); addBlock(ActuallyBlocks.LAVA_FACTORY_CONTROLLER, "Lava Factory Controller"); @@ -52,10 +51,7 @@ public class GeneratorLanguage extends LanguageProvider { addBlock(ActuallyBlocks.POWERED_FURNACE, "Powered Furnace"); addBlock(ActuallyBlocks.ESD, "ESD"); addBlock(ActuallyBlocks.ESD_ADVANCED, "Advanced ASD"); - addBlock(ActuallyBlocks.FISHING_NET, "Fishing Net"); - addBlock(ActuallyBlocks.SOLAR_PANEL, "Solar Panel"); addBlock(ActuallyBlocks.HEAT_COLLECTOR, "Heat Collector"); - addBlock(ActuallyBlocks.ITEM_REPAIRER, "Item Repairer"); addBlock(ActuallyBlocks.GREENHOUSE_GLASS, "Greenhouse Glass"); addBlock(ActuallyBlocks.BREAKER, "Auto-Breaker"); addBlock(ActuallyBlocks.PLACER, "Auto-Placer"); @@ -91,7 +87,6 @@ public class GeneratorLanguage extends LanguageProvider { addBlock(ActuallyBlocks.RANGED_COLLECTOR, "Ranged Collector"); addBlock(ActuallyBlocks.DIRECTIONAL_BREAKER, "Directional Breaker"); addBlock(ActuallyBlocks.LEAF_GENERATOR, "Leaf Generator"); - addBlock(ActuallyBlocks.SMILEY_CLOUD, "Smiley Cloud"); addBlock(ActuallyBlocks.XP_SOLIDIFIER, "XP Solidifier"); addBlock(ActuallyBlocks.GREEN_BLOCK, "Ethentic Green Wall"); addBlock(ActuallyBlocks.WHITE_BLOCK, "Ethentic Quartz Wall"); diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLoot.java b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLoot.java index 326137756..a27190b96 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLoot.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/GeneratorLoot.java @@ -53,7 +53,6 @@ public class GeneratorLoot extends LootTableProvider { this.registerDropSelfLootTable(ActuallyBlocks.FIREWORK_BOX.get()); this.registerDropSelfLootTable(ActuallyBlocks.MINER.get()); this.registerDropSelfLootTable(ActuallyBlocks.ATOMIC_RECONSTRUCTOR.get()); - this.registerDropSelfLootTable(ActuallyBlocks.TREASURE_CHEST.get()); this.registerDropSelfLootTable(ActuallyBlocks.ENERGIZER.get()); this.registerDropSelfLootTable(ActuallyBlocks.ENERVATOR.get()); this.registerDropSelfLootTable(ActuallyBlocks.LAVA_FACTORY_CONTROLLER.get()); @@ -73,10 +72,7 @@ public class GeneratorLoot extends LootTableProvider { this.registerDropSelfLootTable(ActuallyBlocks.POWERED_FURNACE.get()); this.registerDropSelfLootTable(ActuallyBlocks.ESD.get()); this.registerDropSelfLootTable(ActuallyBlocks.ESD_ADVANCED.get()); - this.registerDropSelfLootTable(ActuallyBlocks.FISHING_NET.get()); - this.registerDropSelfLootTable(ActuallyBlocks.SOLAR_PANEL.get()); this.registerDropSelfLootTable(ActuallyBlocks.HEAT_COLLECTOR.get()); - this.registerDropSelfLootTable(ActuallyBlocks.ITEM_REPAIRER.get()); this.registerDropSelfLootTable(ActuallyBlocks.GREENHOUSE_GLASS.get()); this.registerDropSelfLootTable(ActuallyBlocks.BREAKER.get()); this.registerDropSelfLootTable(ActuallyBlocks.PLACER.get()); @@ -88,7 +84,6 @@ public class GeneratorLoot extends LootTableProvider { this.registerDropSelfLootTable(ActuallyBlocks.RANGED_COLLECTOR.get()); this.registerDropSelfLootTable(ActuallyBlocks.DIRECTIONAL_BREAKER.get()); this.registerDropSelfLootTable(ActuallyBlocks.LEAF_GENERATOR.get()); - this.registerDropSelfLootTable(ActuallyBlocks.SMILEY_CLOUD.get()); this.registerDropSelfLootTable(ActuallyBlocks.XP_SOLIDIFIER.get()); this.registerDropSelfLootTable(ActuallyBlocks.ENERGY_LASER_RELAY.get());