Skip to content

Commit c4dfafd

Browse files
committed
Acknowledge TropheusJ's suggestions
1 parent 4680f70 commit c4dfafd

File tree

5 files changed

+6
-13
lines changed

5 files changed

+6
-13
lines changed

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ val buildNum = providers.environmentVariable("GITHUB_RUN_NUMBER")
6969
.orElse("-local")
7070
.getOrElse("")
7171

72-
version = "6.0.6.0+mc$minecraftVersion$buildNum"
72+
version = "6.0.4.0+mc$minecraftVersion$buildNum"
7373

7474
group = "com.simibubi.create"
7575
base.archivesName = "create-fabric"

src/main/java/com/simibubi/create/content/equipment/armor/DivingHelmetItem.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,7 @@ public static void breatheUnderwater(LivingEntity entity) {
121121
if (entity instanceof ServerPlayer sp)
122122
AllAdvancements.DIVING_SUIT.awardTo(sp);
123123

124-
// TODO: Find a way to make this work in Fabric if possible
125-
// event.setCanBreathe(true);
126-
// event.setCanRefillAir(true);
127-
entity.setAirSupply(Math.min(entity.getMaxAirSupply(), entity.getAirSupply() + 10));
128-
entity.addEffect(new MobEffectInstance(MobEffects.WATER_BREATHING, 30, 0, true, false, true));
124+
event.setCanBreathe(true);
125+
event.setCanRefillAir(true);
129126
}
130127
}

src/main/java/com/simibubi/create/content/equipment/armor/RemainingAirOverlay.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ public static void render(GuiGraphics graphics, int width, int height) {
3030
if (!player.getCustomData()
3131
.contains("VisualBacktankAir"))
3232
return;
33-
// TODO: Find a way to make this work in Fabric if possible
34-
if (/*!player.canDrownInFluidType(player.getEyeInFluidType())*/ !player.isEyeInFluid(FluidTags.WATER) && !player.isInLava())
33+
if (!player.canDrownInFluidType(player.getEyeInFluidType()) && !player.isInLava())
3534
return;
3635

3736
int timeLeft = player.getCustomData()

src/main/java/com/simibubi/create/content/kinetics/belt/BeltBlock.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ public void entityInside(BlockState state, Level worldIn, BlockPos pos, Entity e
216216
if (BeltTunnelInteractionHandler.getTunnelOnPosition(worldIn, pos) != null)
217217
return;
218218
withBlockEntityDo(worldIn, pos, be -> {
219-
// ItemEntity itemEntity = (ItemEntity) entityIn;
220219
Storage<ItemVariant> handler = be.getItemStorage(null);
221220
if (handler == null)
222221
return;

src/main/java/com/simibubi/create/content/logistics/vault/ItemVaultBlockEntity.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,11 @@ private static void updateComaratorsInner(Level level, Block provokingBlock, Blo
162162
}
163163

164164
BlockState blockstate = level.getBlockState(updatePos);
165-
// TODO: Find a way to make this work in Fabric if possible
166-
// blockstate.onNeighborChange(level, updatePos, provokingPos);
165+
blockstate.onNeighborChange(level, updatePos, provokingPos);
167166
if (blockstate.isRedstoneConductor(level, updatePos)) {
168167
updatePos.move(direction);
169168
blockstate = level.getBlockState(updatePos);
170-
// TODO: Find a way to make this work in Fabric if possible
171-
if (/*blockstate.getWeakChanges(level, updatePos)*/ blockstate.is(Blocks.COMPARATOR)) {
169+
if (blockstate.getWeakChanges(level, updatePos)) {
172170
level.neighborChanged(blockstate, updatePos, provokingBlock, provokingPos, false);
173171
}
174172
}

0 commit comments

Comments
 (0)