Commit graph

1171 commits

Author SHA1 Message Date
pahimar
9a482adcff Changes to RecipeHelper to solve the case where recipes have individual item stacks with a stack size > 1, and a general method to ensure items without recipes (but that are accessibly via the vanilla Items list) are added to the recipe registry as having no recipe 2013-07-03 16:13:38 -04:00
pahimar
1591f537c3 Organizing imports, cleaning up formatting, and lots of work on recipe registry in prep for building the new DynEMC graph structure 2013-07-03 14:36:35 -04:00
pahimar
fa838f34bc Bit more DynEMC work (busy day today). More to do on the vanilla side of things tonight. 2013-07-02 15:41:40 -04:00
pahimar
bdb138cf17 Vanilla smelting "recipes" now also provide output that can be consumed by the DynEMC system 2013-06-28 15:27:21 -04:00
pahimar
71a2fe3864 Remove references to EE3's logger and use it's own logger for WeightedDirectedGraph (more mod agnostic now) 2013-06-28 11:21:44 -04:00
pahimar
2d95d550a4 Took care of the case of the mundane splash potions 2013-06-28 11:07:13 -04:00
pahimar
edb489bdd4 Yay, adding the potion recipes to my recipe registry seem to work. That ought to reduce my critical node count 2013-06-27 22:35:42 -04:00
pahimar
fa8a51acc2 Oh yay, splash potions can be brewed together too. That's fun. Oh, happy birthday commit for me :D 2013-06-27 22:14:59 -04:00
pahimar
bb5d46d36b More work on potion recipes 2013-06-27 16:01:32 -04:00
pahimar
5d580a5156 More potion recipe work 2013-06-24 22:22:19 -04:00
pahimar
b56edebe9a Some work on how to determine brewing relationships 2013-06-24 00:04:43 -04:00
pahimar
a42a52971f More work on more intelligent recipe input collation (and swapping of wild card metas). More work still to be done 2013-06-23 23:48:49 -04:00
pahimar
5f7ea23a4f Blargh 2013-06-21 13:04:55 -04:00
pahimar
9ac6722860 Some more work on DynEMC 2013-06-18 22:20:50 -04:00
pahimar
87f1108632 Simplify the custom wrapped stack wrapper, and workon a RecipeManager 2013-06-12 16:01:45 -04:00
pahimar
976df1d39b Hacky hacky hack hack fix for decrementing a container itemstack before getting the results of using the container item stack. Will only hold until we move to the new transmutation system. 2013-06-11 15:33:19 -04:00
pahimar
c8b4c4e642 Renaming some stuff, adding more functionality to the LogHelper, and ItemStack wild card detection for the vanilla Crafting Manager 2013-06-11 14:11:56 -04:00
pahimar
a5209fab99 Merge pull request #375 from Hanse00/patch-1
Fixed left / right error
2013-06-10 09:37:34 -07:00
pahimar
00df5d294a Merge pull request #369 from pwnedary/master
32x shardMinium texture
2013-06-10 09:37:19 -07:00
pahimar
9bca6ef589 Merge pull request #377 from aysorth/master
pl_PL.xml update
2013-06-10 09:36:00 -07:00
Mateusz Micał
4eaeaed18c consistency fix 2013-06-10 10:37:58 +02:00
pahimar
81e594dec3 Getting started with an IMC system 2013-06-07 15:57:31 -04:00
Mateusz Micał
991ac45aa7 Polish translation updated
Stylistic changes and new translations made based on en_US.
2013-06-05 18:30:57 +02:00
Philip Hansen
de9b65e6f6 Updated latest official version to pre1h 2013-06-05 00:25:56 +03:00
Philip Hansen
0990c4ef24 Update README.md 2013-06-04 21:07:13 +03:00
pahimar
27fab71f64 Some more DynEMC work - lots still to do! 2013-06-03 13:06:13 -04:00
pahimar
e2b9869c0e More DynEMC work 2013-06-02 22:11:11 -04:00
pahimar
b5c1aa2ad0 Removed a dead constant, and more work on edge problem resolution 2013-06-02 17:23:30 -04:00
pahimar
e3079cbfef Fixed a derp in my edgesTo implementation 2013-06-01 22:17:13 -04:00
pahimar
d8e80366e1 Fix edge weights not getting assigned properly, still some edge exceptions to handle in the graph construction 2013-06-01 21:49:21 -04:00
pahimar
0c35d8cf24 Still a small bug (not the error), but yeah, getting there 2013-05-31 21:04:36 -04:00
pahimar
16b632acfb Now the fun and painful part - building the relational graph. LOTS of work to do here, expect many things being changed in the near future 2013-05-31 15:47:56 -04:00
pahimar
7877ef2781 And missed that we changed the weight of an edge to float from int 2013-05-30 15:43:58 -04:00
pahimar
603a88bb1c Forgot to check to make sure that a weighted directed edge doesn't already exist between two nodes when attempting to add an edge 2013-05-30 15:42:41 -04:00
pahimar
6c8d0449ab I think the removes are all handled now, now we might finally get to play with this thing (the WDAG that is) 2013-05-30 15:41:00 -04:00
pahimar
6d57b7c426 More incomplete work 2013-05-30 07:43:53 -04:00
pahimar
3b521de823 Need removeEdge and equals, and documentation, and testing, but looking good 2013-05-29 16:19:07 -04:00
pahimar
376b37d4bf Underped my generics 2013-05-29 15:03:49 -04:00
pahimar
12e80773ed Again, for more review 2013-05-29 14:00:06 -04:00
pahimar
4bd9ae52f2 Commiting for a review 2013-05-29 13:42:44 -04:00
pahimar
28d7216096 Some graph work before I had to go out, will continue later today 2013-05-29 06:45:30 -04:00
pahimar
13b43a3d29 Merge pull request #370 from MrTJP/patch-1
Huh, I pushed a fix for this earlier but apparently it didn't take. I'll merge this one in.

Rename EMCBlackList.java to EmcBlackList.java
2013-05-27 09:32:19 -07:00
MrTJP
70a63e8ad2 Rename EMCBlackList.java to EmcBlackList.java
Wrong file name. Class was declared EmcBlackList
2013-05-27 13:06:55 -03:00
pahimar
67fcd20e21 Finally fixed the transmutation stone crafting recipe bug, careof https://github.com/cpw. 2013-05-27 11:34:19 -04:00
pwnedary
29d94ecea3 32x shardMinium texture 2013-05-27 14:47:09 +02:00
pahimar
6749a3a68e Population of Equivalency Groups from the OreDicitonary 2013-05-26 23:55:12 -04:00
pahimar
8db11a7c8c Restructuring how EMC stuffs are stored 2013-05-26 23:02:24 -04:00
pahimar
4acc41c2c8 Tidying 2013-05-26 20:09:29 -04:00
pahimar
163083bc89 Some work on a blacklist to prevent items from receiving EMC values 2013-05-26 18:37:08 -04:00
pahimar
521982bed9 Some work on a simple itemstack wrapper 2013-05-23 16:07:07 -04:00