DBot/overdrive_that_matters
DBot/overdrive_that_matters
3
1
Fork 0
Code Issues 63 Pull Requests Packages Releases Wiki Activity

Update code to work on dedicated servers

Browse Source
This commit is contained in:
DBotThePony 2021-08-22 23:31:43 +07:00
parent c66c64f87a
commit 38d34de609
Signed by: DBot
GPG Key ID: DCC23B5715498507
3 changed files with 47 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
View File

@ -16,6 +16,7 @@ import ru.dbotthepony.mc.otm.capability.AndroidCapability;
import ru.dbotthepony.mc.otm.capability.AndroidCapabilityPlayer; import ru.dbotthepony.mc.otm.capability.AndroidCapabilityPlayer;
import ru.dbotthepony.mc.otm.capability.MatteryCapability; import ru.dbotthepony.mc.otm.capability.MatteryCapability;
import ru.dbotthepony.mc.otm.client.AndroidGui; import ru.dbotthepony.mc.otm.client.AndroidGui;
import ru.dbotthepony.mc.otm.client.EventHandler;
import ru.dbotthepony.mc.otm.matter.MatterGrid; import ru.dbotthepony.mc.otm.matter.MatterGrid;
import ru.dbotthepony.mc.otm.matter.MatterRegistry; import ru.dbotthepony.mc.otm.matter.MatterRegistry;
import ru.dbotthepony.mc.otm.network.MatteryNetworking; import ru.dbotthepony.mc.otm.network.MatteryNetworking;
@ -84,6 +85,7 @@ public class OverdriveThatMatters {
ANDROID_GUI = new AndroidGui(); ANDROID_GUI = new AndroidGui();
MinecraftForge.EVENT_BUS.register(ANDROID_GUI); MinecraftForge.EVENT_BUS.register(ANDROID_GUI);
MinecraftForge.EVENT_BUS.register(AndroidGui.class); MinecraftForge.EVENT_BUS.register(AndroidGui.class);
MinecraftForge.EVENT_BUS.register(EventHandler.class);
} }
private void enqueueIMC(final InterModEnqueueEvent event) { private void enqueueIMC(final InterModEnqueueEvent event) {

38
src/main/java/ru/dbotthepony/mc/otm/capability/AndroidCapabilityPlayer.java
View File

@ -159,43 +159,7 @@ public class AndroidCapabilityPlayer extends AndroidCapability {
}); });
} }
private int last_jump_ticks = 14; public int last_jump_ticks = 14;
@SubscribeEvent
public static void inputEvent(InputUpdateEvent event) {
var ply = event.getPlayer();
var input = event.getMovementInput();
ply.getCapability(MatteryCapability.ANDROID).ifPresent(_cap -> {
if (!(_cap instanceof AndroidCapabilityPlayer cap))
return;
if (cap.hasFeature(Registry.AndroidFeatures.AIR_BAGS))
return;
if (ply.getAbilities().mayfly) {
cap.last_jump_ticks = 14;
} else {
if (ply.isInWater()) {
if (ply.isOnGround()) {
cap.last_jump_ticks = 14;
}
if (ply.isSwimming()) {
ply.setSwimming(false);
}
if (cap.last_jump_ticks <= 0) {
event.getMovementInput().jumping = false;
event.getMovementInput().up = false;
} else {
cap.last_jump_ticks--;
}
}
}
});
}
public final Player ply; public final Player ply;
public AndroidCapabilityPlayer(Player ent) { public AndroidCapabilityPlayer(Player ent) {

44
src/main/java/ru/dbotthepony/mc/otm/client/EventHandler.java Normal file
View File

@ -0,0 +1,44 @@
package ru.dbotthepony.mc.otm.client;
import net.minecraftforge.client.event.InputUpdateEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import ru.dbotthepony.mc.otm.Registry;
import ru.dbotthepony.mc.otm.capability.AndroidCapabilityPlayer;
import ru.dbotthepony.mc.otm.capability.MatteryCapability;
public class EventHandler {
@SubscribeEvent
public static void inputEvent(InputUpdateEvent event) {
var ply = event.getPlayer();
var input = event.getMovementInput();
ply.getCapability(MatteryCapability.ANDROID).ifPresent(_cap -> {
if (!(_cap instanceof AndroidCapabilityPlayer cap))
return;
if (cap.hasFeature(Registry.AndroidFeatures.AIR_BAGS))
return;
if (ply.getAbilities().mayfly) {
cap.last_jump_ticks = 14;
} else {
if (ply.isInWater()) {
if (ply.isOnGround()) {
cap.last_jump_ticks = 14;
}
if (ply.isSwimming()) {
ply.setSwimming(false);
}
if (cap.last_jump_ticks <= 0) {
event.getMovementInput().jumping = false;
event.getMovementInput().up = false;
} else {
cap.last_jump_ticks--;
}
}
}
});
}
}