diff --git a/src/main/java/com/thebrokenrail/energonrelics/EnergonRelics.java b/src/main/java/com/thebrokenrail/energonrelics/EnergonRelics.java index f0d6898..9cc5be6 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/EnergonRelics.java +++ b/src/main/java/com/thebrokenrail/energonrelics/EnergonRelics.java @@ -6,11 +6,11 @@ import com.thebrokenrail.energonrelics.block.DefensiveLaserBlock; import com.thebrokenrail.energonrelics.block.HolographicSkyBlock; import com.thebrokenrail.energonrelics.block.LightningRodBlock; import com.thebrokenrail.energonrelics.block.forcefield.ForcefieldProjectorBlock; -import com.thebrokenrail.energonrelics.block.forcefield.IndustrialLaserProjectorBlock; -import com.thebrokenrail.energonrelics.block.forcefield.IndustrialLaserBlock; -import com.thebrokenrail.energonrelics.block.forcefield.RepulsorBeamBlock; -import com.thebrokenrail.energonrelics.block.forcefield.TractorBeamBlock; -import com.thebrokenrail.energonrelics.block.forcefield.TractorBeamProjectorBlock; +import com.thebrokenrail.energonrelics.block.forcefield.laser.IndustrialLaserProjectorBlock; +import com.thebrokenrail.energonrelics.block.forcefield.laser.IndustrialLaserBlock; +import com.thebrokenrail.energonrelics.block.forcefield.beam.RepulsorBeamBlock; +import com.thebrokenrail.energonrelics.block.forcefield.beam.TractorBeamBlock; +import com.thebrokenrail.energonrelics.block.forcefield.beam.TractorBeamProjectorBlock; import com.thebrokenrail.energonrelics.block.forcefield.ForcefieldBlock; import com.thebrokenrail.energonrelics.block.misc.VeridiumBlockBlock; import com.thebrokenrail.energonrelics.block.structure.StructureGeneratorBlock; diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/IndustrialLaserBlockEntity.java b/src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/laser/IndustrialLaserBlockEntity.java similarity index 91% rename from src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/IndustrialLaserBlockEntity.java rename to src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/laser/IndustrialLaserBlockEntity.java index 8d09e1d..ea72c93 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/IndustrialLaserBlockEntity.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/laser/IndustrialLaserBlockEntity.java @@ -1,7 +1,8 @@ -package com.thebrokenrail.energonrelics.block.entity.forcefield; +package com.thebrokenrail.energonrelics.block.entity.forcefield.laser; import com.thebrokenrail.energonrelics.EnergonRelics; -import com.thebrokenrail.energonrelics.block.forcefield.IndustrialLaserProjectorBlock; +import com.thebrokenrail.energonrelics.block.entity.forcefield.FieldProjectorBlockEntity; +import com.thebrokenrail.energonrelics.block.forcefield.laser.IndustrialLaserProjectorBlock; import com.thebrokenrail.energonrelics.config.HardcodedConfig; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -16,6 +17,7 @@ import net.minecraft.world.explosion.Explosion; public class IndustrialLaserBlockEntity extends FieldProjectorBlockEntity { private BlockPos targetPos; private BlockState targetState; + private int progress = 0; public IndustrialLaserBlockEntity(BlockEntityType type) { diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/IndustrialLaserRegistry.java b/src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/laser/IndustrialLaserRegistry.java similarity index 92% rename from src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/IndustrialLaserRegistry.java rename to src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/laser/IndustrialLaserRegistry.java index 2009cc1..6bc7068 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/IndustrialLaserRegistry.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/laser/IndustrialLaserRegistry.java @@ -1,4 +1,4 @@ -package com.thebrokenrail.energonrelics.block.entity.forcefield; +package com.thebrokenrail.energonrelics.block.entity.forcefield.laser; import com.thebrokenrail.energonrelics.EnergonRelics; import com.thebrokenrail.energonrelics.config.HardcodedConfig; @@ -37,6 +37,7 @@ public class IndustrialLaserRegistry { } static { + 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.DIAMOND_ORE, Items.DIAMOND, Blocks.DIAMOND_BLOCK); diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/RepulsorBeamBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/beam/RepulsorBeamBlock.java similarity index 74% rename from src/main/java/com/thebrokenrail/energonrelics/block/forcefield/RepulsorBeamBlock.java rename to src/main/java/com/thebrokenrail/energonrelics/block/forcefield/beam/RepulsorBeamBlock.java index a494a3b..8356a8d 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/RepulsorBeamBlock.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/beam/RepulsorBeamBlock.java @@ -1,4 +1,4 @@ -package com.thebrokenrail.energonrelics.block.forcefield; +package com.thebrokenrail.energonrelics.block.forcefield.beam; import com.thebrokenrail.energonrelics.block.forcefield.util.BeamBlock; diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/TractorBeamBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/beam/TractorBeamBlock.java similarity index 74% rename from src/main/java/com/thebrokenrail/energonrelics/block/forcefield/TractorBeamBlock.java rename to src/main/java/com/thebrokenrail/energonrelics/block/forcefield/beam/TractorBeamBlock.java index 9892b65..2a5469f 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/TractorBeamBlock.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/beam/TractorBeamBlock.java @@ -1,4 +1,4 @@ -package com.thebrokenrail.energonrelics.block.forcefield; +package com.thebrokenrail.energonrelics.block.forcefield.beam; import com.thebrokenrail.energonrelics.block.forcefield.util.BeamBlock; diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/TractorBeamProjectorBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/beam/TractorBeamProjectorBlock.java similarity index 97% rename from src/main/java/com/thebrokenrail/energonrelics/block/forcefield/TractorBeamProjectorBlock.java rename to src/main/java/com/thebrokenrail/energonrelics/block/forcefield/beam/TractorBeamProjectorBlock.java index f1e2d83..a65fdd9 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/TractorBeamProjectorBlock.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/beam/TractorBeamProjectorBlock.java @@ -1,4 +1,4 @@ -package com.thebrokenrail.energonrelics.block.forcefield; +package com.thebrokenrail.energonrelics.block.forcefield.beam; import com.thebrokenrail.energonrelics.EnergonRelics; import com.thebrokenrail.energonrelics.block.forcefield.util.FieldProjectorBlock; diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/IndustrialLaserBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/laser/IndustrialLaserBlock.java similarity index 95% rename from src/main/java/com/thebrokenrail/energonrelics/block/forcefield/IndustrialLaserBlock.java rename to src/main/java/com/thebrokenrail/energonrelics/block/forcefield/laser/IndustrialLaserBlock.java index 787c382..a5a9d5a 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/IndustrialLaserBlock.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/laser/IndustrialLaserBlock.java @@ -1,4 +1,4 @@ -package com.thebrokenrail.energonrelics.block.forcefield; +package com.thebrokenrail.energonrelics.block.forcefield.laser; import com.thebrokenrail.energonrelics.EnergonRelics; import com.thebrokenrail.energonrelics.block.forcefield.util.AbstractFieldBlock; diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/IndustrialLaserProjectorBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/laser/IndustrialLaserProjectorBlock.java similarity index 76% rename from src/main/java/com/thebrokenrail/energonrelics/block/forcefield/IndustrialLaserProjectorBlock.java rename to src/main/java/com/thebrokenrail/energonrelics/block/forcefield/laser/IndustrialLaserProjectorBlock.java index 158fc38..cf175a4 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/IndustrialLaserProjectorBlock.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/laser/IndustrialLaserProjectorBlock.java @@ -1,6 +1,6 @@ -package com.thebrokenrail.energonrelics.block.forcefield; +package com.thebrokenrail.energonrelics.block.forcefield.laser; -import com.thebrokenrail.energonrelics.block.entity.forcefield.IndustrialLaserBlockEntity; +import com.thebrokenrail.energonrelics.block.entity.forcefield.laser.IndustrialLaserBlockEntity; import com.thebrokenrail.energonrelics.block.forcefield.util.FieldProjectorBlock; import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntityType; diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/util/BeamBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/util/BeamBlock.java index 8cc5fea..039ac67 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/util/BeamBlock.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/util/BeamBlock.java @@ -1,7 +1,7 @@ package com.thebrokenrail.energonrelics.block.forcefield.util; import com.thebrokenrail.energonrelics.EnergonRelics; -import com.thebrokenrail.energonrelics.block.forcefield.TractorBeamProjectorBlock; +import com.thebrokenrail.energonrelics.block.forcefield.beam.TractorBeamProjectorBlock; import com.thebrokenrail.energonrelics.config.HardcodedConfig; import net.minecraft.block.BlockState; import net.minecraft.block.ShapeContext;