Commit graph

2070 commits

Author SHA1 Message Date
Ell
35a2a97e00 some master->main related fixes 2020-11-07 14:32:06 +01:00
Michael Hillcox
3e61998ca8
Utils porting 2020-10-31 21:31:04 +00:00
Michael Hillcox
24fb9a26e0
I think that's mostly right 2020-10-31 21:04:39 +00:00
Michael Hillcox
9916db2991
WorldUtils mostly ported 2020-10-31 21:01:43 +00:00
Michael Hillcox
42affe942f
Fixing base classes 2020-10-31 20:42:32 +00:00
Michael Hillcox
4eee99c75b
Merge remote-tracking branch 'origin/master' 2020-10-31 19:47:38 +00:00
Michael Hillcox
4d5cc7aa58
More porting of blocks 2020-10-31 19:47:04 +00:00
canitzp
fb62b86632
I knew I forgot something
Signed-off-by: canitzp <canitzp@gmail.com>
2020-10-07 08:28:30 +02:00
canitzp
2c07ef0fa0
Start to work on DataGenerator. Crusher Recipes should now be able to be serialized to json by its Factory. In general the serializing to json is handled by the RecipeFactoryBase class.
Removed some Recipes after the decision to not port it or change it to loot tables in favor of recipes.
A lot more @Nonnull annotations.

Signed-off-by: canitzp <canitzp@gmail.com>
2020-10-07 08:25:54 +02:00
canitzp
395b6d0491
Recipe Factory changes
Signed-off-by: canitzp <canitzp@gmail.com>
2020-10-06 12:10:09 +02:00
canitzp
35ff26221a
Added CrusherRecipe and Factory
Signed-off-by: canitzp <canitzp@gmail.com>
2020-10-06 09:04:43 +02:00
canitzp
d0363ed81c
Deleted deprecated recipe classes
Signed-off-by: canitzp <canitzp@gmail.com>
2020-10-06 09:01:56 +02:00
canitzp
5db1f3fbcd Deprecate old recipe classes 2020-09-25 09:02:16 +02:00
canitzp
8b22fcfa6b Compost Recipe Factory 2020-09-25 09:00:03 +02:00
canitzp
2c57a7641a Ball of Fur Recipe Factory 2020-09-25 08:30:38 +02:00
Michael Hillcox
26b021a5e9
Lots of compound fixes 2020-09-21 18:59:08 +01:00
Michael Hillcox
497b742b87
Ported most of SmilyCloud 2020-09-20 11:26:01 +01:00
Michael Hillcox
c945843038
Moved Recipes to the common package... 2020-09-20 11:15:04 +01:00
canitzp
615bde1cb8 Added CoffeeMachineIngredient and CoffeeMachineIngredientFactory 2020-09-18 07:56:55 +02:00
canitzp
829cc788c7 Starting to add RecipeFactories and Recipe Handlers. Atomic Reconstructor implemented as ItemStack/Ingredient and BlockState version 2020-09-16 11:48:12 +02:00
Michael
2ae9ed307e
More block porting work :D 2020-09-09 17:16:41 +01:00
Michael
f44c4de74a
Sorted of fixed FastBench compat 2020-09-09 16:57:31 +01:00
Michael
9dbbb7b913
BioReactor, BlockBreaker porting 2020-09-09 16:47:51 +01:00
Michael
b51722e181
Extended Baseblock for BlockItems, auto register blockItems 2020-09-09 16:32:40 +01:00
Michael
9d8e711d35
Made Baseblock abstract, removed rarity and blockItem handlers for now
This might come back but I don't know how we're going to handle block item handling yet
2020-09-09 16:18:09 +01:00
Michael
69df7e0e81
Main class work and nulled out the RegistryHandler 2020-09-09 16:10:55 +01:00
Michael
47f11f0287
Continued Refactors... 2020-09-09 15:49:01 +01:00
Michael
be421af8e2
Big Refactor of the package layout
Ignore this commit for diffs
2020-09-09 15:48:43 +01:00
Michael
4c439f5b56
Merge remote-tracking branch 'origin/master' 2020-09-09 15:34:40 +01:00
Michael
78b9055eae
Hud display port and nulled out creativeTab 2020-09-09 15:33:43 +01:00
canitzp
fb1663f106 Reimplemented Atomic Deconstructor, Battery Box and Bio Reactor Blocks 2020-09-09 10:58:32 +02:00
canitzp
a5c031c135 Undeprecated BlockBase and BlockItemBase; reimplemented crystal cluster blocks (loot tables missing) 2020-09-09 09:58:55 +02:00
Michael
6139ca68fa
InitBlocks no longer has errors and all blocks contructors are now correct 2020-09-08 15:41:52 +01:00
Michael
6e0fb39544
Fixing Registry contructors on blocks and slowly migrating block contructors 2020-09-07 23:46:45 +01:00
Michael
0b964b4c89
Ported the block registry to Deferred Registry 2020-09-07 20:17:53 +01:00
Michael
99b7e0bf43
Render package ported 2020-09-07 19:33:27 +01:00
Michael
aa015521bc
Bumped mappings, deprecated some base classes (for now), ported remaining 2020-09-07 18:43:02 +01:00
Michael
40d27de0f5
Mass removed all license headers 2020-09-07 15:29:31 +01:00
Michael
d04ba602d8
Ported the api package. All minor changes 2020-09-07 15:24:04 +01:00
Brennan Ward
158fe22c8e Closes #1275 2019-08-29 18:51:29 -04:00
Brennan Ward
5a013dba79 Closes #1274 2019-08-29 18:48:02 -04:00
Brennan Ward
f12e83a4d0 Closes #1278 2019-08-29 18:44:13 -04:00
Shadows_of_Fire
a296419857 Closes #1269 again™️ 2019-07-25 19:11:49 -04:00
Shadows_of_Fire
4d97a943fa Closes #1266 2019-07-09 01:38:24 -04:00
Shadows_of_Fire
132b71f4a1 Closes #1269 2019-07-08 22:51:10 -04:00
Shadows_of_Fire
a0ae761660 Closes #1268 2019-07-08 22:51:05 -04:00
Shadows_of_Fire
29011db610 add a forge dep 2019-05-18 14:40:53 -04:00
Shadows_of_Fire
0b0530abaa Closes #1255 2019-05-18 14:16:27 -04:00
Shadows_of_Fire
9e2cfa2770 remove UTF8 BOM that was here somehow 2019-05-02 04:47:21 -04:00
Shadows_of_Fire
ded3877b41 rerun the formatter 2019-05-02 04:43:27 -04:00