Skip to content

Commit

Permalink
Adaptation to the architectural diagram between 1.12.2/1.16.5 (Part 5)
Browse files Browse the repository at this point in the history
  • Loading branch information
OldSerpskiStalker committed Nov 14, 2024
1 parent 432978d commit c70aec6
Show file tree
Hide file tree
Showing 40 changed files with 151 additions and 111 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
import org.imesense.dynamicspawncontrol.plugin.time_control_mod_forge_1_12_2.TimeEvents;
import org.imesense.dynamicspawncontrol.event.OnEventWindowTitle;
import org.imesense.dynamicspawncontrol.core.logfile.Log;
import org.imesense.dynamicspawncontrol.technical.gamestructure.Structure;
import org.imesense.dynamicspawncontrol.core.worldstructure.Structure;
import org.imesense.dynamicspawncontrol.plugin.time_control_mod_forge_1_12_2.network.*;
import org.imesense.dynamicspawncontrol.plugin.webslinger_1_12_2_2_2_4.webbing.PlayerInWebMessage;
import org.imesense.dynamicspawncontrol.technical.parser.GeneralStorageData;
import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript;
import org.imesense.dynamicspawncontrol.parser.algo.GeneralStorageData;
import org.imesense.dynamicspawncontrol.parser.algo.ParserGenericJsonScript;
import org.imesense.dynamicspawncontrol.core.register.RegisterParserManager;
import org.imesense.dynamicspawncontrol.core.worldcache.Cache;
import org.imesense.dynamicspawncontrol.core.worldcache.CacheStorage;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import org.imesense.dynamicspawncontrol.core.collection.UnicodeCharacterCollection;
import org.imesense.dynamicspawncontrol.core.util.CodeGeneric;
import org.imesense.dynamicspawncontrol.core.collection.CmdCallTypeCollection;
import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript;
import org.imesense.dynamicspawncontrol.parser.algo.ParserGenericJsonScript;

import javax.annotation.Nonnull;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.imesense.dynamicspawncontrol.technical.attributefactory;
package org.imesense.dynamicspawncontrol.core.attributefactory;

/**
*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.imesense.dynamicspawncontrol.technical.attributefactory;
package org.imesense.dynamicspawncontrol.core.attributefactory;

import javax.annotation.Nonnull;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.imesense.dynamicspawncontrol.technical.attributefactory;
package org.imesense.dynamicspawncontrol.core.attributefactory;

import javax.annotation.Nonnull;
import java.util.*;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.imesense.dynamicspawncontrol.technical.attributefactory;
package org.imesense.dynamicspawncontrol.core.attributefactory;

import com.google.gson.*;
import org.imesense.dynamicspawncontrol.core.json.Service;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.imesense.dynamicspawncontrol.technical.attributefactory;
package org.imesense.dynamicspawncontrol.core.attributefactory;

import javax.annotation.Nonnull;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
package org.imesense.dynamicspawncontrol.core.auxsolid;

import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.server.management.PlayerList;
import net.minecraftforge.common.DimensionManager;
import net.minecraftforge.common.util.FakePlayer;

import java.util.Objects;

/**
*
*/
public final class Player
{
/**
*
* @param entity
* @return
*/
public static boolean isFakePlayer(Entity entity)
{
if (!(entity instanceof EntityPlayerMP))
{
return false;
}

if (entity instanceof FakePlayer)
{
return true;
}

// If this method returns false, it is still possible that it is a fake player. Let's try to find a player in the list of online players
PlayerList playerList = Objects.requireNonNull(DimensionManager.getWorld(0).getMinecraftServer()).getPlayerList();
EntityPlayerMP playerByUUID = playerList.getPlayerByUUID(((EntityPlayerMP) entity).getGameProfile().getId());

if (playerByUUID == null)
{
// The player is offline. So it can't be a real player
return true;
}

// The player in the list. But is this the right player?
return entity != playerByUUID;
}

/**
*
* @param entity
* @return
*/
public static boolean isRealPlayer(Entity entity)
{
if (!(entity instanceof EntityPlayerMP))
{
return false;
}

return !isFakePlayer(entity);
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.imesense.dynamicspawncontrol.technical.customlibrary;
package org.imesense.dynamicspawncontrol.core.sender;

import net.minecraft.command.CommandResultStats;
import net.minecraft.command.ICommandSender;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.imesense.dynamicspawncontrol.core.util;

import com.google.gson.JsonElement;
import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeKey;
import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeKey;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeMap;
import org.imesense.dynamicspawncontrol.core.logfile.Log;
import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript;
import org.imesense.dynamicspawncontrol.parser.algo.ParserGenericJsonScript;

import java.util.List;
import java.util.function.Function;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.imesense.dynamicspawncontrol.technical.gamestructure;
package org.imesense.dynamicspawncontrol.core.worldstructure;

import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.imesense.dynamicspawncontrol.technical.gamestructure;
package org.imesense.dynamicspawncontrol.core.worldstructure;

import javax.annotation.Nonnull;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import org.imesense.dynamicspawncontrol.config.data.GameDebuggerData;
import org.imesense.dynamicspawncontrol.core.logfile.Log;
import org.imesense.dynamicspawncontrol.eventprocessor.generic.GenericSpawnCondition;
import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript;
import org.imesense.dynamicspawncontrol.parser.algo.ParserGenericJsonScript;

/**
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import org.imesense.dynamicspawncontrol.config.data.GameDebuggerData;
import org.imesense.dynamicspawncontrol.core.logfile.Log;
import org.imesense.dynamicspawncontrol.eventprocessor.generic.GenericDropLoot;
import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript;
import org.imesense.dynamicspawncontrol.parser.algo.ParserGenericJsonScript;

/**
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import org.imesense.dynamicspawncontrol.config.data.GameDebuggerData;
import org.imesense.dynamicspawncontrol.core.logfile.Log;
import org.imesense.dynamicspawncontrol.eventprocessor.generic.GenericExperience;
import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript;
import org.imesense.dynamicspawncontrol.parser.algo.ParserGenericJsonScript;

/**
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import org.imesense.dynamicspawncontrol.core.util.CodeGeneric;
import org.imesense.dynamicspawncontrol.core.logfile.Log;
import org.imesense.dynamicspawncontrol.eventprocessor.generic.GenericMobTaskManager;
import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript;
import org.imesense.dynamicspawncontrol.parser.algo.ParserGenericJsonScript;

/**
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import org.imesense.dynamicspawncontrol.config.data.GameDebuggerData;
import org.imesense.dynamicspawncontrol.core.logfile.Log;
import org.imesense.dynamicspawncontrol.eventprocessor.generic.GenericMapEffectAction;
import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript;
import org.imesense.dynamicspawncontrol.parser.algo.ParserGenericJsonScript;

/**
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import org.imesense.dynamicspawncontrol.config.data.GameDebuggerData;
import org.imesense.dynamicspawncontrol.core.logfile.Log;
import org.imesense.dynamicspawncontrol.eventprocessor.generic.GenericPotentialSpawn;
import org.imesense.dynamicspawncontrol.technical.parser.ParserGenericJsonScript;
import org.imesense.dynamicspawncontrol.parser.algo.ParserGenericJsonScript;
import org.imesense.dynamicspawncontrol.core.worldcache.Cache;
import org.imesense.dynamicspawncontrol.core.worldcache.CacheStorage;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import org.imesense.dynamicspawncontrol.DynamicSpawnControlStructure;
import org.imesense.dynamicspawncontrol.core.util.CodeGeneric;
import org.imesense.dynamicspawncontrol.core.logfile.Log;
import org.imesense.dynamicspawncontrol.technical.parser.GeneralStorageData;
import org.imesense.dynamicspawncontrol.parser.algo.GeneralStorageData;

import java.util.List;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import org.imesense.dynamicspawncontrol.core.field.UniqueField;
import org.imesense.dynamicspawncontrol.core.util.CodeGeneric;
import org.imesense.dynamicspawncontrol.core.logfile.Log;
import org.imesense.dynamicspawncontrol.technical.parser.GeneralStorageData;
import org.imesense.dynamicspawncontrol.parser.algo.GeneralStorageData;

import java.util.*;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
import org.imesense.dynamicspawncontrol.core.logfile.Log;
import org.imesense.dynamicspawncontrol.eventprocessor.listaction.ListActionBinary;
import org.imesense.dynamicspawncontrol.eventprocessor.listaction.ListActionConsumer;
import org.imesense.dynamicspawncontrol.technical.attributefactory.Attribute;
import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap;
import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMapFactory;
import org.imesense.dynamicspawncontrol.core.attributefactory.Attribute;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeMap;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeMapFactory;
import org.imesense.dynamicspawncontrol.technical.customlibrary.*;
import org.imesense.dynamicspawncontrol.core.api.SignalDataAccessor;
import org.imesense.dynamicspawncontrol.core.api.SignalDataGetter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
import net.minecraftforge.event.entity.living.LivingExperienceDropEvent;
import org.imesense.dynamicspawncontrol.core.json.Service;
import org.imesense.dynamicspawncontrol.core.logfile.Log;
import org.imesense.dynamicspawncontrol.eventprocessor.generic.keyword.SingleKeyWord;
import org.imesense.dynamicspawncontrol.eventprocessor.listaction.ListActionBinary;
import org.imesense.dynamicspawncontrol.eventprocessor.listaction.ListActionConsumer;
import org.imesense.dynamicspawncontrol.technical.attributefactory.Attribute;
import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap;
import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMapFactory;
import org.imesense.dynamicspawncontrol.technical.customlibrary.*;
import org.imesense.dynamicspawncontrol.core.attributefactory.Attribute;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeMap;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeMapFactory;
import org.imesense.dynamicspawncontrol.core.api.SignalDataAccessor;
import org.imesense.dynamicspawncontrol.core.api.SignalDataGetter;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.fml.common.gameevent.TickEvent;
import org.imesense.dynamicspawncontrol.technical.attributefactory.Attribute;
import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap;
import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMapFactory;
import org.imesense.dynamicspawncontrol.core.attributefactory.Attribute;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeMap;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeMapFactory;
import org.imesense.dynamicspawncontrol.eventprocessor.listaction.ListActionBinary;
import org.imesense.dynamicspawncontrol.eventprocessor.listaction.ListActionConsumer;
import org.imesense.dynamicspawncontrol.core.logfile.Log;
import org.imesense.dynamicspawncontrol.technical.customlibrary.SingleKeyWord;
import org.imesense.dynamicspawncontrol.eventprocessor.generic.keyword.SingleKeyWord;
import org.imesense.dynamicspawncontrol.core.api.SignalDataAccessor;
import org.imesense.dynamicspawncontrol.core.api.SignalDataGetter;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
import org.imesense.dynamicspawncontrol.technical.attributefactory.Attribute;
import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap;
import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMapFactory;
import org.imesense.dynamicspawncontrol.core.attributefactory.Attribute;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeMap;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeMapFactory;
import org.imesense.dynamicspawncontrol.eventprocessor.listaction.ListActionBinary;
import org.imesense.dynamicspawncontrol.eventprocessor.listaction.ListActionConsumerMobTaskManager;
import org.imesense.dynamicspawncontrol.core.logfile.Log;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
import net.minecraftforge.fml.common.registry.ForgeRegistries;
import org.imesense.dynamicspawncontrol.core.logfile.Log;
import org.imesense.dynamicspawncontrol.core.util.CodeGeneric;
import org.imesense.dynamicspawncontrol.eventprocessor.generic.keyword.SingleKeyWord;
import org.imesense.dynamicspawncontrol.eventprocessor.listaction.ListActionBinary;
import org.imesense.dynamicspawncontrol.eventprocessor.listaction.ListActionConsumer;
import org.imesense.dynamicspawncontrol.technical.attributefactory.Attribute;
import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap;
import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMapFactory;
import org.imesense.dynamicspawncontrol.technical.customlibrary.*;
import org.imesense.dynamicspawncontrol.core.attributefactory.Attribute;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeMap;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeMapFactory;
import org.imesense.dynamicspawncontrol.core.api.SignalDataAccessor;
import org.imesense.dynamicspawncontrol.core.api.SignalDataGetter;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
import net.minecraftforge.event.entity.living.LivingSpawnEvent;
import org.imesense.dynamicspawncontrol.technical.attributefactory.Attribute;
import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMap;
import org.imesense.dynamicspawncontrol.technical.attributefactory.AttributeMapFactory;
import org.imesense.dynamicspawncontrol.core.attributefactory.Attribute;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeMap;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeMapFactory;
import org.imesense.dynamicspawncontrol.eventprocessor.listaction.ListActionBinary;
import org.imesense.dynamicspawncontrol.eventprocessor.listaction.ListActionConsumer;
import org.imesense.dynamicspawncontrol.core.logfile.Log;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package org.imesense.dynamicspawncontrol.eventprocessor.generic.keyword;

import org.imesense.dynamicspawncontrol.technical.attributefactory.*;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeKey;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeType;

/**
*
*/
public class CommonKeyWord
{
public static final AttributeKey<Integer> ID_RULE = AttributeKey.create(AttributeType.INTEGER, "id_rule");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package org.imesense.dynamicspawncontrol.eventprocessor.generic.keyword;

import org.imesense.dynamicspawncontrol.technical.attributefactory.*;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeKey;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeType;

/**
*
*/
public final class DropLoot extends CommonKeyWord
{
public static final AttributeKey<String> ACTION_ITEM = AttributeKey.create(AttributeType.STRING, "item");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package org.imesense.dynamicspawncontrol.eventprocessor.generic.keyword;

import org.imesense.dynamicspawncontrol.technical.attributefactory.*;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeKey;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeType;

/**
*
*/
public final class MobTaskManager extends CommonKeyWord
{
public static final AttributeKey<String> ENEMIES_TO = AttributeKey.create(AttributeType.STRING, "enemies_to");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package org.imesense.dynamicspawncontrol.eventprocessor.generic.keyword;

import org.imesense.dynamicspawncontrol.technical.attributefactory.*;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeKey;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeType;

/**
*
*/
public final class PotentialSpawn extends CommonKeyWord
{
public static AttributeKey<?> MOB_STRUCT = AttributeKey.create(AttributeType.MAP, "struct");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package org.imesense.dynamicspawncontrol.technical.customlibrary;
package org.imesense.dynamicspawncontrol.eventprocessor.generic.keyword;

/**
*
*/
public final class SingleKeyWord
{
/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
package org.imesense.dynamicspawncontrol.eventprocessor.generic.keyword;

import org.imesense.dynamicspawncontrol.technical.attributefactory.*;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeKey;
import org.imesense.dynamicspawncontrol.core.attributefactory.AttributeType;

/**
*
*/
public final class SpawnCondition extends CommonKeyWord
{
public static final AttributeKey<Boolean> CAN_SPAWN_HERE = AttributeKey.create(AttributeType.BOOLEAN, "can_spawn_here");
Expand Down
Loading

0 comments on commit c70aec6

Please sign in to comment.