mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-11-09 11:29:59 +00:00
Code Issues Releases Wiki Activity
931 Commits 24 Branches 230 Tags 30 MiB
c81bc70475
Commit Graph

931 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SquidDev
6020cd55b1 Added documentation and updated changelog/whatsnew 2017-05-07 08:09:36 +01:00
SquidDev
7f8100ae0f Check the offhand inventory too when searching for upgrades 2017-05-07 08:08:09 +01:00
SquidDev
22631cfc63 Add .equip and .unequip methods to pocket API. 2017-05-07 08:08:09 +01:00
SquidDev
5faceac7ba Add registry for pocket computer upgrades 2017-05-07 08:08:09 +01:00
Daniel Ratcliffe
ff16868dd8 Merge pull request #206 from Lignum/update-craftos-version 
Set CraftOS version to 1.8
 2017-05-07 00:41:58 +01:00
Lignum
287c6f172c
Allow passing RGB8 hex values to term.setColour 2017-05-07 01:16:48 +02:00
Daniel Ratcliffe
cad10fa2c7 Fixed incorrectness in os.day(). Added os.epoch() 2017-05-06 23:56:28 +01:00
Daniel Ratcliffe
58713caa73 Merge pull request #203 from SquidDev-CC/feature/turtle-models 
Convert turtle rendering to use tinting
 2017-05-06 23:56:13 +01:00
Daniel Ratcliffe
a6e3d4fd26 Merge pull request #195 from SquidDev-CC/hotfix/selection-boxes 
Fix selection boxes not being shown
 2017-05-06 23:55:45 +01:00
SquidDev
f34a319b79 Make cable collision boxes more accurate for cables 
Each cable segment is added to the list, meaning you can get close and
snugly with the cables.
 2017-05-06 23:45:15 +01:00
Lignum
1cc403191f
Add colours.rgb8(r, g, b)/colours.rgb8(hex) 2017-05-07 00:13:36 +02:00
Lignum
2c7ee1d7e7
Bump CraftOS version to 1.8 2017-05-06 23:26:45 +02:00
Daniel Ratcliffe
3e3c1239b0 Merge pull request #183 from timia2109/master 
Add real world time support
 2017-05-06 22:26:14 +01:00
Daniel Ratcliffe
4b4e041f6f Merge branch 'master' into master 2017-05-06 22:25:46 +01:00
Daniel Ratcliffe
423d5af87f Merge pull request #191 from SquidDev-CC/feature/text-illumination 
Make monitor text glow in the dark
 2017-05-06 22:11:28 +01:00
Daniel Ratcliffe
5b6bbc3cbf Merge pull request #200 from Lignum/fs-weak-set 
Replace WeakHashMap for open files with a weak set
 2017-05-06 21:44:28 +01:00
Daniel Ratcliffe
f4dab801e4 Merge pull request #204 from SquidDev-CC/feature/some-deprecation 
Use IBlockState instead of Block methods
 2017-05-06 21:41:54 +01:00
Lignum
a9e7acbec5
Fix monitors fetching palette when there is no terminal 2017-05-06 20:23:44 +02:00
Lignum
ac2382a861
Add setColour overload with table parameter 2017-05-06 20:22:16 +02:00
SquidDev
2f93354981 Remove dye block state property 
It doesn't make sense to have it now as the coloured models do not exist
any more, and so would just produce errors should we try to load them.
 2017-05-06 17:41:49 +01:00
SquidDev
c7f5d039b2 Use IBlockState instead of Block methods 
There was a crash in RedstoneUtil when redstone state was changing next
to a full block due to the incorrect state being passed. By using
IBlockState methods we ensure that this cannot happen again.

The old IBlockState methods were also deprecated, so this reduces the
warning count a little. I've also moved string translation into
StringUtils, to reduce the number of deprecation warnings from there.
 2017-05-06 15:31:06 +01:00
SquidDev
d652bdb0b0 Convert turtle rendering to use tinting 
This uses Minecraft's colour tinting system in order to change the
colour of turtle models. This removes the need to have 16 models and
textures for each colour, reducing texture atlas space and hopefully
memory consumption.

See #145
 2017-05-06 15:06:02 +01:00
Tim Ittermann
f1c4634dfa os.time( ... ) now returns float 2017-05-06 14:52:02 +02:00
Tim Ittermann
f89bbeee54 Remove import 2017-05-06 14:30:19 +02:00
Tim Ittermann
e0e81a9b18 Put time functions into the OS API 2017-05-06 14:24:48 +02:00
Lignum
bfa5f6ec9c
Make palettes work properly with the window API 2017-05-05 20:23:57 +02:00
Lignum
988e9f10db
Fix compiler error 2017-05-05 19:13:52 +02:00
Lignum
b0ac48b9a3
Use some sweet tricks to have a weak set to store open files 2017-05-05 19:11:59 +02:00
Lignum
3de674dfb1
Simplify the palette payload to an int array 2017-05-05 18:47:43 +02:00
Lignum
39a56c8e55
Get rid of the PaletteColour class 
It just took up a bunch of space. We're storing an array of float[3] now.
 2017-05-05 18:22:48 +02:00
Daniel Ratcliffe
06b63980eb Merge pull request #196 from SquidDev-CC/feature/docs 
Fix several documentation warnings
 2017-05-05 17:19:26 +01:00
Daniel Ratcliffe
3eae944923 Merge pull request #198 from SquidDev-CC/hotfix/no-reset-redstone 
Do not reset redstone inputs when adding peripherals
 2017-05-05 17:17:15 +01:00
Lignum
6997471280
Add palette functions to monitor peripheral 2017-05-05 18:12:33 +02:00
SquidDev
4b95ed5d53 Do not reset redstone inputs when adding peripherals 
As of 8abff95441, peripherals no longer
block redstone input. As this is no longer the case, redstone levels
should not be reset.
 2017-05-05 17:00:44 +01:00
Lignum
088dab799e
Network the colour palette 
Which means it actually has a visible effect! 🎉
 2017-05-05 17:21:53 +02:00
SquidDev
0cdd0ea21a Change license headers to block comments 
This means they do not get picked up by Javadoc and friends
 2017-05-05 16:16:09 +01:00
Daniel Ratcliffe
c413b9af04 Merge pull request #194 from SquidDev-CC/feature/docs 
General improvements to the documentation
 2017-05-05 16:08:45 +01:00
SquidDev
76e926c090 Document several undocumented arguments and exceptions 2017-05-05 16:07:18 +01:00
SquidDev
d87b0e9435 Fix selection boxes not being shown 
getSelectedBoundingBox expects a bounding box relative to (0, 0, 0) but
we were returning one relative to the current block. Instead we allow
the default behaviour to continue, which will call getBoundingBox and
offset it.
 2017-05-05 15:25:07 +01:00
Lignum
b0f0d8fd71
Add getColour/setColour to the window api 2017-05-05 16:14:13 +02:00
SquidDev
7b07921a73 General improvements to the documentation 
- Add documentation for all undocumented methods and enums.
 - Use @code, @link and @see where appropriate.
 - Fix spelling in a couple of cases.
 2017-05-05 14:59:11 +01:00
Lignum
56c9dec687
Add term.setColour/term.getColour 2017-05-05 15:52:21 +02:00
Lignum
936a531cd5
Add a palette class and use it for rendering 2017-05-05 15:24:29 +02:00
Daniel Ratcliffe
09215daa03 FileSystem uses a WeakHashMap to store it's open file handles 
This means if lua code forgets to free a handle, the java GC will still
be able to collect the stream (andclose the file in the finaliser in the
process)
 2017-05-05 00:54:24 +01:00
Daniel Ratcliffe
42f2235d45 Made the black colour on monitors, terminals, block and item graphics darker 
0x111111 is now used throughout, previously there was quite a bit of
variance
 2017-05-05 00:54:24 +01:00
Daniel Ratcliffe
2436d813e6 Treat a maximumFilesOpen values of 0 as unlimited 2017-05-05 00:54:23 +01:00
Daniel Ratcliffe
6271555c45 Merge pull request #192 from Lignum/render-improvements 
Small terminal & monitor rendering improvements
 2017-05-04 23:09:48 +01:00
Lignum
4b8493baab
Terminal cursor bounds checking 2017-05-05 00:08:10 +02:00
Lignum
4e3def39e0
Render terminal cursor in a less awkward way 
The previous way seemed weird enough to seem to have had a purpose, but I can't tell. Revert this if it turns out that there was.
 2017-05-04 23:53:43 +02:00
Lignum
7e71045c7b
Remove texture coordinates from text background part 2017-05-04 23:49:08 +02:00