Skip to content

Commit

Permalink
Implement new vibration control
Browse files Browse the repository at this point in the history
  • Loading branch information
@RSwoop
RSwoop committed Feb 3, 2021
1 parent 1cdf9c6 commit 4dc46b9
Show file tree
Hide file tree
Showing 3 changed files with 185 additions and 41 deletions.
176 changes: 160 additions & 16 deletions src/main/java/com/therainbowville/minegasm/client/ClientEventHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,21 @@

import com.mojang.authlib.GameProfile;
import com.therainbowville.minegasm.common.Minegasm;
import com.therainbowville.minegasm.config.ClientConfig;
import com.therainbowville.minegasm.config.MinegasmConfig;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.player.ClientPlayerEntity;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.IWorld;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.event.TickEvent;
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
import net.minecraftforge.event.entity.EntityLeaveWorldEvent;
import net.minecraftforge.event.entity.living.LivingDeathEvent;
import net.minecraftforge.event.entity.living.LivingHurtEvent;
import net.minecraftforge.event.entity.player.*;
import net.minecraftforge.event.world.BlockEvent;
Expand All @@ -22,6 +26,8 @@
import org.apache.logging.log4j.LogManager;

import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;

@Mod.EventBusSubscriber(modid = Minegasm.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE, value = Dist.CLIENT)
Expand All @@ -31,29 +37,128 @@ public class ClientEventHandler {
private static UUID playerID = null;
private static int tickCounter = -1;
private static int clientTickCounter = -1;
private static double[] toyLevel = new double[1200];
private static double[] state = new double[1200];
private static boolean paused = false;

private static void clearState() {
playerName = null;
playerID = null;
tickCounter = -1;
clientTickCounter = -1;
Arrays.fill(toyLevel, 0);
Arrays.fill(state, 0);
paused = false;
}

private static int getStateCounter() {
return tickCounter / 20;
}

private static void setState(int start, int duration, int intensity, boolean decay) {
if (duration <= 0) {
return;
}

if (decay) {
int safeDuration = Math.max(0, duration - 2);
for (int i = 0; i < safeDuration; i++) {
setState(start+i, intensity);
}
setState(start+safeDuration, intensity/2);
setState(start+safeDuration+1, intensity/4);
} else {
for (int i = 0; i < duration; i++) {
setState(start+i, intensity);
}
}
}

private static void setState(int counter, int intensity) {
setState(counter, intensity, false);
}

private static void setState(int counter, int intensity, boolean accumulate) {
int safeCounter = (counter+1) % state.length;
if (accumulate) {
state[safeCounter] = Math.min(1.0, state[safeCounter] + (intensity / 100.0));
} else {
state[safeCounter] = Math.min(1.0, Math.max(state[safeCounter], (intensity / 100.0)));
}
}

private static int getIntensity(String type) {
Map<String, Integer> normal = new HashMap<String, Integer>();
normal.put("attack", 60);
normal.put("hurt", 0);
normal.put("mine", 80);
normal.put("xpChange", 100);
normal.put("harvest", 0);
normal.put("vitality", 0);

Map<String, Integer> masochist = new HashMap<String, Integer>();
masochist.put("attack", 0);
masochist.put("hurt", 100);
masochist.put("mine", 0);
masochist.put("xpChange", 0);
masochist.put("harvest", 0);
masochist.put("vitality", 10);

Map<String, Integer> hedonist = new HashMap<String, Integer>();
hedonist.put("attack", 60);
hedonist.put("hurt", 10);
hedonist.put("mine", 80);
hedonist.put("xpChange", 100);
hedonist.put("harvest", 20);
hedonist.put("vitality", 10);

Map<String, Integer> custom = new HashMap<String, Integer>();
custom.put("attack", MinegasmConfig.attackIntensity);
custom.put("hurt", MinegasmConfig.hurtIntensity);
custom.put("mine", MinegasmConfig.mineIntensity);
custom.put("xpChange", MinegasmConfig.xpChangeIntensity);
custom.put("harvest", MinegasmConfig.harvestIntensity);
custom.put("vitality", MinegasmConfig.vitalityIntensity);

if (MinegasmConfig.mode.equals(ClientConfig.GameplayMode.MASOCHIST)) {
return masochist.get(type);
} else if (MinegasmConfig.mode.equals(ClientConfig.GameplayMode.HEDONIST)) {
return hedonist.get(type);
} else if (MinegasmConfig.mode.equals(ClientConfig.GameplayMode.CUSTOM)) {
return custom.get(type);
} else {
return normal.get(type);
}
}

@SubscribeEvent
public static void onPlayerTick(TickEvent.PlayerTickEvent event) {
if (event.phase == TickEvent.Phase.END) {
tickCounter = (tickCounter + 1) % 24000;

if (tickCounter % 20 == 0) { // every 1 sec
int stateCounter = getStateCounter();

if (MinegasmConfig.mode.equals(ClientConfig.GameplayMode.MASOCHIST)) {
if (event.player.getHealth() > 0 && event.player.getHealth() <= 1) {
setState(stateCounter, getIntensity("vitality"));
}
} else if (event.player.getHealth() >= 20 && event.player.getFoodStats().getFoodLevel() >= 20) {
setState(stateCounter, getIntensity("vitality"));
}

double newVibrationLevel = state[stateCounter];
state[stateCounter] = 0;

LOGGER.debug("Tick " + stateCounter + ": " + newVibrationLevel);

if (ToyController.currentVibrationLevel != newVibrationLevel) {
ToyController.setVibrationLevel(newVibrationLevel);
}
}

if (tickCounter % (5 * 20) == 0) { // 5 secs
LOGGER.debug("Idle: " + event.player.getIdleTime());
LOGGER.debug("Health: " + event.player.getHealth());
LOGGER.debug("Food: " + event.player.getFoodStats().getFoodLevel());
//TODO on full health and food, low vibrate
LOGGER.debug("Tick " + tickCounter / 20 + ": " + toyLevel[tickCounter / 20]);
}
}
}
Expand All @@ -69,7 +174,7 @@ public static void onClientTick(TickEvent.ClientTickEvent event) {
if (!paused) {
paused = true;
LOGGER.debug("Pausing");
// stop vibrate
ToyController.setVibrationLevel(0);
}

if (paused) {
Expand All @@ -89,7 +194,7 @@ public static void onAttack(AttackEntityEvent event)
GameProfile profile = player.getGameProfile();

if (profile.getId().equals(playerID)) {
ToyController.vibrate();
setState(getStateCounter(), 3, getIntensity("attack"), true);
}
}
}
Expand All @@ -109,19 +214,34 @@ public static void onHurt(LivingHurtEvent event)
GameProfile profile = player.getGameProfile();

if (profile.getId().equals(playerID)) {
ToyController.vibrate();
setState(getStateCounter(), 3, getIntensity("hurt"), true);
}
}
}

@SubscribeEvent
public static void onDeath(LivingDeathEvent event)
{
Entity entity = event.getEntityLiving();
if (entity instanceof PlayerEntity) {
PlayerEntity player = (PlayerEntity) entity;
GameProfile profile = player.getGameProfile();

if (profile.getId().equals(playerID)) {
ToyController.setVibrationLevel(0);
}
}
}

@SubscribeEvent
public static void onHarvest(PlayerEvent.HarvestCheck event)
{
LOGGER.debug("Harvest: " + event.canHarvest() + "[" + event.getTargetBlock().getBlock().getDefaultState().getBlockHardness(null, null) + "]");
//TODO if true, low vibrate
float blockHardness = event.getTargetBlock().getBlock().getDefaultState().getBlockHardness(null, null);
LOGGER.debug("Harvest: " + event.canHarvest() + "[" + blockHardness + "]");

//LOGGER.info(event.canHarvest());
//LOGGER.info(event.getTargetBlock().getBlockState().getValues().toString());
if (event.canHarvest()) {
setState(getStateCounter(), 1, Math.toIntExact(Math.round((getIntensity("harvest")/100.0 * (blockHardness/50.0)) * 100)), false);
}
}

@SubscribeEvent
Expand All @@ -134,8 +254,18 @@ public static void onBreaking(PlayerEvent.BreakSpeed event)
@SubscribeEvent
public static void onBreak(BlockEvent.BreakEvent event)
{
float blockHardness = event.getState().getBlock().getDefaultState().getBlockHardness(null, null);
LOGGER.info("Breaking: " + event.getState().getBlock().toString());
//TODO vibrate

ItemStack mainhandItem = event.getPlayer().getHeldItemMainhand();
boolean usingPickaxe = mainhandItem.getItem().getTranslationKey().contains("pickaxe");
LOGGER.debug(mainhandItem);

if (usingPickaxe) {
int duration = 5; //TODO set depending on block
setState(getStateCounter(), duration, Math.toIntExact(Math.round((getIntensity("mine") / 100.0 * (blockHardness / 50.0)) * 100)), true);
}

LOGGER.info("XP to drop: " + event.getExpToDrop());
}

Expand All @@ -159,19 +289,33 @@ public static void onXpChange(PlayerXpEvent.XpChange event)

LOGGER.info("XP CHANGE: " + xpChange);
LOGGER.debug("duration: " + duration);

setState(getStateCounter(), Math.toIntExact(duration), getIntensity("xpChange"), true);
}

@SubscribeEvent
public static void onWorldLoaded(WorldEvent.Load event) {
IWorld world = event.getWorld();
System.out.println("World loaded: " + world.toString());
public static void onRespawn(PlayerEvent.PlayerRespawnEvent event)
{
clearState();
ToyController.setVibrationLevel(0);
populatePlayerInfo();
}

private static void populatePlayerInfo() {
GameProfile profile = Minecraft.getInstance().getSession().getProfile();
playerName = profile.getName();
playerID = profile.getId();
System.out.println("Current player: " + playerName + " " + playerID.toString());
}

@SubscribeEvent
public static void onWorldLoaded(WorldEvent.Load event) {
IWorld world = event.getWorld();
System.out.println("World loaded: " + world.toString());

populatePlayerInfo();
}

@SubscribeEvent
public static void onWorldEntry(EntityJoinWorldEvent event) {
Entity entity = event.getEntity();
Expand All @@ -185,7 +329,7 @@ public static void onWorldEntry(EntityJoinWorldEvent event) {
if (profile.getId().equals(playerID)) {
System.out.println("Player in: " + playerName + " " + playerID.toString());
if (ToyController.connectDevice()) {
ToyController.vibrate();
setState(getStateCounter(), 5);
player.sendStatusMessage(new StringTextComponent(String.format("Connected to %s [%d]", ToyController.getDeviceName(), ToyController.getDeviceId())), true);
} else {
player.sendStatusMessage(new StringTextComponent(String.format(TextFormatting.YELLOW + "Minegasm " + TextFormatting.RESET + "failed to start\n%s", ToyController.getLastErrorMessage())), false);
Expand Down
44 changes: 22 additions & 22 deletions src/main/java/com/therainbowville/minegasm/client/ToyController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@ public class ToyController {
private static final Logger LOGGER = LogManager.getLogger();
private static final ButtplugWSClient client = new ButtplugWSClient("Minegasm");
private static ButtplugClientDevice device = null;
private static int[] state = new int[24000];
private static int currentStateIndex = 0;
private static int currentState = 0;
private static String lastErrorMessage = "";
private static boolean shutDownHookAdded = false;
public static String lastErrorMessage = "";
public static boolean isConnected = false;
public static double currentVibrationLevel = 0;

public static boolean connectDevice() {
try {
Expand Down Expand Up @@ -71,6 +70,7 @@ public static boolean connectDevice() {
shutDownHookAdded = true;
}

isConnected = true;
} catch (Exception e) {
lastErrorMessage = e.getMessage();
e.printStackTrace();
Expand All @@ -79,24 +79,24 @@ public static boolean connectDevice() {
return Objects.nonNull(device);
}

public static void vibrate() {
try {
client.sendDeviceMessage(device, new SingleMotorVibrateCmd(device.index, (1.0 - Math.random()), client.getNextMsgId()));
new java.util.Timer().schedule(
new java.util.TimerTask() {
@Override
public void run() {
try {
client.sendDeviceMessage(device, new SingleMotorVibrateCmd(device.index, 0, client.getNextMsgId()));
} catch (Exception e) {
e.printStackTrace();
}
}
},
Math.round(100 + 5000 * (1.0 - Math.random()))
);
} catch (Exception e) {
e.printStackTrace();
public static void setVibrationLevel(double level) {
if (MinegasmConfig.vibrate) {
try {
client.sendDeviceMessage(device, new SingleMotorVibrateCmd(device.index, level, client.getNextMsgId()));
currentVibrationLevel = level;
} catch (Exception e) {
e.printStackTrace();
}
} else {
if (currentVibrationLevel > 0) {
try {
level = 0;
client.sendDeviceMessage(device, new SingleMotorVibrateCmd(device.index, level, client.getNextMsgId()));
currentVibrationLevel = level;
} catch (Exception e) {
e.printStackTrace();
}
}
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/therainbowville/minegasm/config/ClientConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import java.util.Objects;

final class ClientConfig {
public final class ClientConfig {
final ForgeConfigSpec.ConfigValue<String> serverUrl;

final ForgeConfigSpec.BooleanValue vibrate;
Expand Down Expand Up @@ -61,12 +61,12 @@ final class ClientConfig {
harvestIntensity = builder
.comment("Vibration intensity when harvesting on custom mode")
.translation(Minegasm.MOD_ID + ".config.intensity.harvest")
.defineInRange("harvestIntensity", 20, 0, 100);
.defineInRange("harvestIntensity", 0, 0, 100);

vitalityIntensity = builder
.comment("Vibration intensity on high level of player's vitality on custom mode")
.translation(Minegasm.MOD_ID + ".config.intensity.vitality")
.defineInRange("vitalityIntensity", 40, 0, 100);
.defineInRange("vitalityIntensity", 0, 0, 100);

builder.pop();
}
Expand Down

0 comments on commit 4dc46b9

Please sign in to comment.