Commit graph

4561 commits

Author SHA1 Message Date
Ayutac
80ee73ddab
New recipes + 1 nerf. Thanks to Ayutac.
* Improved readability of GrinderRecipesProvider

* GrinderRecipesProvider: Sandstone recipes

* GrinderRecipesProvider: added Sandstone recipes

* fixed a generation bug

* nerfed green dye from plantball

* added armor stand extraction recipe

* added book extraction recipe

* added elytra extraction recipe

* added shulker shell extraction recipe
2022-03-27 16:19:24 +03:00
Simon
037851ba3d
Fix #2872 Converted Nickel Dust advancement to Nugget. Thanks to SimonFlapse. 2022-03-27 16:17:40 +03:00
Simon
c61398c950
Fix #2850 Fetching cooking time based on recipe. Thanks to SimonFlapse
* Added new method cookingTime(), replacing totalCookingTime
* Added GameTest for validating smelting times
2022-03-27 16:15:22 +03:00
Ayutac
d2c146b257
Fixed file ending to .json 2022-03-25 14:20:55 +01:00
Ayutac
eab74f9745
Fixed file ending to .json 2022-03-25 14:20:33 +01:00
Ayutac
ad9fb6ca28
Replaced crafting_table with c:workbench, thanks to Xanthian 2022-03-25 12:33:52 +01:00
Ayutac
dbd0cd72f4
Replace blockus:barrels with c:wooden_barrels, thanks to Xanthian 2022-03-25 12:29:59 +01:00
Technici4n
5eb8890d94
Cable optimization: use BlockApiCache to get adjacent BE. Thanks Technici4n 2022-03-25 10:38:58 +03:00
Ayutac
cfff12afd6
Made drain speed configurable for #2863. Thanks to Ayutac. 2022-03-25 10:28:14 +03:00
xanthian
3ad1e4237f
Delete src/main/resources/data/blockus/tags/items directory 2022-03-24 09:14:17 +00:00
xanthian
f1bb48ee57
Update auto_crafting_table.json 2022-03-23 18:22:19 +00:00
xanthian
36fd7b5368
Create workbench 2022-03-23 18:21:15 +00:00
xanthian
87eb6edf21
Create wooden_barrels 2022-03-23 18:18:38 +00:00
xanthian
bf0b9fc196
Update crude_storage_unit.json
removed blockus c: tag
2022-03-23 17:54:30 +00:00
AngelBottomless
7f415d3ec9
Cache Torus.generate result for Origin (#2845)
* Cache Torus.generate result for Origin

Fusion Coils are laggy, not by ticking block entities, just purely by torus.generate(BlockPos.origin, size)

* Assign TorusListCache

* use cached result
2022-03-05 14:17:16 +00:00
modmuss50
40f4785816 Fix possible server crash. 2022-03-04 16:07:37 +00:00
modmuss50
85757e7854 Remove autoswitch api as the API broke, and I cannot find a working latest version on jitpack or cursemaven. I can bring this back once fixed, right now this is breaking the build. 2022-03-04 16:06:41 +00:00
modmuss50
0a8e34d9c6 Add ClientNetworkManager 2022-03-02 14:39:30 +00:00
Ayutac
08ed4abcd4
Resin Basin updated. Thanks to Spearkiller and Ayutac. (#2777)
* Resin Basin updated. Thanks to Spearkiller and Ayutac.

Hitbox has been updated to half a block, better matching the model.
Item model has been updated by Spearkiller to look nice.
There was a weird inconsistency about the amount of sap given to player depending on either putting it into an inventory or breaking the block.

Right click to harvest basin didn't work as intended, so removed for now.

Also it seems the block states (full/pouring/pouringTime) are not saved via nbt?

Also also wow the warnings.

* Added removal of sap from basin when right -clicking.

The error was me not understanding that "setFullState" had nothing to do with the variable "isFull". My bad, my bad.

For some reason one right click triggers the onUse twice, and previously I didn't correctly update the sap after the first one, but now it should work. Testing went off without a hitch.
2022-03-02 14:33:27 +00:00
modmuss50
612657ecf4 Even more client/server cleanup. 2022-03-02 14:32:52 +00:00
modmuss50
9c390e40a5 Revert manual.png removal. 2022-03-02 14:22:26 +00:00
modmuss50
0296c59393 More client/server cleanup. 2022-03-02 14:20:34 +00:00
modmuss50
27cc9d0730 Refactor sendNoSpamMessage to use a packet, fixes a number of issues where no chat messsage was being received at all.
More work towards splitting client and server.
2022-03-02 01:50:38 +00:00
modmuss50
45c1e7412c Merge remote-tracking branch 'Ayutac/1.18-Ayutac-datagen-6' into 1.18
# Conflicts:
#	RebornCore/src/main/java/reborncore/common/misc/TagConvertible.java
#	src/datagen/groovy/techreborn/datagen/recipes/TechRebornRecipesProvider.groovy
#	src/datagen/groovy/techreborn/datagen/recipes/machine/compressor/CompressorRecipesProvider.groovy
#	src/main/java/techreborn/init/TRContent.java
2022-03-02 01:19:11 +00:00
modmuss50
7065f5efae Split GuiType into ClientGuiType to remove some horrid code. 2022-03-02 01:06:05 +00:00
xanthian
89e0c6b0cf
add c:workbench
to include compat for byg, betterx and other mods with added crafting tables
2022-03-01 12:35:29 +00:00
xanthian
e653d28a7d
add c:wooden_barrels to recipe
tested in dev working fine, 
betterx, blockus, eden ring, vanilla and other mods barrels all accepted as viable recipe
2022-03-01 12:11:34 +00:00
modmuss50
f7d5139332
Port to 1.18.2 (#2824)
* Port to 1.18.2-pre1

* 1.18.2-pre3

* Fix build.

* Fixes and cleanup

* Build fix?

* Update REI
2022-02-28 09:18:27 +00:00
Ayutac
e35e222fa6 Merge branch '1.18' into 1.18-Ayutac-datagen-6
# Conflicts:
#	src/main/java/techreborn/init/TRContent.java
#	src/main/resources/data/techreborn/recipes/compressor/chrome_plate.json
#	src/main/resources/data/techreborn/recipes/compressor/chrome_plate_from_block.json
#	src/main/resources/data/techreborn/recipes/grinder/chrome_dust.json
2022-02-26 12:14:11 +01:00
Tryank
4ce4d6c361
Use translation keys on RebornCore and CellItem. Thanks to Maz-T 2022-02-26 14:10:43 +03:00
Ayutac
b378f2dcb9
In-depth update of chrome->chromium, thanks to Ayutac, Xanthian
* In-depth update of chrome->chromium, thanks to Ayutac, Xanthian

This fixes Bug #2621 without accidentally destroying items (untested, but the chrome item registration isn't changed) and supersedes PR #2780 which only made language changes.

I just plainly copied the lang changes from Xanthian. As for the chrome stuff, I thought long and hard how to do it properly. Possible variants:
1. Change tag names in constructor for chrome only.
2. Change tag names in enum for chrome only.
3. Don't change the internal tag names of the enums, but change the tag registration process in datagen for chrome only.
4. Introduce CHROMIUM variant, add conversion recipes etc. and hope over time CHROME can be safely removed.

(4) always had the potential of item loss, so I discarded it first. Deciding between (1), (2) and (3) was harder. The drawback of (2) is code bloating by adding a lot of extra enum constructors, especially for cases which already had enum constructor options. But in the end I decided to go with it because it was the cleanest solution to a dirty problem. This is the first time I encountered a datagen drawback, because if we didn't register by running through the enum array, we could have simply changed it there; a possible (5) but still worse than (2).

* Whoops, forgot recipe changes with the tags

* Merged chromium with hardness/resistance

Replaced the isHot argument from constructors with default false while I was at it.
2022-02-26 14:03:23 +03:00
drcrazy
21515c8908 Check for ability to output from side. Closes #2822 2022-02-26 01:25:00 +03:00
drcrazy
0ece1d570c IndGrinder recipes for Iridium ore 2022-02-20 12:39:25 +03:00
ErrorSys
774f7709ef
Change Primary output to Raw Iridium. Thanks to ErrorSys.
Changes primary output to 2x raw iridium as other recipes that use mercury with this machine generally have a greater output than just with water.
Makes more sense to have the raw ore as the output from this machine instead of an ingot, which you would usually get from a furnace of some type.
2022-02-20 12:35:19 +03:00
AngelBottomless
1a4895e525
Fixes Invalid recipe lag by caching validity of recipe. Thanks to aria1th.
reduces 5mspt -> 0.01mspt
2022-02-20 12:26:07 +03:00
drcrazy
df8706381b Fix coolant cells recipe 2022-02-18 23:28:22 +03:00
Ayutac
92f98a5c56
Fixes #2783 (#2791). Thanks to Ayutac
* Fixes #2783 hopefully

Needs to be tested still. Goal: changed blasting to use half as much as time as regular furnace for same item.

* Fixed bug in commit thanks to ErrorSys

forgot that order of optional arguments is important and that int can be cast to float automatically
2022-02-18 13:57:01 +03:00
Ayutac
3b6e1d1d89
Removed empty line in crafting recipe. Thanks to Ayutac 2022-02-18 13:55:28 +03:00
ErrorSys
7b6c117f7a
Fixes deepslate ores having the same hardness values as their stone variants. They shouldn't be the same. Thanks to ErrorSys 2022-02-18 13:53:48 +03:00
Ayutac
805b5418db
Removed empty line from crafting recipe. Thanks to Ayutac. 2022-02-18 13:53:17 +03:00
Ayutac
eadd16c4be
Added 2 canning machine recipes for coolant cells. Thanks to Ayutac
Hopefully this can ease the construction of those.
2022-02-18 13:52:39 +03:00
Ayutac
07f8722d83
rebalanced tank capacities. Thanks to Ayutac.
I increased the capacity of tanks to be even remotely considered an alternative to storage units with cells. I kept the values conservative since increasing is always an option, but decreasing might cause item loss.

Changes:
Basic Tank: 35 -> 128 (about 3.5 times)
Advanced Tank: 200 -> 512 (about 2.5 times)
Industrial Tank: 500 -> 1024 (about 2 times)

I oriented myself at the storage unit steps, which are quadrupled with each tier until advanced, then doubled to industrial.

While I was at it, I changed everything to powers of 2 with the shift operator (so other code readers aren't too confused about seemingly arbitrary values) and added explaining comments.
2022-02-18 13:49:39 +03:00
ErrorSys
19b44c200a
Added properties for individual metal blocks for hardness. Thanks to ErrorSys.
Added properties for individual machine casings so that they are easier to break with a pickaxe.
2022-02-18 13:47:10 +03:00
Ayutac
8888f1d698 Corrected Toast icons for blast furnace and assembling machine
Just like in last commit, assembling machine one is a bit hacky (we add dummy classes), but better than putting an if into RebornRecipe and faster+safer than correcting the differences between assembly_machine and assembling_machine in the code.
2022-02-11 22:08:26 +01:00
Ayutac
d200f931f3 Corrected Toast icons for fusion computer and centrifuge
Centrifuge one is a bit hacky (we add dummy classes), but better than putting an if into RebornRecipe and faster+safer than correcting the differences between centrifuge and industrial_centrifuge in the code.
2022-02-11 21:40:39 +01:00
Ayutac
3101b9a5b6 Forgot toast for rubber planks 2022-02-11 21:25:58 +01:00
Ayutac
922880bf64 Toast-related bug fixes. 2022-02-11 21:00:25 +01:00
Ayutac
4d78b616d5 Added some toasts for rolling machine
not for the vanilla items, those are probably cursed or something
2022-02-11 18:37:41 +01:00
Ayutac
04290d2182 Added toasts for fusion reactor 2022-02-11 18:32:26 +01:00
Ayutac
8a4e0397f4 Added missing fluid recipes to centrifuge 2022-02-11 18:26:58 +01:00
Ayutac
0e18f11dea Corrected recipe name 2022-02-11 18:26:39 +01:00
Ayutac
7d9b82c5e2 Added toasts for dist. tower, s.c.m. and wire mill 2022-02-11 18:19:15 +01:00
Ayutac
6cf95524aa Added toasts for silicon plate in blast furnace 2022-02-11 18:10:12 +01:00
Ayutac
f5e3b8ea91 Added centrifuge recipe advancements. Centrifuge doesn't have correct symbol displayed in toast
Excluding calciumcarbonate_cell, deuterium_cell, helium_cell, hydrogen_cell, lava_cell, sulfur_cell
2022-02-11 18:07:20 +01:00
Ayutac
5c8d405a25 Added toasts for fluids in chem. reactor 2022-02-11 18:05:05 +01:00
Ayutac
5f48f56615 Added toasts for helium via vacuum_freezer 2022-02-11 17:49:06 +01:00
Ayutac
26d35a8981 Added toasts for crafting_table/unit/tank 2022-02-11 17:44:02 +01:00
Ayutac
a6c04dc6a2 Added toasts for crafting_table/unit/storage 2022-02-11 17:38:17 +01:00
Ayutac
559f32200e Added non-datagen toasts for crafting_table/storage_block 2022-02-11 17:28:18 +01:00
Ayutac
1b578c096c Added some non-datagen toasts for crafting_table/ingot
Iridium Alloy and the two easy versions of mixed metal ingot. I don't want to do all mixed metal manually D:
2022-02-11 17:21:17 +01:00
Ayutac
c3b928eb04 Added non-datagen toasts for crafting_table/dust 2022-02-11 17:14:31 +01:00
Ayutac
33a3b5213f Added toasts for crafting_table/armor 2022-02-11 17:08:20 +01:00
Ayutac
3db7afef40 Added toasts for crafting_table/battery 2022-02-11 16:55:35 +01:00
Ayutac
97177000b0 Added toasts for crafting_table/misc_block 2022-02-11 15:02:07 +01:00
Ayutac
cea01d6075 Added toasts for crafting_table/parts 2022-02-11 14:33:49 +01:00
Ayutac
ee17fe58d8 Added ind sawmill datagen 2022-02-10 20:21:07 +01:00
Ayutac
c928c2b790 Added simple ind grinder toasts
simple means if there are recipes for something with water/mercury/sodiumpersulfate only the first occurring one is made a toast for.
2022-02-10 15:58:46 +01:00
Ayutac
02b3f30aa1 Added non-datagen grinder toasts 2022-02-10 11:23:23 +01:00
Ayutac
4bc6841eae Gave datagen/content a marker to be filtered out if not needed 2022-02-10 10:58:38 +01:00
Ayutac
d0482c1ffd Corrected grinder recipe name 2022-02-10 09:32:11 +01:00
Ayutac
009fff88e5 Simplified calcite related recipes 2022-02-10 09:04:35 +01:00
Ayutac
16a9b84ac7 Corrected recipe name 2022-02-10 08:56:52 +01:00
Ayutac
c2fa34c92b Added toast for new vacuum freezer recipe 2022-02-10 08:50:28 +01:00
Ayutac
1017ea672c Added non-datagen compressor toasts 2022-02-10 08:48:49 +01:00
Ayutac
97005e318c renamed 2 compressor recipes to fit rest 2022-02-10 08:35:44 +01:00
Ayutac
df2fb48c86 forgot to delete a duplicate 2022-02-10 08:21:12 +01:00
Ayutac
145ba48e27 Put the default toast additions into a proper place. 2022-02-10 08:10:56 +01:00
xanthian
b4adfd652c Update tungsten_ingot.json
correct tag to prevent being unlocked erroneously
2022-02-09 21:12:00 +01:00
Ayutac
4bbace58bc Added byg compatibility recipe advancements 2022-02-09 20:49:26 +01:00
Ayutac
290dde38de Some bug fixes to the new toasts 2022-02-09 20:47:40 +01:00
Ayutac
5a03882e9b Added Industrial Blast Furnace recipe advancements
Excluding getting Silicon Plate recipe by silicon fluid.
2022-02-09 20:47:12 +01:00
Ayutac
1a8253c6ed Added Assembly Machine Smelter recipe advancements
Excluding getting Lithium Ion Battery recipe by lithium fluid. Assembly Machine doesn't has correct symbol displayed in toast because of inconsistency in assembly/assembling.
2022-02-09 20:45:08 +01:00
Ayutac
b9ec2e36af Added Alloy Smelter recipe advancements 2022-02-09 20:45:04 +01:00
Ayutac
52c9802f4d Added Vacuum Freezer Recipe toasts w/o Helium Plasma 2022-02-09 20:44:40 +01:00
Ayutac
145427db0b Added Implosion Compressor Recipe toasts w/o alt
alt being End Crystal instead of TNT, which doesn't really change the toast
2022-02-09 20:44:35 +01:00
Ayutac
1b83168ca2 Added Extractor Recipe toasts w/o empty cell 2022-02-09 20:44:28 +01:00
Ayutac
560d0b102f Added Chemical Reactor Recipe toasts w/o fluids 2022-02-09 20:44:20 +01:00
Ayutac
2928d8a713 Added toasts for crafting recipes not in subfolders 2022-02-09 20:43:52 +01:00
Ayutac
954afe21a5 Improved the industrial_electrolyzer toasts 2022-02-09 20:43:36 +01:00
Ayutac
c874fde92d Added toasts for industrial_electrolyzer thanks to Xanthian 2022-02-09 20:43:29 +01:00
Ayutac
572f0b0e65 Added toasts for crafting_table/tool 2022-02-09 20:42:21 +01:00
Ayutac
1c1ed7c3eb Added toasts for crafting_table/upgrade 2022-02-09 20:35:26 +01:00
Ayutac
9a2dfd746e Added toasts for crafting_table/solar_panel 2022-02-09 20:35:17 +01:00
Ayutac
580a8b54f1 Added toasts for crafting_table/cable 2022-02-09 20:35:10 +01:00
Ayutac
f4d75ef59b Added toasts for crafting_table/machine_block 2022-02-09 20:34:57 +01:00
Ayutac
3f26e24184 Changed drain toast according to new recipe. 2022-02-09 20:33:52 +01:00
Ayutac
672e3134e8 Added toasts for crafting_table/machine 2022-02-09 20:32:33 +01:00
Ayutac
19f657a0d6 Merge branch '1.18' into 1.18-Ayutac-datagen-6 2022-02-09 20:30:43 +01:00
Ayutac
6fa922c022 Added toast generation for datagen'd recipes 2022-02-09 20:29:50 +01:00
Ayutac
a097f9eae1 Fixed Blast Furnace data gen. 2022-02-09 13:44:06 +01:00