Commit graph

38 commits

Author SHA1 Message Date
modmuss50
0845d6618b Support id ingredients, and load conditions in datagen. 2022-06-01 22:34:53 +01:00
modmuss50
ebaddaca59 Fix TR villagers. 2022-05-27 15:20:06 +01:00
Ayutac
a2b6ce4aea
Recipes for 1.19 (#2962)
* Added mangrove to sawmill recipes

* added sculk stuff

* added froglight stuff

* grind mangrove roots

* added root stuff
2022-05-26 15:00:09 +02:00
modmuss50
7692bd4356 Do as I say, not as I do. 2022-05-21 20:23:56 +01:00
modmuss50
9293931bd0 Fix rubber door model 2022-05-21 20:15:08 +01:00
modmuss50
5a0d017cd0 Rename rubber slab and stair. Fixes #2834 2022-05-21 19:38:23 +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
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
1fc34f1786
New recipes (#2917)
* Added assembling colored beds via machine

* Added pufferfish extraction for sponge piece.

Including toast and also added missing toast for sponge piece (see #2883)

* Added painting tool -> 1 string extraction

* Added sticky piston -> slime ball extraction

* Improved two recipe names incl. toasts

* Added smelting glass panes back to glass

* Added anvil uncrafting

* Added bow/crossbow -> String via extraction

* Added cobble->black & bars->ingot blast furnace recipes
2022-04-28 09:45:20 +01:00
Ayutac
da1113408f
New recipes (#2907)
* Added red sand recipe

Crafting Table: Sand + Netherrack Dust -> Red Sand

Gives another use to Netherrack Dust and makes Red Sand almost renewable (only limited by available Netherrack)

* Added sugar recipe

Extractor: Sugar Cane -> Sugar

Increases yield by 50%. Good for food mods.

* Added Ender Chest uncrafting

Ind.Grinder: Ender Chest + Water/Mercury -> some obsidian dust and ender eye dust

Of course we want to throw a stone chest in the grinder. Returning dusts instead of items should make this work.

* Added datagen fluid extraction recipes

Extractor: bucket/bottle/cell -> empty version

The empty cell recipe has been moved into datagen, the rest are natural expansions.

* Added string extraction

Extractor: banner/bed -> 5/3 String

About 1 String per used wool, but 6 seemed too much for banner in comparison to bed, so 1 less.

* Added sponge grinding

Grinder: (any tagged) sponge -> 5 sponge pieces

Not much use rn. Grinding over crafting because the newly introduced tag allows grinding of other sponges as well, which might have another color. I think grinding works better for that.

* Added lantern assembling

Assembling Machine: 10 (soul) torches + 8 iron ingots -> 10 (soul) lantern

8 iron ingots are 8x8 + 8 iron nuggets and could normally only be used for 9 lanterns. The automation also saves the step of turning an ingot into nuggets first.

* Added netherite alloying

Alloy Smelter: 10 gold ingots + 10 netherite scrap -> 3 netherite ingots

Since returning 3 ingots, time is tripled from normal alloying. Effectively means 20 scrap can produce 6 ingots instead of 5, which is a 20% increase.

There are 5 tools and 4 armor pieces that can be netherite'd in vanilla. In vanilla this needs 36 Ancient debris. With the ind. Grinder only 12 Ancient Debris are needed, and alloying reduces this further to 10.
2022-04-20 23:27:03 +01:00
Ayutac
3c0ad31cce
Uncrafting Overhaul (#2893)
* Uncrafting Overhaul

Not yet working, some groovy curse I imagine.

new uncrafting recipes:
 - Chestplate (Dia/Ruby/Saph/Peri)
  + Ind.Grinder
   + Water
    -> 4 dusts + 2 small dust
   + Mercury
    -> 6 dusts + 1 small dust
 - Chestplate (Iron/Gold/Bronze/Silver/Steel)
  + Ind.BFurnace
   + Sand
    -> 5 ingots + dark ashes
 - Leggings (Dia/Ruby/Saph/Peri) or Horse Armor (Dia)
  + Ind.Grinder
   + Water
    -> 3 dusts + 2 small dust
   + Mercury
    -> 5 dusts + 1 small dust
 - Leggings (Iron/Gold/Bronze/Silver/Steel) or Horse Armor (Iron/Gold)
  + Ind.BFurnace
   + Sand
    -> 4 ingots + dark ashes
 - Helmet (Dia/Ruby/Saph/Peri)
  + Ind.Grinder
   + Water
    -> 2 dusts + 2 small dust
   + Mercury
    -> 4 dusts + 1 small dust
 - Helmet (Iron/Gold/Bronze/Silver/Steel)
  + Ind.BFurnace
   + Sand
    -> 3 ingots + dark ashes
 - Boots (Dia/Ruby/Saph/Peri)
  + Ind.Grinder
   + Water
    -> 1 dusts + 2 small dust
   + Mercury
    -> 3 dusts + 1 small dust
 - Boots (Iron/Gold/Bronze/Silver/Steel)
  + Ind.BFurnace
   + Sand
    -> 2 ingots + dark ashes
 - Axe or Pickaxe (Dia/Ruby/Saph/Peri)
  + Ind.Grinder
   + Water
    -> 3 small dust + 1 small saw dust
   + Mercury
    -> 1 dust + 3 small dust + 1 small saw dust
 - Axe or Pickaxe (Iron/Gold/Bronze)
  + Ind.BFurnace
   + Sand
    -> 1 ingot + dark ashes
 - Hoe or Sword (Dia/Ruby/Saph/Peri)
  + Ind.Grinder
   + Water
    -> 2 small dust + 1 small saw dust
   + Mercury
    -> 1 dust + 1 small dust + 1 small saw dust
 - Hoe or Sword (Iron/Gold/Bronze)
  + Ind.BFurnace
   + Sand
    -> 5 nuggets + dark ashes
 - Shovel (Dia/Ruby/Saph/Peri)
  + Ind.Grinder
   + Water
    -> 1 small dust + 1 small saw dust
   + Mercury
    -> 2 small dust + 1 small saw dust
 - Shovel (Iron/Gold/Bronze)
  + Ind.BFurnace
   + Sand
    -> 3 nuggets + dark ashes

I also made pickaxe and axe grindable for normal grinder, added a bit more sawdust for them in ind.Sawmill and added treetap to be grinded in industrial sawmill.

* Fix datagen

Co-authored-by: modmuss50 <modmuss50@gmail.com>
2022-04-19 15:27:39 +01:00
Ayutac
c8ca8a5aa3
More sawmill recipes, finally :) Thanks to Ayutac
Important one is adding the nether stuff, which I forgot in a previous sawmill update.
Added slicing of a part of stairs to make slabs.
Added slicing slabs into pressure plate.
Added sawdust recipes for a lots of wooden stuff.
Also added grinder recipes when appropriate.
2022-04-01 09:55:35 +03:00
Ayutac
07e8ddf172
Datagen'd the vanilla dye recipes. Thanks to Ayutac.
Notably also added the extractor recipes for Cornflower, Lapis Lazuli, Cocoa Beans, Bone Meal and Lily of the Valley, hence implementing #2789
2022-04-01 09:55:09 +03:00
Ayutac
ccfeeb42b1
Added datagen: Concrete Grinder and some dying recipes. Thanks to Ayutac
* Added datagen: Concrete Grinder and some dying recipes

* fixed the bugs

* dont decrease efficiency of carpet...

* another bug leftover, whoops
2022-03-30 12:23:05 +03:00
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
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
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
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
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
Ayutac
a097f9eae1 Fixed Blast Furnace data gen. 2022-02-09 13:44:06 +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
af5f1b37c3 Tried adding BlastFurnace recipes, doesn't work yet 2022-01-31 17:43:49 +01:00
Ayutac
4952cee268 Used TagConvertible for all smelting recipes. 2022-01-31 16:22:49 +01: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
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
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
c0b6b231c4 Fix datagen 2022-01-20 19:44:11 +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
Ayutac
330521fdfe
Added smelting iron plates into refined iron plates. Thanks to Ayutac
Normal cooking times by using the datagen I hope, and there is no reason to not have this.
2022-01-02 12:13:42 +03:00
modmuss50
47eea962a0 Start on recipe serde rewrite 2021-12-19 13:44:46 +00:00
modmuss50
45e79fe7b3 Fix licenses 2021-12-03 19:02:55 +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