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 |
|
pahimar
|
224f347878
|
Allow Alchemical Upgrades to stack up to 64
|
2014-03-27 10:52:43 -04:00 |
|
pahimar
|
c51a9aa415
|
Potentially fixes #660
|
2014-03-27 10:51:35 -04:00 |
|
pahimar
|
ef2de23f54
|
Add some Aludel recipes to upgrade Ash into different dusts, based on other dusts
|
2014-03-27 09:46:07 -04:00 |
|
pahimar
|
94c808668b
|
Merge pull request #653 from Dynious/chestUpgrades
Added in-world upgrades for alchemical chests
|
2014-03-27 09:45:59 -04:00 |
|
pahimar
|
49db646cb4
|
Update localizations to reflect that bags work
|
2014-03-26 21:40:22 -04:00 |
|
pahimar
|
b8d6a9fb45
|
You can not store bags inside of bags!
|
2014-03-26 21:26:46 -04:00 |
|
pahimar
|
d4631222e5
|
Bags appear to work!
|
2014-03-26 21:24:43 -04:00 |
|
pahimar
|
31aff45a72
|
Getting close with bags!
|
2014-03-26 21:01:54 -04:00 |
|
pahimar
|
c3dd664629
|
Some more work on alchemical bag inventories
|
2014-03-25 21:59:36 -04:00 |
|
pahimar
|
5a6279eae9
|
Disable the blockl highlight handler for the transmutation stones until the transmutation system is in place
|
2014-03-22 17:29:53 -04:00 |
|
Dynious
|
048efd856e
|
Updated Alchemical Upgrade texture
|
2014-03-17 20:32:28 +01:00 |
|
Dynious
|
cb384d3128
|
Added in-world upgrades of alchemical chests
|
2014-03-15 12:23:29 +01:00 |
|
pahimar
|
f3f9032715
|
ItemStacks that are damaged now have their EmcValue calculated properly from the undamaged one
|
2014-03-14 21:07:39 -04:00 |
|
pahimar
|
ce822d0ebb
|
Make it so you can "upgrade" existing Chests/Alchemical Chests with the Aludel
|
2014-03-11 21:09:52 -04:00 |
|
pahimar
|
a7946fd8e6
|
Make it so you can "upgrade" existing Chests/Alchemical Chests with the Aludel
|
2014-03-11 20:22:19 -04:00 |
|
pahimar
|
f5d2e4dbd0
|
Bit more work on the bag inventory, should be done tomorrow
|
2014-03-02 22:13:03 -05:00 |
|
pahimar
|
0980cf9101
|
Some divide by 0 protection in TileCalcinator
|
2014-03-02 13:12:50 -05:00 |
|
pahimar
|
3332bc75fd
|
Prelim work on getting the bag inventories working
|
2014-02-24 22:13:56 -05:00 |
|
Dynious
|
3a71863dae
|
Optimized getEmcValue and hasEmcValue
|
2014-02-24 16:27:44 +01:00 |
|
Dynious
|
42eb7336d6
|
Better handling of null WrappedStack input in RecipeMapping.
|
2014-02-14 14:06:23 +01:00 |
|
pahimar
|
e07435ebca
|
ISidedInventory support for the Aludel (similiar to @ganymedes01's PR https://github.com/pahimar/Equivalent-Exchange-3/pull/611)
|
2014-02-12 22:11:19 -05:00 |
|
pahimar
|
2638d355bf
|
ISidedInventory support for the Calcinator (similiar to @ganymedes01's PR https://github.com/pahimar/Equivalent-Exchange-3/pull/611)
|
2014-02-12 20:49:34 -05:00 |
|
pahimar
|
566ef37060
|
Break out single item stack sizes from stack sizes > 1
|
2014-02-12 19:11:28 -05:00 |
|
pahimar
|
96e88d40d5
|
Fixes #632
|
2014-02-12 19:08:48 -05:00 |
|
pahimar
|
6cf9c0c20b
|
Fixes #632
|
2014-02-12 18:47:56 -05:00 |
|
pahimar
|
933d5eb1b3
|
Merge pull request #635 from Dynious/CalcinatorSuck
Added sucking in items ontop of calcinator.
|
2014-02-12 18:40:32 -05:00 |
|
pahimar
|
8050ddadda
|
Merge pull request #621 from monster860/master
Fixed placing glass bell on aludel in creative mode removing the item. Also, fixed glass bell rendering sideways for one tick when being placed.
|
2014-02-12 18:38:16 -05:00 |
|
Dynious
|
3eac68ad53
|
Added sucking in items ontop of calcinator.
|
2014-02-11 22:12:55 +01:00 |
|
Dynious
|
bd09f3e808
|
Fixed #626 with stack sizes > 1
|
2014-02-11 20:15:14 +01:00 |
|
Dynious
|
af8b2c32d8
|
Fixes #626
|
2014-02-11 19:21:49 +01:00 |
|
pahimar
|
c6b6b1f301
|
Add in missing IInventory method
|
2014-02-10 20:20:55 -05:00 |
|
pahimar
|
c7054f92d1
|
Fix Alchemical Chest/Bag gui texture paths
|
2014-02-10 20:20:36 -05:00 |
|
pahimar
|
9f8f286c67
|
https://github.com/pahimar/Equivalent-Exchange-3/issues/599
|
2014-02-10 20:14:13 -05:00 |
|
pahimar
|
09b07b460e
|
Prevent Alchemical Bag GUI from being opened while it's inventory is being finished up
|
2014-02-10 20:12:09 -05:00 |
|
pahimar
|
683cde92fb
|
Fixes #625
|
2014-02-10 20:10:31 -05:00 |
|
pahimar
|
96b6e1d1e4
|
Merge remote-tracking branch 'origin/master'
Conflicts:
src/main/resources/assets/ee3/textures/gui/alchemicalStorage_large.png
src/main/resources/assets/ee3/textures/gui/alchemicalStorage_medium.png
src/main/resources/assets/ee3/textures/gui/alchemicalStorage_small.png
|
2014-02-10 20:03:18 -05:00 |
|
pahimar
|
ffc5a204f1
|
Updating some broken bag code
|
2014-02-10 20:02:38 -05:00 |
|
monster860
|
2feca6ac13
|
Fixed placing bell on aludel in creative mode removes item.
|
2014-02-05 18:33:48 -05:00 |
|
pahimar
|
8f32e2380d
|
Merge pull request #620 from Dynious/aludelfix
Fixes Aludel problem of #618
|
2014-02-05 15:16:33 -05:00 |
|
Dynious
|
3601074945
|
Fixes Aludel problem of #618
|
2014-02-05 20:49:08 +01:00 |
|
pahimar
|
10378cfaec
|
Fixes the missed texture renames (for the alchemical chest guis)
|
2014-02-05 14:37:45 -05:00 |
|
pahimar
|
75f12767d9
|
Fixes #617 and #618
|
2014-02-05 14:20:42 -05:00 |
|
pahimar
|
a3b0758b9f
|
Cleaning up some old TODOs that I've finished
|
2014-02-01 22:01:57 -05:00 |
|
pahimar
|
4c57687968
|
Some recipes for the bags. THEY DO NOT HAVE WORKING INVENTORIES YET!!! Don't cry to me if they don't meet your expectations
|
2014-02-01 21:58:49 -05:00 |
|
pahimar
|
ab288a587d
|
Added subtypes to Alchemical Bags, played with the texture a bit to visually distinguish the different types better (omg texture artists please help me)
|
2014-02-01 21:23:47 -05:00 |
|
pahimar
|
78d876e78b
|
Infused wood logs are now "rotatable"
|
2014-02-01 18:40:16 -05:00 |
|
pahimar
|
3e2a9e3883
|
Updated how the Glass Bell renders its inventory in the TESR
|
2014-02-01 15:22:39 -05:00 |
|
pahimar
|
1e67db9399
|
Fix up how the Aludel sends/receives data on how to display the output stack contents in world in its TESR
|
2014-02-01 13:38:08 -05:00 |
|
pahimar
|
7d46311003
|
Update Aludel to render the contents of the output slot (and not the input slot)
|
2014-02-01 12:40:22 -05:00 |
|
pahimar
|
e8b63a28d6
|
RecipeAludel now supports OreDictionary input stacks. Also, added grouping (non-localized) to the EMC tooltip
|
2014-02-01 12:02:30 -05:00 |
|
pahimar
|
75dd447044
|
Added RecipesAludel support to RecipeRegistry, so that items can have their values assigned via DynEmc
|
2014-02-01 11:01:56 -05:00 |
|
pahimar
|
748f6ca593
|
Merge pull request #612 from Dynious/AludelRecipeFix
Fixes Aludel consuming wrong amount of items
|
2014-02-01 07:51:07 -08:00 |
|
RedmenNL
|
abd00dc200
|
Fixes Aludel consuming wrong amount of items
|
2014-02-01 15:10:19 +01:00 |
|
pahimar
|
bb5e20cd13
|
Bit of work on some stuff, super generic as always
|
2014-01-31 21:54:41 -05:00 |
|
pahimar
|
7a2c0c79c3
|
Merge pull request #608 from SpartaMercenary/master
Tidied up the log and debug methods in LogHelper
|
2014-01-31 18:22:37 -08:00 |
|
pahimar
|
076d17de2c
|
Merge pull request #610 from Dynious/ParticleFix
Fixes Aludel fire particle placing
|
2014-01-31 18:21:01 -08:00 |
|
pahimar
|
771e95c756
|
Can shift click items with fuel values into the Input slot of the Aludel
|
2014-01-31 13:18:15 -05:00 |
|
RedmenNL
|
09a36126b0
|
Fixes Aludel fire particle placing
|
2014-01-31 15:26:52 +01:00 |
|
pahimar
|
810232cfe0
|
Fixes #609
|
2014-01-30 22:05:46 -05:00 |
|
pahimar
|
ca6b8cd560
|
Yay Aludel :)
|
2014-01-30 22:03:11 -05:00 |
|
Brian
|
70f6782788
|
Tidied up the log and debug methods in LogHelper
Changed the manual null check and String conversion in LogHelper to the static String.valueOf() method, which automatically performs a null check and handles it appropriately. See [String.valueOf(Object)](http://docs.oracle.com/javase/7/docs/api/java/lang/String.html#valueOf(java.lang.Object\))
|
2014-01-26 18:56:22 -05:00 |
|
pahimar
|
490c9342ba
|
Merge pull request #596 from ganymedes01/master
A simple way to assign EMC values
|
2014-01-24 07:28:55 -08:00 |
|
pahimar
|
6301083b36
|
Merge pull request #603 from Dynious/NBTFix
Fixed NBTTagged Itemstack crashing GSON (de)serialization
|
2014-01-24 07:27:07 -08:00 |
|
pahimar
|
b8437deee4
|
Merge pull request #604 from Dynious/RecipeAludel
Finished matches method in RecipeAludel
|
2014-01-24 07:26:45 -08:00 |
|
RedmenNL
|
d3e6332d48
|
Fixed OreStack EMC values not being looked up properly
|
2014-01-24 11:39:11 +01:00 |
|
RedmenNL
|
c43c341412
|
Finished matches method in RecipeAludel
|
2014-01-23 20:28:13 +01:00 |
|
RedmenNL
|
048204c145
|
Fixed NBTTagged Itemstack crashing GSON (de)serialization
|
2014-01-23 19:16:26 +01:00 |
|
pahimar
|
eed4a7bdaa
|
Work on getting the Aludel working - to be continued on my desktop
|
2014-01-19 11:18:16 -05:00 |
|
ganymedes01
|
ce2e33996d
|
Update InterModCommsHandler.java
|
2014-01-17 15:17:42 +00:00 |
|
ganymedes01
|
b19b667bae
|
Update InterModCommsOperations.java
|
2014-01-17 15:17:23 +00:00 |
|
pahimar
|
baf7d501a4
|
Fixes #592. Can't even remember why that was there in the first place
|
2014-01-16 16:51:15 -05:00 |
|
pahimar
|
71b9d9a184
|
Optimize some code, and fix up dust stack rendering (colour) once and for all
|
2014-01-16 11:21:28 -05:00 |
|
pahimar
|
20b23ee923
|
More work on getting the dusts rendering properly (using @psxlover's suggestion)
|
2014-01-13 14:47:39 -05:00 |
|
pahimar
|
4381b89b9f
|
Merge pull request #574 from SoldierW518/patch-1
Update ConfigurationSettings.java
|
2014-01-13 06:18:18 -08:00 |
|
pahimar
|
eac7f32e2b
|
In light of now knowing the blockEvent data payloads are limited to a byte in size, changed up the network communication for dust updates
|
2014-01-12 22:14:24 -05:00 |
|
SoldierW518
|
1a03cb8c45
|
Update ConfigurationSettings.java
That should say mob not block.
|
2014-01-12 15:38:44 -05:00 |
|
pahimar
|
025bb567fb
|
Noting the bug in the coden
|
2014-01-12 13:54:12 -05:00 |
|
pahimar
|
d81d5594e2
|
Fixing a sided error, but also discovering a dust stack colour bug in SMP
|
2014-01-12 13:52:52 -05:00 |
|
pahimar
|
58bd0a1dca
|
Just cleaning up some stuff
|
2014-01-12 12:42:41 -05:00 |
|
pahimar
|
f16ff69042
|
Fixes #570
|
2014-01-12 12:40:30 -05:00 |
|