Commit graph

367 commits

Author SHA1 Message Date
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
f580e4646f Add the logo xcf file, and update the path to the image in the mcmod.info 2013-03-04 23:48:47 -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
pahimar
257ab2144b Fix imports for the new FML/MinecraftForge repackaging 2012-12-13 10:01:41 -05:00
pahimar
c078794880 Beginnings of a proper hook for world protection. Client intiates a request to the server. Server validates if the request is going to be allowed (via an event). If the event is not canceled, then the server allows the action to occur. 2012-12-12 22:41:40 -05:00
pahimar
fb689d0697 Commiting what I have at home so I can work on it later today 2012-12-07 07:11:57 -05:00
pahimar
ae14f68167 More WorldEvent work 2012-12-06 21:06:16 -05:00
pahimar
69293538b9 More work on WorldEvent packets (the way clients will request servers to do world modification events). Decided to go with a general packet with event types 2012-12-06 16:04:20 -05:00
pahimar
a5127a6a13 More work on a packet for in world events 2012-12-05 23:15:36 -05:00
pahimar
02e9bb09da Beginning work on world transmutation packets 2012-12-05 16:06:50 -05:00
pahimar
8b059dfd0c Some rework on configs (where they are stored/etc) 2012-12-05 14:33:03 -05:00
pahimar
bb07edc77c Nothing to see here 2012-12-04 16:11:54 -05:00
pahimar
bc1740ebee Some work on getting bags off the ground, also learned how to do multiple render passes and overlays of overlays (yay!). Note: the bags aren't functional at all yet; just viewable in game. Much more work to be done. 2012-11-30 22:45:54 -05:00
pahimar
abae80d52d Formatting 2012-11-30 15:45:32 -05:00
pahimar
0ecca70ffe Move art/sprite related constants out of the general Reference class into their out Sprites lib class, move the RenderTickHandler into the client package (where it belongs), 2012-11-30 15:28:42 -05:00
pahimar
fa1271f5c5 In world transmutation overlay works for all transmutation stones, P Stone now is chargeable and has sounds, sounds renamed to be more intuitive 2012-11-30 14:03:36 -05:00
pahimar
d2fca0a6d9 Re-jigging of how keybindings are handled, now keybindings are passed to items implementing IKeyBound and the item itself determines what code is called depending on the keybinding 2012-11-30 10:47:18 -05:00
pahimar
4de5c80593 Reworking how keybindings work with items, more refactoring to be done here 2012-11-26 15:59:26 -05:00
pahimar
aa0b4219f6 Clean up, and realizing I don't have to send custom sound packets 2012-11-26 13:30:01 -05:00
pahimar
0b8413ec67 Bugfix for pre1c, new version pre1d 2012-11-26 09:31:47 -05:00
pahimar
1c7ef909e6 Prep for pre1c release 2012-11-25 21:51:05 -05:00
pahimar
ae6201a62c Some work on in world transmutation overlays for the pstone 2012-11-25 21:11:12 -05:00
pahimar
48dce26390 Unnecessary line 2012-11-24 22:47:57 -05:00
pahimar
ef2ed87bc9 Moving some stuff around 2012-11-22 22:14:57 -05:00
pahimar
552bcc90d1 Someone missed a comman when adding their localization 2012-11-22 10:43:44 -05:00
Lure
10b2580d6a Chinese(Traditional) Localization
Update provided by wtmhahagd on #ee
2012-11-21 22:35:31 -02:00
pahimar
4ca464e072 Getting into some rendering; fun stuff! 2012-11-21 15:29:26 -05:00
Lure
17e9314986 Alphabetical Order
alphabetical order should been obvious to me first... don't know why it
wasn't
2012-11-21 14:04:35 -02:00
Lure
845f4ed672 Portuguese(BR) Localization
also enabled pt_BR
2012-11-21 13:56:27 -02:00
pahimar
659b2a9620 Some work on what I hope could be a cool overlay for managing the different modes of the P Stone/etc. Thanks Azanor for the concept 2012-11-20 22:33:50 -05:00
pahimar
218fc8ceef Cleaned up detection of hostile mobs 2012-11-20 15:39:32 -05:00
pahimar
1c3da781ea Updated the localization files to use the new remote update location variable (see en_US.xml) and made sure all localization files get initialized into the LanguageRegistry 2012-11-20 14:50:40 -05:00
pahimar
01304fb4c4 Refactored the remote version check to check against the GitHub repo instead of my DropBox folder, added some colourized text to the result message on the client, and reformatted some of the localization. 2012-11-20 14:42:39 -05:00
pahimar
b250509962 Update to MC 1.4.5b (nothing needed to be done), re-implement colour overlays, reduce the number of dusts 2012-11-19 19:49:39 -05:00
pahimar
b0d0e13a22 Proper fix for Pull #75 2012-11-07 13:32:34 -05:00
Minerman
b1f15e0050 Fixing minor Auto-detected smelting issue
Auto-detected portable smelting recipes should now take into account the output number of the recipe.

Example here (Wheat Block smelts to 3 Bread each) : http://puu.sh/1nuLD
2012-11-07 11:09:48 -05:00
gishicrafter
b6f438983f Update and enable ja_JP 2012-11-07 23:13:05 +09:00
pahimar
86e01679a3 New Strings lib for holding common names/etc, merge in some of the block/item initialization stuff into their respective classes, proper config loading for Alchemy Dusts, oh yeah Alchemy Dusts, some new Localization keys, etc 2012-11-06 15:49:43 -05:00
pahimar
8fc5bf43b9 Amazing how you can spend a whole morning fixing small things; new Inert Stone recipe, initial class for the base alchemy dusts to extend, dropping the use of colour overlays. 2012-11-04 13:14:51 -05:00
pahimar
0f353593af Updated the EE3 link thread in the localizations, finally fixed the derp in the pl_PL.xml localization (missing /), and fixed my own derp in keybinding localization (I wasn't doing it properly). 2012-11-03 22:11:41 -04:00
pahimar
272aa21b31 Blah 2012-11-02 16:06:08 -04:00
pahimar
62872b13ee Improved GUI calling for the portable crafting interface, fixing an inefficient Red Water check, get more of the PStone functionality working, and included some texture work from spikeof2010 2012-10-28 23:16:32 -04:00
pahimar
e3ef89d38e Javadoc update 2012-10-27 17:41:02 -04:00
pahimar
942f97eda3 Custom EE3 Creative Tab and working in world transmutation. Just some testing and updated javadoc to go! 2012-10-27 16:04:43 -04:00
pahimar
16d9d6dedb Work on a recursive method for transmuting equivalent blocks in world - switching PCs so easier to commit 2012-10-27 12:33:04 -04:00
pahimar
f3fc5f48e0 Misc cleanup 2012-10-26 11:34:05 -04:00
pahimar
4b29fb2b0b Added some of the new localizations to the listing of files, and corrected the comments (it's Localizations, not BlockIds....) 2012-10-26 10:32:35 -04:00
pahimar
3cd83d283c Clean up some references, and getting ready for the ant build file to auto fill in version details at build time 2012-10-25 22:17:19 -04:00
pahimar
c32bf44d61 Changed out the temp recipe for the Minium Stone to use an Inert Stone instead of a diamond 2012-10-25 22:13:25 -04:00
pahimar
3e9c60a39c Getting closer to pre1! 2012-10-25 20:55:26 -04:00
pahimar
f47d87f639 Merge remote-tracking branch 'origin/master' 2012-10-24 21:53:51 -04:00
pahimar
4e8cbd16f9 Make a Colours lib and "abstact" some textures to grayscale (we can recolour them with colour overlays and reuse the texture more efficiently) 2012-10-24 21:53:41 -04:00
pahimar
4f509ebdb1 When I localized key bindings, I missed updating the KeyPressed packet to also accomodate the change - whoops! 2012-10-23 22:01:41 -04:00
pahimar
30c0d78eba Merge pull request #25 from aritzhack/master
Added Spanish-Spain (es-ES) translation
2012-10-22 09:27:54 -07:00
phpr
04d70e77fc Update Localizations.java file for the French version 2012-10-22 18:21:57 +02:00
aritzhack
9e56c39703 Merge remote-tracking branch 'upstream/master' 2012-10-22 15:37:44 +02:00
pahimar
cfb4d74002 Update naming to MC 1.4 2012-10-21 22:39:43 -04:00
pahimar
3f1664c322 getPrev done 2012-10-21 19:56:52 -04:00
pahimar
d0036f1d85 Getting the Equivalency Handler back online, finishing it up tonight 2012-10-17 16:01:43 -04:00
pahimar
95f5230d24 Basic get/sets for the EMCRegistry 2012-10-16 13:31:27 -04:00
pahimar
e666b0f546 Fix some whitespace issues, and some renames for EMC types 2012-10-16 10:38:31 -04:00
pahimar
eeadd08ef0 TINY bit more work before bed 2012-10-15 21:56:50 -04:00
pahimar
040500292d tab cleanup in comments, might take the whole table out of the comments 2012-10-15 21:45:38 -04:00
pahimar
fa94dc6d5e Some work on the DynEMC system 2012-10-15 21:42:57 -04:00