virt-mirrors/Sit
1
0
Fork 1
mirror of https://github.com/Oth3r/Sit.git synced 2025-09-20 00:13:21 +02:00
Code Issues Projects Releases Packages Wiki Activity

removed console debug

Browse source
This commit is contained in:
Oth3r 2023-07-25 07:42:32 -05:00
commit 12b74d39bf
1 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main/java/one/oth3r/sit/Events.java
View file

@ -61,7 +61,6 @@ public class Events {
} }
public static boolean checkList(List<String> list, Item item) { public static boolean checkList(List<String> list, Item item) {
String itemID = Registries.ITEM.getId(item).toString(); String itemID = Registries.ITEM.getId(item).toString();
System.out.println(itemID);
return list.contains(itemID); return list.contains(itemID);
} }
public static HashMap<String,HashMap<String,Object>> getCustomBlocks() { public static HashMap<String,HashMap<String,Object>> getCustomBlocks() {
@ -85,7 +84,6 @@ public class Events {
Block block = blockState.getBlock(); Block block = blockState.getBlock();
BlockState blockStateAbove = world.getBlockState(pos.add(0,1,0)); BlockState blockStateAbove = world.getBlockState(pos.add(0,1,0));
Block blockAbove = blockStateAbove.getBlock(); Block blockAbove = blockStateAbove.getBlock();
System.out.println(blockState);
//not the biggest fan but ah well //not the biggest fan but ah well
if (blockStateAbove.isFullCube(world,pos.add(0,1,0)) && blockStateAbove.blocksMovement()) return false; if (blockStateAbove.isFullCube(world,pos.add(0,1,0)) && blockStateAbove.blocksMovement()) return false;
else if (blockAbove instanceof StairsBlock || blockAbove instanceof SlabBlock || blockAbove instanceof CarpetBlock) return false; else if (blockAbove instanceof StairsBlock || blockAbove instanceof SlabBlock || blockAbove instanceof CarpetBlock) return false;
@ -95,7 +93,6 @@ public class Events {
if (block instanceof CarpetBlock && config.carpetsOn) return true; if (block instanceof CarpetBlock && config.carpetsOn) return true;
if (blockState.isFullCube(world,pos.add(0,1,0)) && config.fullBlocksOn) return true; if (blockState.isFullCube(world,pos.add(0,1,0)) && config.fullBlocksOn) return true;
if (config.customOn && config.customBlocks.size() != 0) { if (config.customOn && config.customBlocks.size() != 0) {
System.out.println("checking custom");
for (HashMap<String,Object> map:getCustomBlocks().values()) { for (HashMap<String,Object> map:getCustomBlocks().values()) {
String blockID = Registries.BLOCK.getId(block).toString(); String blockID = Registries.BLOCK.getId(block).toString();
if (map.get("block").equals(blockID)) { if (map.get("block").equals(blockID)) {
@ -135,7 +132,6 @@ public class Events {
entity.setBoundingBox(Box.of(Vec3d.of(pos),1.5,2,1.5)); entity.setBoundingBox(Box.of(Vec3d.of(pos),1.5,2,1.5));
} }
if (config.customOn && config.customBlocks.size() != 0) { if (config.customOn && config.customBlocks.size() != 0) {
System.out.println("checking custom sit height");
for (HashMap<String,Object> map:getCustomBlocks().values()) { for (HashMap<String,Object> map:getCustomBlocks().values()) {
String blockID = Registries.BLOCK.getId(block).toString(); String blockID = Registries.BLOCK.getId(block).toString();
if (map.get("block").equals(blockID)) { if (map.get("block").equals(blockID)) {
@ -205,16 +201,12 @@ public class Events {
Entity entity = entry.getValue(); Entity entity = entry.getValue();
if (player.getVehicle() == null || !player.getVehicle().equals(entity)) { if (player.getVehicle() == null || !player.getVehicle().equals(entity)) {
entity.setRemoved(Entity.RemovalReason.DISCARDED); entity.setRemoved(Entity.RemovalReason.DISCARDED);
System.out.println("removed..");
entityLoop.remove(); entityLoop.remove();
} else { } else {
BlockPos pos = new BlockPos(entity.getBlockX(),(int) Math.floor(player.getY()),entity.getBlockZ()); BlockPos pos = new BlockPos(entity.getBlockX(),(int) Math.floor(player.getY()),entity.getBlockZ());
if (entity.getPitch() == 90) pos = new BlockPos(entity.getBlockX(),(int) Math.ceil(player.getY()),entity.getBlockZ()); if (entity.getPitch() == 90) pos = new BlockPos(entity.getBlockX(),(int) Math.ceil(player.getY()),entity.getBlockZ());
BlockState blockState = player.getWorld().getBlockState(pos); BlockState blockState = player.getWorld().getBlockState(pos);
if (blockState.isAir()) { if (blockState.isAir()) {
System.out.println(pos);
System.out.println(entity.getY());
System.out.println("dismount");
player.teleport(player.getX(),player.getBlockY()+1,player.getZ()); player.teleport(player.getX(),player.getBlockY()+1,player.getZ());
entity.setRemoved(Entity.RemovalReason.DISCARDED); entity.setRemoved(Entity.RemovalReason.DISCARDED);
entityLoop.remove(); entityLoop.remove();
@ -228,15 +220,12 @@ public class Events {
int i = entry.getValue(); int i = entry.getValue();
checkPlayers.put(player,i-1); checkPlayers.put(player,i-1);
if (i<0) { if (i<0) {
System.out.println("fail");
playerCheckLoop.remove(); playerCheckLoop.remove();
continue; continue;
} }
System.out.println("trying to add back");
if (player.getVehicle() != null) { if (player.getVehicle() != null) {
Entity entity = player.getVehicle(); Entity entity = player.getVehicle();
if (entity.getName().getString().equals(Sit.ENTITY_NAME)) { if (entity.getName().getString().equals(Sit.ENTITY_NAME)) {
System.out.println("adding back");
setEntity(player.getBlockPos().add(0,1,0),player.getServerWorld(),entity); setEntity(player.getBlockPos().add(0,1,0),player.getServerWorld(),entity);
entities.put(player,entity); entities.put(player,entity);
playerCheckLoop.remove(); playerCheckLoop.remove();
@ -248,15 +237,12 @@ public class Events {
int i = checkPlayers.get(player); int i = checkPlayers.get(player);
checkPlayers.put(player,i-1); checkPlayers.put(player,i-1);
if (i<0) { if (i<0) {
System.out.println("fail");
checkPlayers.remove(player); checkPlayers.remove(player);
continue; continue;
} }
System.out.println("trying to add back");
if (player.getVehicle() != null) { if (player.getVehicle() != null) {
Entity entity = player.getVehicle(); Entity entity = player.getVehicle();
if (entity.getName().getString().equals(Sit.ENTITY_NAME)) { if (entity.getName().getString().equals(Sit.ENTITY_NAME)) {
System.out.println("adding back");
setEntity(player.getBlockPos().add(0,1,0),player.getServerWorld(),entity); setEntity(player.getBlockPos().add(0,1,0),player.getServerWorld(),entity);
entities.put(player,entity); entities.put(player,entity);
checkPlayers.remove(player); checkPlayers.remove(player);