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

1307 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Florian Nücke
8b1db646d6 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/java/li/cil/oc/api/prefab/TileEntitySidedEnvironment.java
 2014-03-12 06:49:12 +01:00
Florian Nücke
8a8a5d6d86 fixed comments in config getting duplicated when new settings were added (damn line endings...) 2014-03-12 06:48:22 +01:00
Florian Nücke
4967b79126 adjusted sound stuff to the 1.7 way 2014-03-12 05:33:01 +01:00
Florian Nücke
e581990bc2 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/common/tileentity/Computer.scala
	src/main/scala/li/cil/oc/common/tileentity/Rack.scala
 2014-03-12 04:00:40 +01:00
Florian Nücke
0d71363160 removed accidental scala from prefab in api 2014-03-12 03:59:26 +01:00
Florian Nücke
6b2e374563 added setting for computer running noise volume 2014-03-11 21:22:46 +01:00
Florian Nücke
f8a0b60abd robot label now moves smoothly with the robot; running sound for computers, robots and server racks; split sound class into server and client side 2014-03-11 21:17:34 +01:00
Florian Nücke
bb98121a82 forcing a new address onto nodes added to a network in which another node with that address already exists. this was possible in case of duplicated items (creative mode e.g.) 2014-03-11 16:42:35 +01:00
Florian Nücke
723dbda71c Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/WirelessNetworkDebugRenderer.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
 2014-03-11 16:14:00 +01:00
Florian Nücke
7d95148d8b fixed class transformer for mods reobfed to notch names (i was *so* sure i tested this before...) 2014-03-11 15:49:26 +01:00
Florian Nücke
fa7da0536f added some more jdoc to api; added FluidTankInfo type converter; made robot interface extend rotatable 2014-03-11 12:44:19 +01:00
Florian Nücke
c8d7d569c9 organized imports 2014-03-11 00:19:01 +01:00
Florian Nücke
0890689b31 Merge branch 'master' of https://github.com/MightyPirates/OpenComputers into MC1.7 
Conflicts:
	src/main/scala/li/cil/oc/client/renderer/WirelessNetworkDebugRenderer.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/tileentity/Hub.scala
	src/main/scala/li/cil/oc/common/tileentity/Router.scala
	src/main/scala/li/cil/oc/server/component/NetworkCard.scala
	src/main/scala/li/cil/oc/server/network/Network.scala
	src/main/scala/li/cil/oc/server/network/WirelessNetwork.scala
 2014-03-10 23:56:30 +01:00
Florian Nücke
73bdde3acb fixed auto tostring in pretty serialization; fixed files not being 'reset' when opening unbuffered files in write mode 2014-03-10 23:14:59 +01:00
Florian Nücke
ac1bb3847d disabled debug network rendering 2014-03-10 22:33:55 +01:00
Florian Nücke
cfff33cc4b Merge branch 'master' of https://github.com/MightyPirates/OpenComputers 
Conflicts:
	src/main/resources/assets/opencomputers/robot.names
 2014-03-10 22:32:36 +01:00
Florian Nücke
32cde6d2ad javadoc for wireless api 2014-03-10 22:31:20 +01:00
Johannes Lohrer
190414fd90 added robot names from perry rhodan 2014-03-10 22:18:36 +01:00
Florian Nücke
2ef86cfacc cleaning up network a lot; fixed cc comps not being able to send wireless messages via access points; started wireless api 2014-03-10 22:07:56 +01:00
Florian Nücke
0f0843e4dd Merge pull request #158 from Wobbo/master 
Added some pionering robots to the list
 2014-03-10 21:24:33 +01:00
René Mellema
1829fcc79d Update robot.names 2014-03-10 21:24:03 +01:00