AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-26 14:35:04 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,028 Commits 29 Branches 143 Tags
Commit Graph

2028 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
234651592e made hardmode.recipes include default.recipes to avoid missing recipes when players comment out the default recipes in the user.recipes; additionally using block break event to check if robots may break blocks (either by "clicking" them or by moving into them), making it compatible with WorldGuard, e.g. 2014-03-20 11:18:14 +01:00
Florian Nücke
2366e8c5fb Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/RedstoneAware.scala
 2014-03-19 07:54:41 +01:00
Florian Nücke
9778a72fc9 added setting for sync call pause 2014-03-19 07:53:57 +01:00
Florian Nücke
8437af06d5 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/common/tileentity/BundledRedstoneAware.scala
	src/main/scala/li/cil/oc/common/tileentity/RedstoneAware.scala
 2014-03-19 07:53:38 +01:00
Florian Nücke
4e7bc78836 cleaned up redstone logic a bit and enforcing a short delay after synchronized calls to avoid tick times for computers going through the roof due to spammy synchronized calls (e.g. redstone.setOutput every frame). this is more of a workaround, i'll have to see if i can find a cleaner solution for this. 2014-03-18 19:00:57 +01:00
Florian Nücke
c8fa07c2b9 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-18 14:06:19 +01:00
Florian Nücke
3b5bb9487b undid the Arguments.checkInteger change since it can break things (and did!), checking for actual int byte mask in hologram manually now 2014-03-18 14:05:58 +01:00
Florian Nücke
61a2ceaf3d Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-18 09:32:56 +01:00
Florian Nücke
296daa7e1c fixed Arguments.checkInt for 0x80000000 2014-03-18 09:32:12 +01:00
Florian Nücke
4d79646ed6 adjusted version specific parts in readme 2014-03-18 07:00:28 +01:00
Florian Nücke
9c9b9d3c02 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-18 06:56:58 +01:00
Florian Nücke
bd780583c7 more info on using api/deobf jar as dependency 2014-03-18 06:56:06 +01:00
Florian Nücke
e9adf89123 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-17 18:57:08 +01:00
Florian Nücke
1c049fe9bd plain sources in api jar 2014-03-17 18:56:41 +01:00
Florian Nücke
e1ab023fa0 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-17 17:40:50 +01:00
Florian Nücke
cba29b2e9a make computer state save system more compatible with non-standard use of save/load 2014-03-17 16:57:32 +01:00
Florian Nücke
5319d5f0ea Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-17 13:31:53 +01:00
Florian Nücke
2e92183abb fixed config not being created (only updated) 2014-03-17 13:31:26 +01:00
Florian Nücke
3d5901843d Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-17 12:12:02 +01:00
Florian Nücke
a65ccb7407 fixed save system for computer states. god that was stupid. warning: computers saved in build 266-273 won't be restored properly. 2014-03-17 12:11:38 +01:00
Florian Nücke
708f751fb6 added missing side check when stopping running sound for computers 2014-03-17 11:36:27 +01:00
Florian Nücke
3442dbed18 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-17 10:42:23 +01:00
Florian Nücke
018da854ed making deobf jar default jar in maven repo; added javadoc jar to maven 2014-03-17 10:42:00 +01:00
Florian Nücke
af543848bd Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-17 10:20:59 +01:00
Florian Nücke
9c1cc85cb8 formatting in fingerprint warning string 2014-03-17 09:56:33 +01:00
Florian Nücke
678424ee09 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-17 09:03:39 +01:00
Florian Nücke
daba8544fb fixed returning java maps as tables from callbacks 2014-03-17 09:02:43 +01:00
Florian Nücke
e7f4a32d95 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/java/li/cil/oc/api/network/SidedEnvironment.java
	src/main/scala/li/cil/oc/OpenComputers.scala
	src/main/scala/li/cil/oc/common/ConnectionHandler.scala
	src/main/scala/li/cil/oc/common/SaveHandler.scala
 2014-03-16 17:54:28 +01:00
Florian Nücke
1ac63d205a some jdoc fixes 2014-03-16 17:17:23 +01:00
Florian Nücke
8c1571c1d0 added javadoc jar generation; added fingerprint generation/check and jar signing 2014-03-16 17:05:52 +01:00
Florian Nücke
70755c8528 better clean up of no longer valid computer state saves by handling saving in the chunk's save callback (instead of the world's) 2014-03-16 10:31:45 +01:00
Florian Nücke
a7701969d5 updated luaj to cvs snapshot version, to get official fix for string matcher 2014-03-16 10:07:17 +01:00
Florian Nücke
9f638c0984 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-16 09:20:35 +01:00
Florian Nücke
c887317622 adjusted event handler for 1.7 2014-03-16 09:20:26 +01:00
Florian Nücke
62f5a7a993 made zip file system error instead of return null if the specified root path isn't a directory 2014-03-16 09:01:03 +01:00
Florian Nücke
b3a737c57c some cleanup in save handler 2014-03-16 08:00:46 +01:00
Florian Nücke
f448cbbf57 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-16 07:54:54 +01:00
Florian Nücke
067664dd3e added position to owner interface in the API to make machine saving more generic 2014-03-16 07:36:53 +01:00
Florian Nücke
b5da283204 fixed saving for server racks in new kernel save system 2014-03-16 07:25:51 +01:00
Florian Nücke
f9c4306692 fixed component.isRobot (tho that's deprecated anyway!); reworked machine state saving - kernel (and stack, if necessary) are now saved in extra files instead of in the tile entity's nbt tag. if the data gets too bit, minecraft apparently silently fails in saving the chunk... yay. the kernel data is dumped uncompressed to saves/[world]/opencomputers/[chunkX].[chunkY]/[node_address]_kernel - uncompressed because gzipping makes saving noticeably slower. this also allows removing the waila check in the save in case people still have a very old version of it. 2014-03-16 06:56:38 +01:00
Florian Nücke
ad9b8826c2 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 2014-03-15 20:07:38 +01:00
Florian Nücke
48ad030feb Merge branch 'master' of https://github.com/MightyPirates/OpenComputers 2014-03-15 20:00:24 +01:00
Florian Nücke
5b8029364f fixed the dig program 2014-03-15 20:00:08 +01:00
Florian Nücke
a6b3f45ce8 readme rewrite 2014-03-15 02:24:17 +01:00
Florian Nücke
683a9da6ff properly checking if stream was opened successfully in internet.open 2014-03-14 17:56:04 +01:00
Florian Nücke
415602a604 updated bc and ic2 apis -> working power from those two in 1.7; fixed sound in obf'ed mc 2014-03-14 06:04:03 +01:00
Florian Nücke
259aae00c3 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/Sound.scala
	src/main/scala/li/cil/oc/common/ConnectionHandler.scala
	src/main/scala/li/cil/oc/common/tileentity/Adapter.scala
	src/main/scala/li/cil/oc/common/tileentity/Computer.scala
	src/main/scala/li/cil/oc/common/tileentity/Environment.scala
	src/main/scala/li/cil/oc/common/tileentity/Hologram.scala
	src/main/scala/li/cil/oc/common/tileentity/Rack.scala
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
 2014-03-14 05:33:11 +01:00
Florian Nücke
2a443aa17e non-streaming sounds, this means no fade in / out, but since there are only 4 streaming sound channels it's the only sensible way; hopefully fixed potential threading issues when saving file systems; added direct support for energy systems beside UE again, to allow pulling it into a mixin, instead of having it at the top-level tile entity - this is mainly to avoid confusing the crap out of ic2's power system in combination with the robot proxy, but also avoids stuff like cables showing up in openperipherals; with all the scala synthetic classes this is all kinda tightrope-walk-ish so i added some custom interface and method stripping to the class transformer for oc classes (cleans up said synthetic classes quite nicely); this will probably be hell to merge into 1.7...; also adjusted localization files to represent the change in power support 2014-03-14 05:12:42 +01:00
Florian Nücke
4b20f58891 fixed class transformer for certain scenarios where the tile entity class was not found by the loader 2014-03-13 21:30:47 +01:00
Florian Nücke
4f28fd4c45 try again, jenkins 2014-03-12 07:09:43 +01:00