Compare commits

..

No commits in common. "e98b44453db00e38c4430b53a11e80dd84d0c6e1" and "488c37049f2a97afcd6cb396282be9ccd3235674" have entirely different histories.

9 changed files with 16 additions and 19 deletions

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.laser.IndustrialLaserProjectorBlock; import com.thebrokenrail.energonrelics.block.forcefield.IndustrialLaserProjectorBlock;
import com.thebrokenrail.energonrelics.block.forcefield.laser.IndustrialLaserBlock; import com.thebrokenrail.energonrelics.block.forcefield.IndustrialLaserBlock;
import com.thebrokenrail.energonrelics.block.forcefield.beam.RepulsorBeamBlock; import com.thebrokenrail.energonrelics.block.forcefield.RepulsorBeamBlock;
import com.thebrokenrail.energonrelics.block.forcefield.beam.TractorBeamBlock; import com.thebrokenrail.energonrelics.block.forcefield.TractorBeamBlock;
import com.thebrokenrail.energonrelics.block.forcefield.beam.TractorBeamProjectorBlock; import com.thebrokenrail.energonrelics.block.forcefield.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;

View File

@ -1,8 +1,7 @@
package com.thebrokenrail.energonrelics.block.entity.forcefield.laser; package com.thebrokenrail.energonrelics.block.entity.forcefield;
import com.thebrokenrail.energonrelics.EnergonRelics; import com.thebrokenrail.energonrelics.EnergonRelics;
import com.thebrokenrail.energonrelics.block.entity.forcefield.FieldProjectorBlockEntity; import com.thebrokenrail.energonrelics.block.forcefield.IndustrialLaserProjectorBlock;
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;
@ -17,7 +16,6 @@ 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) {
@ -54,7 +52,7 @@ public class IndustrialLaserBlockEntity extends FieldProjectorBlockEntity {
} else { } else {
Vec3d vec = Vec3d.ofCenter(targetPos); Vec3d vec = Vec3d.ofCenter(targetPos);
((ServerWorld) getWorld()).spawnParticles(ParticleTypes.FLAME, vec.getX(), vec.getY(), vec.getZ(), 1, 0.4f, 0.4f, 0.4f, 0f); ((ServerWorld) getWorld()).spawnParticles(ParticleTypes.FLAME, vec.getX(), vec.getY(), vec.getZ(), 2, 0.3f, 0.3f, 0.3f, 0f);
progress++; progress++;
} }

View File

@ -1,4 +1,4 @@
package com.thebrokenrail.energonrelics.block.entity.forcefield.laser; package com.thebrokenrail.energonrelics.block.entity.forcefield;
import com.thebrokenrail.energonrelics.EnergonRelics; import com.thebrokenrail.energonrelics.EnergonRelics;
import com.thebrokenrail.energonrelics.config.HardcodedConfig; import com.thebrokenrail.energonrelics.config.HardcodedConfig;
@ -37,7 +37,6 @@ 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);

View File

@ -1,4 +1,4 @@
package com.thebrokenrail.energonrelics.block.forcefield.laser; package com.thebrokenrail.energonrelics.block.forcefield;
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;

View File

@ -1,6 +1,6 @@
package com.thebrokenrail.energonrelics.block.forcefield.laser; package com.thebrokenrail.energonrelics.block.forcefield;
import com.thebrokenrail.energonrelics.block.entity.forcefield.laser.IndustrialLaserBlockEntity; import com.thebrokenrail.energonrelics.block.entity.forcefield.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;

View File

@ -1,4 +1,4 @@
package com.thebrokenrail.energonrelics.block.forcefield.beam; package com.thebrokenrail.energonrelics.block.forcefield;
import com.thebrokenrail.energonrelics.block.forcefield.util.BeamBlock; import com.thebrokenrail.energonrelics.block.forcefield.util.BeamBlock;

View File

@ -1,4 +1,4 @@
package com.thebrokenrail.energonrelics.block.forcefield.beam; package com.thebrokenrail.energonrelics.block.forcefield;
import com.thebrokenrail.energonrelics.block.forcefield.util.BeamBlock; import com.thebrokenrail.energonrelics.block.forcefield.util.BeamBlock;

View File

@ -1,4 +1,4 @@
package com.thebrokenrail.energonrelics.block.forcefield.beam; package com.thebrokenrail.energonrelics.block.forcefield;
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;

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.beam.TractorBeamProjectorBlock; import com.thebrokenrail.energonrelics.block.forcefield.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;