Commit graph

356 commits

Author SHA1 Message Date
Pahimar
46e6fa9b8b Yeah, another whack of code. 2014-07-18 22:26:59 -04:00
Pahimar
6fd0b0de79 Add a helper to ensure that the String value we get from the configuration file is a valid one 2014-07-18 18:21:56 -04:00
Pahimar
4ea086f1b8 Coming back to configurations tonight 2014-07-18 16:06:37 -04:00
Pahimar
24a2ae35bc Move some interfaces into the util package
Remove the client configuration
Work on configuration
Implement bspkrs graphical configuration system
2014-07-18 15:55:10 -04:00
Pahimar
b82bb5b4b0 Add in Augmentation Table GUI xcf, add some more NBT name constants, implement a basic PlayerKnowledge object for storing transmutation data, and add in a basic save handler for the PlayerKnowledge 2014-07-18 12:58:35 -04:00
pahimar
6d223cea1e Adjust slot placement for the new GUI texture 2014-07-17 21:15:27 -04:00
pahimar
97b465a311 Reorganize the block registration to do machines (in order) first, then blocks 2014-07-17 21:15:10 -04:00
pahimar
3a8c5d1760 Properly light our item renderers (makes them look much cooler) 2014-07-17 21:14:36 -04:00
pahimar
01be020ba5 Add a progress bar to the research station 2014-07-17 20:44:26 -04:00
pahimar
52453a7b86 Properly light our tile entities (makes them look much cooler) 2014-07-17 20:44:14 -04:00
Pahimar
be80bcc176 More modes 2014-07-17 16:07:13 -04:00
Pahimar
2093c485a0 Committing (you guessed it) a whack of stuff 2014-07-17 15:20:53 -04:00
Pahimar
5464f1a119 Committing a whack of stuff 2014-07-16 21:46:35 -04:00
Pahimar
0966eae4ae Committing a whack of stuff 2014-07-16 21:42:41 -04:00
Pahimar
67340a1b20 Committing a whack of stuff 2014-07-16 21:40:12 -04:00
Pahimar
d10e2acc81 Commiting a chunk of code 2014-07-16 16:10:18 -04:00
pahimar
1d02efa0e6 Fix GuiIds now that they are an enum 2014-07-15 19:39:21 -04:00
Pahimar
e7cd1a0d63 Commiting a chunk of code 2014-07-15 15:52:39 -04:00
Pahimar
b048fa280d Commiting a chunk of code 2014-07-15 13:24:04 -04:00
Pahimar
85e1a62c5a Commiting a chunk of code 2014-07-15 12:24:18 -04:00
Pahimar
a7a13d05a3 Fix ObjectHolder reference for the Dark Matter Pickaxe, and commit the texture 2014-07-15 08:22:24 -04:00
Pahimar
eae005aaab Get sounds working again 2014-07-14 21:23:48 -04:00
Pahimar
385ee4d8ea Fully implement getStacksInRange, documentation needed still 2014-07-14 18:37:50 -04:00
Pahimar
53d224369b Animated the texture for Dark Matter 2014-07-14 18:37:32 -04:00
Pahimar
3b938c4622 Stub in a method in the API for returning a list of ItemStacks (may change to Objects) that have an Energy Value between the two parameters 2014-07-14 14:39:23 -04:00
Pahimar
1221fc1163 Fix support for IEnergyValueProviders - to use implement the interface on your Items! 2014-07-14 14:30:50 -04:00
Pahimar
4bdc313237 Small refactor of EnergyValue 2014-07-14 14:12:14 -04:00
Pahimar
d4f5781ea9 How about some new Matter types? Much love to @BigBadChris! (Support him at http://www.patreon.com/bigbadchris) 2014-07-14 14:11:59 -04:00
Pahimar
71b9699497 Some more work related to the EnergyValueRegistry API, should definitely work now 2014-07-14 12:04:20 -04:00
Pahimar
a659aabd8b Mark EnergyValueRegistryProxy as final 2014-07-14 06:52:08 -04:00
Pahimar
cb47b5a81f More API work 2014-07-14 06:51:35 -04:00
Pahimar
03e0897c15 Rework the EnergyValueRegistry to be more friendly with the API 2014-07-13 22:05:27 -04:00
Pahimar
63972f1ddc Fix a naming derp in registering tile entities (and perserve previous names) 2014-07-13 21:46:32 -04:00
pahimar
d497d3f9d9 Smarter localization of Creative Tabs 2014-07-12 19:10:04 -04:00
Pahimar
3c69ee4f7b Moving things around 2014-07-10 16:20:35 -04:00
Pahimar
0a38400559 Remove the concept of EnergyComponents and set it so that an EnergyValue is only of one EnergyType (simplifies a lot of things) 2014-07-10 16:05:14 -04:00
Pahimar
32bbca53cb More API related shenanigans, MUCH more to come (provide comments on your API related needs to pahimar@gmail.com) 2014-07-07 15:31:10 -04:00
Pahimar
a1dc2d2130 A lot of refactoring in an attempt to get a proper API package. Do not consider this done or safe at all - pushing so that saner men/women than I can critique it 2014-07-07 11:22:21 -04:00
Pahimar
dc90ee2ada Let's give the Research Station some loving, eh? 2014-07-06 21:47:57 -04:00
pahimar
5bc742bb94 Move around where the recipes are and how they are initialized 2014-07-06 15:09:50 -04:00
pahimar
8642d5c70e Fix up some network sync with the Aludel and Glass Bell 2014-07-06 14:21:03 -04:00
pahimar
f8df05268d Get the Aludel working again 2014-07-06 12:14:45 -04:00
Pahimar
469fa9f5d2 Add back in that you don't need to Shift place Glass Bells on top of Aludel's 2014-07-04 16:16:11 -04:00
Pahimar
c8b510f90f More work on the Aludel 2014-07-04 16:11:39 -04:00
Pahimar
f48f9093ab Fix some netsync stuff with the Calcinator, as well as the read/write NBT stuff. Also reformat some of the code 2014-07-04 15:18:10 -04:00
Pahimar
990dab6bf5 Ok a little bit more on the Aludel, but seriously now, pizza time! 2014-07-03 16:00:25 -04:00
Pahimar
7723f846e6 Getting somewhere with the Aludel as well. More to come tonight, for now, hometime and pizza 2014-07-03 15:54:14 -04:00
Pahimar
92b8d6f8c5 Calcinator works again 2014-07-03 15:44:44 -04:00
Pahimar
60df8efccb Forgot to commit the texture for the alchemical tome last night - oops! 2014-07-03 14:10:39 -04:00
Pahimar
6a9e14449f Why don't we give this fancy @API thinger a try? 2014-07-02 21:36:25 -04:00
Pahimar
668d1b3db4 Add in Tome of Alchemical Knowledge (Work In Progress) 2014-07-02 20:54:54 -04:00
Pahimar
2e10010e29 Fixes #698 2014-07-02 09:49:25 -04:00
ganymedes01
21efd96004 You forgot to use the right method
Derpymar
2014-06-27 18:35:21 +01:00
Pahimar
97ad0db66a Switching to ore dictionary names for recipe inputs 2014-06-27 11:14:16 -04:00
Pahimar
4d939c8e60 Some work on getting recipes working again (yes, some recipes are INTENTIONALLY left out) 2014-06-26 16:05:18 -04:00
Pahimar
8a2226d483 When player data is loaded from disk, store the location it's reading the data from. Also, create a file for the player should one not already exist. 2014-06-26 15:19:59 -04:00
Pahimar
fecefc230a Add back in the fingerprint check messages (now that the build system is signing jar files again) 2014-06-22 14:12:47 -04:00
Pahimar
0961c35ab0 First stab at the Skills system (knowledge system) 2014-06-22 14:04:39 -04:00
Pahimar
5bfe76336c Add in some more testing with the Player load/save events (discovered a possible bug with the event for the loading of player data in a single player world) 2014-06-22 14:03:30 -04:00
Pahimar
c101a8f85e Move the default energy values to the init package 2014-06-22 14:02:15 -04:00
Pahimar
1a0627eed5 Remove unnecessary registries (they were placeholders to begin with) 2014-06-22 14:01:47 -04:00
Pahimar
82f82862a4 Add a very basic PlayerEventHandler to test the new events 2014-06-22 10:50:31 -04:00
Pahimar
4fb4480cd8 Fix up the referencing of client side code on the server (server wouldn't start because the client config was referencing Keybinding which is client side only) 2014-06-22 10:49:44 -04:00
Pahimar
af8621f480 Refactored references of Emc to EnergyValue and renamed the thread that initializes the value registry 2014-06-20 15:57:27 -04:00
Pahimar
1f726f33d9 Update default Exchange Energy values for vanilla items. 2014-06-20 14:56:24 -04:00
Pahimar
646631d074 More optimizations to DynEmc computation - definitely seems faster now! 2014-06-19 15:56:00 -04:00
Pahimar
c88b5dcad0 Should be a massive improvement in EE3 DynEmc start up time (removed a redundant and slow part of the DynEmc init) 2014-06-19 14:39:46 -04:00
Pahimar
3a4d06ad48 Working on getting the Exchange Energy system back up and running, and trying to optimize it 2014-06-19 14:18:04 -04:00
Pahimar
e77bb9ec48 Bump to latest Forge RB, and some work on getting Energy Value generation working again. More to be done! 2014-06-14 15:40:45 -04:00
Lluixhi Scura
12fff5f26e Don't forget the import statements :P 2014-05-26 14:27:11 -07:00
Pahimar
e0718b48fe Merge remote-tracking branch 'origin/master' 2014-05-26 16:04:00 -04:00
Pahimar
39a6db0dce Playing around with some gradle improvements 2014-05-26 16:03:54 -04:00
pahimar
2c631f30f9 Merge pull request #679 from Enosphorous/master
Don't hardcode names in, use lang files!
2014-05-26 11:32:20 -04:00
Pahimar
b1cad58550 Bump to Forge 1095, and proper use of ObjectHolder (protip: instance variable names should match object names for easier ObjectHolder use) 2014-05-26 11:28:51 -04:00
Enosphorous
22483a7839 Don't hardcode names in. 2014-05-26 08:19:19 -07:00
pahimar
abde1fc874 Missed some files 2014-05-25 10:00:38 -05:00
pahimar
7bd8adf478 Working keybinding listener, and first stab at the ObjectHolder (some more learning necessary it seems, so commented out at the moment) 2014-05-25 09:55:50 -05:00
pahimar
06dced01b3 Merge remote-tracking branch 'origin/master' 2014-05-24 15:52:34 -05:00
pahimar
d18a1c2f3c Working on keybindings, going to test a FML fix for SimpleNetworkWrapper later 2014-05-24 15:52:23 -05:00
theflogat
e3d6273d01 Adding a needed parameter to @Instance
Adding a needed parameter to @Instance to avoid problems.
2014-05-24 19:54:46 +02:00
pahimar
99527d35a8 Working on keybindings 2014-05-22 17:35:31 -05:00
Pahimar
a2a82d3d36 Tweaking some build script and mcmod stuff 2014-05-16 11:48:51 -04:00
Pahimar
8ee4fa0147 Some starter work on keybindings and config files 2014-05-02 16:06:56 -04:00
pahimar
26d3a5dd11 Re-implemented Alchemical Bag functionality, and added back the fuel handler 2014-04-30 19:33:29 -04:00
pahimar
cf1dcfa1a0 Merge remote-tracking branch 'origin/master' 2014-04-30 18:03:22 -04:00
pahimar
5a8665a581 Fixes chest lids in MP 2014-04-30 18:01:35 -04:00
pahimar
3362621750 Moving the intialization of items and blocks to the init package, and simplifying things and removing the infused blocks (Aludel recipes will take their place) 2014-04-29 22:26:30 -04:00
pahimar
ac207393fe Managed to get a few things done today 2014-04-29 21:46:59 -04:00
pahimar
5794037f51 Getting ma groove on 2014-04-28 21:24:31 -04:00
pahimar
664387f063 Machines: Getting them to render in world. Still not functional. 2014-04-11 16:01:11 -04:00
pahimar
ac14fe32ab Machines: Getting more of the machines implemented, still a WIP 2014-04-11 07:06:32 -04:00
pahimar
f6d58abca2 Getting Alchemical Chests into the port. They definitely aren't finished yet, networking still to be done. 2014-04-10 19:59:04 -04:00
pahimar
c0a2f2d929 Some more work on stuffs 2014-04-01 22:47:08 -04:00
pahimar
16edfe03a4 Bunch more work on porting Items. More to come tonight 2014-04-01 16:11:52 -04:00
pahimar
4410c25bd6 Don't be scared - it's easier to start from the bottom. There's also still the MC 1.6.4 branch :) 2014-03-28 15:54:15 -04:00
pahimar
059d9614c1 Another pass at the 1.7 update - more to come tomorrow 2014-03-27 22:21:21 -04:00
pahimar
9070ad038b First initial pass of 1.7 update 2014-03-27 21:36:03 -04:00
pahimar
9f56070058 First initial pass of 1.7 update 2014-03-27 21:34:47 -04:00
pahimar
065d129b76 Resolves #661 2014-03-27 15:26:04 -04:00
pahimar
ea280ba2aa Resolves #661 2014-03-27 15:24:09 -04:00