Anvilcraft/equivalent-exchange-3
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
1845 commits 1 branch 0 tags 11 MiB
Commit graph

477 commits

Author SHA1 Message Date
Pahimar
c141fe39bc More glyph work 2014-10-07 23:11:54 -04:00
Pahimar
6e727a5a7f More glyph work 2014-10-07 16:20:41 -04:00
Pahimar
a1e502c295 Fixed block bounds depending on orientation 2014-10-07 00:18:11 -04:00
Pahimar
dea21c3f21 Thought I was being clever - I wasn't 2014-10-06 11:17:50 -04:00
Pahimar
5824495b33 Thanks to Parker for catching this derp - bce498695e (commitcomment-8050478) 2014-10-06 11:09:25 -04:00
Pahimar
bce498695e More glyph stuff 2014-10-05 19:29:54 -04:00
Pahimar
699a624c8a Get Waila head provider working and providing good feedback to the user 2014-10-03 22:56:58 -04:00
Pahimar
243459eb04 Reminder to myself for later tonight 2014-10-03 15:58:17 -04:00
Pahimar
b41d4bf055 Just a whack of work, nothing to see here 2014-10-03 15:55:22 -04:00
Pahimar
731ec0fc77 Some WAILA work, some Glyph work 2014-10-02 00:16:47 -04:00
Pahimar
f1723c4289 More WAILA work - now to figure out what I want to show up per block :) 2014-09-30 23:48:42 -04:00
Pahimar
276632ecf3 Getting there 2014-09-26 16:06:12 -04:00
Pahimar
865c4c4d9a Missed this 2014-09-25 16:29:28 -04:00
Pahimar
21368b49f5 Work on Alchemy Arrays and getting symbols to render in the TE 2014-09-25 16:23:45 -04:00
Pahimar
745098665c Dear lord its been awhile since I've done rendering 2014-09-24 16:02:45 -04:00
Pahimar
7537165eec Got some new art from @BigBadChris! 2014-09-23 14:58:43 -04:00
Pahimar
83945f1102 Proper resolution to #726 2014-09-23 14:18:45 -04:00
Pahimar
017803b484 Hopefully will resolve #736 2014-09-23 11:51:48 -04:00
Pahimar
579897040a Work work work 2014-09-19 16:09:07 -04:00
Pahimar
8f5ea0a2b5 Work work work 2014-09-19 15:55:28 -04:00
Pahimar
48db29113b Rethought the ideas - alchemy arrays it is! 2014-09-18 22:38:14 -04:00
Pahimar
07fd936081 Getting ready for transmutation and alchemy squares 2014-09-16 22:58:54 -04:00
Pahimar
95d67e1f05 Working on dem trans squares :) 2014-09-16 15:36:11 -04:00
Pahimar
98706387f0 Sure, let's add another command - but this one just uses the item you are currently holding! :) 2014-09-16 15:28:14 -04:00
Pahimar
5066ec80f1 Made the sync threshold configurable (server admins can tune how long clients have to wait before they can sync their energy values with the server again) 2014-09-16 12:53:22 -04:00
Pahimar
b3efb75ef8 Add in a throttle for users syncing values while on a server to prevent massive amounts of network spam 2014-09-16 12:38:28 -04:00
Pahimar
a97fa3fb49 Now when a pre-assigned value is set via command line, the next time the server starts it will regen the values of everything and save the new values to disk (tl;dr - set a pre-assigned value via command and then restart server for the changes to take effect) 2014-09-16 12:08:16 -04:00
Pahimar
b36ea50c70 Reminder to myself in the morning 2014-09-15 23:01:37 -04:00
Pahimar
a2b134b23f More work on the set-value command 2014-09-15 16:06:28 -04:00
Pahimar
4b02b80d21 More command work 2014-09-15 16:06:20 -04:00
Pahimar
87ad5984c5 Added in support for reading in custom pre/post value assignments from json files. More coming documentation/command wise to support this 2014-09-12 16:11:18 -04:00
Pahimar
67c704870e More work on the set-value command 2014-09-11 16:13:39 -04:00
Pahimar
6b66ac8a4f Make adding new commands more extendable in the future 2014-09-10 15:59:33 -04:00
Pahimar
f39b047c0a Unfinished work, nothing to see here, got a baby to feed! 2014-09-09 22:52:46 -04:00
Pahimar
b5974a02b0 Fix a dumb decompilation artifact, I think. 2014-09-09 21:12:59 -04:00
Pahimar
740c60763f Some more work on commands. Not long now and set-energy-value will be working and admins can change values on the fly :) 2014-09-09 15:59:07 -04:00
Pahimar
2eb9e72399 Command stuff 2014-09-08 23:18:16 -04:00
Pahimar
89c94d71c4 Might fix #730 2014-09-04 21:12:22 -04:00
Pahimar
63d6c61007 Beginning work on a /ee3 command. Mostly testing pushing to the new Jenkins 2014-09-04 15:28:43 -04:00
Pahimar
73d67dd30d Only run the DynamicEnergyValueInitThread on the server side (prevents clients running it when connecting to a server because since the server sends the values there is no need to gen values on the client). Also fix some sided stuff in the serialization of values when clients connect to servers. 2014-09-04 15:15:16 -04:00
Pahimar
49dbe16757 Save EnergyValues to disk when the server stops 2014-09-04 14:55:06 -04:00
Pahimar
7244bdedf6 Servers now sync their EnergyValue mappings to clients when they join. This means clients don't have to change their configs when joining servers (different servers can have different values) 2014-09-04 11:30:22 -04:00
Pahimar
fe7afe15d4 Serialize computed EnergyValues to disk after the initial computation. If mods change, or the file is not found, the values are computed again. Should significantly improve start up times when many mods are present. Closes #724 2014-08-29 16:25:31 -04:00
Pahimar
e70eecb11f Trying to figure out search boxes and scroll bars. Holy hell Minecraft 2014-08-28 16:05:43 -04:00
Pahimar
9edf1409a3 Add a helper for creating a reliable MD5 hash from all mods found in the currently loaded instance 2014-08-25 16:00:51 -04:00
Pahimar
61558daa61 Fix an obscure DynEV bug where different items would be detected as the same item and not resolve properly 2014-08-25 12:43:20 -04:00
Pahimar
c8ae0b29d6 Now that the Research Station is working well, time to make a stab at transmutation 2014-08-01 16:04:11 -04:00
Pahimar
8a9eb91c2b No point in having subclasses of Slot when there are only some small changes being overridden, and they are only used once. 2014-07-31 15:53:58 -04:00
Pahimar
faa1e45997 Added a GUI to the Alchemical Tome (still a WIP), got the functionality of the Research Station working, and with the help of KingLemming we have a more intelligent shift click method for our containers 2014-07-31 15:38:23 -04:00
Pahimar
b49df1901f Make sure that the registry proxy classes in the API are final, and expose more API functionality to the skill registry proxy 2014-07-31 08:37:20 -04:00
Pahimar
f2eba38284 Some more new textures 2014-07-30 15:47:59 -04:00
Pahimar
3c6892cd90 Some more new textures 2014-07-30 15:44:37 -04:00
Pahimar
e6ff288551 @BigBadChris provided some shiny new animated textures for the different matters! 2014-07-30 15:41:34 -04:00
Pahimar
4372294d61 Added in some debug configuration for helping mods interacting with EE3 (more debug options to come as API matures) 2014-07-24 22:03:36 -04:00
Pahimar
ed2be79ec2 Some work on skills 2014-07-24 21:05:04 -04:00
Pahimar
0e69b7568e Some convenience methods 2014-07-24 16:07:34 -04:00
Pahimar
644f07dd20 Commmitting another whack of code 2014-07-24 16:01:42 -04:00
Pahimar
f764310622 Proof of concept that the new RecipeRegistry proxy stuff works properly. Will continue in the morning 2014-07-22 22:12:04 -04:00
Pahimar
84eb69e9d6 Reminder to self to get milk working in a later build (re: dyn values) 2014-07-22 19:26:53 -04:00
Pahimar
3bcf4663f2 Merge remote-tracking branch 'origin/master' 2014-07-22 15:56:44 -04:00
Pahimar
3de8b57202 Managed to get a tiny bit of work done at work today (yay lunch breaks!) 2014-07-22 15:56:39 -04:00
Semion Nadezhdin
70344a214b Fixed #713 2014-07-22 18:29:59 +04:00
Pahimar
82fb615521 Fix the derp caught here (2093c485a0 (commitcomment-7095985)) 2014-07-22 08:49:07 -04:00
Pahimar
18564da7d2 Fixed the Dynamic Value system 2014-07-21 21:43:04 -04:00
Pahimar
118228b828 Committing some stuff 2014-07-21 18:55:51 -04:00
Pahimar
5718da1aa9 Add some more stuff to the NBTHelper 2014-07-21 16:19:25 -04:00
Pahimar
e1c677d3d8 Some new textures from BigBadChris, got conditional player mod sounds working again (same as in older versions of EE3), and worked on a bit of tool functionality 2014-07-21 14:47:00 -04:00
Pahimar
f11b700704 Merge pull request #711 from Dynious/nullItemFix 
Fixes #705
 2014-07-21 11:28:37 -04:00
Dynious
ef46fda725 Fixed #705 2014-07-21 15:59:40 +02:00
Pahimar
ad8f6d5a3d Too distracted to code, so committing a whack of stuff 2014-07-20 21:32:23 -04:00
pahimar
8a0da1b572 Add in a template system for player transmutation knowledge 2014-07-19 18:15:40 -04:00
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