Commit graph

210 commits

Author SHA1 Message Date
pahimar
30a8bdcb94 Goofed up the colours for these two guys 2013-04-02 15:57:47 -04:00
pahimar
9ab2420425 Merge pull request #288 from DarkTrollRises/master
Transformation bug involving metadata
2013-04-02 12:56:28 -07:00
pahimar
e5228cb697 Removing the now unnecessary CustomItemRarity piece 2013-04-02 15:51:27 -04:00
pahimar
bf09bdb8a6 Reduce number of startDrawing/draw calls to the tessellator (thanks for the tip), add some render methods to WavefrontObject, removed unnecessary commenting 2013-04-02 14:38:24 -04:00
LordOfTheMine
e9b8bd5b91 Fixed transmutation recipes involving metadata 2013-04-01 01:04:26 +03:00
DarkTrollRises
a40b1a208f Transmutation bug involving metadata fixed 2013-03-31 09:48:55 +02:00
Captain of all Shadows
ca7a589f1b Transmutation Fix
Fix for a bug where the transmutation wouldn't work unless the stone was
new
2013-03-30 00:08:04 -04:00
ChrRaz
c1557d4b72 Fixed a crash involving kills by arrows
I've fixed a crash, occurring when a mob was shot with a bow, by a player.
2013-03-29 22:59:38 +01:00
pahimar
4fed6ca22d Only calculate normals as many times as needed, add support for specifying the glDrawingMode (if desired) 2013-03-28 00:02:15 -04:00
pahimar
83051d7705 Update EE3 to MC 1.5.1, and more work on the OBJ importer (almost done with it!). My first MC update outside of Canada :) 2013-03-21 19:44:21 -04:00
pahimar
bbf22cace7 Finished up writing our own method of parsing WavefrontOBJ model files into a useable object. Proper documentation is still needed, as is some more validation stuff, and the load should throw an exception in the event that it can't load the model properly from file. 2013-03-21 09:55:28 -04:00
pahimar
4da1c0e455 The start of some comments, and writing my own Wavefront OBJ parser (the one from the lib was needlessly complex) 2013-03-19 15:21:10 -04:00
pahimar
e118cb78a7 Reverting back the version check mechanic I was trying out (different release streams), and some source code cleanup 2013-03-19 12:15:09 -04:00
pahimar
f0ac7a41fc Testing some new Version Check mechanics 2013-03-19 10:42:28 -04:00
pahimar
bf864e3f88 Simplify some stuff related to the new OBJ loading 2013-03-18 22:37:03 -04:00
pahimar
3a3afc4651 Fix import 2013-03-18 20:42:05 -04:00
aginsun
27962c6351 Letting arrow death work
makes it so that when mobs killed with a bow have a chance of dropping minium shards.
2013-03-16 12:50:54 +01:00
pahimar
1f9f579663 More pruning 2013-03-15 15:18:01 -04:00
pahimar
51df757c9c Faces now store the GL drawing mode for them, and updated the Models of EE3 to reflect this (it simplifies things). More work still coming on the OBJ stuff before its ready for MCForge 2013-03-14 22:31:47 -04:00
pahimar
d27009d621 Source cleanup pass 2013-03-14 22:23:02 -04:00
pahimar
164affe403 Shrink the block boundaries of the Calcinator to match its model, clean up the WavefrontObject class some more 2013-03-14 22:22:01 -04:00
pahimar
3ea9614926 Fix the Transmutation Overlay to work with MC 1.5, and temporarily storing some classes I'm working on for OBJ model loading in MCForge 2013-03-14 22:14:02 -04:00
pahimar
2a4d2eedcb Code cleanup 2013-03-11 23:24:05 -04:00
pahimar
bfc28d6597 Working implementation of custom models for the Calcinator and Aludel (Requires OBJ Loader lib) 2013-03-11 23:23:06 -04:00
pahimar
811bbfe9f7 Not all of this will make sense; working on implementing custom models from Wavefront OBJ model files. 2013-03-10 22:26:55 -04:00
pahimar
af59bc543c Models 2013-03-09 15:21:11 -05:00
pahimar
4e7c8ebdc5 Javadoc related updates and code cleanup 2013-03-08 13:40:59 -05:00
pahimar
6a8098ecbc Alchemical Bags can now be dyed 2013-03-07 22:45:55 -05:00
pahimar
509cc8f6ca Calcinator and Aludel now support custom names, some work on getting Alchemical Bags to support being dyed 2013-03-07 21:26:42 -05:00
pahimar
7326032b24 TileEE's properly synch custom NBT data, and Alchemical Chests properly display custom inventory names. 2013-03-07 16:12:19 -05:00
pahimar
72830edbaa Suppress some warnings we can't do anything about right now 2013-03-06 21:52:30 -05:00
pahimar
ec7c35e604 Work on enabling custom inventory names 2013-03-06 21:46:19 -05:00
pahimar
a1733467d3 The Aludel, Alchemical Chest, and Calcinator all render again in MC 1.5 2013-03-06 19:02:12 -05:00
pahimar
30d3e3aef5 Standardize "alchemical" over "alchemy" for names, get all the items rendering again as they were prior to MC 1.5 2013-03-06 18:46:19 -05:00
pahimar
987689d193 Fix saving of configuration related changes 2013-03-05 23:51:29 -05:00
pahimar
c9cb29ede5 Fix up more of the rendering stuff for 1.5 2013-03-05 16:17:54 -05:00
pahimar
148bbacade Fix a fringe case with the Version Checker, finally figured out why some item textures weren't working, and got sounds working too 2013-03-04 23:26:26 -05:00
pahimar
0b49a57a19 More work on renders 2013-03-04 22:26:17 -05:00
pahimar
1116fb6351 More 1.5 work 2013-03-04 22:18:15 -05:00
pahimar
e3f6491c4f More 1.5 port work (and general cleanup). Still doesn't build yet. 2013-03-04 16:02:24 -05:00
pahimar
e43ba7463b Initial bit of work on 1.5 compatibility 2013-03-04 11:40:40 -05:00
pahimar
87c0dfea75 Lots of work on various things 2013-02-26 16:08:43 -05:00
pahimar
77697c78b2 Fixes Issue #230 2013-02-26 11:43:40 -05:00
pahimar
676200a1d5 Alchemical Chest lid functions properly, and shift click functionality 2013-02-25 22:00:57 -05:00
pahimar
c012aab4a9 A little extra work on getting the lid working :) 2013-02-25 16:03:45 -05:00
pahimar
3c4c6a60f8 Alchemical Chest renders in world now, only thing remaining is TE data on the lid angle. Will handle in the morning. 2013-02-25 00:33:21 -05:00
pahimar
0f53144c8f Alchemical Chests have a working inventory/gui now, but still needs the render finished. Alchemical Bags have a half completed inventory/gui (still needs UUIDs and bag data). Commiting for the night because I'm tired :) 2013-02-24 23:03:45 -05:00
pahimar
df33604c43 Some sided work, and the skin for the alchemical chest 2013-02-23 20:25:04 -05:00
pahimar
dc74e1cf7b Lots of work! 2013-02-18 20:13:24 -05:00
pahimar
4192236cd8 Some more rendering work on the new block, and a simplification to the Calcinator model 2013-02-18 18:00:25 -05:00
pahimar
214bb9e7d5 More work on the new block! 2013-02-18 13:55:57 -05:00
pahimar
0a5f552deb Some work on a new EE machine! 2013-02-17 21:30:11 -05:00
pahimar
223f42a07c Some starting work on the alchemical bag/chest gui 2013-02-17 08:53:35 -05:00
pahimar
3be4bc05eb Small changes 2013-02-16 17:49:33 -05:00
pahimar
ca8d51a5a3 Re-worked the version check to only nag the player in game once per newly detected version. Still need to massage the text a bit and work out how to pull down a changelog. 2013-02-16 15:10:28 -05:00
pahimar
e8c31c468a Move around some sprites 2013-02-13 15:52:00 -05:00
pahimar
455307b193 Some more work on the calcinator 2013-02-12 21:47:17 -05:00
pahimar
79abcd0991 Some brief Calcinator work, continuing more tonight 2013-02-12 16:02:40 -05:00
pahimar
f6e5e2fdbf Merge remote-tracking branch 'origin/master' 2013-02-04 08:03:21 -05:00
pahimar
d24b4d1b45 Packetized charging sounds for the PStone (got missed before) 2013-02-04 08:03:10 -05:00
Vazkii
8cc805ca4d Make GeneralHelper.isHostileEntity apply to all mobs
Not all mobs extend EntityMob (e.g. Ghasts), the interface IMob, trough, encompasses all mobs.
2013-02-02 20:55:01 +00:00
pahimar
113e36572f Some more portable transmutation work, added a new NBT tag for it and refactored the existing one. GUI/Container for it still to be finished 2013-01-29 22:15:59 -05:00
pahimar
6a0329f73a Some work on the portable transmutation mode for the transmutation stones 2013-01-28 15:52:28 -05:00
pahimar
b63c9dfb46 EE3 transmutation stones now properly take durability damage when used for portable crafting 2013-01-22 15:40:15 -05:00
pahimar
3ae9ae154d Some work on getting Portable Crafting to properly damage transmutuation stones, finishing this up tomorrow 2013-01-21 22:15:51 -05:00
pahimar
56edefb8d2 Stones make the "break" noise when they are used up during world block transmutation 2013-01-18 16:12:27 -05:00
pahimar
d16887932e Solved Minium/Philosopher stone taking damage on world block transmutation, while also respecting EE3 world block protection. Yay! 2013-01-17 22:36:35 -05:00
pahimar
647f600cba Fixed a logic derp in the version checker, and hopefully fixed positioning of the overlay for all possible positions. 2013-01-14 14:57:12 -05:00
pahimar
d4a97f97be De-localized a fair bit of the commands system (response messages can be localized, but the actual commands you type in will not be localized), changed the colour of the response message the player sees to gray, re-org'd some files, etc 2013-01-11 15:01:47 -05:00
pahimar
8c26feab5b Derped and didn't fix the remote URL. Also made the client message portion of the version check wait for th e result to finally be determined before reporting to the player in game. 2013-01-09 15:37:29 -05:00
pahimar
e570fc3139 Fixed non-OPs using /ee3 command on servers, localize a more of the /ee3 command (feel free to submit localizations again), and threaded the version checker 2013-01-09 15:22:21 -05:00
pahimar
b1c3cfff50 fixed indentation in the Localizations file listing, added a missing locale to the list, and put in some stubs for the new command localizations 2013-01-04 21:26:58 -05:00
pahimar
9d7eb635e5 Localization support for the ee3 command, fix a bug with the minium stone in SMP, and a stub to remind me to make the charging/decharging of the pstone fire packets for sounds as opposed to directly playing them for all 2013-01-04 18:53:34 -05:00
pahimar
4b9c42f3c4 Fixed the double packet bug thanks to @cpw 2013-01-03 21:43:30 -05:00
pahimar
cd5f58196e Player specific sound options, and various other things 2013-01-03 21:17:49 -05:00
pahimar
71989cfef1 Merge pull request #150 from nevercast/fix-smpbug
Fix SMP Bug -- Again
2013-01-02 17:09:27 -08:00
pahimar
27d4679a2b Merge pull request #152 from PizzAna/master
Added Finnish localization
2013-01-02 17:08:24 -08:00
Antti
dc05bfd54a added Finnish localization 2013-01-01 21:25:24 +02:00
Antti
c6d411083c added Finnish localization 2013-01-01 21:24:48 +02:00
Antti
999d74f167 added Finnish localization 2013-01-01 21:23:54 +02:00
Antti
b499e335e8 added Finnish localization 2013-01-01 21:22:44 +02:00
Antti
f24d3387f5 added Finnish localization 2013-01-01 21:21:36 +02:00
NeverCast
1daff46a9a Re-applied world equivalency and tested 2013-01-01 08:37:40 +13:00
NeverCast
bff1c1ceb8 Second SMP fix, with the right number this time. 2013-01-01 08:34:26 +13:00
pahimar
984dcd7b4a Some fixes 2012-12-31 03:14:44 -05:00
NeverCast
c1074aae40 Fix for SMP bug 2012-12-31 18:37:57 +13:00
NeverCast
c6e8ccb39a Added code for minium stone also 2012-12-31 17:06:31 +13:00
NeverCast
96639ee9d0 Added previousBlock helper methods
You can reverse cycle with crouch+g key
2012-12-31 17:04:34 +13:00
pahimar
db2891c508 Fixed a big bug that prevented in world transmutation working in SMP environments (sorry guys), and fixed the ability to cycle through transmutation options while in SMP (half-assed, will revisit) 2012-12-30 22:03:12 -05:00
pahimar
ea431cb3e7 Finished up the EE3 command, for now 2012-12-30 20:42:27 -05:00
pahimar
36e296a53d Merge pull request #143 from narc0tiq/patch-1
Fix EE3+NetherOres+PetroGen startup crash
2012-12-30 17:42:04 -08:00
Octav Sandulescu
a001e25dfd Fix EE3+NetherOres+PetroGen startup crash 2012-12-29 16:11:58 +02:00
pksiazek
4c61868b08 Fixed RedPowerWorld FQDN 2012-12-28 09:41:41 +01:00
pahimar
aee18dfa79 Discovered that in world transmutation isn't exactly great, have to come up with a good resolution 2012-12-21 14:01:23 -05:00
pahimar
c80e797957 Some hackey work on world transmutation. Need a more intelligent way of handling metadata on in world transmutation 2012-12-21 13:04:48 -05:00
pahimar
30ae7db6c0 Cleaning up some command stuff before more work 2012-12-21 10:44:15 -05:00
pahimar
754bd0bf48 Some more command stuff, and re-organizing the resources to fit the new package structure 2012-12-21 10:25:18 -05:00
pahimar
96d635e727 More command stuff 2012-12-20 21:31:59 -05:00
pahimar
6bc714a704 Transmutation target block overlay (the spinny thing) can now be placed in any of the four corners of the screen, and the beginnings of a /ee3 command system 2012-12-20 16:45:50 -05:00
pahimar
46d95ca362 Some tweaks, some fixes, some removals of redundancies 2012-12-19 16:56:49 -05:00
pahimar
a1e45baf45 Derped and left unnecessary sysouts, added the named version of registerBlock 2012-12-19 13:49:39 -05:00
pahimar
95bd72e0d8 Successful transmutation events properly play sounds/particles on the client now 2012-12-19 13:47:45 -05:00
pahimar
38b2efa70c Clean up unused imports and some formatting 2012-12-19 13:09:56 -05:00
pahimar
c6a5774867 Multiblock in world transmutation almost done 2012-12-18 21:57:38 -05:00
pahimar
21020bce90 Some more control for the user to say what they want a block to transmute into 2012-12-18 17:06:00 -05:00
pahimar
487fc17d19 Bump the version number, add some NPE protection to the version checker 2012-12-18 13:13:20 -05:00
pahimar
112b74dd30 Generalize more of the events, add the ability to have events fire before/after the action proposed 2012-12-18 13:05:04 -05:00
pahimar
d6aca678d5 Update to MC 1.4.6 2012-12-18 08:41:49 -05:00
pahimar
24ab86083f Some abstractions/etc related to action events and request events 2012-12-17 16:38:56 -05:00
pahimar
e03797f1ca Repackaging EE3 packages/classes to better match up with the MC repackaging 2012-12-17 15:21:53 -05:00