Skip to content

Commit 4df3d6b

Browse files
pupnewfsterpupnewfster
committed
Add a helper to get the default block state for block providers
1 parent f8efd06 commit 4df3d6b

File tree

12 files changed

+46
-35
lines changed

12 files changed

+46
-35
lines changed

‎src/additions/java/mekanism/additions/client/render/entity/RenderObsidianTNTPrimed.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public void render(@NotNull EntityObsidianTNT tnt, float entityYaw, float partia
4141
matrix.mulPose(Axis.YP.rotationDegrees(-90.0F));
4242
matrix.translate(-0.5, -0.5, 0.5);
4343
matrix.mulPose(Axis.YP.rotationDegrees(90.0F));
44-
TntMinecartRenderer.renderWhiteSolidBlock(blockRenderer, AdditionsBlocks.OBSIDIAN_TNT.getBlock().defaultBlockState(), matrix, renderer, light,
44+
TntMinecartRenderer.renderWhiteSolidBlock(blockRenderer, AdditionsBlocks.OBSIDIAN_TNT.defaultState(), matrix, renderer, light,
4545
tnt.getFuse() / 5 % 2 == 0);
4646
matrix.popPose();
4747
super.render(tnt, entityYaw, partialTick, matrix, renderer, light);

‎src/additions/java/mekanism/additions/common/block/plastic/BlockPlasticStairs.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class BlockPlasticStairs extends StairBlock implements IColoredBlock, ISt
2929
private final EnumColor color;
3030

3131
public BlockPlasticStairs(IBlockProvider blockProvider, EnumColor color, UnaryOperator<Properties> propertyModifier) {
32-
super(() -> blockProvider.getBlock().defaultBlockState(), BlockStateHelper.applyLightLevelAdjustments(propertyModifier.apply(BlockBehaviour.Properties.of()
32+
super(blockProvider::defaultState, BlockStateHelper.applyLightLevelAdjustments(propertyModifier.apply(BlockBehaviour.Properties.of()
3333
.mapColor(color.getMapColor()).strength(5, 6))));
3434
this.color = color;
3535
//Uses getDefaultState as starting state to take into account the stuff from super

‎src/api/java/mekanism/api/MekanismAPI.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ private MekanismAPI() {
2929
/**
3030
* The version of the api classes - may not always match the mod's version
3131
*/
32-
public static final String API_VERSION = "10.5.18";
32+
public static final String API_VERSION = "10.5.20";
3333
/**
3434
* Mekanism's Mod ID
3535
*/

‎src/api/java/mekanism/api/providers/IBlockProvider.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,24 @@
44
import net.minecraft.core.registries.BuiltInRegistries;
55
import net.minecraft.resources.ResourceLocation;
66
import net.minecraft.world.level.block.Block;
7+
import net.minecraft.world.level.block.state.BlockState;
8+
import org.jetbrains.annotations.NotNull;
79

810
@MethodsReturnNonnullByDefault
911
public interface IBlockProvider extends IItemProvider {
1012

1113
Block getBlock();
1214

15+
/**
16+
* Helper to get the default block state for the provided block.
17+
*
18+
* @since 10.5.20
19+
*/
20+
@NotNull
21+
default BlockState defaultState() {
22+
return getBlock().defaultBlockState();
23+
}
24+
1325
@Override
1426
default ResourceLocation getRegistryName() {
1527
//Make sure to use the block's registry name in case it somehow doesn't match

‎src/gameTest/java/mekanism/common/tests/network/InventoryNetworkTest.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ public class InventoryNetworkTest {
4545
.set(2, 0, 0, Blocks.BARREL.defaultBlockState())
4646
.set(8, 0, 0, Blocks.BARREL.defaultBlockState())
4747

48-
.set(3, 0, 1, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.getBlock().defaultBlockState(), configured(Direction.NORTH))
48+
.set(3, 0, 1, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState(), configured(Direction.NORTH))
4949

50-
.fill(0, 0, 0, 1, 0, 0, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.getBlock().defaultBlockState())
51-
.set(0, 0, 1, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.getBlock().defaultBlockState())
52-
.fill(0, 0, 2, 9, 0, 2, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.getBlock().defaultBlockState())
53-
.fill(9, 0, 0, 9, 0, 1, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.getBlock().defaultBlockState())
50+
.fill(0, 0, 0, 1, 0, 0, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState())
51+
.set(0, 0, 1, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState())
52+
.fill(0, 0, 2, 9, 0, 2, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState())
53+
.fill(9, 0, 0, 9, 0, 1, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState())
5454
);
5555

5656
//TODO: Do we want to somehow test the case of when we add a shorter path to the same destination, as the newly pulled items go via the new shorter path
@@ -82,8 +82,8 @@ public static void shorterNewDestination(final DynamicTest test) {
8282
.set(0, 0, 5, Blocks.BARREL.defaultBlockState())
8383
.set(2, 0, 2, Blocks.BARREL.defaultBlockState())
8484

85-
.set(0, 0, 1, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.getBlock().defaultBlockState(), configured(Direction.NORTH))
86-
.fill(0, 0, 2, 0, 0, 4, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.getBlock().defaultBlockState())
85+
.set(0, 0, 1, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState(), configured(Direction.NORTH))
86+
.fill(0, 0, 2, 0, 0, 4, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState())
8787
);
8888

8989
test.onGameTest(helper -> helper.startSequence()
@@ -111,11 +111,11 @@ public static void shorterEnabledPath(final DynamicTest test) {
111111
.set(0, 0, 5, Blocks.BARREL.defaultBlockState())
112112
.set(2, 0, 2, Blocks.BARREL.defaultBlockState())
113113

114-
.set(0, 0, 1, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.getBlock().defaultBlockState(), configured(Direction.NORTH))
115-
.fill(0, 0, 2, 0, 0, 4, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.getBlock().defaultBlockState())
114+
.set(0, 0, 1, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState(), configured(Direction.NORTH))
115+
.fill(0, 0, 2, 0, 0, 4, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState())
116116

117-
.set(1, 0, 3, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.getBlock().defaultBlockState())
118-
.set(1, 0, 2, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.getBlock().defaultBlockState(), configured(null, Direction.WEST, ConnectionType.NONE))
117+
.set(1, 0, 3, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState())
118+
.set(1, 0, 2, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState(), configured(null, Direction.WEST, ConnectionType.NONE))
119119
);
120120

121121
test.onGameTest(helper -> helper.startSequence()
@@ -143,8 +143,8 @@ public static void colorlessIntoColor(final DynamicTest test) {
143143
.set(0, 0, 0, Blocks.BARREL.defaultBlockState(), containing(Items.STONE))
144144
//End barrel
145145
.set(1, 0, 0, Blocks.BARREL.defaultBlockState())
146-
.set(0, 0, 1, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.getBlock().defaultBlockState(), configured(Direction.NORTH))
147-
.set(1, 0, 1, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.getBlock().defaultBlockState(), colored(EnumColor.BLACK))
146+
.set(0, 0, 1, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState(), configured(Direction.NORTH))
147+
.set(1, 0, 1, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState(), colored(EnumColor.BLACK))
148148
);
149149

150150
//Note: We initialize the starting inventory above
@@ -169,10 +169,10 @@ public static void colorMatches(final DynamicTest test) {
169169
.set(2, 0, 2, Blocks.BARREL.defaultBlockState())
170170
.set(2, 0, 3, Blocks.BARREL.defaultBlockState())
171171

172-
.set(0, 0, 1, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.getBlock().defaultBlockState(), colored(EnumColor.BLACK, Direction.NORTH))
173-
.set(1, 0, 2, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.getBlock().defaultBlockState(), colored(EnumColor.DARK_BLUE))
174-
.set(1, 0, 3, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.getBlock().defaultBlockState(), colored(EnumColor.BLACK))
175-
.fill(0, 0, 2, 0, 0, 3, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.getBlock().defaultBlockState())
172+
.set(0, 0, 1, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState(), colored(EnumColor.BLACK, Direction.NORTH))
173+
.set(1, 0, 2, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState(), colored(EnumColor.DARK_BLUE))
174+
.set(1, 0, 3, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState(), colored(EnumColor.BLACK))
175+
.fill(0, 0, 2, 0, 0, 3, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState())
176176
);
177177

178178
test.onGameTest(helper -> helper.startSequence()
@@ -199,9 +199,9 @@ public static void colorIsNotPriority(final DynamicTest test) {
199199
.set(1, 0, 2, Blocks.BARREL.defaultBlockState())
200200
.set(1, 0, 3, Blocks.BARREL.defaultBlockState())
201201

202-
.set(0, 0, 1, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.getBlock().defaultBlockState(), colored(EnumColor.BLACK, Direction.NORTH))
203-
.set(0, 0, 2, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.getBlock().defaultBlockState())
204-
.set(0, 0, 3, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.getBlock().defaultBlockState(), colored(EnumColor.BLACK))
202+
.set(0, 0, 1, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState(), colored(EnumColor.BLACK, Direction.NORTH))
203+
.set(0, 0, 2, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState())
204+
.set(0, 0, 3, MekanismBlocks.BASIC_LOGISTICAL_TRANSPORTER.defaultState(), colored(EnumColor.BLACK))
205205
);
206206

207207
test.onGameTest(helper -> helper.startSequence()

‎src/gameTest/java/mekanism/common/tests/network/TransmitterNetworkTest.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,7 @@ public static void reloadIntermediary(final DynamicTest test) {
5858
.thenExecuteAfter(5, level -> chunkData.updateChunkLoading(helper, true, level))
5959
.thenWaitUntil(() -> chunkData.waitFor(helper, true))
6060
//Wait 5 ticks in case anything needs more time to process after the chunk loads
61-
.thenIdle(5)
62-
.thenExecute(new MatchingNetworkValidator(helper))
61+
.thenExecuteAfter(5, new MatchingNetworkValidator(helper))
6362
.thenSucceed()
6463
);
6564
}
@@ -89,8 +88,7 @@ public static void inaccessibleNotUnloaded(final ExtendedGameTestHelper helper)
8988
//Set the chunk level back to what it was before (aka loading it fully again)
9089
.thenExecuteAfter(5, level -> GameTestUtils.setChunkLoadLevel(helper, relativeChunk, level))
9190
//Wait 5 ticks in case anything needs more time to process after the chunk loads
92-
.thenIdle(5)
93-
.thenExecute(new MatchingNetworkValidator(helper))
91+
.thenExecuteAfter(5, new MatchingNetworkValidator(helper))
9492
.thenSucceed();
9593
}
9694

‎src/generators/java/mekanism/generators/common/registries/GeneratorsBuilders.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ protected void build(Level world, BlockPos start, boolean empty) {
3333
buildColumn(world, start, new BlockPos(sizeX / 2, 1, sizeZ / 2), 14, GeneratorsBlocks.TURBINE_ROTOR.getBlock(),
3434
TileEntityTurbineRotor.class, rotor -> rotor.blades = 2);
3535
buildInteriorLayer(world, start, 15, MekanismBlocks.PRESSURE_DISPERSER.getBlock());
36-
world.setBlockAndUpdate(start.offset(sizeX / 2, 15, sizeZ / 2), GeneratorsBlocks.ROTATIONAL_COMPLEX.getBlock().defaultBlockState());
36+
world.setBlockAndUpdate(start.offset(sizeX / 2, 15, sizeZ / 2), GeneratorsBlocks.ROTATIONAL_COMPLEX.defaultState());
3737
buildInteriorLayer(world, start, 16, GeneratorsBlocks.SATURATING_CONDENSER.getBlock());
3838
buildPlane(world, start, 5, 5, 13, 13, 16, GeneratorsBlocks.ELECTROMAGNETIC_COIL.getBlock());
3939
}
@@ -75,7 +75,7 @@ protected void build(Level world, BlockPos start, boolean empty) {
7575
if (x % 2 == z % 2) {
7676
buildColumn(world, start, mutablePos, 15, GeneratorsBlocks.FISSION_FUEL_ASSEMBLY.getBlock());
7777
mutablePos.setWithOffset(start, x, sizeY - 2, z);
78-
world.setBlockAndUpdate(mutablePos, GeneratorsBlocks.CONTROL_ROD_ASSEMBLY.getBlock().defaultBlockState());
78+
world.setBlockAndUpdate(mutablePos, GeneratorsBlocks.CONTROL_ROD_ASSEMBLY.defaultState());
7979
} else {
8080
buildColumn(world, start, mutablePos, 16, Blocks.AIR);
8181
}
@@ -106,7 +106,7 @@ protected void build(Level world, BlockPos start, boolean empty) {
106106
buildPartialFrame(world, start, 1);
107107
buildWalls(world, start);
108108
buildInteriorLayers(world, start, 1, 3, Blocks.AIR);
109-
world.setBlockAndUpdate(start.offset(2, 4, 2), GeneratorsBlocks.FUSION_REACTOR_CONTROLLER.getBlock().defaultBlockState());
109+
world.setBlockAndUpdate(start.offset(2, 4, 2), GeneratorsBlocks.FUSION_REACTOR_CONTROLLER.defaultState());
110110
}
111111

112112
@Override

‎src/main/java/mekanism/client/model/baked/DriveArrayBakedModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ private static class DriveStatusBakedModel extends ModelDataBakedModel {
167167

168168
public DriveStatusBakedModel(BakedModel original, ModelData data) {
169169
super(original, data);
170-
this.targetState = MekanismBlocks.QIO_DRIVE_ARRAY.getBlock().defaultBlockState();
170+
this.targetState = MekanismBlocks.QIO_DRIVE_ARRAY.defaultState();
171171
}
172172

173173
@NotNull

‎src/main/java/mekanism/common/block/states/BlockStateHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ public static BlockState copyStateData(BlockState oldState, @Nullable IBlockProv
117117
if (newBlockProvider == null) {
118118
return oldState;
119119
}
120-
return copyStateData(oldState, newBlockProvider.getBlock().defaultBlockState());
120+
return copyStateData(oldState, newBlockProvider.defaultState());
121121
}
122122

123123
public static BlockState copyStateData(BlockState oldState, BlockState newState) {

‎src/main/java/mekanism/common/command/builders/Builders.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public void build(Level world, BlockPos start, boolean empty) {
9292
buildFrame(world, start);
9393
buildWalls(world, start);
9494
buildInteriorLayers(world, start, 1, 17, Blocks.AIR);
95-
world.setBlockAndUpdate(start.offset(1, 1, 0), MekanismBlocks.THERMAL_EVAPORATION_CONTROLLER.getBlock().defaultBlockState());
95+
world.setBlockAndUpdate(start.offset(1, 1, 0), MekanismBlocks.THERMAL_EVAPORATION_CONTROLLER.defaultState());
9696
}
9797

9898
@Override

0 commit comments

Comments
 (0)