Commit graph

5438 commits

Author SHA1 Message Date
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
61c1cd7744 5.2.0-beta.2 2022-03-04 15:16:32 +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
14c237e4a4 Update curseforge version. 2022-03-02 02:41:20 +00:00
modmuss50
4772af50ff Fix log spam due to trying to add RebornRecipe's to the recipe book.
Regressed in: d200f931f3
2022-03-02 02:39:22 +00:00
modmuss50
d59092ac5c Fix #2842 Register the recipe type with vanilla's registry. 2022-03-02 02:32:51 +00:00
modmuss50
f2be7d0acc Stable 1.18.2 2022-03-02 02:28:59 +00:00
modmuss50
03985f2aae Move all RebornCore client code into the client package.
Also Fix PowerSystem.locale being awful.
2022-03-02 02:27:04 +00:00
modmuss50
7c02024a2d Fix item renderer command doing bad things. Now works on a server :)
Final major thing I noticed when trying to split the client and server.
2022-03-02 02:01:59 +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
c72f519248
5.2.0-beta.1 2022-02-28 14:13:51 +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
modmuss50
4465ffa1aa
5.1.0 2022-02-26 13:08:38 +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
BoogieMonster1O1
ff56edb2c3
Fix fluid rendering in GUI. Thanks to BoogieMonster1O1 2022-02-25 22:09:53 +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