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

3459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian Nücke
284c4fd3d0 Minor rendering tweaks. 2015-02-12 00:49:20 +01:00
Florian Nücke
22759e827b Server rack block rendering. 2015-02-11 23:57:53 +01:00
Florian Nücke
bcf7fc4235 Centering keyboard when rendered in GUI. 2015-02-11 19:22:34 +01:00
Florian Nücke
a28275e240 Robot rendering in inventory. 2015-02-11 19:12:09 +01:00
Florian Nücke
f547cb6f1f Cable (and general) rendering improvements (fixed some orientation for AO. 2015-02-11 17:58:18 +01:00
Florian Nücke
707a5c728c Pulling a bunch of constants (item and block names for now) into a single class. 
Minor rendering adjustments after updating Forge version.
 2015-02-11 15:58:11 +01:00
Florian Nücke
e93546feac Fixed block break texture of a few blocks. 2015-02-10 21:32:05 +01:00
Florian Nücke
1936b1989f Fixed iron ingot icon. 2015-02-10 02:47:49 +01:00
Florian Nücke
b526d07079 GlRenderState all the things, fixing a couple of rendering glitches. 2015-02-10 02:37:09 +01:00
Florian Nücke
b2c30e34bc Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/gui/Assembler.scala
	src/main/scala/li/cil/oc/client/gui/Disassembler.scala
	src/main/scala/li/cil/oc/client/gui/Raid.scala
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
 2015-02-10 02:34:55 +01:00
Florian Nücke
43edfefa6e Potential rendering improvements (mostly stuff discovered while porting to 1.8 that didn't seem to have an effect in 1.7, but can't hurt to clean up). 2015-02-10 02:32:55 +01:00
Florian Nücke
66763c3317 Fixed robot inventory slot range. 2015-02-10 02:32:14 +01:00
Florian Nücke
c05b4fc3d6 Fixed potential NPE in MCU tooltip. 2015-02-10 02:27:34 +01:00
Florian Nücke
279f87a2b9 Fixed cables having a chance to not yielding outputs when being disassembled. 2015-02-10 02:26:21 +01:00
Florian Nücke
d366618836 Fixes creative tab crashing. 2015-02-10 00:04:17 +01:00
Florian Nücke
47c8448c7e Disabled state self-test because that seems to crash in obf'ed MC. 2015-02-09 23:54:10 +01:00
Florian Nücke
6a2ae319dd Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/client/Proxy.scala
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/common/tileentity/Case.scala
	src/main/scala/li/cil/oc/common/tileentity/Microcontroller.scala
	src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Colored.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Rotatable.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/AppliedEnergistics2.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/Factorization.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Classic.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/IndustrialCraft2Experimental.scala
	src/main/scala/li/cil/oc/util/ExtendedBlock.scala
 2015-02-09 23:03:26 +01:00
Florian Nücke
d4b5a6e7db Changed tablet block interaction a bit, closes #905. 
When doing a "short" right click, tablets will behave as before, i.e. shift-right-click opens their GUI, normal right-click will either activate a block or open the GUI. To "analyze" a block, you'll now have to hold the right mouse button for half a second (or whatever it is you use to draw your bow). This will work when sneaking or not, also allowing inspection of blocks that'd otherwise open their GUI (like chests) or do stuff (like levers).
 2015-02-09 20:24:31 +01:00
Florian Nücke
30e37daba6 Merge branch 'recursive-flatten' of https://github.com/benblank/OpenComputers into master-MC1.7.10 2015-02-09 16:20:13 +01:00
Florian Nücke
eec36e94ec Testing method for value conversion and userdata. 2015-02-09 16:19:46 +01:00
Florian Nücke
0e887eb3cc Fixed component node in MCU not being saved properly. 2015-02-09 13:34:03 +01:00
Florian Nücke
43a40cd3a8 Ensure writeToNBT/readFromNBT is only called on the server, as some mods may choose to call it on the client... 2015-02-09 13:30:14 +01:00
Florian Nücke
dab5a56def Added missing check for whether tablet actually can be charged. Closes #902. 2015-02-09 12:53:15 +01:00
Florian Nücke
7819544bde Fixed tablet disassembly. Closes #904. 2015-02-09 12:50:37 +01:00
Ben Blank
5b09d44944 flatten converted values *after* recursive conversion, not instead of 2015-02-07 21:29:12 -08:00
Florian Nücke
e5d930c0b1 Jenkins plz. Also, why is this marked as deprecated? 2015-02-07 18:08:08 +01:00
Florian Nücke
e574ee9b84 Less ambiguous? 2015-02-07 17:37:25 +01:00
Florian Nücke
e58136ed55 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/Settings.scala
	src/main/scala/li/cil/oc/common/event/RobotCommonHandler.scala
	src/main/scala/li/cil/oc/common/init/Items.scala
	src/main/scala/li/cil/oc/common/tileentity/Microcontroller.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Hub.scala
	src/main/scala/li/cil/oc/integration/opencomputers/DriverBlockEnvironments.scala
	src/main/scala/li/cil/oc/server/agent/Player.scala
 2015-02-07 17:11:42 +01:00
Florian Nücke
fa5c66907d Merge branch '1.5' into master-MC1.7.10 
Conflicts:
	build.properties
	src/main/scala/li/cil/oc/integration/opencomputers/DriverBlockEnvironments.scala
 2015-02-07 16:53:07 +01:00
Florian Nücke
66a51ecf52 Microcontrollers are now fully sided, i.e. each side is in a separate network. Closes #788. 
MCUs do not automatically forward network messages. They do not distribute power. Network messages arriving on all sides will always be forwarded to the MCU. Which sides are used for sending can be controlled via the `microcontroller` component. Further change: computers must now sit directly adjacent to MUCs to access their external component. Avoids the nasty hacks used in access points to avoid duplicate components if two sides are in the same network.

More cleanup, drones can be named now.
 2015-02-07 16:51:42 +01:00
Florian Nücke
0aba4be4b8 Mark power value config settings for upgrading (so existing configs are adjusted automatically). 2015-02-07 15:00:19 +01:00
Florian Nücke
dd3f7652ac Improve robot fake player permission checks, not sure if that method is even used anywhere... 2015-02-06 18:07:43 +01:00
Florian Nücke
803551d288 Avoid interface based block drivers being shown for pretty much everything in the NEI API list. 
Workaround only works for stuff using the prefab class.
Fixed drone API in NEI usage.
 2015-02-06 16:55:12 +01:00
Florian Nücke
383388d57c Version bump. 2015-02-06 13:55:21 +01:00
Florian Nücke
14e3599b37 Merge branch '1.5' of C:\Users\fnuecke\Workspace\OpenComputers-dev-MC1.7.10 into master-MC1.8 
Conflicts:
	src/main/scala/li/cil/oc/common/event/RobotCommonHandler.scala
 2015-02-06 05:32:35 +01:00
Florian Nücke
26b5a48441 Merge branch '1.5' of C:\Users\fnuecke\Workspace\OpenComputers-dev-MC1.7.10 into master-MC1.8 
Conflicts:
	src/main/java/li/cil/oc/api/event/GeolyzerEvent.java
	src/main/java/li/cil/oc/api/event/RobotAttackEntityEvent.java
	src/main/java/li/cil/oc/api/event/RobotBreakBlockEvent.java
	src/main/java/li/cil/oc/api/event/RobotEvent.java
	src/main/java/li/cil/oc/api/event/RobotMoveEvent.java
	src/main/java/li/cil/oc/api/event/RobotPlaceBlockEvent.java
	src/main/java/li/cil/oc/api/event/RobotRenderEvent.java
	src/main/java/li/cil/oc/api/internal/Agent.java
	src/main/java/li/cil/oc/api/internal/Drone.java
	src/main/java/li/cil/oc/api/internal/Robot.java
	src/main/scala/li/cil/oc/Settings.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/MicrocontrollerRenderer.scala
	src/main/scala/li/cil/oc/client/renderer/tileentity/RaidRenderer.scala
	src/main/scala/li/cil/oc/common/Proxy.scala
	src/main/scala/li/cil/oc/common/block/RobotProxy.scala
	src/main/scala/li/cil/oc/common/entity/Drone.scala
	src/main/scala/li/cil/oc/common/event/AngelUpgradeHandler.scala
	src/main/scala/li/cil/oc/common/event/ChunkloaderUpgradeHandler.scala
	src/main/scala/li/cil/oc/common/event/ExperienceUpgradeHandler.scala
	src/main/scala/li/cil/oc/common/event/GeolyzerHandler.scala
	src/main/scala/li/cil/oc/common/event/RobotCommonHandler.scala
	src/main/scala/li/cil/oc/common/event/WirelessNetworkCardHandler.scala
	src/main/scala/li/cil/oc/common/item/Tablet.scala
	src/main/scala/li/cil/oc/common/tileentity/Case.scala
	src/main/scala/li/cil/oc/common/tileentity/Microcontroller.scala
	src/main/scala/li/cil/oc/common/tileentity/Robot.scala
	src/main/scala/li/cil/oc/common/tileentity/RobotProxy.scala
	src/main/scala/li/cil/oc/common/tileentity/ServerRack.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/Computer.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/TileEntity.scala
	src/main/scala/li/cil/oc/common/tileentity/traits/power/Galacticraft.scala
	src/main/scala/li/cil/oc/integration/opencomputers/DriverBlockEnvironments.scala
	src/main/scala/li/cil/oc/integration/opencomputers/DriverMemory.scala
	src/main/scala/li/cil/oc/server/agent/Inventory.scala
	src/main/scala/li/cil/oc/server/agent/Player.scala
	src/main/scala/li/cil/oc/server/component/Agent.scala
	src/main/scala/li/cil/oc/server/component/Geolyzer.scala
	src/main/scala/li/cil/oc/server/component/Server.scala
	src/main/scala/li/cil/oc/server/component/UpgradeInventoryController.scala
	src/main/scala/li/cil/oc/server/component/UpgradeTankController.scala
	src/main/scala/li/cil/oc/util/BlockPosition.scala
	src/main/scala/li/cil/oc/util/ExtendedWorld.scala
	src/main/scala/li/cil/oc/util/ItemUtils.scala
 2015-02-06 05:31:58 +01:00
Florian Nücke
37200adffc Fixed flight height check. 2015-02-06 05:31:46 +01:00
Florian Nücke
747ede3383 Merge branch 'master-MC1.7.10' into 1.5 2015-02-06 04:07:48 +01:00
Florian Nücke
a19d1e614a Name changes! 2015-02-06 04:06:50 +01:00
Florian Nücke
0e7f7a598d Minor cleanup. 2015-02-05 20:02:24 +01:00
Florian Nücke
003463ec4a Limiting robot flight height, by default to 8 blocks above ground for now. 
Movement rules are as follows now:
 1. Robots may only move if the start or target position is valid (e.g. to allow building bridges).
 2. The position below a robot is always valid (can always move down).
 3. Positions up to <flightHeight> above a block are valid (limited flight capabilities).
 4. Any position that has an adjacent block with a solid face towards the position is valid (robots can "climb").
 2015-02-05 20:02:14 +01:00
Florian Nücke
4f222680a9 Merge branch 'master-MC1.7.10' of github.com:MightyPirates/OpenComputers into master-MC1.7.10 2015-02-05 16:21:08 +01:00
Florian Nücke
f091b19255 Re-evaluated some power values, now that more mods are on RF and generate RF. Closes #888. 
This is based on the RF output of BC and EnderIO generators now, because TE steam dynamos are, in my tests at least, outliers.
 2015-02-05 16:20:54 +01:00
Florian Nücke
29b9a2d007 Tweaked insertion patch a little to only be used when an explicit range is supplied. This will make it work as before, preferring merges in inventories without a specific "order" (such as normal chests). Also added safeguard against empty ranges, since that matters now, just in case... 2015-02-05 13:02:09 +01:00
Florian Nücke
fbf5f2af6f Merge branch 'insertIntoInventory-fix' of https://github.com/DirtYiCE/OpenComputers into 1.5 2015-02-05 12:55:21 +01:00
Florian "Sangar" Nücke
e21f573a60 Merge pull request #890 from hunator/patch-2 
Create manpage for yes.lua.
 2015-02-05 12:43:27 +01:00
Florian Nücke
34083e98e1 Reworked internet component to use userdata, makes for nicer interaction from the Lua side. 
Also allows a clean way of providing response information (code, message and headers).
Code only interacting with the internet lib should not be affected by these changes.
 2015-02-05 12:40:31 +01:00
Florian "Sangar" Nücke
3bbb96d57b Merge pull request #889 from hunator/patch-1 
Create yes.lua
 2015-02-05 09:06:20 +01:00
Martin Hunek
36a2661922 Update yes.lua 2015-02-04 17:59:27 +01:00
Florian Nücke
4f9165d4be That needs to move, too... 2015-02-04 17:51:55 +01:00