diff --git a/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index d5b39ee9..ce5b3c62 100644 --- a/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -552,7 +552,7 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE mFacing = (byte)(aValue& 7); mActive = ((aValue& 8) != 0); mRedstone = ((aValue&16) != 0); - mLockUpgrade = ((aValue&32) != 0); + //mLockUpgrade = ((aValue&32) != 0); break; case 1: if (hasValidMetaTileEntity()) mMetaTileEntity.onValueUpdate((byte)aValue); diff --git a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index 0e703913..3bf171f4 100644 --- a/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -325,7 +325,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { stopMachine(); return false; } - if (mRuntime++>10) { + if (mRuntime++>1000) { mRuntime = 0; if (getBaseMetaTileEntity().getRandomNumber(6000) == 0) { switch (getBaseMetaTileEntity().getRandomNumber(6)) { diff --git a/main/java/gregtech/common/blocks/GT_Block_Machines.java b/main/java/gregtech/common/blocks/GT_Block_Machines.java index 07dfa1db..dd791ec7 100644 --- a/main/java/gregtech/common/blocks/GT_Block_Machines.java +++ b/main/java/gregtech/common/blocks/GT_Block_Machines.java @@ -296,10 +296,14 @@ public class GT_Block_Machines public float getPlayerRelativeBlockHardness(EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ) { +// System.out.println("player hardness"); TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ); - if (((tTileEntity instanceof BaseMetaTileEntity)) && (((BaseMetaTileEntity)tTileEntity).privateAccess()) && (!((BaseMetaTileEntity)tTileEntity).playerOwnsThis(aPlayer, false))) { - return -1.0F; + if (((tTileEntity instanceof BaseMetaTileEntity)) && (((BaseMetaTileEntity)tTileEntity).privateAccess()) && (!((BaseMetaTileEntity)tTileEntity).playerOwnsThis(aPlayer, true))) { +// System.out.println("locked"); + return -1.0F; } +// System.out.println("unlocked"); +// System.out.println("hardness: "+super.getPlayerRelativeBlockHardness(aPlayer, aWorld, aX, aY, aZ)); return super.getPlayerRelativeBlockHardness(aPlayer, aWorld, aX, aY, aZ); } diff --git a/main/java/gregtech/common/tools/GT_Tool_Wrench.java b/main/java/gregtech/common/tools/GT_Tool_Wrench.java index 8a79c967..2b68b6ea 100644 --- a/main/java/gregtech/common/tools/GT_Tool_Wrench.java +++ b/main/java/gregtech/common/tools/GT_Tool_Wrench.java @@ -141,10 +141,4 @@ public class GT_Tool_Wrench { return new ChatComponentText(EnumChatFormatting.GREEN + aPlayer.getCommandSenderName() + EnumChatFormatting.WHITE + " threw a Monkey Wrench into the Plans of " + EnumChatFormatting.RED + aEntity.getCommandSenderName() + EnumChatFormatting.WHITE); } -} - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.common.tools.GT_Tool_Wrench - * JD-Core Version: 0.7.0.1 - */ \ No newline at end of file +} \ No newline at end of file diff --git a/main/resources/assets/gregtech/textures/aspects/Thumbs.db b/main/resources/assets/gregtech/textures/aspects/Thumbs.db deleted file mode 100644 index ac54cb9c..00000000 Binary files a/main/resources/assets/gregtech/textures/aspects/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/blocks/basicmachines/plasma_arc_furnace/Thumbs.db b/main/resources/assets/gregtech/textures/blocks/basicmachines/plasma_arc_furnace/Thumbs.db deleted file mode 100644 index 40f96f45..00000000 Binary files a/main/resources/assets/gregtech/textures/blocks/basicmachines/plasma_arc_furnace/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/blocks/fluids/Thumbs.db b/main/resources/assets/gregtech/textures/blocks/fluids/Thumbs.db deleted file mode 100644 index 1f30c464..00000000 Binary files a/main/resources/assets/gregtech/textures/blocks/fluids/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/Thumbs.db b/main/resources/assets/gregtech/textures/blocks/iconsets/Thumbs.db deleted file mode 100644 index afa9370a..00000000 Binary files a/main/resources/assets/gregtech/textures/blocks/iconsets/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/Thumbs.db b/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/Thumbs.db deleted file mode 100644 index 6620e38c..00000000 Binary files a/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/Thumbs.db b/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/Thumbs.db deleted file mode 100644 index 3c3df981..00000000 Binary files a/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/Thumbs.db b/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/Thumbs.db deleted file mode 100644 index b1b59a5a..00000000 Binary files a/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/Thumbs.db b/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/Thumbs.db deleted file mode 100644 index 1d543273..00000000 Binary files a/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/entity/Thumbs.db b/main/resources/assets/gregtech/textures/entity/Thumbs.db deleted file mode 100644 index e2db25ee..00000000 Binary files a/main/resources/assets/gregtech/textures/entity/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/gui/basicmachines/Thumbs.db b/main/resources/assets/gregtech/textures/gui/basicmachines/Thumbs.db deleted file mode 100644 index a5d43c9e..00000000 Binary files a/main/resources/assets/gregtech/textures/gui/basicmachines/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/gui/multimachines/Thumbs.db b/main/resources/assets/gregtech/textures/gui/multimachines/Thumbs.db deleted file mode 100644 index 7a063c63..00000000 Binary files a/main/resources/assets/gregtech/textures/gui/multimachines/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/Thumbs.db b/main/resources/assets/gregtech/textures/items/Thumbs.db deleted file mode 100644 index 297415ad..00000000 Binary files a/main/resources/assets/gregtech/textures/items/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/510/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/510/Thumbs.db deleted file mode 100644 index 5b0dd7cd..00000000 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/510/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/511/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/511/Thumbs.db deleted file mode 100644 index 8646c511..00000000 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/511/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/517/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/517/Thumbs.db deleted file mode 100644 index 151006be..00000000 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/517/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/518/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/518/Thumbs.db deleted file mode 100644 index 02609a57..00000000 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/518/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/519/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/519/Thumbs.db deleted file mode 100644 index 9c2aaeba..00000000 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/519/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/520/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/520/Thumbs.db deleted file mode 100644 index a22fc267..00000000 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/520/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/521/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/521/Thumbs.db deleted file mode 100644 index 6a1a7afc..00000000 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/521/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/527/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/527/Thumbs.db deleted file mode 100644 index ae0d8d4c..00000000 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/527/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/528/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/528/Thumbs.db deleted file mode 100644 index 8cb193fe..00000000 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/528/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/529/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/529/Thumbs.db deleted file mode 100644 index a75152a9..00000000 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/529/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/530/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/530/Thumbs.db deleted file mode 100644 index 84629f51..00000000 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/530/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/531/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/531/Thumbs.db deleted file mode 100644 index 3075ada8..00000000 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/531/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/537/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/537/Thumbs.db deleted file mode 100644 index 6397f92d..00000000 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/537/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/538/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/538/Thumbs.db deleted file mode 100644 index 63e80cab..00000000 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/538/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/539/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/539/Thumbs.db deleted file mode 100644 index 2e55ddf3..00000000 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/539/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/Thumbs.db deleted file mode 100644 index 9cf61630..00000000 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/598/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/598/Thumbs.db deleted file mode 100644 index 3bb6657e..00000000 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/598/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/599/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/599/Thumbs.db deleted file mode 100644 index 75646461..00000000 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/599/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/605/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/605/Thumbs.db deleted file mode 100644 index 3a726fca..00000000 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/605/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.01/Thumbs.db deleted file mode 100644 index 2da839bc..00000000 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/gt.metaitem.02/Thumbs.db b/main/resources/assets/gregtech/textures/items/gt.metaitem.02/Thumbs.db deleted file mode 100644 index 1af77b66..00000000 Binary files a/main/resources/assets/gregtech/textures/items/gt.metaitem.02/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/iconsets/Thumbs.db b/main/resources/assets/gregtech/textures/items/iconsets/Thumbs.db deleted file mode 100644 index cc2f3431..00000000 Binary files a/main/resources/assets/gregtech/textures/items/iconsets/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/Thumbs.db b/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/Thumbs.db deleted file mode 100644 index 71241310..00000000 Binary files a/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/materialicons/DULL/Thumbs.db b/main/resources/assets/gregtech/textures/items/materialicons/DULL/Thumbs.db deleted file mode 100644 index 191cd4ba..00000000 Binary files a/main/resources/assets/gregtech/textures/items/materialicons/DULL/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/materialicons/FINE/Thumbs.db b/main/resources/assets/gregtech/textures/items/materialicons/FINE/Thumbs.db deleted file mode 100644 index 257d2e28..00000000 Binary files a/main/resources/assets/gregtech/textures/items/materialicons/FINE/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/materialicons/LEAF/Thumbs.db b/main/resources/assets/gregtech/textures/items/materialicons/LEAF/Thumbs.db deleted file mode 100644 index d91d0524..00000000 Binary files a/main/resources/assets/gregtech/textures/items/materialicons/LEAF/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/Thumbs.db b/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/Thumbs.db deleted file mode 100644 index 40704eff..00000000 Binary files a/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/Thumbs.db b/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/Thumbs.db deleted file mode 100644 index 5a25bde9..00000000 Binary files a/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/materialicons/RUBY/Thumbs.db b/main/resources/assets/gregtech/textures/items/materialicons/RUBY/Thumbs.db deleted file mode 100644 index f1c001dc..00000000 Binary files a/main/resources/assets/gregtech/textures/items/materialicons/RUBY/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/materialicons/SAND/Thumbs.db b/main/resources/assets/gregtech/textures/items/materialicons/SAND/Thumbs.db deleted file mode 100644 index 0156664b..00000000 Binary files a/main/resources/assets/gregtech/textures/items/materialicons/SAND/Thumbs.db and /dev/null differ diff --git a/main/resources/assets/gregtech/textures/items/materialicons/Thumbs.db b/main/resources/assets/gregtech/textures/items/materialicons/Thumbs.db deleted file mode 100644 index 5adf9682..00000000 Binary files a/main/resources/assets/gregtech/textures/items/materialicons/Thumbs.db and /dev/null differ