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

Added Configuration Option for Crafting Stabilized Rift Blade, Minor Additional Changes #13

Merged
SenseiKiwi merged 5 commits from master into master 2013-06-13 06:48:42 +00:00
Conversation 0 Commits 5 Files Changed 2 +622 -643
2 changed files with 622 additions and 643 deletions
Download Patch File Download Diff File Expand all files Collapse all files

299
StevenDimDoors/mod_pocketDim/DimDoorsConfig.java
View File

@@ -11,233 +11,210 @@ public class DimDoorsConfig
* BlockIDs * BlockIDs
*/ */
public static Property chaosDoor; public static Property UnstableDoorID;
public static Property dimDoor; public static Property DimensionalDoorID;
public static Property exitDoor; public static Property WarpDoorID;
public static Property dimHatch; public static Property TransTrapdoorID;
public static Property transientDoor; public static Property TransientDoorID;
public static Property blockFabric;
public static Property blockRift;
public static Property FabricBlockID;
public static Property RiftBlockID;
/** /**
* WorldGenBlockIDs * WorldGenBlockIDs
*/ */
public static Property blockLimbo; public static Property LimboBlockID;
public static Property blockFabricPerm; public static Property PermaFabricBlockID;
/** /**
* ItemIDs * ItemIDs
*/ */
public static Property itemRiftBlade; public static Property RiftBladeItemID;
public static Property itemRiftSignature; public static Property RiftSignatureItemID;
public static Property itemRiftRemover; public static Property RiftRemoverItemID;
public static Property itemStableFabric; public static Property StableFabricItemID;
public static Property itemStabilizedRiftSignature; public static Property StabilizedRiftSignatureItemID;
public static Property itemDimDoor;
public static Property itemChaosDoor;
public static Property itemExitDoor;
public static Property DimensionalDoorItemID;
public static Property UnstableDoorItemID;
public static Property WarpDoorItemID;
/** /**
* Other IDs * Other IDs
*/ */
public static Property limboBiomeID; public static Property LimboBiomeID;
public static Property pocketBiomeID; public static Property PocketBiomeID;
public static Property limboDimID; public static Property LimboDimensionID;
public static Property limboProviderID; public static Property limboProviderID;
public static Property pocketProviderID; public static Property PocketProviderID;
public static Property doorRenderID; public static Property DoorRenderEntityID;
public static Property monolithID; public static Property MonolithEntityID;
/** /**
* CraftingFlags * CraftingFlags
*/ */
public static Property bCraftDimDoor; public static Property CraftingDimensionaDoorAllowed;
public static Property bCraftExitDoor; public static Property CraftingWarpDoorAllowed;
public static Property bCraftRiftSig; public static Property CraftingRiftSignatureAllowed;
public static Property bCraftRiftRemover; public static Property CraftingRiftRemoverAllowed;
public static Property bCraftUnstableDoor; public static Property CraftingUnstableDoorAllowed;
public static Property bCraftRiftBlade; public static Property CraftingRiftBladeAllowed;
public static Property bCraftDimHatch; public static Property CraftingTransTrapdoorAllowed;
public static Property bCraftChaosDoor; public static Property CraftingStabilizedRiftSignatureAllowed;
/** /**
* OtherFlags * OtherFlags
*/ */
public static Property bWorldGenRifts;
public static Property bRiftSpread;
public static Property bRiftGreif;
public static Property bRiftsSpawnEndermen;
public static Property bLimboActive;
public static Property bHardcoreLimbo;
public static Property bLimboReturnInventory;
public static Property bEnableDoorRender;
public static Property bTNFREAKINGT;
public static Property WorldRiftGenerationEnabled;
public static Property RiftSpreadEnabled;
public static Property RiftGriefingEnabled;
public static Property RiftsSpawnEndermenEnabled;
public static Property LimboEnabled;
public static Property LimboRespawningEnabled;
public static Property LimboReturnsInventoryEnabled;
public static Property DoorRenderingEnabled;
public static Property TNFREAKINGT_Enabled;
/** /**
* Other * Other
*/ */
public static Property HOWMUCHTNT; public static Property NonTntWeight;
public static Property riftSpreadModifier; public static Property RiftSpreadModifier;
public static Property limboReturnRange; public static Property LimboReturnRange;
public static void loadConfig(File configFile) public static void loadConfig(File configFile)
{ {
Configuration config = new Configuration(configFile); Configuration config = new Configuration(configFile);
config.load(); config.load();
bCraftDimHatch = config.get("Crafting control", "bCraftDimHatch", true); CraftingDimensionaDoorAllowed = config.get("Crafting control", "bCraftDimDoor", true);
CraftingWarpDoorAllowed = config.get("Crafting control", "bCraftExitDoor", true);
CraftingUnstableDoorAllowed = config.get("Crafting control", "bCraftChaosDoor", true);
CraftingTransTrapdoorAllowed = config.get("Crafting control", "bCraftDimHatch", true);
CraftingRiftSignatureAllowed = config.get("Crafting control", "bCraftRiftSig", true);
CraftingRiftRemoverAllowed = config.get("Crafting control", "bCraftRiftRemover", true);
CraftingStabilizedRiftSignatureAllowed = config.get("Crafting control", "bCraftStabilizedRiftSig", true);
CraftingRiftBladeAllowed = config.get("Crafting control", "bCraftRiftBlade", true);
bCraftDimDoor = config.get("Crafting control", "bCraftDimDoor", true); LimboRespawningEnabled = config.get(Configuration.CATEGORY_GENERAL, "bHardcoreLimbo", false);
LimboRespawningEnabled.comment = "True causes the player to respawn in limbo if they die in limbo";
bCraftRiftBlade = config.get("Crafting control", "bCraftRiftBlade", true); TNFREAKINGT_Enabled = config.get("Configuration.CATEGORY_GENERAL", "EXPLOSIONS!!???!!!?!?!!", false);
bCraftRiftRemover = config.get("Crafting control", "bCraftRiftRemover", true); RiftGriefingEnabled = config.get(Configuration.CATEGORY_GENERAL, "bRiftGreif", true);
RiftGriefingEnabled.comment = "toggles whether rifts eat blocks around them or not";
bCraftRiftSig = config.get("Crafting control", "bCraftRiftSig", true); DoorRenderingEnabled = config.get(Configuration.CATEGORY_GENERAL, "bEnableDoorRender", true);
bCraftChaosDoor = config.get("Crafting control", "bCraftChaosDoor", true); LimboReturnsInventoryEnabled = config.get(Configuration.CATEGORY_GENERAL, "bLimboReturnInventory", true);
LimboReturnsInventoryEnabled.comment="Toggles whether or not your inventory is returned upon dying and respawning in limbo";
bCraftExitDoor = config.get("Crafting control", "bCraftExitDoor", true); NonTntWeight=config.get(Configuration.CATEGORY_GENERAL, "HOWMUCHTNT", 25);
NonTntWeight.comment="Chance that a block will not be TNT. must be greater than or equal to 0. Explosions!?!?? must be set to true, and you figure out what it does. ";
MonolithEntityID=config.get(Configuration.CATEGORY_GENERAL, "monolithID", 125);
DimensionalDoorID = config.getBlock("DimensionalDoorID", 1970);
WarpDoorID = config.getBlock("WarpDoorID", 1975);
UnstableDoorID = config.getBlock("UnstableDoorID", 1978);
TransTrapdoorID = config.getBlock("TransdimensionalTrapdoorID", 1971);
TransientDoorID = config.getBlock("TransientDoorID", 1979);
FabricBlockID =config.getBlock("FabricOfRealityBlockID", 1973);
RiftBlockID = config.getBlock("RiftBlockID", 1977);
StabilizedRiftSignatureItemID=config.getItem("Stabilized Rift Signature", 5677);
RiftBladeItemID=config.getItem("Rift Blade", 5676);
UnstableDoorItemID=config.getItem("Chaos Door", 5673);
RiftRemoverItemID=config.getItem("Rift Remover", 5671);
StableFabricItemID=config.getItem("Stable Fabric", 5672);
WarpDoorItemID=config.getItem("Warp Door Item", 5673);
DimensionalDoorItemID=config.getItem("Dimensional Door Item", 5674);
RiftSignatureItemID=config.getItem("Rift Signature Item", 5675);
LimboEnabled=config.get(Configuration.CATEGORY_GENERAL, "bLimboActive", true);
bHardcoreLimbo = config.get(Configuration.CATEGORY_GENERAL, "bHardcoreLimbo", false); LimboBlockID=config.get("Worldgen Block IDs - must be less than 256", "blockLimbo", 217);
bHardcoreLimbo.comment = "True causes the player to respawn in limbo if they die in limbo"; PermaFabricBlockID=config.get("Worldgen Block IDs - must be less than 256", "blockFabricPerm", 220);
bTNFREAKINGT = config.get("Configuration.CATEGORY_GENERAL", "EXPLOSIONS!!???!!!?!?!!", false); LimboDimensionID=config.get(Configuration.CATEGORY_GENERAL, "limboDimID", -23);
DoorRenderEntityID=config.get(Configuration.CATEGORY_GENERAL, "doorRenderID", 89);
bRiftGreif = config.get(Configuration.CATEGORY_GENERAL, "bRiftGreif", true); LimboReturnRange=config.get(Configuration.CATEGORY_GENERAL, "limboReturnRange", 500);
bRiftGreif.comment = "toggles whether rifts eat blocks around them or not"; LimboReturnRange.comment = "The farthest possible distance that limbo can send you upon return to the overworld.";
bEnableDoorRender = config.get(Configuration.CATEGORY_GENERAL, "bEnableDoorRender", true); PocketProviderID=config.get(Configuration.CATEGORY_GENERAL, "pocketProviderID", 24);
bLimboReturnInventory = config.get(Configuration.CATEGORY_GENERAL, "bLimboReturnInventory", true);
bLimboReturnInventory.comment="Toggles whether or not your inventory is returned upon dying and respawning in limbo";
HOWMUCHTNT=config.get(Configuration.CATEGORY_GENERAL, "HOWMUCHTNT", 25);
HOWMUCHTNT.comment="Chance that a block will not be TNT. must be greater than 1. Explosions!?!?? must be set to true, and you figure out what it does. ";
monolithID=config.get(Configuration.CATEGORY_GENERAL, "monolithID", 125);
// dimRailID = config.getBlock("Dimensional Rail", 1980).getInt();
chaosDoor = config.getBlock("Chaos Door", 1978);
dimDoor = config.getBlock("Dimensional Door", 1970);
dimHatch = config.getBlock("Transdimensional Trapdoor", 1971);
blockFabric=config.getBlock("Fabric of Reality", 1973);
exitDoor = config.getBlock("Warp Door", 1975);
blockRift = config.getBlock("Rift", 1977);
transientDoor = config.getBlock("transientDoorID", 1979);
itemStabilizedRiftSignature=config.getItem("Stabilized Rift Signature", 5677);
itemRiftBlade=config.getItem("Rift Blade", 5676);
itemChaosDoor=config.getItem("Chaos Door", 5673);
itemRiftRemover=config.getItem("Rift Remover", 5671);
itemStableFabric=config.getItem("Stable Fabric", 5672);
itemExitDoor=config.getItem("Warp Door Item", 5673);
itemDimDoor=config.getItem("Dimensional Door Item", 5674);
itemRiftSignature=config.getItem("Rift Signature Item", 5675);
bLimboActive=config.get(Configuration.CATEGORY_GENERAL, "bLimboActive", true);
blockLimbo=config.get("Worldgen Block IDs - must be less than 256", "blockLimbo", 217);
blockFabricPerm=config.get("Worldgen Block IDs - must be less than 256", "blockFabricPerm", 220);
limboDimID=config.get(Configuration.CATEGORY_GENERAL, "limboDimID", -23);
doorRenderID=config.get(Configuration.CATEGORY_GENERAL, "doorRenderID", 89);
limboReturnRange=config.get(Configuration.CATEGORY_GENERAL, "limboReturnRange", 500);
limboReturnRange.comment = "The farthest possible distance that limbo can send you upon return to the overworld.";
pocketProviderID=config.get(Configuration.CATEGORY_GENERAL, "pocketProviderID", 24);
limboProviderID=config.get(Configuration.CATEGORY_GENERAL, "limboProvider ID", 13); limboProviderID=config.get(Configuration.CATEGORY_GENERAL, "limboProvider ID", 13);
bWorldGenRifts = config.get(Configuration.CATEGORY_GENERAL, "bWorldGenRifts", true); WorldRiftGenerationEnabled = config.get(Configuration.CATEGORY_GENERAL, "bWorldGenRifts", true);
bWorldGenRifts.comment = "Toggles the natrual generation of dungeon rifts in other dimensions"; WorldRiftGenerationEnabled.comment = "Toggles the natrual generation of dungeon rifts in other dimensions";
bLimboActive = config.get(Configuration.CATEGORY_GENERAL, "bLimboActive", true); LimboEnabled = config.get(Configuration.CATEGORY_GENERAL, "bLimboActive", true);
bLimboActive.comment="Toggles if dying in a pocket dim respawns the player in limbo"; LimboEnabled.comment="Toggles if dying in a pocket dim respawns the player in limbo";
riftSpreadModifier = config.get(Configuration.CATEGORY_GENERAL, "riftSpreadModifier", 3); RiftSpreadModifier = config.get(Configuration.CATEGORY_GENERAL, "riftSpreadModifier", 3);
riftSpreadModifier.comment = "How many times a rift can spread- 0 prevents rifts from spreading at all. I dont recommend putting it highter than 5, because its rather exponential. "; RiftSpreadModifier.comment = "How many times a rift can spread- 0 prevents rifts from spreading at all. I dont recommend putting it highter than 5, because its rather exponential. ";
limboBiomeID=config.get(Configuration.CATEGORY_GENERAL, "limboBiomeID", 251); LimboBiomeID=config.get(Configuration.CATEGORY_GENERAL, "limboBiomeID", 251);
pocketBiomeID=config.get(Configuration.CATEGORY_GENERAL, "pocketBiomeID", 250); PocketBiomeID=config.get(Configuration.CATEGORY_GENERAL, "pocketBiomeID", 250);
config.save(); config.save();
mod_pocketDim.blockDimWallID=FabricBlockID.getInt();
config.save(); mod_pocketDim.blockDimWallPermID=PermaFabricBlockID.getInt();
mod_pocketDim.blockLimboID=LimboBlockID.getInt();
mod_pocketDim.blockDimWallID=blockFabric.getInt(); mod_pocketDim.blockRiftID=LimboBlockID.getInt();
mod_pocketDim.blockDimWallPermID=blockFabricPerm.getInt(); mod_pocketDim.dimDoorID=DimensionalDoorID.getInt();
mod_pocketDim.blockLimboID=blockLimbo.getInt(); mod_pocketDim.chaosDoorID=UnstableDoorID.getInt();
mod_pocketDim.blockRiftID=blockLimbo.getInt(); mod_pocketDim.transientDoorID=TransientDoorID.getInt();
mod_pocketDim.dimDoorID=dimDoor.getInt(); mod_pocketDim.dimHatchID=TransTrapdoorID.getInt();
mod_pocketDim.chaosDoorID=chaosDoor.getInt(); mod_pocketDim.ExitDoorID=WarpDoorID.getInt();
mod_pocketDim.transientDoorID=transientDoor.getInt(); mod_pocketDim.blockRiftID=RiftBlockID.getInt();
mod_pocketDim.dimHatchID=dimHatch.getInt(); mod_pocketDim.DoorRenderID=DoorRenderEntityID.getInt();
mod_pocketDim.ExitDoorID=exitDoor.getInt(); mod_pocketDim.hardcoreLimbo=LimboRespawningEnabled.getBoolean(false);
mod_pocketDim.blockRiftID=blockRift.getInt(); mod_pocketDim.enableDimTrapDoor=CraftingTransTrapdoorAllowed.getBoolean(true);
mod_pocketDim.DoorRenderID=doorRenderID.getInt(); mod_pocketDim.enableDoorOpenGL=DoorRenderingEnabled.getBoolean(true);
mod_pocketDim.hardcoreLimbo=bHardcoreLimbo.getBoolean(false); mod_pocketDim.enableIronDimDoor=CraftingDimensionaDoorAllowed.getBoolean(true);
mod_pocketDim.enableDimTrapDoor=bCraftDimHatch.getBoolean(true); mod_pocketDim.enableRiftBlade=CraftingRiftBladeAllowed.getBoolean(true);
mod_pocketDim.enableDoorOpenGL=bEnableDoorRender.getBoolean(true); mod_pocketDim.enableRiftRemover=CraftingRiftBladeAllowed.getBoolean(true);
mod_pocketDim.enableIronDimDoor=bCraftDimDoor.getBoolean(true); mod_pocketDim.enableRiftSignature=CraftingRiftSignatureAllowed.getBoolean(true);
mod_pocketDim.enableRiftBlade=bCraftRiftBlade.getBoolean(true); mod_pocketDim.enableUnstableDoor=CraftingUnstableDoorAllowed.getBoolean(true);
mod_pocketDim.enableRiftRemover=bCraftRiftBlade.getBoolean(true); mod_pocketDim.enableWoodenDimDoor=CraftingWarpDoorAllowed.getBoolean(true);
mod_pocketDim.enableRiftSignature=bCraftRiftSig.getBoolean(true); mod_pocketDim.enableStabilizedRiftSignature=CraftingStabilizedRiftSignatureAllowed.getBoolean(true);
mod_pocketDim.enableUnstableDoor=bCraftRiftSig.getBoolean(true); mod_pocketDim.itemChaosDoorID=UnstableDoorItemID.getInt();
mod_pocketDim.enableWoodenDimDoor=bCraftExitDoor.getBoolean(true); mod_pocketDim.itemDimDoorID=DimensionalDoorItemID.getInt();
mod_pocketDim.itemChaosDoorID=itemChaosDoor.getInt(); mod_pocketDim.itemExitDoorID=WarpDoorItemID.getInt();
mod_pocketDim.itemDimDoorID=itemDimDoor.getInt(); mod_pocketDim.itemLinkSignatureID=RiftSignatureItemID.getInt();
mod_pocketDim.itemExitDoorID=itemExitDoor.getInt(); mod_pocketDim.itemRiftBladeID=RiftBladeItemID.getInt();
mod_pocketDim.itemLinkSignatureID=itemRiftSignature.getInt(); mod_pocketDim.itemRiftRemoverID=RiftRemoverItemID.getInt();
mod_pocketDim.itemRiftBladeID=itemRiftBlade.getInt(); mod_pocketDim.itemStabilizedLinkSignatureID=StabilizedRiftSignatureItemID.getInt();
mod_pocketDim.itemRiftRemoverID=itemRiftRemover.getInt(); mod_pocketDim.itemStableFabricID=StableFabricItemID.getInt();
mod_pocketDim.itemStabilizedLinkSignatureID=itemStabilizedRiftSignature.getInt(); mod_pocketDim.obeliskID=MonolithEntityID.getInt();
mod_pocketDim.itemStableFabricID=itemStableFabric.getInt(); mod_pocketDim.limboBiomeID=LimboBiomeID.getInt();
mod_pocketDim.obeliskID=monolithID.getInt(); mod_pocketDim.pocketBiomeID=PocketBiomeID.getInt();
mod_pocketDim.limboBiomeID=limboBiomeID.getInt(); mod_pocketDim.providerID=PocketProviderID.getInt();
mod_pocketDim.pocketBiomeID=pocketBiomeID.getInt();
mod_pocketDim.providerID=pocketProviderID.getInt();
mod_pocketDim.limboProviderID=limboProviderID.getInt(); mod_pocketDim.limboProviderID=limboProviderID.getInt();
mod_pocketDim.limboExitRange=limboReturnRange.getInt(); mod_pocketDim.limboExitRange=LimboReturnRange.getInt();
mod_pocketDim.TNFREAKINGT=bTNFREAKINGT.getBoolean(false); mod_pocketDim.TNFREAKINGT=TNFREAKINGT_Enabled.getBoolean(false);
mod_pocketDim.riftsInWorldGen=bWorldGenRifts.getBoolean(true); mod_pocketDim.riftsInWorldGen=WorldRiftGenerationEnabled.getBoolean(true);
mod_pocketDim.riftSpreadFactor=riftSpreadModifier.getInt(); mod_pocketDim.riftSpreadFactor=RiftSpreadModifier.getInt();
mod_pocketDim.returnInventory=bLimboReturnInventory.getBoolean(true); mod_pocketDim.returnInventory=LimboReturnsInventoryEnabled.getBoolean(true);
mod_pocketDim.HOW_MUCH_TNT=HOWMUCHTNT.getInt(); mod_pocketDim.HOW_MUCH_TNT=NonTntWeight.getInt() + 1; //workaround so the generator code doesn't have to be changed
mod_pocketDim.limboDimID = limboDimID.getInt(); mod_pocketDim.limboDimID = LimboDimensionID.getInt();
mod_pocketDim.isLimboActive= bLimboActive.getBoolean(true); mod_pocketDim.isLimboActive= LimboEnabled.getBoolean(true);
} }

10
StevenDimDoors/mod_pocketDim/mod_pocketDim.java
View File

@@ -77,7 +77,6 @@ import cpw.mods.fml.relauncher.Side;
@Mod(modid = mod_pocketDim.modid, name = "Dimensional Doors", version = mod_pocketDim.version) @Mod(modid = mod_pocketDim.modid, name = "Dimensional Doors", version = mod_pocketDim.version)
@NetworkMod(clientSideRequired = true, serverSideRequired = false, @NetworkMod(clientSideRequired = true, serverSideRequired = false,
clientPacketHandlerSpec = clientPacketHandlerSpec =
@SidedPacketHandler(channels = {"pocketDim" }, packetHandler = ClientPacketHandler.class), @SidedPacketHandler(channels = {"pocketDim" }, packetHandler = ClientPacketHandler.class),
@@ -87,8 +86,6 @@ import cpw.mods.fml.relauncher.Side;
public class mod_pocketDim public class mod_pocketDim
{ {
public static final String version = "1.5.2R1.3.6RC1"; public static final String version = "1.5.2R1.3.6RC1";
public static final String modid = "DimDoors"; public static final String modid = "DimDoors";
@@ -185,7 +182,7 @@ public class mod_pocketDim
public static HashMap<String,ArrayList<EntityItem>> limboSpawnInventory=new HashMap<String,ArrayList<EntityItem>>(); public static HashMap<String,ArrayList<EntityItem>> limboSpawnInventory=new HashMap<String,ArrayList<EntityItem>>();
public static ArrayList blocksImmuneToRift= new ArrayList(); public static ArrayList<Integer> blocksImmuneToRift= new ArrayList<Integer>();
@@ -213,6 +210,8 @@ public class mod_pocketDim
public static boolean enableDimTrapDoor; public static boolean enableDimTrapDoor;
public static boolean enableStabilizedRiftSignature;
public static boolean enableDoorOpenGL; public static boolean enableDoorOpenGL;
public static boolean hardcoreLimbo; public static boolean hardcoreLimbo;
@@ -498,10 +497,13 @@ public class mod_pocketDim
" y ", "yxy", " y ", 'x', Item.enderPearl, 'y', this.blockLimbo " y ", "yxy", " y ", 'x', Item.enderPearl, 'y', this.blockLimbo
}); });
if (this.enableStabilizedRiftSignature)
{
GameRegistry.addRecipe(new ItemStack(this.itemStabilizedLinkSignature,1), new Object[] GameRegistry.addRecipe(new ItemStack(this.itemStabilizedLinkSignature,1), new Object[]
{ {
" y ", "yxy", " y ", 'x', this.itemLinkSignature, 'y', this.itemStableFabric " y ", "yxy", " y ", 'x', this.itemLinkSignature, 'y', this.itemStableFabric
}); });
}
this.blocksImmuneToRift.add(this.blockDimWallID); this.blocksImmuneToRift.add(this.blockDimWallID);
this.blocksImmuneToRift.add(this.blockDimWallPermID); this.blocksImmuneToRift.add(this.blockDimWallPermID);