From 142fd83a2949c755d218c31f5dfde5c1eadbe629 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Wed, 22 Jul 2020 18:57:51 -0400 Subject: [PATCH] Tweaking --- .../thebrokenrail/energonrelics/EnergonRelics.java | 7 +++---- .../energonrelics/block/BlockBreakerBlock.java | 2 +- .../energonrelics/block/DefensiveLaserBlock.java | 2 +- .../energonrelics/block/ThermalGlassBlock.java | 2 +- .../energonrelics/block/VeridiumBlockBlock.java | 13 +++++++++++++ .../block/entity/DefensiveLaserBlockEntity.java | 2 +- .../entity/render/HighlightBlockEntityRenderer.java | 12 ++++++------ .../resources/assets/energonrelics/lang/en_us.json | 8 ++++---- 8 files changed, 30 insertions(+), 18 deletions(-) create mode 100644 src/main/java/com/thebrokenrail/energonrelics/block/VeridiumBlockBlock.java diff --git a/src/main/java/com/thebrokenrail/energonrelics/EnergonRelics.java b/src/main/java/com/thebrokenrail/energonrelics/EnergonRelics.java index 9b64cc5..b94c3dc 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/EnergonRelics.java +++ b/src/main/java/com/thebrokenrail/energonrelics/EnergonRelics.java @@ -2,6 +2,7 @@ package com.thebrokenrail.energonrelics; import com.thebrokenrail.energonrelics.block.BlockBreakerBlock; import com.thebrokenrail.energonrelics.block.DefensiveLaserBlock; +import com.thebrokenrail.energonrelics.block.VeridiumBlockBlock; import com.thebrokenrail.energonrelics.block.structure.StructureGeneratorBlock; import com.thebrokenrail.energonrelics.block.ThermalGlassBlock; import com.thebrokenrail.energonrelics.block.battery.ActiveBatteryControllerBlock; @@ -22,11 +23,9 @@ import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.minecraft.block.Material; -import net.minecraft.block.MaterialColor; import net.minecraft.item.Item; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; -import net.minecraft.sound.BlockSoundGroup; import net.minecraft.util.Identifier; import net.minecraft.util.registry.BuiltinRegistries; import net.minecraft.util.registry.Registry; @@ -58,8 +57,8 @@ public class EnergonRelics implements ModInitializer { public static final ReactorControllerBlock REACTOR_CONTROLLER_BLOCK = new ReactorControllerBlock(); public static final Item VERIDIUM_INGOT_ITEM = new Item(new Item.Settings().group(ITEM_GROUP)); - public static final SimpleBlock VERIDIUM_ORE_BLOCK = new SimpleBlock(FabricBlockSettings.of(Material.STONE).requiresTool().strength(3.0F, 3.0F)); - public static final SimpleBlock VERIDIUM_BLOCK_BLOCK = new SimpleBlock(FabricBlockSettings.of(Material.METAL, MaterialColor.GOLD).requiresTool().strength(3.0F, 6.0F).sounds(BlockSoundGroup.METAL)); + public static final SimpleBlock VERIDIUM_ORE_BLOCK = new SimpleBlock(FabricBlockSettings.of(Material.STONE).requiresTool().strength(3f, 3f)); + public static final SimpleBlock VERIDIUM_BLOCK_BLOCK = new VeridiumBlockBlock(); public static final ConfiguredFeature VERIDIUM_ORE_FEATURE = Feature.ORE.configure(new OreFeatureConfig(OreFeatureConfig.class_5436.field_25845, EnergonRelics.VERIDIUM_ORE_BLOCK.getDefaultState(), 9)).method_30377(32).spreadHorizontally().repeat(2); public static final Item CIRCUIT_BOARD_ITEM = new Item(new Item.Settings().group(ITEM_GROUP)); diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/BlockBreakerBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/BlockBreakerBlock.java index e2328c8..80557fd 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/BlockBreakerBlock.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/BlockBreakerBlock.java @@ -21,7 +21,7 @@ public class BlockBreakerBlock extends FacingEnergyProviderBlock { public static final BooleanProperty POWERED = Properties.POWERED; public BlockBreakerBlock() { - super(FabricBlockSettings.copy(Blocks.BLACKSTONE).strength(2.0F, 6.0F).nonOpaque().lightLevel(state -> state.get(POWERED) ? 7 : 0)); + super(FabricBlockSettings.copy(Blocks.BLACKSTONE).strength(2f, 6f).nonOpaque().lightLevel(state -> state.get(POWERED) ? 7 : 0)); setDefaultState(getDefaultState().with(POWERED, false)); } diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/DefensiveLaserBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/DefensiveLaserBlock.java index b00cecb..a2772bc 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/DefensiveLaserBlock.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/DefensiveLaserBlock.java @@ -39,7 +39,7 @@ public class DefensiveLaserBlock extends EnergyProviderBlock { @SuppressWarnings("deprecation") @Environment(EnvType.CLIENT) public float getAmbientOcclusionLightLevel(BlockState state, BlockView world, BlockPos pos) { - return 1.0F; + return 1f; } @Override diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/ThermalGlassBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/ThermalGlassBlock.java index 32e092e..0c51385 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/ThermalGlassBlock.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/ThermalGlassBlock.java @@ -20,7 +20,7 @@ public class ThermalGlassBlock extends SimpleBlock { @SuppressWarnings("deprecation") @Environment(EnvType.CLIENT) public float getAmbientOcclusionLightLevel(BlockState state, BlockView world, BlockPos pos) { - return 1.0F; + return 1f; } @Override diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/VeridiumBlockBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/VeridiumBlockBlock.java new file mode 100644 index 0000000..326c1cd --- /dev/null +++ b/src/main/java/com/thebrokenrail/energonrelics/block/VeridiumBlockBlock.java @@ -0,0 +1,13 @@ +package com.thebrokenrail.energonrelics.block; + +import com.thebrokenrail.energonrelics.block.util.SimpleBlock; +import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; +import net.minecraft.block.Material; +import net.minecraft.block.MaterialColor; +import net.minecraft.sound.BlockSoundGroup; + +public class VeridiumBlockBlock extends SimpleBlock { + public VeridiumBlockBlock() { + super(FabricBlockSettings.of(Material.METAL, MaterialColor.PURPLE).requiresTool().strength(3f, 6f).sounds(BlockSoundGroup.METAL).nonOpaque().lightLevel(8).emissiveLighting((state, world, pos) -> true)); + } +} diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/entity/DefensiveLaserBlockEntity.java b/src/main/java/com/thebrokenrail/energonrelics/block/entity/DefensiveLaserBlockEntity.java index 98ad57c..57e3f9a 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/entity/DefensiveLaserBlockEntity.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/entity/DefensiveLaserBlockEntity.java @@ -147,7 +147,7 @@ public class DefensiveLaserBlockEntity extends EnergyReceiverBlockEntity { Vec3d pos = getPosVec(); double diffX = targetPos.getX() - pos.getX(); double diffZ = targetPos.getZ() - pos.getZ(); - return -((float) (MathHelper.atan2(diffZ, diffX) * RAD2DEG) - 90.0F); + return -((float) (MathHelper.atan2(diffZ, diffX) * RAD2DEG) - 90f); } private static final int COUNTDOWN = 28; diff --git a/src/main/java/com/thebrokenrail/energonrelics/client/block/entity/render/HighlightBlockEntityRenderer.java b/src/main/java/com/thebrokenrail/energonrelics/client/block/entity/render/HighlightBlockEntityRenderer.java index 0620524..ac88db9 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/client/block/entity/render/HighlightBlockEntityRenderer.java +++ b/src/main/java/com/thebrokenrail/energonrelics/client/block/entity/render/HighlightBlockEntityRenderer.java @@ -53,12 +53,12 @@ public class HighlightBlockEntityRenderer extends BlockEntityRenderer