aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build.gradle2
-rw-r--r--src/Java/mcmod.info19
-rw-r--r--src/Java/miscutil/core/block/antigrief/TowerDevice.java11
-rw-r--r--src/Java/miscutil/core/handler/UnbreakableBlockManager.java138
-rw-r--r--src/Java/miscutil/core/handler/XEventHandler.java50
-rw-r--r--src/Java/miscutil/core/lib/CORE.java4
-rw-r--r--src/Java/miscutil/gregtech/gui/CONTAINER_SafeBlock.java22
-rw-r--r--src/Java/miscutil/gregtech/gui/GUI_SafeBlock.java31
-rw-r--r--src/Java/miscutil/gregtech/metatileentity/implementations/base/GregtechMetaSafeBlockBase.java28
-rw-r--r--src/Java/miscutil/mcmod.info2
-rw-r--r--src/mcmod.info19
11 files changed, 267 insertions, 59 deletions
diff --git a/build.gradle b/build.gradle
index d81a41ca12..5af53419bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,5 +40,5 @@ sourceCompatibility = 1.7
targetCompatibility = 1.7
archivesBaseName = "MiscUtils"
-version = "0.9.6"
+version = "0.9.8"
minecraft.version = "1.7.10-10.13.4.1448-1.7.10" \ No newline at end of file
diff --git a/src/Java/mcmod.info b/src/Java/mcmod.info
new file mode 100644
index 0000000000..46c51b6525
--- /dev/null
+++ b/src/Java/mcmod.info
@@ -0,0 +1,19 @@
+/**
+ * @version 0.1
+ * @author Alkalus
+ * In-game info for project: Hello World.
+ */
+[ { "modid" : "miscutil"
+ , "name" : "miscutils"
+ , "description" : "Adds a few various things. Supported mods include GregTech, EnderIO, Big Reactors, Thaumcraft, ExtraUtils, Pnuematicraft & Simply Jetpacks."
+ , "version" : "0.9.8"
+ , "mcversion" : "1.7.10"
+ , "url" : ""
+ , "updateUrl" : ""
+ , "authorList" : ["Alkalus"]
+ , "credits" : ""
+ , "logoFile" : ""
+ , "screenshots" : []
+ , "dependencies" : ["Forge10.13.0.1180"]
+ }
+]
diff --git a/src/Java/miscutil/core/block/antigrief/TowerDevice.java b/src/Java/miscutil/core/block/antigrief/TowerDevice.java
index 5299875355..7e9a3d78a9 100644
--- a/src/Java/miscutil/core/block/antigrief/TowerDevice.java
+++ b/src/Java/miscutil/core/block/antigrief/TowerDevice.java
@@ -18,6 +18,7 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.IBlockAccess;
@@ -28,6 +29,8 @@ import cpw.mods.fml.relauncher.SideOnly;
public class TowerDevice extends Block {
private static IIcon TEX_ANTIBUILDER;
public static final int META_ANTIBUILDER = 9;
+ private boolean bUnbreakable;
+
public TowerDevice()
{
super(Material.wood);
@@ -42,6 +45,14 @@ public class TowerDevice extends Block {
return 15;
}
+ public void saveNBTData(NBTTagCompound aNBT) {
+ aNBT.setBoolean("bUnbreakable", bUnbreakable);
+ }
+
+ public void loadNBTData(NBTTagCompound aNBT) {
+ bUnbreakable = aNBT.getBoolean("bUnbreakable");
+ }
+
public IIcon getIcon(int side, int meta)
{
return TEX_ANTIBUILDER;
diff --git a/src/Java/miscutil/core/handler/UnbreakableBlockManager.java b/src/Java/miscutil/core/handler/UnbreakableBlockManager.java
new file mode 100644
index 0000000000..62193d4b5c
--- /dev/null
+++ b/src/Java/miscutil/core/handler/UnbreakableBlockManager.java
@@ -0,0 +1,138 @@
+package miscutil.core.handler;
+
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.metatileentity.BaseMetaPipeEntity;
+import gregtech.api.metatileentity.BaseMetaTileEntity;
+import gregtech.api.metatileentity.BaseTileEntity;
+import miscutil.core.util.Utils;
+import miscutil.gregtech.metatileentity.implementations.GregtechMetaSafeBlock;
+import net.minecraft.block.Block;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+
+public class UnbreakableBlockManager{
+
+ private static boolean hasRun = false;
+
+ public final BaseMetaTileEntity getmTileEntity() {
+ return mTileEntity;
+ }
+
+
+ public final void setmTileEntity(BaseMetaTileEntity mTileEntity/*, EntityPlayer aPlayer*/) {
+ UnbreakableBlockManager.mTileEntity = mTileEntity;
+ if (!hasRun){
+ hasRun = true;
+ makeIndestructible(/*aPlayer*/);
+ }
+ else {
+ Utils.LOG_WARNING("Why do you run twice?");
+ }
+ }
+
+
+ //BaseMetaTileEntity
+ //GregtechMetaSafeBlock
+ private static BaseMetaTileEntity mTileEntity = null;
+
+
+ private void makeIndestructible(/*EntityPlayer aPlayer*/){
+
+
+ Utils.LOG_WARNING("Initializing the code to set this TE to -1 hardness and make it indestructible.");
+ int X = ((BaseMetaTileEntity)mTileEntity).xCoord; //(GregtechMetaSafeBlock) this.mTileEntity.getXCoord();
+ int Y = ((BaseMetaTileEntity)mTileEntity).yCoord;
+ int Z = ((BaseMetaTileEntity)mTileEntity).zCoord;
+ Utils.LOG_WARNING("Grabbing TileEntity @ [x,y,z] |"+X+"|"+Y+"|"+Z+"|");
+
+
+
+ try{
+ GregtechMetaSafeBlock MetaSafeBlock = ((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity());
+ TileEntity BaseMetaTileEntity = ((BaseMetaTileEntity)mTileEntity).getTileEntity(X, Y, Z);
+ //MetaSafeBlockBase.
+ World TE_WORLD = MetaSafeBlock.getBaseMetaTileEntity().getWorld();
+ Utils.LOG_WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
+ TileEntity entity = BaseMetaTileEntity;
+ innerInvincible(MetaSafeBlock, entity, TE_WORLD, /*aPlayer,*/ X, Y, Z);
+ }
+ catch (NullPointerException e) {
+ System.out.print("Caught a NullPointerException involving Safe Blocks. Cause: ");
+ e.printStackTrace();
+ }
+ }
+
+
+ private static void innerInvincible(GregtechMetaSafeBlock MetaSafeBlock, TileEntity entity, World TE_WORLD, /*EntityPlayer aPlayer,*/ int X, int Y, int Z){
+ if (entity != null && !entity.equals(null)){
+ Utils.LOG_WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
+ Utils.LOG_WARNING("Grabbed TE: "+entity.toString());
+
+
+
+
+ if (entity instanceof BaseTileEntity && !(entity instanceof BaseMetaPipeEntity)){
+ IMetaTileEntity I = ((BaseMetaTileEntity)entity).getMetaTileEntity();
+ Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
+ Utils.LOG_WARNING("I Details: "+I.getMetaName()+" | "+I.getTileEntityBaseType()+" | "+I.toString());
+
+
+
+
+
+ if (I instanceof GregtechMetaSafeBlock){
+ Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
+
+ Block ThisBlock = I.getBaseMetaTileEntity().getBlock(X, Y, Z);
+ Utils.LOG_WARNING("Block Details: "+ThisBlock.toString());
+
+
+ if (((GregtechMetaSafeBlock)I).bUnbreakable){
+ ThisBlock.setHardness(Integer.MAX_VALUE);
+ //ThisBlock.setResistance(18000000.0F);
+ ThisBlock.setResistance(-1);
+ ThisBlock.setBlockUnbreakable();
+ Utils.LOG_WARNING("Changing State of Flag. Old Value="+MetaSafeBlock.bUnbreakable+" Expected Value=true");
+ MetaSafeBlock.bUnbreakable = true;
+ //entity.markDirty();
+ Utils.LOG_WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
+ Utils.LOG_ERROR("New Indestructible Flag enabled.");
+ //GT_Utility.sendChatToPlayer(aPlayer, "Block is now unbreakable.");
+ }
+
+
+
+
+ else {
+ ThisBlock.setHardness(1);
+ ThisBlock.setResistance(1.0F);
+ Utils.LOG_WARNING("Changing State of Flag. Old Value="+MetaSafeBlock.bUnbreakable+" Expected Value=false");
+ MetaSafeBlock.bUnbreakable = false;
+ //entity.markDirty();
+ Utils.LOG_WARNING("Checking new State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
+ Utils.LOG_ERROR("New Indestructible Flag disabled.");
+ //GT_Utility.sendChatToPlayer(aPlayer, "Block is now breakable.");
+ }
+
+ //entity.markDirty();
+
+ Utils.LOG_WARNING("Block Hardness: "+ThisBlock.getBlockHardness(TE_WORLD, X, Y, Z));
+ Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
+ hasRun = false;
+
+ }
+ else {
+ Utils.LOG_WARNING("I is not an instanceof MetaSafeBlockBase");
+ Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
+ }
+ } else {
+ Utils.LOG_WARNING("TE is not an instanceof BaseTileEntity or may be a pipe.");
+ Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
+ }
+ }else {
+ Utils.LOG_WARNING("Did not grab a TE instance to make a block instance from.");
+ Utils.LOG_WARNING("Checking State of Flag[nUnbreakable]. Value="+MetaSafeBlock.bUnbreakable);
+ }
+ }
+
+}
diff --git a/src/Java/miscutil/core/handler/XEventHandler.java b/src/Java/miscutil/core/handler/XEventHandler.java
index 6c23675abc..db6a03e3e6 100644
--- a/src/Java/miscutil/core/handler/XEventHandler.java
+++ b/src/Java/miscutil/core/handler/XEventHandler.java
@@ -15,33 +15,39 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent;
public class XEventHandler {
@SubscribeEvent
public void onBreakBlock(BreakEvent event) {
- TileEntity entity = event.world.getTileEntity(event.x, event.y, event.z);
- EntityPlayer playerInternal = event.getPlayer();
-
try{
- if (entity instanceof BaseTileEntity && !(entity instanceof BaseMetaPipeEntity)){
- IMetaTileEntity X = ((BaseMetaTileEntity)entity).getMetaTileEntity();
- Block ThisBlock = X.getBaseMetaTileEntity().getBlock(event.x, event.y, event.z);
- if (X instanceof GregtechMetaSafeBlockBase){
-
- String ownerUUID = ((GregtechMetaSafeBlockBase)X).ownerUUID;
- String accessorUUID = playerInternal.getUniqueID().toString();
- Utils.LOG_WARNING("Owner UUID: "+ownerUUID);
- Utils.LOG_WARNING("Accessor UUID: "+accessorUUID);
-
- if (((GregtechMetaSafeBlockBase)X).bUnbreakable){
- if (accessorUUID.equals(ownerUUID)){
- Utils.messagePlayer(playerInternal, "Since you own this block, it has been destroyed.");
- event.setCanceled(false);
- }
- else {
- event.setCanceled(true);
- Utils.messagePlayer(playerInternal, "Since you do not own this block, it has not been destroyed.");
+ TileEntity entity = event.world.getTileEntity(event.x, event.y, event.z);
+ if (entity != null && !entity.equals(null)){
+ EntityPlayer playerInternal = event.getPlayer();
+ Utils.LOG_WARNING(entity.getClass().getSimpleName());
+ if (entity.getClass().getSimpleName().equals("")){
+
+ }
+ if (entity instanceof BaseTileEntity && !(entity instanceof BaseMetaPipeEntity)){
+ IMetaTileEntity X = ((BaseMetaTileEntity)entity).getMetaTileEntity();
+ Block ThisBlock = X.getBaseMetaTileEntity().getBlock(event.x, event.y, event.z);
+ if (X instanceof GregtechMetaSafeBlockBase){
+
+ String ownerUUID = ((GregtechMetaSafeBlockBase)X).ownerUUID;
+ String accessorUUID = playerInternal.getUniqueID().toString();
+ Utils.LOG_WARNING("Owner UUID: "+ownerUUID);
+ Utils.LOG_WARNING("Accessor UUID: "+accessorUUID);
+
+ if (((GregtechMetaSafeBlockBase)X).bUnbreakable){
+ if (accessorUUID.equals(ownerUUID)){
+ Utils.messagePlayer(playerInternal, "Since you own this block, it has been destroyed.");
+ event.setCanceled(false);
+ }
+ else {
+ event.setCanceled(true);
+ Utils.messagePlayer(playerInternal, "Since you do not own this block, it has not been destroyed.");
+ }
+ //
}
- //
}
}
}
+
}
catch (NullPointerException e) {
System.out.print("Caught a NullPointerException involving Safe Blocks. Cause: "+e.getCause());
diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java
index 4acd30d4d8..05e8fa75a3 100644
--- a/src/Java/miscutil/core/lib/CORE.java
+++ b/src/Java/miscutil/core/lib/CORE.java
@@ -8,8 +8,8 @@ public class CORE {
public static final String name = "Misc. Utils";
public static final String MODID = "miscutils";
- public static final String VERSION = "0.9.6";
- public static final boolean DEBUG = true;
+ public static final String VERSION = "0.9.8";
+ public static final boolean DEBUG = false;
public static final boolean LOAD_ALL_CONTENT = false;
public static final int GREG_FIRST_ID = 760;
public static Map PlayerCache;
diff --git a/src/Java/miscutil/gregtech/gui/CONTAINER_SafeBlock.java b/src/Java/miscutil/gregtech/gui/CONTAINER_SafeBlock.java
index eff42eb4d5..4d7b94db0e 100644
--- a/src/Java/miscutil/gregtech/gui/CONTAINER_SafeBlock.java
+++ b/src/Java/miscutil/gregtech/gui/CONTAINER_SafeBlock.java
@@ -3,19 +3,13 @@ package miscutil.gregtech.gui;
import gregtech.api.gui.GT_ContainerMetaTile_Machine;
import gregtech.api.gui.GT_Slot_Holo;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.BaseMetaTileEntity;
-import gregtech.api.util.GT_Utility;
-import miscutil.core.handler.UnbreakableBlockManager;
-import miscutil.core.util.Utils;
+import miscutil.core.util.PlayerCache;
import miscutil.gregtech.metatileentity.implementations.GregtechMetaSafeBlock;
import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
-import org.lwjgl.Sys;
-
public class CONTAINER_SafeBlock
extends GT_ContainerMetaTile_Machine {
public CONTAINER_SafeBlock(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
@@ -24,6 +18,7 @@ extends GT_ContainerMetaTile_Machine {
//public String UUID = ((BaseMetaTileEntity)mTileEntity).getMetaTileEntity().getBaseMetaTileEntity().getOwnerName();
public String ownerUUID = ((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).ownerUUID;
+ public String tempPlayer = PlayerCache.lookupPlayerByUUID(ownerUUID);
public boolean blockStatus = ((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).bUnbreakable;
@Override
@@ -52,7 +47,7 @@ extends GT_ContainerMetaTile_Machine {
if (aSlotIndex == 27) {
- ((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bOutput = (!((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bOutput);
+ /*((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bOutput = (!((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bOutput);
if (((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bOutput) {
if (aPlayer != null && aPlayer instanceof EntityPlayerMP && (((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).bOutput != false)) {
@@ -64,7 +59,9 @@ extends GT_ContainerMetaTile_Machine {
} else {
GT_Utility.sendChatToPlayer(aPlayer, "Don't emit Energy");
}
- return null;
+ return null;*/
+
+
}
if (aSlotIndex == 28) {}
/* ((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull = (!((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bRedstoneIfFull);
@@ -91,14 +88,17 @@ extends GT_ContainerMetaTile_Machine {
{
((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bUnbreakable = (!((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bUnbreakable);
- if (aPlayer != null && aPlayer instanceof EntityPlayerMP && (((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).bUnbreakable != false)) {
+ blockStatus = ((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).bUnbreakable;
+ ownerUUID = ((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).ownerUUID;
+ //Utils.messagePlayer(aPlayer, "Is the safe locked? "+String.valueOf(((GregtechMetaSafeBlock) this.mTileEntity.getMetaTileEntity()).bUnbreakable).toUpperCase());
+ /*if (aPlayer != null && aPlayer instanceof EntityPlayerMP && (((GregtechMetaSafeBlock)this.mTileEntity.getMetaTileEntity()).bUnbreakable != false)) {
UnbreakableBlockManager Xasda = new UnbreakableBlockManager();
Xasda.setmTileEntity((BaseMetaTileEntity) mTileEntity, aPlayer);
}
else {
UnbreakableBlockManager Xasda = new UnbreakableBlockManager();
Xasda.setmTileEntity((BaseMetaTileEntity) mTileEntity, aPlayer);
- }
+ }*/
return null;
}
diff --git a/src/Java/miscutil/gregtech/gui/GUI_SafeBlock.java b/src/Java/miscutil/gregtech/gui/GUI_SafeBlock.java
index 264cc7c556..fea5c1bfc1 100644
--- a/src/Java/miscutil/gregtech/gui/GUI_SafeBlock.java
+++ b/src/Java/miscutil/gregtech/gui/GUI_SafeBlock.java
@@ -3,7 +3,6 @@ package miscutil.gregtech.gui;
import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import miscutil.core.lib.CORE;
-import miscutil.core.util.PlayerCache;
import net.minecraft.entity.player.InventoryPlayer;
public class GUI_SafeBlock
@@ -12,31 +11,29 @@ public class GUI_SafeBlock
super(new CONTAINER_SafeBlock(aInventoryPlayer, aTileEntity), CORE.MODID + ":" + "textures/gui/" + "SafeBlock.png");
}
- String UUID = ((CONTAINER_SafeBlock)this.mContainer).ownerUUID;
+ //String UUID = ((CONTAINER_SafeBlock)this.mContainer).ownerUUID.toString();
boolean blockStatus = ((CONTAINER_SafeBlock)this.mContainer).blockStatus;
- String tempPlayer = PlayerCache.lookupPlayerByUUID(UUID);
+ //String tempPlayer;
+
+ private void updateVars(){
+ //UUID = ((CONTAINER_SafeBlock)this.mContainer).ownerUUID;
+ blockStatus = ((CONTAINER_SafeBlock)this.mContainer).blockStatus;
+ // tempPlayer = PlayerCache.lookupPlayerByUUID(UUID);
+ }
@Override
protected void drawGuiContainerForegroundLayer(int par1, int par2)
{
-
- UUID = ((CONTAINER_SafeBlock)this.mContainer).ownerUUID;
- blockStatus = ((CONTAINER_SafeBlock)this.mContainer).blockStatus;
- tempPlayer = PlayerCache.lookupPlayerByUUID(UUID);
-
+ updateVars();
+ //this.fontRendererObj.drawString("Owner: "+ tempPlayer, 64, 72, 4210752);
+ //this.fontRendererObj.drawString(": "+ UUID.toLowerCase(), 44, 82, 4210752);
+ this.fontRendererObj.drawString("Safe Status", 76, 61, 4210752);
if (blockStatus){
- this.fontRendererObj.drawString("Safe Status: Locked", 64, 62, 4210752);
+ this.fontRendererObj.drawString("Locked", 88, 73, 4210752);
}
else {
- this.fontRendererObj.drawString("Safe Status: Unlocked", 64, 62, 4210752);
+ this.fontRendererObj.drawString("Unlocked", 82, 73, 4210752);
}
-
- this.fontRendererObj.drawString("Owner: "+ tempPlayer, 64, 72, 4210752);
- this.fontRendererObj.drawString(": "+ tempPlayer, 64, 82, 4210752);
-
- if (!CORE.DEBUG){
-
- }
}
@Override
diff --git a/src/Java/miscutil/gregtech/metatileentity/implementations/base/GregtechMetaSafeBlockBase.java b/src/Java/miscutil/gregtech/metatileentity/implementations/base/GregtechMetaSafeBlockBase.java
index 76b87b0b9b..7e6eb1d9cf 100644
--- a/src/Java/miscutil/gregtech/metatileentity/implementations/base/GregtechMetaSafeBlockBase.java
+++ b/src/Java/miscutil/gregtech/metatileentity/implementations/base/GregtechMetaSafeBlockBase.java
@@ -7,6 +7,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
import gregtech.api.objects.GT_RenderedTexture;
import gregtech.api.util.GT_Utility;
+import miscutil.core.handler.UnbreakableBlockManager;
import miscutil.core.util.PlayerCache;
import miscutil.core.util.Utils;
import net.minecraft.entity.player.EntityPlayer;
@@ -17,6 +18,8 @@ public abstract class GregtechMetaSafeBlockBase extends GT_MetaTileEntity_Tiered
public boolean bOutput = false, bRedstoneIfFull = false, bInvert = false, bUnbreakable = false;
public int mSuccess = 0, mTargetStackSize = 0;
public String ownerUUID = "";
+ UnbreakableBlockManager Xasda = new UnbreakableBlockManager();
+ private boolean value_last = false, value_current = false;
public GregtechMetaSafeBlockBase(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription) {
super(aID, aName, aNameRegional, aTier, aInvSlotCount, aDescription);
@@ -198,7 +201,7 @@ public abstract class GregtechMetaSafeBlockBase extends GT_MetaTileEntity_Tiered
Utils.LOG_WARNING("OwnerUUID is Null, let's set it.");
Utils.LOG_WARNING("Accessing Players UUID is: "+tempUUID);
ownerUUID = tempUUID;
- Utils.messagePlayer(aPlayer, "Owner of this safe, now set. Try accessing it again.");
+ //Utils.messagePlayer(aPlayer, "Owner of this safe, now set. Try accessing it again.");
Utils.LOG_WARNING("Block Owner is now set to: "+ownerUUID);
}
Utils.LOG_WARNING("No, it is not.");
@@ -273,13 +276,28 @@ public abstract class GregtechMetaSafeBlockBase extends GT_MetaTileEntity_Tiered
/*if (aBaseMetaTileEntity.isAllowedToWork() && aBaseMetaTileEntity.isServerSide() && aBaseMetaTileEntity.isUniversalEnergyStored(getMinimumStoredEU()) && (aBaseMetaTileEntity.hasWorkJustBeenEnabled() || aBaseMetaTileEntity.hasInventoryBeenModified() || aTimer % 200 == 0 || mSuccess > 0)) {
*/
if (aBaseMetaTileEntity.isServerSide() && (aBaseMetaTileEntity.hasWorkJustBeenEnabled() || aBaseMetaTileEntity.hasInventoryBeenModified() || aTimer % 200 == 0 || mSuccess > 0)) {
-
- if (bUnbreakable = true){
-
+ value_last = value_current;
+ value_current = bUnbreakable;
+ if (value_last != value_current){
+ Utils.LOG_WARNING("VALUE CHANGE - Ticking for a moment.");
+ if (bUnbreakable == true){
+ //Xasda.setmTileEntity((BaseMetaTileEntity) aBaseMetaTileEntity);
+ //Utils.LOG_ERROR("Safe is Indestructible.");
+ this.getBaseMetaTileEntity().getBlock(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()).setResistance(Float.MAX_VALUE);
+ this.getBaseMetaTileEntity().getBlock(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()).setBlockUnbreakable();
+ }
+ else {
+ //Xasda.setmTileEntity((BaseMetaTileEntity) aBaseMetaTileEntity);
+ //Utils.LOG_ERROR("Safe is not Indestructible.");
+ this.getBaseMetaTileEntity().getBlock(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()).setResistance(1F);
+ this.getBaseMetaTileEntity().getBlock(this.getBaseMetaTileEntity().getXCoord(), this.getBaseMetaTileEntity().getYCoord(), this.getBaseMetaTileEntity().getZCoord()).setHardness(2);
+
+ }
}
else {
-
+
}
+
diff --git a/src/Java/miscutil/mcmod.info b/src/Java/miscutil/mcmod.info
index 3e9f0a5d47..46c51b6525 100644
--- a/src/Java/miscutil/mcmod.info
+++ b/src/Java/miscutil/mcmod.info
@@ -6,7 +6,7 @@
[ { "modid" : "miscutil"
, "name" : "miscutils"
, "description" : "Adds a few various things. Supported mods include GregTech, EnderIO, Big Reactors, Thaumcraft, ExtraUtils, Pnuematicraft & Simply Jetpacks."
- , "version" : "0.9.6"
+ , "version" : "0.9.8"
, "mcversion" : "1.7.10"
, "url" : ""
, "updateUrl" : ""
diff --git a/src/mcmod.info b/src/mcmod.info
new file mode 100644
index 0000000000..ae0af1f862
--- /dev/null
+++ b/src/mcmod.info
@@ -0,0 +1,19 @@
+/**
+ * @version 0.1
+ * @author Alkalus
+ * In-game info for project: Hello World.
+ */
+[ { "modid" : "miscutils"
+ , "name" : "miscutils"
+ , "description" : "Adds a few various things. Supported mods include GregTech, EnderIO, Big Reactors, Thaumcraft, ExtraUtils, Pnuematicraft & Simply Jetpacks."
+ , "version" : "0.9.4_public_gregtech5u"
+ , "mcversion" : "1.7.10"
+ , "url" : ""
+ , "updateUrl" : ""
+ , "authorList" : ["Alkalus"]
+ , "credits" : ""
+ , "logoFile" : ""
+ , "screenshots" : []
+ , "dependencies" : ["Forge10.13.0.1180"]
+ }
+]