Upstream/Yatopia
1
0
Fork 0
mirror of https://github.com/YatopiaMC/Yatopia.git synced 2024-11-26 20:55:30 +01:00
Code Issues Projects Releases Wiki Activity

ANOTHER ONE

Browse Source 
Screw predicates, this works properly.
This commit is contained in:
Ivan Pekov 2020-08-22 14:01:52 +03:00
parent 681c1c881a
commit c32fe11abd
1 changed files with 72 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
patches/server/0007-Per-entity-type-collision-settings.patch
View File

@ -60,14 +60,12 @@ index cb344a424bf4c657bb1bbca286a1136c9b21b489..82fc63dbfc0d48267e0c1972a312b714
\ No newline at end of file \ No newline at end of file
diff --git a/src/main/java/dev/tr7zw/yatopia/EntityFilter.java b/src/main/java/dev/tr7zw/yatopia/EntityFilter.java diff --git a/src/main/java/dev/tr7zw/yatopia/EntityFilter.java b/src/main/java/dev/tr7zw/yatopia/EntityFilter.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..669ff5861d6b32483a2294405fac3b1ecb41207a index 0000000000000000000000000000000000000000..e8211826a342d743b897d816d7ece2e8d4cd0388
--- /dev/null --- /dev/null
+++ b/src/main/java/dev/tr7zw/yatopia/EntityFilter.java +++ b/src/main/java/dev/tr7zw/yatopia/EntityFilter.java
@@ -0,0 +1,161 @@ @@ -0,0 +1,133 @@
+package dev.tr7zw.yatopia; +package dev.tr7zw.yatopia;
+ +
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import de.minebench.origami.OrigamiConfig; +import de.minebench.origami.OrigamiConfig;
+import java.util.function.Predicate; +import java.util.function.Predicate;
+import net.minecraft.server.Entity; +import net.minecraft.server.Entity;
@ -75,93 +73,9 @@ index 0000000000000000000000000000000000000000..669ff5861d6b32483a2294405fac3b1e
+import net.minecraft.server.EnumCreatureType; +import net.minecraft.server.EnumCreatureType;
+import net.minecraft.server.IEntitySelector; +import net.minecraft.server.IEntitySelector;
+import net.minecraft.server.ScoreboardTeamBase; +import net.minecraft.server.ScoreboardTeamBase;
+import net.minecraft.server.World;
+import net.minecraft.server.WorldDataServer;
+ +
+public class EntityFilter { +public class EntityFilter {
+ +
+ private static Multimap<String, Predicate<Entity>> collisionChecks = HashMultimap.create();
+
+ public static void initializeCollisionChecks(String worldName, OrigamiConfig.WorldConfig config) {
+ if (collisionChecks.containsKey(worldName)) {
+ collisionChecks.removeAll(worldName);
+ }
+ if (!config.playerCollisions) {
+ collisionChecks.put(worldName, (entity) -> entity.getEntityType() != EntityTypes.PLAYER);
+ }
+ if (!config.animalCollisions) {
+ collisionChecks.put(worldName, (entity) -> entity.getEntityType().getEnumCreatureType() != EnumCreatureType.CREATURE);
+ }
+ if (!config.ambientCollisions) {
+ collisionChecks.put(worldName, (entity) -> entity.getEntityType().getEnumCreatureType() != EnumCreatureType.AMBIENT);
+ }
+ if (!config.waterAmbientCollisions) {
+ collisionChecks.put(worldName, (entity) -> entity.getEntityType().getEnumCreatureType() != EnumCreatureType.WATER_AMBIENT);
+ }
+ if (!config.waterCreatureCollisions) {
+ collisionChecks.put(worldName, (entity) -> entity.getEntityType().getEnumCreatureType() != EnumCreatureType.WATER_CREATURE);
+ }
+ Predicate<Entity> misc = (entity) -> {
+ if (config.miscCollisions) {
+ if (entity.getEntityType().getEnumCreatureType() == EnumCreatureType.MISC) {
+ if (!config.villagerCollisions) {
+ if (!config.ironGolemCollisions) {
+ if (!config.itemCollisions) {
+ return entity.getEntityType() != EntityTypes.VILLAGER
+ && entity.getEntityType() != EntityTypes.IRON_GOLEM
+ && entity.getEntityType() != EntityTypes.ITEM;
+ } else {
+ return entity.getEntityType() != EntityTypes.VILLAGER
+ && entity.getEntityType() != EntityTypes.IRON_GOLEM;
+ }
+ } else {
+ return entity.getEntityType() != EntityTypes.VILLAGER;
+ }
+ }
+ }
+ return true;
+ } else {
+ if (entity.getEntityType().getEnumCreatureType() == EnumCreatureType.MISC) {
+ if (config.villagerCollisions) {
+ if (config.ironGolemCollisions) {
+ if (config.itemCollisions) {
+ return entity.getEntityType() == EntityTypes.VILLAGER
+ || entity.getEntityType() == EntityTypes.IRON_GOLEM
+ || entity.getEntityType() == EntityTypes.ITEM;
+ } else {
+ return entity.getEntityType() == EntityTypes.VILLAGER
+ || entity.getEntityType() == EntityTypes.IRON_GOLEM;
+ }
+ } else {
+ return entity.getEntityType() == EntityTypes.VILLAGER;
+ }
+ } else {
+ return false;
+ }
+ } else {
+ return true;
+ }
+ }
+ };
+ collisionChecks.put(worldName, (entity) -> {
+ if (config.monsterCollisions) {
+ if (!config.pillagerCollisions) {
+ return entity.getEntityType() != EntityTypes.PILLAGER && misc.test(entity);
+ } else {
+ return misc.test(entity);
+ }
+ } else {
+ if (!config.pillagerCollisions) {
+ return entity.getEntityType().getEnumCreatureType() != EnumCreatureType.MONSTER && misc.test(entity);
+ } else {
+ return entity.getEntityType() == EntityTypes.PILLAGER
+ || (entity.getEntityType().getEnumCreatureType() != EnumCreatureType.MONSTER
+ && misc.test(entity));
+ }
+ }
+ });
+ }
+
+ public static Predicate<Entity> getFilter(Entity entity) { + public static Predicate<Entity> getFilter(Entity entity) {
+ OrigamiConfig.WorldConfig config = entity.world.origamiConfig; + OrigamiConfig.WorldConfig config = entity.world.origamiConfig;
+ if (config.allCollisionsEnabled) { + if (config.allCollisionsEnabled) {
@ -209,21 +123,79 @@ index 0000000000000000000000000000000000000000..669ff5861d6b32483a2294405fac3b1e
+ } + }
+ }; + };
+ +
+ String worldName = getWorldName(entity.world); + ret = ret.and((tested) -> {
+ if (!collisionChecks.containsKey(worldName)) { + if (tested.getEntityType() == EntityTypes.PLAYER && config.playerCollisions) {
+ initializeCollisionChecks(worldName, config); + return true;
+ } + }
+ + if (tested.getEntityType().getEnumCreatureType() == EnumCreatureType.CREATURE && config.animalCollisions) {
+ for (Predicate<Entity> predicate : collisionChecks.get(worldName)) { + return true;
+ ret = ret.and(predicate); + }
+ } + if (tested.getEntityType().getEnumCreatureType() == EnumCreatureType.AMBIENT && config.ambientCollisions) {
+ return true;
+ }
+ if (tested.getEntityType().getEnumCreatureType() == EnumCreatureType.MONSTER) {
+ if (config.monsterCollisions) {
+ if (config.pillagerCollisions) {
+ return true;
+ } else {
+ return tested.getEntityType() != EntityTypes.PILLAGER;
+ }
+ } else {
+ if (config.pillagerCollisions) {
+ return tested.getEntityType() == EntityTypes.PILLAGER;
+ } else {
+ return false;
+ }
+ }
+ }
+ if (tested.getEntityType().getEnumCreatureType() == EnumCreatureType.MISC) {
+ if (config.miscCollisions) {
+ if (!config.villagerCollisions) {
+ if (!config.ironGolemCollisions) {
+ if (!config.itemCollisions) {
+ return tested.getEntityType() != EntityTypes.VILLAGER
+ && tested.getEntityType() != EntityTypes.IRON_GOLEM
+ && tested.getEntityType() != EntityTypes.ITEM;
+ } else {
+ return tested.getEntityType() != EntityTypes.VILLAGER
+ && tested.getEntityType() != EntityTypes.IRON_GOLEM;
+ }
+ } else {
+ return tested.getEntityType() != EntityTypes.VILLAGER;
+ }
+ } else {
+ return true;
+ }
+ } else {
+ if (config.villagerCollisions) {
+ if (config.ironGolemCollisions) {
+ if (config.itemCollisions) {
+ return tested.getEntityType() == EntityTypes.VILLAGER
+ || tested.getEntityType() == EntityTypes.IRON_GOLEM
+ || tested.getEntityType() == EntityTypes.ITEM;
+ } else {
+ return tested.getEntityType() == EntityTypes.VILLAGER
+ || tested.getEntityType() == EntityTypes.IRON_GOLEM;
+ }
+ } else {
+ return tested.getEntityType() == EntityTypes.VILLAGER;
+ }
+ } else {
+ return false;
+ }
+ }
+ }
+ if (tested.getEntityType().getEnumCreatureType() == EnumCreatureType.WATER_CREATURE && config.waterCreatureCollisions) {
+ return true;
+ }
+ if (tested.getEntityType().getEnumCreatureType() == EnumCreatureType.WATER_AMBIENT && config.waterAmbientCollisions) {
+ return true;
+ }
+ return false;
+ });
+ +
+ return ret; + return ret;
+ } + }
+
+ private static String getWorldName(World world) {
+ return ((WorldDataServer) world.worldData).getName();
+ }
+} +}
diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
index 88f4c30a03e9139b0284ff1a545ad80941dbd46c..dca7a86dba22bca9bfd830a353a2c9561d1cf0ec 100644 index 88f4c30a03e9139b0284ff1a545ad80941dbd46c..dca7a86dba22bca9bfd830a353a2c9561d1cf0ec 100644