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

179 commits

Author SHA1 Message Date
Ayutac
b462109fba
Fix for #3047 (#3067) 
* fixed the calcite recipes

* removed symmetry from padded shaped recipes

* removed unneeded accesswidener

Co-authored-by: ayutac <fly.high.android@gmail.com>
 2022-11-20 17:49:48 +01:00
Ayutac
34012fd6a6
1.19 launchpad and elevator, textures by Spearkiller (#3060) 
* crude launchpad functionality

* added launchpad config

* gave launchpad ingame config, now speed's changeable

* made launchpad orientable

* added block drop

* added recipe + recipe advancement

* launchpad texture by Spearkiller

* added configurable launch interval

* added sound

* cleanup

* small cleanup

* minor refactoring: static to non static

* added elevator block (with launchpad functionality)

* added elevator functionality w/o mixin

* added blank elevator GUI

* added elevator textures by Spearkiller

* implemented down travelling

* implemented up travelling

* fixed energy usage

* minor refactoring: changed from static to non-static

* improved teleport command

* improved getting world limits

* minor refactoring, code improvement, documentation

* improved sound

* made going through blocks optional

* corrected prev commit, whoopsie

* Mixin KeyBinding

* minor formatting

* removed generated block loot

Co-authored-by: ayutac <fly.high.android@gmail.com>
Co-authored-by: modmuss50 <modmuss50@gmail.com>
 2022-11-20 16:28:46 +00:00
modmuss50
193be50df8 Remove a mixin. 2022-11-19 18:01:22 +00:00
modmuss50
c6f6b6f49c Ensure the maximum of either ranges is preserved 2022-11-16 22:28:53 +00:00
modmuss50
f24e8f0631 Combine adjacent screen handler inv ranges. Fixes #2365 2022-11-16 22:18:21 +00:00
modmuss50
3fa83d8f63 Optimise TagIngredient sync. Fixes #3024 2022-11-16 21:31:32 +00:00
modmuss50
770ac2292f Cleanup/remove old "spamless" chat message code. 
This was quickly ported to use overlays in 1.19, this commit removes the old junk code.
 2022-11-16 21:19:12 +00:00
modmuss50
878aa0a74d Support new fabric block appearance API 2022-11-08 08:58:13 +00:00
modmuss50
c97cadeea2 Update Fabric API and make use of its new features. 2022-09-26 18:40:45 +01:00
modmuss50
75c9fc9ba3 Update deps 2022-09-10 22:12:10 +01:00
drcrazy
dde6da28e6 Add REI Exclusion zones. Closes #2626 2022-08-25 04:00:48 +03:00
drcrazy
5407295bed Add more info to help with debug of recipe sync weirdness. 2022-08-23 14:05:30 +03:00
modmuss50
9c8c28d025 Update min minecraft version 2022-08-08 23:20:01 +01:00
modmuss50
e401fa5a97 1.19.2 + gradle cleanup 2022-08-08 23:04:22 +01:00
drcrazy
248b9ef1a7 Do not destroy torches by TR fluids. Closes #2813 2022-08-09 00:36:23 +03:00
drcrazy
c8e04537a0 Do not store player heads in storages. Closes #2888 2022-08-07 16:15:08 +03:00
modmuss50
88d448c3a5 Move sendToServer to ClientNetworkManager to finalise the client/server split :) 2022-08-03 19:57:40 +01:00
modmuss50
3313f3165f 1.19.1 2022-07-27 18:30:16 +01:00
modmuss50
abcac85d0e Cleanup modcompat code, initial build setup for JEI support. 2022-06-24 00:12:30 +01:00
modmuss50
6347296509 1.19 2022-06-07 19:18:21 +01:00
drcrazy
6cde366510 Bump deps 2022-06-06 18:56:16 +03:00
modmuss50
23375b5cd3 Misc deprecation fixes. 2022-05-21 19:28:21 +01:00
modmuss50
a162a5ab40 Optimise imports. 
Find + replace during porting made a bit of a mess of them.
 2022-05-21 19:04:06 +01:00
modmuss50
0ba85b37cc Update deps and mappings. 2022-05-21 19:00:33 +01:00
modmuss50
4d5f8d097f Update loader 2022-05-20 00:42:22 +01:00
modmuss50
c3622cb263 Split client and server. 2022-05-19 21:45:31 +01:00
modmuss50
3cb62b0291 1.19-pre1 2022-05-18 20:20:44 +01:00
Ayutac
07547dfd6d
1.18 ayutac r8 woolomania. Thanks to Ayutac 
* Added woolomania and started carpetmania

* Added ColoredItem utility class

* Removed optional getters for normal ones

* Added ColoredItem Util and used that for chem. Reactor

* Added documentation for the util class
 2022-05-05 12:07:40 +03:00
Ayutac
a574c7f67e
Added the muffler upgrade (#2928) 
* Added flag for ability to play sound.

* Added muffler functionality

* Added muffler to upgrade advancement

* Added muffler model

* Added muffler lang entry

* Added muffler placeholder texture

* Added muffler recipe + toast

* Added muffler tooltip
 2022-04-28 09:52:10 +01:00
Ayutac
b14a4c72a1
Added two TR villagers (#2931) 
* Added Tinkerer

* Added registration to tinkerer and lang

* Added electrician
 2022-04-28 09:50:35 +01:00
modmuss50
22c29fea14 Replace all accessors with accesswideners. 2022-04-20 23:46:50 +01:00
modmuss50
60fd7b1ab6 Replace MixinItemStack with new API in Fabric. 
Also remove un-used ExtendedRecipeRemainder
 2022-04-15 00:04:12 +01:00
modmuss50
9683023658 Revert "#2775 Adding Trinket support for BatpackItem. Thanks to SimonFlapse" 
This reverts commit e28c9176e5.
 2022-04-05 14:12:57 +01:00
Simon
852c867a0d
Fixed #2892 Added Dark Green color. Thanks to SimonFlapse 
* Changed the processing message of block breaker and placer to use dark green instead of green
 2022-04-05 15:00:04 +03:00
Simon
7f2912009b
Added Block Breaker and Block Placer Machine. Huge thanks to SimonFlapse 
* Added advancements crafting data for block breaker and placer

(From 7a31de7b869e67697f85aeca9f0a5099c6bc7d62)
Added Block Breaker Machine (#2871)

* Added a new machine that can break blocks in front of it

(From e56a51da2b0c4e144cdf70ebff53d7097e81b5ce)
Added Block Placer Machine

* Added a new machine that can place blocks in front of it

(From e80de2ec82e0a14f161137e4b147bb455a839e3d)
Added Block Breaker and Placer recipe

(From dccdf76eacb8ceb7075897170e098bc346b8b4db)
Break blocks instead of removing + Refactoring
 2022-04-02 10:47:36 +03:00
Ayutac
61188e755d
No, bad RuntimeException!! 
Of course I oversaw the second one... No PR this time since I just cp'd the exception class
 2022-03-31 20:01:55 +02:00
Ayutac
e829e371d1
Formatted comment for better readability 2022-03-31 19:54:17 +02:00
Ayutac
8394a9940b RuntimeExceptions are not to be thrown 
as a PR to be sure this still compiles and I haven't introduced a typo here by chance.

Will merge once checks say it's okay
 2022-03-31 19:34:12 +02:00
Simon
0f9512efc5
Fix #2847 Allowing values larger than Integer.MAX_VALUE. Thanks to SimonFlapse 
* Fix #2847 Allowing values larger than Integer.MAX_VALUE

* Allowed the GUI to display `Long` numbers to fix overflow values

* Added missing Death Messages from stepping on the fusion reactor

* Fusion Control using TranslatableText

* I've converted LiteralText to TranslatableText
 2022-03-30 12:29:58 +03:00
Simon
e28c9176e5
#2775 Adding Trinket support for BatpackItem. Thanks to SimonFlapse 
* #2775 Adding trinket support for BatpackItem

* Added support for wearing BatpackItems in the 'back' trinket slot on the chest. This frees up an additional space for regular armor.

* BatpackItem only output when in chest armor slot
 2022-03-30 12:21:29 +03:00
AngelBottomless
4fc9352c76
Fix RecipeCrafter spamming sound every tick. Thanks to aria1th 
* Fix RecipeCrafter spamming sound every tick

Recycler was able to spam sound due to this. Now its limited to twice per second

* Revert Indent changes & test code

Its Identical whitespaces but different?
Speed Multiplier was changed to verify packet speed, should be reverted
 2022-03-28 08:45:05 +03: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
0a8e34d9c6 Add ClientNetworkManager 2022-03-02 14:39:30 +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
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
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