maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5498 commits 1 branch 0 tags 80 MiB
Commit graph

131 commits

Author SHA1 Message Date
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
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
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
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
ee17fe58d8 Added ind sawmill datagen 2022-02-10 20:21:07 +01:00
Ayutac
145ba48e27 Put the default toast additions into a proper place. 2022-02-10 08:10:56 +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
Foo
43c0fa9e89
Fix spelling, grammar, javadocs, and similar issues (#2784) 
* fix naming in ModelSantaHat.java

* Fix grammar, spelling, and javadocs in RebornCore

* Fix spelling error in datagen

* fix missed variable name

* fix grammar, spelling, and javadoc errors

* fix grammar and spelling errors in project files

* specify indent_size in .editorconfig
 2022-02-06 13:14:56 +00:00
modmuss50
31743d7684 Update Energy API and deps. 2022-02-02 21:21:06 +00:00
modmuss50
5b596aa5f8 Sync ore depths to all clients via a packet on server login. 2022-01-28 20:14:35 +00:00
modmuss50
32368f8388 First look at data generated machine recipes. 
Doesn't support all the features but should be a good start.
 2022-01-28 19:18:43 +00:00
modmuss50
fa657d46e8 Fix recipe syncing, improve (add) error handling. 2022-01-27 20:34:26 +00:00
Ayutac
9fcf9447e4
Added Rubber Sapling to wandering trader (#2772) 2022-01-23 18:35:26 +00:00
Ayutac
0a5be13901
1.18 ayutac datagen4 (#2769) 
* Added dust crafting data gen.

Generation works, but how do I get TR to recognize the existence of the new stuff?

* Added generic armor and tools to the datagen. Also resolved conflicts from the merge with recently changed datagen

* Fixed copy-paste error

by accident for second ingredient first would be taken again

* automatized tag generation

* fixed lingering bugs from previous commit

* much much more gen, for about 269 files

* wrongly deleted recipes in last commit

* Added rest of the decorative storage block variants to datagen
 2022-01-23 18:34:35 +00:00
modmuss50
3eb91f255c Finish 2022-01-20 19:40:55 +00:00
modmuss50
8863ea30b3 Merge branch '1.18' into recipe_serde 
# Conflicts:
#	RebornCore/src/main/java/reborncore/common/crafting/RebornRecipeType.java
#	src/datagen/groovy/techreborn/datagen/recipes/smelting/SmeltingRecipesProvider.groovy
 2022-01-20 18:51:48 +00:00
modmuss50
55eb70742f Migrate to SLF4j 2022-01-19 20:41:36 +00:00
modmuss50
b59c535c3d Use fabric resource conditions api. Remove reborncore's. 2022-01-17 22:34:47 +00:00
drcrazy
58c87b3bbf Update yarn and fapi versions. 2022-01-10 01:12:58 +03:00
drcrazy
4560771144 Remove unused method. 2022-01-10 00:43:06 +03:00
drcrazy
c887d1652d Fix item storage blocks. Closes #2717 2022-01-10 00:39:56 +03:00
vladislemon
cf9965a598
Fixes #2680. Chunks that had tickets before world save/load now takes tickets after world load. Chunk Loaders now works without players in world. (#2735) 2022-01-09 16:10:32 +00:00
vladislemon
a2ea684c57
Make energy tools usable while charging, fixes #2232 (#2733) 2022-01-08 20:39:17 +00:00
modmuss50
892f3cba05 Fix curse mc version. Closes #2727 2022-01-08 00:42:13 +00:00
Technici4n
1329c30556
Fix #2566: Implement Fabric's Fluid-containing Item API (#2706) 2022-01-03 17:29:46 +00:00
drcrazy
5f7570cfff Fix experience button in Iron Furnace. Closes #2692 2021-12-30 03:39:26 +03:00
modmuss50
47eea962a0 Start on recipe serde rewrite 2021-12-19 13:44:46 +00:00
modmuss50
f7f8127ba0 Move some smelting and blasting recipes to data gen. 2021-12-03 17:34:42 +00:00
modmuss50
89b47b33fd Add base datagen sourceset 2021-12-03 15:58:43 +00:00
modmuss50
c0c6724cd5 Update CF mc version. 2021-11-28 14:36:58 +00:00
modmuss50
76e11b4e5a Fix #2620 2021-11-28 14:16:28 +00:00
modmuss50
8b24b8439a Replace MixinItemRenderer by the new 1.17 vanilla API. Fixes #2602 2021-11-26 21:06:45 +00:00
modmuss50
f500b5ddff Remove MixinWorldRenderer and replace with a fabric api. Fixes #2603 2021-11-26 20:31:22 +00:00
modmuss50
90b119cfe6 Update mixin compat level 2021-11-26 20:17:14 +00:00
modmuss50
b5004d3c85 1.18-rc3 2021-11-26 18:38:51 +00:00
modmuss50
dd79effe80 Finish rubber trees. 2021-11-17 21:28:26 +00:00
modmuss50
4a2e81550f Port to 1.18-pre2 without worldgen 2021-11-16 22:38:31 +00:00
modmuss50
f5c3b85773 Update deps 2021-11-11 10:54:33 +00:00
Orygeunik
61878d4f81
Fixed missprint into translation of conf direction (#2592) 
Original text is https://github.com/TechReborn/TechReborn/blob/1.17/RebornCore/src/main/resources/assets/reborncore/lang/en_us.json#L38
- "Orange side means output". "Output" is translaited into russian like as "Выход"
Proof: https://translate.google.com/?sl=en&tl=ru&text=output&op=translate

Also added missing translate for key "reborncore.tooltip.has_data"
 2021-11-03 01:59:10 +03:00
Technici4n
7b4306a883
Fix #2569: make IDSU work properly with the new energy API (#2588) 2021-11-02 15:59:23 +01:00
Technici4n
b300456e77
Fix #2574: Use the fabric item API for auto input and auto output (#2585) 
* Fix #2574: Use the fabric item API for auto input and auto output

* Only auto-insert at most 4 items at once
 2021-10-31 18:14:26 +01:00
Technici4n
165d27cfda
Set creative tank amount to capacity on tick. Fix #2558. Thanks to Technici4n 
* Set creative tank amount to capacity on tick. Fix #2558.
* Remove FluidValue.INFINITE
* Was better with the /1000
 2021-10-08 08:49:19 +03:00
Technici4n
0ddf6688c9
Return a dummy when recipe deserialization fails. Closes #2563. (#2565). Thanks to Technici4n 2021-10-08 01:00:22 +03:00
ramidzkh
2d9cdfbdc9
Fix item exporting. Closes #2445. Thanks to ramidzkh 2021-10-07 00:28:51 +03:00
drcrazy
773f9f06c1 Notify neighbors on machine removal. Closes #2484 2021-09-20 12:03:17 +03:00
Technici4n
a5aa7acc83
Fix #2504: Don't check energy capacity when reading NBT, but check after applying upgrades (#2507) 2021-09-20 08:59:40 +02:00
Technici4n
f7e1ad1367
Fix #2436: Stop dropping upgrades when they are clicked (#2508) 2021-09-20 08:59:09 +02:00
Dave Smith
56dcc4dd16
Add support for solar energy scaling during day (#2497) 2021-09-16 23:45:38 +02:00
modmuss50
6c3b461e11 Fix build and update deps 2021-09-01 21:17:58 +01:00
Technici4n
3e2b0e11ae
Initial migration to V2 Energy API (#2474) 
* Initial Energy API refactor

* Allow charging in energy storage BEs

* Remove maven for experimental fabric

Co-authored-by: modmuss50 <modmuss50@gmail.com>
 2021-09-01 21:14:15 +01:00
drcrazy
2bc4886cc0 Update Fabric API version and move versions to properties. 2021-08-19 13:33:26 +03:00
modmuss50
93c1d65adf Remove broken AccessorIngredient mixin. 2021-08-13 21:08:56 +01:00
Technici4n
fd9d776b43
Initial move to the fabric fluid API (#2465) 2021-08-05 20:51:11 +01:00
modmuss50
548c12eee8 Cleanup worldgen code, should fix a lot of issues with other mods. Configuration will come later. 2021-07-20 20:16:10 +01:00
modmuss50
838bb9b114 Fix with no changelog 2021-07-20 20:00:11 +01:00
modmuss50
1e895f1786 Add changelog generation 2021-07-20 19:59:04 +01:00
modmuss50
52357cff10 Publish reborn core jar to curseforge and TR's github 2021-07-20 19:10:11 +01:00
modmuss50
66c70e7e96 Fix conflicts with mojang's mappings 2021-07-20 19:03:30 +01:00
drcrazy
08a2cdb081 First pass on 1.17.1 update. 13 errors left 2021-07-20 03:38:43 +03:00
drcrazy
cb6c6337a8 Fix some warnings. 2021-07-19 16:15:49 +03:00
drcrazy
1af68f5422 Some work on render command #2445 2021-07-08 14:29:43 +03:00
grandmaster
bc719bb7f4
fix unnecessary floating number print (#2415). Thanks to grandmaster8 2021-06-21 12:24:16 +03:00
drcrazy
fa2469b034 Fix crash with casing loading. Closes #2410 2021-06-19 02:47:14 +03:00
modmuss50
dc216b974d Fix UU matter recipes. 
Adds a PaddedShapedRecipe to RebornCore
 2021-06-02 21:25:15 +01:00
modmuss50
3e13cdb4a6 1.17-pre2 2021-05-31 17:41:07 +01:00
modmuss50
3dfb211309 Fix excessive lag caused by chunk loader. Closes #2375 2021-05-31 17:16:44 +01:00
modmuss50
85dbe15590 Remove big int support from ObjectBufferUtils 2021-05-30 14:59:54 +01:00
modmuss50
31e7b357dc Use modern java features where we can, optimise imports. 2021-05-29 20:32:05 +01:00
modmuss50
52e4767247 Fix screen handler data syncing, also rewrite it while im at it to reduce the number of packets sent. 2021-05-29 20:05:13 +01:00
modmuss50
d8db208279 Fix crash when opening GUIs 2021-05-29 13:47:09 +01:00
modmuss50
8591baf420 Apply some lost changes to RC 2021-05-29 13:35:01 +01:00
modmuss50
b33f4be5f4 1.17: TechReborn compiles and runs, big thanks to @petabyteboy 
Co-authored-by: Milan Pässler <milan@petabyte.dev>
 2021-05-29 13:19:29 +01:00
modmuss50
c661de5254 1.17: RebornCore compiles, big thanks to @petabyteboy 
Co-authored-by: Milan Pässler <milan@petabyte.dev>
 2021-05-29 12:49:17 +01:00
modmuss50
9520a3e607 Migrate mappings, 1888 errors to go 2021-05-28 14:58:12 +01:00
modmuss50
b0c7a733c7 Move RebornCore into a sub project 
Update gradle and build against java 16
 2021-05-28 14:51:01 +01:00