Commit graph

161 commits

Author SHA1 Message Date
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
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
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
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
ee17fe58d8 Added ind sawmill datagen 2022-02-10 20:21:07 +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
19f657a0d6 Merge branch '1.18' into 1.18-Ayutac-datagen-6 2022-02-09 20:30:43 +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
Ayutac
8ed5082d81
Fixed datagen related bug (#2790)
Raw metals thought the ingot storage block variant was their variant. THIS AFFECTS STORAGE RECIPES! Effectively means 9 raw variants can be combined to one ingot storage block, so maybe quickly new beta?
2022-02-06 13:14:32 +00:00
Ayutac
100579c288
Added two storage blocks, textures by Xanthian. Thanks to Ayutac.
* Half of 2 new blocks, other half is a lot of data/model files

* Rest of the data/asset changes for new storage blocks.

* Bugfixes

* made hot tungstensteel storage block opaque
2022-02-01 13:53:11 +03:00
Ayutac
5b4dec0cc3 Compressor datagen w/o toasts. 66 recipes changed from manual to datagen
Unified power/time for a couple of similar processings.
2022-01-29 17:26:55 +01:00
Ayutac
79715b89a1 Grinder datagen w/o toasts. -25 manual, +41 datagen recipes
Unified power/time for a couple of similar processings.
All storage blocks of items that could be grinded should be able to be grinded now, with some time save compared to the items themselves.
2022-01-29 10:27:51 +01: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
e3e5414cee
Merge pull request #2760 from Ayutac/1.18-Ayutac-38
Added XP for ores, fixes #2759
2022-01-20 19:56:23 +00:00
modmuss50
7e1125f6aa Fix #2625. 2022-01-20 19:54:20 +00:00
Ayutac
f4c0cf9e8e Fixed bug introduced in previous commit.
Deepslate was a problem because they don't save their distribution. Added a workaround.
2022-01-20 16:30:18 +01:00
Ayutac
b7a42f0a01 Added XP for ores, fixes #2759
The ore XP drop is not done by JSON but by hard-coding as a second parameter to OreBlock.
2022-01-20 02:34:33 +01:00
Ayutac
6db3df3037
Added sponge piece + recipes, texture by Spearkiller (#2751) 2022-01-17 22:41:50 +00:00
Ayutac
5c6ac37044 Added Steel Armor. Textures by Xanthian. Thanks to Ayutac
Steel's durability is about between iron and diamond, it is almost as tough as diamond, half as tough as netherite, but has same knockback resistance as netherite (which diamond lacks completely). But because we mixed some dirty coal to our iron to make it this tough and resistant, the enchantability is down to 5, which is by far the worst enchantability of all vanilla and TR armors.

Not tested yet, but I basically did the same changes as in the silver armor commit line by line.
2022-01-07 17:25:35 +03:00
xanthian
157ace896c Added Amethyst dust. Thanks to Xanthian.
* Create amethyst_dust_alt

* Update amethyst_dust_alt

* Update and rename amethyst_dust_alt to amethyst_dust_alt.json

* implements grinding of amethyst blocks to dust
1 Block = 2 Dust
implements production of amethyst shards from dust + tnt in implosion compressor.
8 Dust + 16 TNT = 16 Shards

Conversion ratio = 1 Stack of Amethyst Block + 1 Stack of TNT = 1 Stack of Shard

* Update amethyst_dust_alt.json

noticed small mistake chrome dust > quartz dust
2022-01-07 17:25:35 +03:00
Ayutac
c4625762d1
Added tooltips for unobtainable ores. (#2663) 2021-12-30 19:42:51 +00:00
Ayutac
47fe351ecb
Added Silver Armor. Textures by Xanthian. (#2659). Thanks to Ayutac
Silver is 2 times as durable as gold (still less than iron), -5 of gold's enchantability (still more than diamond and netherite) and cannot pacify/distract piglins. Also, it looks very fancy.
2021-12-19 16:38:05 +03:00
Ayutac
5eab27bead
Fixed activation of root advancement. (#2658) 2021-12-19 12:37:50 +00:00
drcrazy
774d42d944 Fixed some warnings 2021-12-19 04:19:46 +03:00
Jose
a0d827fa3b
TR ores fixes (#2654). Thanks to josilo
* Remove deprecated breakByTool() function. Closes #2609

* Removed leftover unused imports

* Set correct BlockSoundGroup for deepslate ores

* Fix tin tool tag
2021-12-19 03:54:47 +03:00
modmuss50
27c684d376 Add tooltip for ore generation depths.
Will only work in SP for now, will need to create a packet to send the data from the server.
2021-11-28 14:14:35 +00:00
modmuss50
3752154bcd Add a simple tool to visualise ore distribution. 2021-11-26 20:01:08 +00:00
modmuss50
98bfb7b958 Deepslate ore gen improvements. 2021-11-17 23:19:38 +00:00
modmuss50
6f8282b188 Add deepslate ores 2021-11-17 22:40:02 +00:00
modmuss50
e1093d782a First pass at world gen, rubber tree needs further work, ideally depends on fab api changes. 2021-11-16 23:54:31 +00:00
Technici4n
f39c619c22
Fix cable shape computation. Closes #2435. Thanks to Technici4n
* Fix cable shape computation. Closes #2435.
* Remove unused import
2021-10-08 08:48:11 +03:00
drcrazy
5261d9f11f Bauxite should be mined with iron pickaxe. Closes #2489 2021-09-17 22:59:33 +03: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
cb6c6337a8 Fix some warnings. 2021-07-19 16:15:49 +03:00
drcrazy
9cb90bb56d Bronze small dust is gone. 2021-07-19 10:55:40 +03:00
drcrazy
163d41ad85 Aluminium and brass small dusts are gone 2021-07-19 10:49:20 +03:00
drcrazy
c319e66b81 Silver and lead small dusts are gone. 2021-07-19 10:33:11 +03:00
drcrazy
0cab865fdb Gold and Tin small dusts are gone. 2021-07-18 13:45:07 +03:00
drcrazy
b8715ecdda Gold small dust is gone. All hail gold nugget. 2021-07-07 16:28:03 +03:00
drcrazy
23868443b5 Iron small dust is gone. All hail iron nugget. 2021-07-05 11:39:02 +03:00
drcrazy
42e86acba3 Raw tin, silver, lead, tungsten and iridium storage blocks 2021-06-22 17:18:36 +03:00
drcrazy
78a9a61bb4 Raw tin, silver, lead, tungsten and iridium 2021-06-21 13:58:53 +03:00
drcrazy
fa2469b034 Fix crash with casing loading. Closes #2410 2021-06-19 02:47:14 +03:00
drcrazy
7216f55ba9 Copper stairs, blocks and slabs are gone. 2021-06-15 00:38:29 +03:00
drcrazy
c4011c800b Replace copper dust with raw copper in recipes 2021-06-14 22:15:38 +03:00
drcrazy
d8a11eaebf Replace gold dust with raw gold in recipes 2021-06-14 21:34:53 +03:00
drcrazy
765d96a05a Replace iron dust with raw iron in recipes 2021-06-14 21:17:11 +03:00
drcrazy
b445582784 Oh no. We lost TR copper ore. All Hail MC Copper ore. 2021-06-11 02:47:25 +03:00
modmuss50
31e7b357dc Use modern java features where we can, optimise imports. 2021-05-29 20:32:05 +01:00
drcrazy
3cf57044ce Rubber sapling could be potted. Closes #2279 2020-11-08 20:53:58 +03:00