Merge branch 'master' into dev

# Conflicts:
#	src/main/java/noppes/npcs/scripted/ScriptFaction.java
#	src/main/java/noppes/npcs/scripted/ScriptWorld.java
#	src/main/java/noppes/npcs/scripted/entity/ScriptNpc.java
#	src/main/java/noppes/npcs/scripted/entity/ScriptPlayer.java
#	src/main/java/noppes/npcs/scripted/interfaces/IEntity.java
#	src/main/java/noppes/npcs/scripted/interfaces/IWorld.java
#	src/main/java/noppes/npcs/scripted/interfaces/entity/ICustomNpc.java
#	src/main/java/noppes/npcs/scripted/interfaces/entity/IPlayer.java
This commit is contained in:
Luis C.M committed 2022-05-27 15:31:02 -05:00
commit ec5fc71413
300 files changed
+9920 -2959

No files matched your search

+21 -3
View File
@@ -1,6 +1,5 @@
package noppes.npcs;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
@@ -27,7 +26,8 @@ import noppes.npcs.controllers.*;
import noppes.npcs.enchants.EnchantInterface;
import noppes.npcs.entity.*;
import noppes.npcs.entity.old.*;
import noppes.npcs.scripted.wrapper.WrapperNpcAPI;
import noppes.npcs.scripted.NpcAPI;
import java.io.File;
import java.util.Set;
@@ -63,6 +63,15 @@ public class CustomNpcs {
@ConfigProp(info = "The amount of time that passes before a player's quests are checked for completion in seconds.")
public static int PlayerQuestCheck = 300;
@ConfigProp(info = "Client sided! Determines where tracking quest info shows up on the screen based on a number from 0 to 8.")
public static int TrackingInfoAlignment = 5;
@ConfigProp(info = "Client sided! Offsets the tracking info GUI by this amount in the X direction.")
public static int TrackingInfoX = 0;
@ConfigProp(info = "Client sided! Offsets the tracking info GUI by this amount in the Y direction.")
public static int TrackingInfoY = 0;
@ConfigProp
public static boolean InventoryGuiEnabled = true;
@@ -165,6 +174,11 @@ public class CustomNpcs {
if(PlayerQuestCheck < 1)
PlayerQuestCheck = 1;
if (TrackingInfoAlignment < 0)
TrackingInfoAlignment = 0;
if (TrackingInfoAlignment > 8)
TrackingInfoAlignment = 8;
EnchantInterface.load();
CustomItems.load();
@@ -182,6 +196,10 @@ public class CustomNpcs {
MinecraftForge.EVENT_BUS.register(forgeEventHandler);
FMLCommonHandler.instance().bus().register(forgeEventHandler);
ScriptItemEventHandler scriptItemEventHandler = new ScriptItemEventHandler();
MinecraftForge.EVENT_BUS.register(scriptItemEventHandler);
FMLCommonHandler.instance().bus().register(scriptItemEventHandler);
FMLCommonHandler.instance().bus().register(new ServerTickHandler());
registerNpc(EntityNPCHumanMale.class, "npchumanmale");
@@ -253,7 +271,7 @@ public class CustomNpcs {
ScriptController.Instance.loadNPCScripts();
ScriptController.Instance.loadPlayerScripts();
ScriptController.HasStart = false;
WrapperNpcAPI.clearCache();
NpcAPI.clearCache();
Set<String> names = Block.blockRegistry.getKeys();
for(String name : names){