From 2b0e7555b5ac179efe9bec299aeef48028230a14 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Mon, 3 Aug 2020 18:00:22 -0400 Subject: [PATCH] Update Yarn Build --- gradle.properties | 2 +- .../java/com/thebrokenrail/energonrelics/EnergonRelics.java | 3 +-- .../block/forcefield/util/AbstractFieldBlock.java | 2 +- .../energonrelics/component/NetworkComponent.java | 2 +- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index 12eac77..98a6da1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs = -Xmx1G # Fabric Properties # check these on https://fabricmc.net/use minecraft_version = 1.16.2-pre1 - yarn_build = 9 + yarn_build = 16 fabric_loader_version = 0.9.0+build.204 # Mod Properties diff --git a/src/main/java/com/thebrokenrail/energonrelics/EnergonRelics.java b/src/main/java/com/thebrokenrail/energonrelics/EnergonRelics.java index c575943..4cb9bf6 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/EnergonRelics.java +++ b/src/main/java/com/thebrokenrail/energonrelics/EnergonRelics.java @@ -98,8 +98,7 @@ public class EnergonRelics implements ModInitializer { public static final SpecialRecipeSerializer DUPLICATE_NETWORK_CHIP_RECIPE = new SpecialRecipeSerializer<>(DuplicateNetworkChipRecipe::new); - public static final Material FIELD_MATERIAL = new Material.Builder(MaterialColor.CLEAR).build(); - public static final Material BEAM_MATERIAL = new Material.Builder(MaterialColor.CLEAR).replaceable().build(); + public static final Material FIELD_MATERIAL = new Material.Builder(MaterialColor.CLEAR).replaceable().build(); public static final ForcefieldBlock FORCEFIELD_BLOCK = new ForcefieldBlock(); public static final ForcefieldProjectorBlock FORCEFIELD_PROJECTOR_BLOCK = new ForcefieldProjectorBlock(); diff --git a/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/util/AbstractFieldBlock.java b/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/util/AbstractFieldBlock.java index 958cb79..128ff47 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/util/AbstractFieldBlock.java +++ b/src/main/java/com/thebrokenrail/energonrelics/block/forcefield/util/AbstractFieldBlock.java @@ -31,7 +31,7 @@ public abstract class AbstractFieldBlock extends SimpleBlock { public static final DirectionProperty FACING = Properties.FACING; public AbstractFieldBlock(boolean hasCollision) { - super((hasCollision ? FabricBlockSettings.of(EnergonRelics.FIELD_MATERIAL) : FabricBlockSettings.of(EnergonRelics.BEAM_MATERIAL).noCollision()).strength(-1.0F, 3600000.8F).dropsNothing().nonOpaque().lightLevel(4).emissiveLighting((state, world, pos) -> true).nonOpaque().sounds(BlockSoundGroup.GLASS).allowsSpawning((state, world, pos, type) -> false).solidBlock((state, world, pos) -> false).suffocates((state, world, pos) -> false).blockVision((state, world, pos) -> false)); + super((hasCollision ? FabricBlockSettings.of(EnergonRelics.FIELD_MATERIAL) : FabricBlockSettings.of(EnergonRelics.FIELD_MATERIAL).noCollision()).strength(-1.0F, 3600000.8F).dropsNothing().nonOpaque().lightLevel(4).emissiveLighting((state, world, pos) -> true).nonOpaque().sounds(BlockSoundGroup.GLASS).allowsSpawning((state, world, pos, type) -> false).solidBlock((state, world, pos) -> false).suffocates((state, world, pos) -> false).blockVision((state, world, pos) -> false)); setDefaultState(getDefaultState().with(FACING, Direction.NORTH)); } diff --git a/src/main/java/com/thebrokenrail/energonrelics/component/NetworkComponent.java b/src/main/java/com/thebrokenrail/energonrelics/component/NetworkComponent.java index 72d8957..114009e 100644 --- a/src/main/java/com/thebrokenrail/energonrelics/component/NetworkComponent.java +++ b/src/main/java/com/thebrokenrail/energonrelics/component/NetworkComponent.java @@ -4,9 +4,9 @@ import com.thebrokenrail.energonrelics.EnergonRelics; import com.thebrokenrail.energonrelics.energy.core.EnergyProviderBlockEntity; import com.thebrokenrail.energonrelics.util.BlockPosWithDimension; import net.minecraft.block.entity.BlockEntity; -import net.minecraft.datafixer.NbtOps; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.ListTag; +import net.minecraft.nbt.NbtOps; import net.minecraft.nbt.Tag; import net.minecraft.server.world.ServerWorld; import net.minecraft.util.Identifier;