Remove everything related to depreciated digital & quantum chest + tank

src/main/java/techreborn/blockentity/storage/fluid/CreativeQuantumTankBlockEntity.java

@@ -1,65 +0,0 @@
-/*
- * This file is part of TechReborn, licensed under the MIT License (MIT).
- *
- * Copyright (c) 2020 TechReborn
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package techreborn.blockentity.storage.fluid;
-
-import net.minecraft.block.BlockState;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import reborncore.common.util.Tank;
-import techreborn.init.TRBlockEntities;
-import techreborn.init.TRContent;
-
-@Deprecated
-public class CreativeQuantumTankBlockEntity extends TankUnitBaseBlockEntity {
-
-	// Save
-	public CreativeQuantumTankBlockEntity() {
-		super(TRBlockEntities.CREATIVE_QUANTUM_TANK, TRContent.TankUnit.QUANTUM);
-	}
-
-	@Override
-	public void onBreak(World world, PlayerEntity playerEntity, BlockPos blockPos, BlockState blockState) {
-		inventory.clear();
-	}
-
-	@Override
-	public void tick() {
-
-		if (world.isClient()) {
-			return;
-		}
-
-		Tank tank = this.getTank();
-
-		inventory.clear();
-
-		world.setBlockState(pos, TRContent.TankUnit.CREATIVE.block.getDefaultState());
-
-		TankUnitBaseBlockEntity tankEntity = (TankUnitBaseBlockEntity) world.getBlockEntity(pos);
-
-		tankEntity.setTank(tank);
-	}
-}

src/main/java/techreborn/blockentity/storage/fluid/QuantumTankBlockEntity.java

@@ -1,75 +0,0 @@
-/*
- * This file is part of TechReborn, licensed under the MIT License (MIT).
- *
- * Copyright (c) 2020 TechReborn
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package techreborn.blockentity.storage.fluid;
-
-import net.minecraft.block.BlockState;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import reborncore.common.util.Tank;
-import techreborn.init.TRBlockEntities;
-import techreborn.init.TRContent;
-
-@Deprecated
-public class QuantumTankBlockEntity extends TankUnitBaseBlockEntity {
-
-	// Save
-	public QuantumTankBlockEntity() {
-		super(TRBlockEntities.QUANTUM_TANK, TRContent.TankUnit.QUANTUM);
-	}
-
-	@Override
-	public void onBreak(World world, PlayerEntity playerEntity, BlockPos blockPos, BlockState blockState) {
-		inventory.clear();
-	}
-
-	@Override
-	public void tick() {
-
-		if (world.isClient()) {
-			return;
-		}
-
-		Tank tank = this.getTank();
-
-		ItemStack inputSlotStack = getStack(0).copy();
-		ItemStack outputSlotStack = getStack(1).copy();
-		inventory.clear();
-
-		world.setBlockState(pos, TRContent.TankUnit.QUANTUM.block.getDefaultState());
-
-		TankUnitBaseBlockEntity tankEntity = (TankUnitBaseBlockEntity) world.getBlockEntity(pos);
-
-		if (tankEntity == null) {
-			return;
-		}
-
-		tankEntity.setTank(tank);
-
-		tankEntity.setStack(0, inputSlotStack);
-		tankEntity.setStack(1, outputSlotStack);
-	}
-}

src/main/java/techreborn/blockentity/storage/fluid/TankUnitBaseBlockEntity.java

@@ -67,12 +67,6 @@ public class TankUnitBaseBlockEntity extends MachineBaseBlockEntity implements I
 		configureEntity(type);
 	}
 
-
-	public TankUnitBaseBlockEntity(BlockEntityType<?> blockEntityTypeIn, TRContent.TankUnit type) {
-		super(blockEntityTypeIn);
-		this.type = type;
-	}
-
 	private void configureEntity(TRContent.TankUnit type) {
 		this.type = type;
 		this.tank = new Tank("TankStorage", type.capacity, this);
@@ -110,22 +104,9 @@ public class TankUnitBaseBlockEntity extends MachineBaseBlockEntity implements I
 			this.type = TRContent.TankUnit.valueOf(tagCompound.getString("unitType"));
 			configureEntity(type);
 			tank.read(tagCompound);
-		} else {
-			// SAVE COMPAT
-			if (tagCompound.contains("QuantumTankBlockEntity")) {
-				this.type = TRContent.TankUnit.QUANTUM;
-				Tank temp = new Tank("QuantumTankBlockEntity", type.capacity, this);
-				temp.read(tagCompound);
-
-				// Set tank name to what it should be
-				tank = new Tank("TankStorage", type.capacity, this);
-				tank.setFluid(null, temp.getFluidInstance().copy());
 		}
 	}
 
-
-	}
-
 	@Override
 	public CompoundTag toTag(final CompoundTag tagCompound) {
 		super.toTag(tagCompound);

src/main/java/techreborn/blockentity/storage/item/CreativeQuantumChestBlockEntity.java

@@ -1,65 +0,0 @@
-/*
- * This file is part of TechReborn, licensed under the MIT License (MIT).
- *
- * Copyright (c) 2020 TechReborn
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package techreborn.blockentity.storage.item;
-
-import net.minecraft.block.BlockState;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import techreborn.init.TRBlockEntities;
-import techreborn.init.TRContent;
-
-@Deprecated
-public class CreativeQuantumChestBlockEntity extends StorageUnitBaseBlockEntity {
-
-	public CreativeQuantumChestBlockEntity() {
-		super(TRBlockEntities.CREATIVE_QUANTUM_CHEST, "QuantumChestBlockEntity", Integer.MAX_VALUE);
-	}
-
-	@Override
-	public void onBreak(World world, PlayerEntity playerEntity, BlockPos blockPos, BlockState blockState) {
-		super.inventory.clear();
-	}
-
-	@Override
-	public void tick() {
-		if (world.isClient()) {
-			return;
-		}
-
-		ItemStack storedStack = this.getAll();
-
-		this.clear();
-
-		world.setBlockState(pos, TRContent.StorageUnit.CREATIVE.block.getDefaultState());
-
-		StorageUnitBaseBlockEntity storageEntity = (StorageUnitBaseBlockEntity) world.getBlockEntity(pos);
-
-		if (!storedStack.isEmpty() && storageEntity != null) {
-			storageEntity.setStoredStack(storedStack);
-		}
-	}
-}

src/main/java/techreborn/blockentity/storage/item/DigitalChestBlockEntity.java

@@ -1,67 +0,0 @@
-/*
- * This file is part of TechReborn, licensed under the MIT License (MIT).
- *
- * Copyright (c) 2020 TechReborn
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package techreborn.blockentity.storage.item;
-
-import net.minecraft.block.BlockState;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import techreborn.init.TRBlockEntities;
-import techreborn.init.TRContent;
-
-@Deprecated
-public class DigitalChestBlockEntity extends StorageUnitBaseBlockEntity {
-
-	public DigitalChestBlockEntity() {
-		super(TRBlockEntities.DIGITAL_CHEST, "DigitalChestBlockEntity", 32768);
-	}
-
-	@Override
-	public void onBreak(World world, PlayerEntity playerEntity, BlockPos blockPos, BlockState blockState) {
-		super.inventory.clear();
-	}
-
-	@Override
-	public void tick() {
-		if (world.isClient()) {
-			return;
-		}
-
-		ItemStack storedStack = this.getAll();
-		ItemStack inputSlotStack = this.getStack(0).copy();
-
-		this.clear();
-
-		world.setBlockState(pos, TRContent.StorageUnit.INDUSTRIAL.block.getDefaultState());
-
-		StorageUnitBaseBlockEntity storageEntity = (StorageUnitBaseBlockEntity) world.getBlockEntity(pos);
-
-		if (!storedStack.isEmpty() && storageEntity != null) {
-			storageEntity.setStoredStack(storedStack);
-			storageEntity.setStack(0, inputSlotStack);
-		}
-	}
-}

src/main/java/techreborn/blockentity/storage/item/QuantumChestBlockEntity.java

@@ -1,68 +0,0 @@
-/*
- * This file is part of TechReborn, licensed under the MIT License (MIT).
- *
- * Copyright (c) 2020 TechReborn
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package techreborn.blockentity.storage.item;
-
-import net.minecraft.block.BlockState;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import techreborn.init.TRBlockEntities;
-import techreborn.init.TRContent;
-
-@Deprecated
-public class QuantumChestBlockEntity extends StorageUnitBaseBlockEntity {
-
-	public QuantumChestBlockEntity() {
-		super(TRBlockEntities.QUANTUM_CHEST, "QuantumChestBlockEntity", Integer.MAX_VALUE);
-	}
-
-	@Override
-	public void onBreak(World world, PlayerEntity playerEntity, BlockPos blockPos, BlockState blockState) {
-		super.inventory.clear();
-		super.onBreak(world, playerEntity, blockPos, blockState);
-	}
-
-	@Override
-	public void tick() {
-		if (world.isClient()) {
-			return;
-		}
-
-		ItemStack storedStack = this.getAll();
-		ItemStack inputSlotStack = this.getStack(0).copy();
-
-		this.clear();
-
-		world.setBlockState(pos, TRContent.StorageUnit.QUANTUM.block.getDefaultState());
-
-		StorageUnitBaseBlockEntity storageEntity = (StorageUnitBaseBlockEntity) world.getBlockEntity(pos);
-
-		if (!storedStack.isEmpty() && storageEntity != null) {
-			storageEntity.setStoredStack(storedStack);
-			storageEntity.setStack(0, inputSlotStack);
-		}
-	}
-}

src/main/java/techreborn/blockentity/storage/item/StorageUnitBaseBlockEntity.java

@@ -80,15 +80,6 @@ public class StorageUnitBaseBlockEntity extends MachineBaseBlockEntity
 		configureEntity(type);
 	}
 
-	@Deprecated
-	public StorageUnitBaseBlockEntity(BlockEntityType<?> blockEntityTypeIn, String name, int maxCapacity) {
-		super(blockEntityTypeIn);
-		this.maxCapacity = maxCapacity;
-		storeItemStack = ItemStack.EMPTY;
-		type = TRContent.StorageUnit.QUANTUM;
-		inventory = new RebornInventory<>(3, name, maxCapacity, this);
-	}
-
 	private void configureEntity(TRContent.StorageUnit type) {
 		this.maxCapacity = type.capacity;
 		storeItemStack = ItemStack.EMPTY;

src/main/java/techreborn/blocks/storage/OldBlock.java

@@ -1,39 +0,0 @@
-/*
- * This file is part of TechReborn, licensed under the MIT License (MIT).
- *
- * Copyright (c) 2020 TechReborn
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package techreborn.blocks.storage;
-
-import net.minecraft.block.entity.BlockEntity;
-import techreborn.blocks.GenericMachineBlock;
-import techreborn.client.GuiType;
-
-import java.util.function.Supplier;
-
-@Deprecated
-public class OldBlock extends GenericMachineBlock {
-
-	public OldBlock(GuiType gui, Supplier<BlockEntity> blockEntityClass) {
-		super(gui, blockEntityClass);
-	}
-}

src/main/java/techreborn/init/TRBlockEntities.java

@@ -59,12 +59,7 @@ import techreborn.blockentity.storage.energy.MediumVoltageSUBlockEntity;
 import techreborn.blockentity.storage.energy.idsu.InterdimensionalSUBlockEntity;
 import techreborn.blockentity.storage.energy.lesu.LSUStorageBlockEntity;
 import techreborn.blockentity.storage.energy.lesu.LapotronicSUBlockEntity;
-import techreborn.blockentity.storage.fluid.CreativeQuantumTankBlockEntity;
-import techreborn.blockentity.storage.fluid.QuantumTankBlockEntity;
 import techreborn.blockentity.storage.fluid.TankUnitBaseBlockEntity;
-import techreborn.blockentity.storage.item.CreativeQuantumChestBlockEntity;
-import techreborn.blockentity.storage.item.DigitalChestBlockEntity;
-import techreborn.blockentity.storage.item.QuantumChestBlockEntity;
 import techreborn.blockentity.storage.item.StorageUnitBaseBlockEntity;
 import techreborn.blockentity.transformers.EVTransformerBlockEntity;
 import techreborn.blockentity.transformers.HVTransformerBlockEntity;
@@ -83,11 +78,6 @@ public class TRBlockEntities {
 
 	public static final BlockEntityType<StorageUnitBaseBlockEntity> STORAGE_UNIT = register(StorageUnitBaseBlockEntity::new, "storage_unit", TRContent.StorageUnit.values());
 	public static final BlockEntityType<TankUnitBaseBlockEntity> TANK_UNIT = register(TankUnitBaseBlockEntity::new, "tank_unit", TRContent.TankUnit.values());
-	public static final BlockEntityType<QuantumTankBlockEntity> QUANTUM_TANK = register(QuantumTankBlockEntity::new, "quantum_tank", TRContent.Machine.QUANTUM_TANK);
-	public static final BlockEntityType<QuantumChestBlockEntity> QUANTUM_CHEST = register(QuantumChestBlockEntity::new, "quantum_chest", TRContent.Machine.QUANTUM_CHEST);
-	public static final BlockEntityType<DigitalChestBlockEntity> DIGITAL_CHEST = register(DigitalChestBlockEntity::new, "digital_chest", TRContent.Machine.DIGITAL_CHEST);
-	public static final BlockEntityType<CreativeQuantumChestBlockEntity> CREATIVE_QUANTUM_CHEST = register(CreativeQuantumChestBlockEntity::new, "creative_quantum_chest", TRContent.Machine.CREATIVE_QUANTUM_CHEST);
-	public static final BlockEntityType<CreativeQuantumTankBlockEntity> CREATIVE_QUANTUM_TANK = register(CreativeQuantumTankBlockEntity::new, "creative_quantum_tank", TRContent.Machine.CREATIVE_QUANTUM_TANK);
 	public static final BlockEntityType<DrainBlockEntity> DRAIN = register(DrainBlockEntity::new, "drain", TRContent.Machine.DRAIN);
 	public static final BlockEntityType<ThermalGeneratorBlockEntity> THERMAL_GEN = register(ThermalGeneratorBlockEntity::new, "thermal_generator", TRContent.Machine.THERMAL_GENERATOR);
 	public static final BlockEntityType<IndustrialCentrifugeBlockEntity> INDUSTRIAL_CENTRIFUGE = register(IndustrialCentrifugeBlockEntity::new, "industrial_centrifuge", TRContent.Machine.INDUSTRIAL_CENTRIFUGE);

src/main/java/techreborn/init/TRContent.java

@@ -52,11 +52,6 @@ import techreborn.blockentity.machine.tier3.ChunkLoaderBlockEntity;
 import techreborn.blockentity.machine.tier3.IndustrialCentrifugeBlockEntity;
 import techreborn.blockentity.machine.tier3.MatterFabricatorBlockEntity;
 import techreborn.blockentity.storage.energy.AdjustableSUBlockEntity;
-import techreborn.blockentity.storage.fluid.CreativeQuantumTankBlockEntity;
-import techreborn.blockentity.storage.fluid.QuantumTankBlockEntity;
-import techreborn.blockentity.storage.item.CreativeQuantumChestBlockEntity;
-import techreborn.blockentity.storage.item.DigitalChestBlockEntity;
-import techreborn.blockentity.storage.item.QuantumChestBlockEntity;
 import techreborn.blocks.DataDrivenMachineBlock;
 import techreborn.blocks.GenericMachineBlock;
 import techreborn.blocks.cable.CableBlock;
@@ -72,7 +67,6 @@ import techreborn.blocks.misc.BlockAlarm;
 import techreborn.blocks.misc.BlockMachineCasing;
 import techreborn.blocks.misc.BlockMachineFrame;
 import techreborn.blocks.misc.BlockStorage;
-import techreborn.blocks.storage.OldBlock;
 import techreborn.blocks.storage.energy.*;
 import techreborn.blocks.storage.fluid.TankUnitBlock;
 import techreborn.blocks.storage.item.StorageUnitBlock;
@@ -511,14 +505,6 @@ public class TRContent {
 
 		DRAIN(new GenericMachineBlock(null, DrainBlockEntity::new)),
 
-		//TODO DEPRECATED
-		DIGITAL_CHEST(new OldBlock(null, DigitalChestBlockEntity::new)),
-		QUANTUM_CHEST(new OldBlock(null, QuantumChestBlockEntity::new)),
-		QUANTUM_TANK(new OldBlock(null, QuantumTankBlockEntity::new)),
-		CREATIVE_QUANTUM_CHEST(new OldBlock(null, CreativeQuantumChestBlockEntity::new)),
-		CREATIVE_QUANTUM_TANK(new OldBlock(null, CreativeQuantumTankBlockEntity::new)),
-
-
 		ADJUSTABLE_SU(new AdjustableSUBlock()),
 		CHARGE_O_MAT(new GenericMachineBlock(GuiType.CHARGEBENCH, ChargeOMatBlockEntity::new)),
 		INTERDIMENSIONAL_SU(new InterdimensionalSUBlock()),

src/main/resources/assets/techreborn/blockstates/creative_quantum_chest.json

@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "": { "model": "techreborn:block/machines/tier3_machines/creative_quantum_chest" }
-    }
-}

src/main/resources/assets/techreborn/blockstates/creative_quantum_tank.json

@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "": { "model": "techreborn:block/machines/tier3_machines/creative_quantum_tank" }
-    }
-}

src/main/resources/assets/techreborn/blockstates/digital_chest.json

@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "": { "model": "techreborn:block/machines/tier2_machines/digital_chest" }
-    }
-}

src/main/resources/assets/techreborn/blockstates/quantum_chest.json

@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "": { "model": "techreborn:block/machines/tier3_machines/quantum_chest" }
-    }
-}

src/main/resources/assets/techreborn/blockstates/quantum_tank.json

@@ -1,5 +0,0 @@
-{
-    "variants": {
-        "": { "model": "techreborn:block/machines/tier3_machines/quantum_tank" }
-    }
-}

src/main/resources/assets/techreborn/lang/en_us.json

@@ -21,13 +21,6 @@
   "block.techreborn.quantum_tank_unit": "Quantum Tank Unit",
   "block.techreborn.creative_tank_unit": "Creative Tank Unit",
 
-
-  "block.techreborn.creative_quantum_tank": "Creative Quantum Tank (DEPRECATED)",
-  "block.techreborn.creative_quantum_chest": "Creative Quantum Chest (DEPRECATED)",
-  "block.techreborn.digital_chest": "Digital Chest (DEPRECATED)",
-  "block.techreborn.quantum_chest": "Quantum Chest (DEPRECATED)",
-  "block.techreborn.quantum_tank": "Quantum Tank (DEPRECATED)",
-
   "block.techreborn.industrial_centrifuge": "Industrial Centrifuge",
   "block.techreborn.rolling_machine": "Rolling Machine",
   "block.techreborn.basic_machine_casing": "Standard Machine Casing",
@@ -684,15 +677,10 @@
   "techreborn.message.info.block.techreborn.thermal_generator": "Converts lava and other heat sources into energy",
   "techreborn.message.info.block.techreborn.water_mill": "Uses the power of any water source adjacent to it to generate energy",
   "techreborn.message.info.block.techreborn.wind_mill": "Produces energy when placed above the height of 64 blocks from air\n25% more efficient in thunderstorms",
-  "techreborn.message.info.block.techreborn.creative_quantum_tank": "Infinite liquid, creative-only",
-  "techreborn.message.info.block.techreborn.digital_chest": "Stores 32,640 of a single item",
-  "techreborn.message.info.block.techreborn.quantum_chest": "Stores near-infinite of a single item",
-  "techreborn.message.info.block.techreborn.quantum_tank": "Stores near-infinite of a single liquid",
   "techreborn.message.info.block.techreborn.charge_o_mat": "Charges up to 6 items simultaneously",
   "techreborn.message.info.block.techreborn.chunk_loader": "Keeps chunks loaded, allows machines to run when you're not nearby",
   "techreborn.message.info.block.techreborn.drain": "Pulls any fluid directly above it, pairs nicely with a tank unit underneath",
 
-
   "keys.techreborn.category": "TechReborn Category",
   "keys.techreborn.config": "Config",
 

src/main/resources/assets/techreborn/models/block/machines/tier2_machines/digital_chest.json

@@ -1,8 +0,0 @@
-{
-    "parent": "minecraft:block/cube_bottom_top",
-    "textures": {
-        "top": "techreborn:block/machines/tier2_machines/digital_chest_top",
-        "bottom": "techreborn:block/machines/tier2_machines/digital_chest_bottom",
-        "side": "techreborn:block/machines/tier2_machines/digital_chest_side"
-    }
-}

src/main/resources/assets/techreborn/models/block/machines/tier3_machines/creative_quantum_chest.json

@@ -1,8 +0,0 @@
-{
-    "parent": "minecraft:block/cube_bottom_top",
-    "textures": {
-        "top": "techreborn:block/machines/tier3_machines/quantum_chest_top",
-        "bottom": "techreborn:block/machines/tier3_machines/quantum_chest_bottom",
-        "side": "techreborn:block/machines/tier3_machines/creative_quantum_chest_side"
-    }
-}

src/main/resources/assets/techreborn/models/block/machines/tier3_machines/creative_quantum_tank.json

@@ -1,8 +0,0 @@
-{
-    "parent": "minecraft:block/cube_bottom_top",
-    "textures": {
-        "top": "techreborn:block/machines/tier3_machines/quantum_tank_top",
-        "bottom": "techreborn:block/machines/tier3_machines/quantum_tank_bottom",
-        "side": "techreborn:block/machines/tier3_machines/creative_quantum_tank_side"
-    }
-}

src/main/resources/assets/techreborn/models/block/machines/tier3_machines/quantum_chest.json

@@ -1,8 +0,0 @@
-{
-    "parent": "minecraft:block/cube_bottom_top",
-    "textures": {
-        "top": "techreborn:block/machines/tier3_machines/quantum_chest_top",
-        "bottom": "techreborn:block/machines/tier3_machines/quantum_chest_bottom",
-        "side": "techreborn:block/machines/tier3_machines/quantum_chest_side"
-    }
-}

src/main/resources/assets/techreborn/models/block/machines/tier3_machines/quantum_tank.json

@@ -1,8 +0,0 @@
-{
-    "parent": "minecraft:block/cube_bottom_top",
-    "textures": {
-        "top": "techreborn:block/machines/tier3_machines/quantum_tank_top",
-        "bottom": "techreborn:block/machines/tier3_machines/quantum_tank_bottom",
-        "side": "techreborn:block/machines/tier3_machines/quantum_tank_side"
-    }
-}

src/main/resources/assets/techreborn/models/item/creative_quantum_chest.json

@@ -1,4 +0,0 @@
-{
-    "parent": "techreborn:block/machines/tier3_machines/creative_quantum_chest"
-}
-

src/main/resources/assets/techreborn/models/item/creative_quantum_tank.json

@@ -1,3 +0,0 @@
-{
-    "parent": "techreborn:block/machines/tier3_machines/creative_quantum_tank"
-}

src/main/resources/assets/techreborn/models/item/digital_chest.json

@@ -1,3 +0,0 @@
-{
-	"parent": "techreborn:block/machines/tier2_machines/digital_chest"
-}

src/main/resources/assets/techreborn/models/item/quantum_chest.json

@@ -1,4 +0,0 @@
-{
-    "parent": "techreborn:block/machines/tier3_machines/quantum_chest"
-}
-

src/main/resources/assets/techreborn/models/item/quantum_tank.json

@@ -1,4 +0,0 @@
-{
-    "parent": "techreborn:block/machines/tier3_machines/quantum_tank"
-}
-