TheBrokenRail/EnergonRelics
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Reorganize

Browse Source
This commit is contained in:
TheBrokenRail 2020-07-28 16:46:34 -04:00
parent 488c37049f
commit ee7f8e481c
9 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/thebrokenrail/energonrelics/EnergonRelics.java
View File

@ -6,11 +6,11 @@ import com.thebrokenrail.energonrelics.block.DefensiveLaserBlock;
import com.thebrokenrail.energonrelics.block.HolographicSkyBlock; import com.thebrokenrail.energonrelics.block.HolographicSkyBlock;
import com.thebrokenrail.energonrelics.block.LightningRodBlock; import com.thebrokenrail.energonrelics.block.LightningRodBlock;
import com.thebrokenrail.energonrelics.block.forcefield.ForcefieldProjectorBlock; import com.thebrokenrail.energonrelics.block.forcefield.ForcefieldProjectorBlock;
import com.thebrokenrail.energonrelics.block.forcefield.IndustrialLaserProjectorBlock; import com.thebrokenrail.energonrelics.block.forcefield.laser.IndustrialLaserProjectorBlock;
import com.thebrokenrail.energonrelics.block.forcefield.IndustrialLaserBlock; import com.thebrokenrail.energonrelics.block.forcefield.laser.IndustrialLaserBlock;
import com.thebrokenrail.energonrelics.block.forcefield.RepulsorBeamBlock; import com.thebrokenrail.energonrelics.block.forcefield.beam.RepulsorBeamBlock;
import com.thebrokenrail.energonrelics.block.forcefield.TractorBeamBlock; import com.thebrokenrail.energonrelics.block.forcefield.beam.TractorBeamBlock;
import com.thebrokenrail.energonrelics.block.forcefield.TractorBeamProjectorBlock; import com.thebrokenrail.energonrelics.block.forcefield.beam.TractorBeamProjectorBlock;
import com.thebrokenrail.energonrelics.block.forcefield.ForcefieldBlock; import com.thebrokenrail.energonrelics.block.forcefield.ForcefieldBlock;
import com.thebrokenrail.energonrelics.block.misc.VeridiumBlockBlock; import com.thebrokenrail.energonrelics.block.misc.VeridiumBlockBlock;
import com.thebrokenrail.energonrelics.block.structure.StructureGeneratorBlock; import com.thebrokenrail.energonrelics.block.structure.StructureGeneratorBlock;

6
src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/IndustrialLaserBlockEntity.java → src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/laser/IndustrialLaserBlockEntity.java
View File

@ -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.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 com.thebrokenrail.energonrelics.config.HardcodedConfig;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
@ -16,6 +17,7 @@ import net.minecraft.world.explosion.Explosion;
public class IndustrialLaserBlockEntity extends FieldProjectorBlockEntity { public class IndustrialLaserBlockEntity extends FieldProjectorBlockEntity {
private BlockPos targetPos; private BlockPos targetPos;
private BlockState targetState; private BlockState targetState;
private int progress = 0; private int progress = 0;
public IndustrialLaserBlockEntity(BlockEntityType<?> type) { public IndustrialLaserBlockEntity(BlockEntityType<?> type) {

3
src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/IndustrialLaserRegistry.java → src/main/java/com/thebrokenrail/energonrelics/block/entity/forcefield/laser/IndustrialLaserRegistry.java
View File

@ -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.EnergonRelics;
import com.thebrokenrail.energonrelics.config.HardcodedConfig; import com.thebrokenrail.energonrelics.config.HardcodedConfig;
@ -37,6 +37,7 @@ public class IndustrialLaserRegistry {
} }
static { static {
add(Blocks.COAL_ORE, Items.COAL, Blocks.COAL_BLOCK);
add(Blocks.IRON_ORE, Items.IRON_INGOT, Blocks.IRON_BLOCK); add(Blocks.IRON_ORE, Items.IRON_INGOT, Blocks.IRON_BLOCK);
add(Blocks.GOLD_ORE, Items.GOLD_INGOT, Blocks.GOLD_BLOCK); add(Blocks.GOLD_ORE, Items.GOLD_INGOT, Blocks.GOLD_BLOCK);
add(Blocks.DIAMOND_ORE, Items.DIAMOND, Blocks.DIAMOND_BLOCK); add(Blocks.DIAMOND_ORE, Items.DIAMOND, Blocks.DIAMOND_BLOCK);

2
src/main/java/com/thebrokenrail/energonrelics/block/forcefield/RepulsorBeamBlock.java → src/main/java/com/thebrokenrail/energonrelics/block/forcefield/beam/RepulsorBeamBlock.java
View File

@ -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; import com.thebrokenrail.energonrelics.block.forcefield.util.BeamBlock;

2
src/main/java/com/thebrokenrail/energonrelics/block/forcefield/TractorBeamBlock.java → src/main/java/com/thebrokenrail/energonrelics/block/forcefield/beam/TractorBeamBlock.java
View File

@ -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; import com.thebrokenrail.energonrelics.block.forcefield.util.BeamBlock;

2
src/main/java/com/thebrokenrail/energonrelics/block/forcefield/TractorBeamProjectorBlock.java → src/main/java/com/thebrokenrail/energonrelics/block/forcefield/beam/TractorBeamProjectorBlock.java
View File

@ -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.EnergonRelics;
import com.thebrokenrail.energonrelics.block.forcefield.util.FieldProjectorBlock; import com.thebrokenrail.energonrelics.block.forcefield.util.FieldProjectorBlock;

2
src/main/java/com/thebrokenrail/energonrelics/block/forcefield/IndustrialLaserBlock.java → src/main/java/com/thebrokenrail/energonrelics/block/forcefield/laser/IndustrialLaserBlock.java
View File

@ -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.EnergonRelics;
import com.thebrokenrail.energonrelics.block.forcefield.util.AbstractFieldBlock; import com.thebrokenrail.energonrelics.block.forcefield.util.AbstractFieldBlock;

4
src/main/java/com/thebrokenrail/energonrelics/block/forcefield/IndustrialLaserProjectorBlock.java → src/main/java/com/thebrokenrail/energonrelics/block/forcefield/laser/IndustrialLaserProjectorBlock.java
View File

@ -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 com.thebrokenrail.energonrelics.block.forcefield.util.FieldProjectorBlock;
import net.minecraft.block.entity.BlockEntity; import net.minecraft.block.entity.BlockEntity;
import net.minecraft.block.entity.BlockEntityType; import net.minecraft.block.entity.BlockEntityType;

2
src/main/java/com/thebrokenrail/energonrelics/block/forcefield/util/BeamBlock.java
View File

@ -1,7 +1,7 @@
package com.thebrokenrail.energonrelics.block.forcefield.util; package com.thebrokenrail.energonrelics.block.forcefield.util;
import com.thebrokenrail.energonrelics.EnergonRelics; 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 com.thebrokenrail.energonrelics.config.HardcodedConfig;
import net.minecraft.block.BlockState; import net.minecraft.block.BlockState;
import net.minecraft.block.ShapeContext; import net.minecraft.block.ShapeContext;