Skip to content

Commit be4be08

Browse files
Minor improvements to jetpacks (#3798)
1 parent 3909384 commit be4be08

3 files changed

Lines changed: 18 additions & 2 deletions

File tree

src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2452,7 +2452,7 @@ public static ItemEntry<ComponentItem> createFluidCell(Material mat, int capacit
24522452
public static ItemEntry<ArmorComponentItem> ELECTRIC_JETPACK = REGISTRATE
24532453
.item("electric_jetpack",
24542454
(p) -> new ArmorComponentItem(GTArmorMaterials.JETPACK, ArmorItem.Type.CHESTPLATE, p)
2455-
.setArmorLogic(new Jetpack(30,
2455+
.setArmorLogic(new Jetpack(15,
24562456
1_000_000L * (long) Math.max(1,
24572457
Math.pow(4, ConfigHolder.INSTANCE.tools.voltageTierImpeller - 2)),
24582458
ConfigHolder.INSTANCE.tools.voltageTierImpeller)))
@@ -2466,7 +2466,7 @@ public static ItemEntry<ComponentItem> createFluidCell(Material mat, int capacit
24662466
public static ItemEntry<ArmorComponentItem> ELECTRIC_JETPACK_ADVANCED = REGISTRATE
24672467
.item("advanced_electric_jetpack",
24682468
(p) -> new ArmorComponentItem(GTArmorMaterials.JETPACK, ArmorItem.Type.CHESTPLATE, p)
2469-
.setArmorLogic(new AdvancedJetpack(512,
2469+
.setArmorLogic(new AdvancedJetpack(256,
24702470
6_400_000L * (long) Math.max(1,
24712471
Math.pow(4, ConfigHolder.INSTANCE.tools.voltageTierAdvImpeller - 4)),
24722472
ConfigHolder.INSTANCE.tools.voltageTierAdvImpeller)))

src/main/java/com/gregtechceu/gtceu/common/item/armor/IJetpack.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ default double getSidewaysSpeed() {
5050
return 0.0D;
5151
}
5252

53+
default boolean removeMiningSpeedPenalty() {
54+
return true;
55+
}
56+
5357
@Nullable
5458
default ParticleOptions getParticle() {
5559
return ParticleTypes.LARGE_SMOKE;

src/main/java/com/gregtechceu/gtceu/forge/ForgeCommonEventListener.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -618,4 +618,16 @@ public static void remapIds(MissingMappingsEvent event) {
618618
});
619619
}
620620
}
621+
622+
@SubscribeEvent
623+
public static void breakSpeed(PlayerEvent.BreakSpeed event) {
624+
Player player = event.getEntity();
625+
for (ItemStack stack : player.getArmorSlots()) {
626+
if (stack.getItem() instanceof ArmorComponentItem componentItem) {
627+
if (componentItem.getArmorLogic() instanceof IJetpack jetpack && jetpack.removeMiningSpeedPenalty()) {
628+
if (!player.onGround() || player.isUnderWater()) event.setNewSpeed(event.getOriginalSpeed() * 5);
629+
}
630+
}
631+
}
632+
}
621633
}

0 commit comments

Comments
 (0)