diff options
| author | Blood-Asp <Blood@Asp> | 2015-09-05 23:18:46 +0200 |
|---|---|---|
| committer | Blood-Asp <Blood@Asp> | 2015-09-05 23:18:46 +0200 |
| commit | 1f3bb4317f799aba85e774b30ccc67019cecdf02 (patch) | |
| tree | 9d67b620f73175a1d7f50e019899919a109b23b3 /main | |
| parent | fbf9df8b2e9c7e007a979873472a8a6c84f7ab66 (diff) | |
| download | GT5-Unofficial-1f3bb4317f799aba85e774b30ccc67019cecdf02.tar.gz GT5-Unofficial-1f3bb4317f799aba85e774b30ccc67019cecdf02.tar.bz2 GT5-Unofficial-1f3bb4317f799aba85e774b30ccc67019cecdf02.zip | |
GT5.08.29
Diffstat (limited to 'main')
47 files changed, 9 insertions, 11 deletions
diff --git a/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index d5b39ee9b7..ce5b3c629e 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 0e7039131a..3bf171f434 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 07dfa1dbfe..dd791ec783 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 8a79c96750..2b68b6eaa2 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 Binary files differdeleted file mode 100644 index ac54cb9c8f..0000000000 --- a/main/resources/assets/gregtech/textures/aspects/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index 40f96f4510..0000000000 --- a/main/resources/assets/gregtech/textures/blocks/basicmachines/plasma_arc_furnace/Thumbs.db +++ /dev/null diff --git a/main/resources/assets/gregtech/textures/blocks/fluids/Thumbs.db b/main/resources/assets/gregtech/textures/blocks/fluids/Thumbs.db Binary files differdeleted file mode 100644 index 1f30c4642e..0000000000 --- a/main/resources/assets/gregtech/textures/blocks/fluids/Thumbs.db +++ /dev/null diff --git a/main/resources/assets/gregtech/textures/blocks/iconsets/Thumbs.db b/main/resources/assets/gregtech/textures/blocks/iconsets/Thumbs.db Binary files differdeleted file mode 100644 index afa9370a5c..0000000000 --- a/main/resources/assets/gregtech/textures/blocks/iconsets/Thumbs.db +++ /dev/null diff --git a/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/Thumbs.db b/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/Thumbs.db Binary files differdeleted file mode 100644 index 6620e38c37..0000000000 --- a/main/resources/assets/gregtech/textures/blocks/materialicons/DIAMOND/Thumbs.db +++ /dev/null diff --git a/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/Thumbs.db b/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/Thumbs.db Binary files differdeleted file mode 100644 index 3c3df98116..0000000000 --- a/main/resources/assets/gregtech/textures/blocks/materialicons/DULL/Thumbs.db +++ /dev/null diff --git a/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/Thumbs.db b/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/Thumbs.db Binary files differdeleted file mode 100644 index b1b59a5a21..0000000000 --- a/main/resources/assets/gregtech/textures/blocks/materialicons/EMERALD/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index 1d543273e6..0000000000 --- a/main/resources/assets/gregtech/textures/blocks/materialicons/GEM_HORIZONTAL/Thumbs.db +++ /dev/null diff --git a/main/resources/assets/gregtech/textures/entity/Thumbs.db b/main/resources/assets/gregtech/textures/entity/Thumbs.db Binary files differdeleted file mode 100644 index e2db25ee53..0000000000 --- a/main/resources/assets/gregtech/textures/entity/Thumbs.db +++ /dev/null diff --git a/main/resources/assets/gregtech/textures/gui/basicmachines/Thumbs.db b/main/resources/assets/gregtech/textures/gui/basicmachines/Thumbs.db Binary files differdeleted file mode 100644 index a5d43c9e55..0000000000 --- a/main/resources/assets/gregtech/textures/gui/basicmachines/Thumbs.db +++ /dev/null diff --git a/main/resources/assets/gregtech/textures/gui/multimachines/Thumbs.db b/main/resources/assets/gregtech/textures/gui/multimachines/Thumbs.db Binary files differdeleted file mode 100644 index 7a063c63b7..0000000000 --- a/main/resources/assets/gregtech/textures/gui/multimachines/Thumbs.db +++ /dev/null diff --git a/main/resources/assets/gregtech/textures/items/Thumbs.db b/main/resources/assets/gregtech/textures/items/Thumbs.db Binary files differdeleted file mode 100644 index 297415ad51..0000000000 --- a/main/resources/assets/gregtech/textures/items/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index 5b0dd7cd70..0000000000 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/510/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index 8646c5114e..0000000000 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/511/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index 151006bef8..0000000000 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/517/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index 02609a57de..0000000000 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/518/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index 9c2aaebafd..0000000000 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/519/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index a22fc2670c..0000000000 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/520/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index 6a1a7afc18..0000000000 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/521/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index ae0d8d4ceb..0000000000 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/527/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index 8cb193fef8..0000000000 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/528/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index a75152a9a7..0000000000 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/529/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index 84629f51ec..0000000000 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/530/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index 3075ada8d4..0000000000 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/531/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index 6397f92ded..0000000000 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/537/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index 63e80cab23..0000000000 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/538/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index 2e55ddf38e..0000000000 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/539/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index 9cf6163043..0000000000 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/597/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index 3bb6657ecb..0000000000 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/598/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index 7564646145..0000000000 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/599/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index 3a726fca0a..0000000000 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/605/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index 2da839bcaa..0000000000 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.01/Thumbs.db +++ /dev/null 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 Binary files differdeleted file mode 100644 index 1af77b6637..0000000000 --- a/main/resources/assets/gregtech/textures/items/gt.metaitem.02/Thumbs.db +++ /dev/null diff --git a/main/resources/assets/gregtech/textures/items/iconsets/Thumbs.db b/main/resources/assets/gregtech/textures/items/iconsets/Thumbs.db Binary files differdeleted file mode 100644 index cc2f343151..0000000000 --- a/main/resources/assets/gregtech/textures/items/iconsets/Thumbs.db +++ /dev/null diff --git a/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/Thumbs.db b/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/Thumbs.db Binary files differdeleted file mode 100644 index 7124131009..0000000000 --- a/main/resources/assets/gregtech/textures/items/materialicons/DIAMOND/Thumbs.db +++ /dev/null diff --git a/main/resources/assets/gregtech/textures/items/materialicons/DULL/Thumbs.db b/main/resources/assets/gregtech/textures/items/materialicons/DULL/Thumbs.db Binary files differdeleted file mode 100644 index 191cd4ba03..0000000000 --- a/main/resources/assets/gregtech/textures/items/materialicons/DULL/Thumbs.db +++ /dev/null diff --git a/main/resources/assets/gregtech/textures/items/materialicons/FINE/Thumbs.db b/main/resources/assets/gregtech/textures/items/materialicons/FINE/Thumbs.db Binary files differdeleted file mode 100644 index 257d2e28e1..0000000000 --- a/main/resources/assets/gregtech/textures/items/materialicons/FINE/Thumbs.db +++ /dev/null diff --git a/main/resources/assets/gregtech/textures/items/materialicons/LEAF/Thumbs.db b/main/resources/assets/gregtech/textures/items/materialicons/LEAF/Thumbs.db Binary files differdeleted file mode 100644 index d91d05245d..0000000000 --- a/main/resources/assets/gregtech/textures/items/materialicons/LEAF/Thumbs.db +++ /dev/null diff --git a/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/Thumbs.db b/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/Thumbs.db Binary files differdeleted file mode 100644 index 40704effd6..0000000000 --- a/main/resources/assets/gregtech/textures/items/materialicons/LIGNITE/Thumbs.db +++ /dev/null diff --git a/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/Thumbs.db b/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/Thumbs.db Binary files differdeleted file mode 100644 index 5a25bde979..0000000000 --- a/main/resources/assets/gregtech/textures/items/materialicons/METALLIC/Thumbs.db +++ /dev/null diff --git a/main/resources/assets/gregtech/textures/items/materialicons/RUBY/Thumbs.db b/main/resources/assets/gregtech/textures/items/materialicons/RUBY/Thumbs.db Binary files differdeleted file mode 100644 index f1c001dc26..0000000000 --- a/main/resources/assets/gregtech/textures/items/materialicons/RUBY/Thumbs.db +++ /dev/null diff --git a/main/resources/assets/gregtech/textures/items/materialicons/SAND/Thumbs.db b/main/resources/assets/gregtech/textures/items/materialicons/SAND/Thumbs.db Binary files differdeleted file mode 100644 index 0156664b08..0000000000 --- a/main/resources/assets/gregtech/textures/items/materialicons/SAND/Thumbs.db +++ /dev/null diff --git a/main/resources/assets/gregtech/textures/items/materialicons/Thumbs.db b/main/resources/assets/gregtech/textures/items/materialicons/Thumbs.db Binary files differdeleted file mode 100644 index 5adf9682fc..0000000000 --- a/main/resources/assets/gregtech/textures/items/materialicons/Thumbs.db +++ /dev/null |