apex/DimDoors
1
1
Fork 0
Code Issues 26 Pull Requests Actions Packages Projects Releases Wiki Activity

Minor Change #141

Merged
SenseiKiwi merged 3 commits from master into master 2014-03-07 05:26:04 +00:00
Conversation 0 Commits 3 Files Changed 14 +14 -5
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a8e37da4bc - Show all commits

9
src/main/java/StevenDimDoors/mod_pocketDim/DDProperties.java
View File

@@ -96,6 +96,7 @@ public class DDProperties
public final boolean LimboReturnsInventoryEnabled; public final boolean LimboReturnsInventoryEnabled;
public final boolean DoorRenderingEnabled; public final boolean DoorRenderingEnabled;
public final boolean TNFREAKINGT_Enabled; public final boolean TNFREAKINGT_Enabled;
public final boolean MonolithTeleportationEnabled;
/** /**
@@ -118,6 +119,7 @@ public class DDProperties
//Names of categories //Names of categories
private final String CATEGORY_CRAFTING = "crafting"; private final String CATEGORY_CRAFTING = "crafting";
private final String CATEGORY_ENTITY = "entity"; private final String CATEGORY_ENTITY = "entity";
private final String CATEGORY_SPECIAL = "special";
private final String CATEGORY_DIMENSION = "dimension"; private final String CATEGORY_DIMENSION = "dimension";
private final String CATEGORY_PROVIDER = "provider"; private final String CATEGORY_PROVIDER = "provider";
private final String CATEGORY_BIOME = "biome"; private final String CATEGORY_BIOME = "biome";
@@ -235,6 +237,13 @@ public class DDProperties
{ {
throw new IllegalStateException("World generation blocks MUST have block IDs less than 256. Fix your configuration!"); throw new IllegalStateException("World generation blocks MUST have block IDs less than 256. Fix your configuration!");
} }
// SPECIAL CONFIG SETTINGS
// I'm adding this category because one of our users convinced me, personally, to please allow this.
// These settings are checked _after_ we save the config file, so Forge won't generate them automatically.
// Whoever wants to use them must intentionally write them into the config file.
MonolithTeleportationEnabled = config.get(CATEGORY_SPECIAL, "Enable Monolith Teleportation", true).getBoolean(true);
} }
public static DDProperties initialize(File configFile) public static DDProperties initialize(File configFile)

2
src/main/java/StevenDimDoors/mod_pocketDim/ticking/MobMonolith.java
View File

@@ -193,7 +193,7 @@ public class MobMonolith extends EntityFlying implements IMob
this.soundTime=200; this.soundTime=200;
} }
} }
else if (!this.worldObj.isRemote && !entityPlayer.capabilities.isCreativeMode) else if (!this.worldObj.isRemote && properties.MonolithTeleportationEnabled && !entityPlayer.capabilities.isCreativeMode)
{ {
ChunkCoordinates coords = LimboProvider.getLimboSkySpawn(entityPlayer.worldObj.rand); ChunkCoordinates coords = LimboProvider.getLimboSkySpawn(entityPlayer.worldObj.rand);
Point4D destination = new Point4D((int) (coords.posX+entityPlayer.posX), coords.posY, (int) (coords.posZ+entityPlayer.posZ ), mod_pocketDim.properties.LimboDimensionID); Point4D destination = new Point4D((int) (coords.posX+entityPlayer.posX), coords.posY, (int) (coords.posZ+entityPlayer.posZ ), mod_pocketDim.properties.LimboDimensionID);