Commit graph

5413 commits

Author SHA1 Message Date
Ayutac
9a78910fbc fixes #2950 2022-05-26 13:58:17 +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
23375b5cd3 Misc deprecation fixes. 2022-05-21 19:28:21 +01:00
modmuss50
d0bdf744cf Move the grinder back to code. 2022-05-21 19:16:54 +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
b0ddb4cc95 Update REI, disabled for now due to https://github.com/shedaniel/RoughlyEnoughItems/issues/856 2022-05-20 13:20:29 +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
drcrazy
05d443c51d Fix fluid replication from air. Closes #2913 2022-05-06 02:31:45 +03:00
drcrazy
420a165f6b Fix tooltip for cables. Closes #2915 2022-05-06 02:15:59 +03:00
drcrazy
40b58b4ce5 Bump REI version in dev env 2022-05-06 01:48:42 +03:00
AngelBottomless
c1983f7a2d
Fix KIBE Entangled Bucket bug. Thanks to aria1th.
Also, this fixes creative tank not being actually creative when its used without item slots.
2022-05-05 12:15:45 +03: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
AngelBottomless
f75ebc2361
Allow Drain drain Cauldrons. Thanks to aria1th
There's no proper fluid interface in cauldron block so its only working for Water and Lava. If any mods uses cauldron as other fluid holder, it might have to change, but I've never seen one.
2022-05-05 12:06:11 +03:00
Ayutac
6a91757791
Added storage buffer, textures thanks to Spearkiller. Thanks to Ayutac
Tested a bit, but I would like additional testing by someone else.
2022-05-05 12:04:36 +03:00
Ayutac
0cbcc3a93a
Added advanced circuit to digital display recipe. Thanks to Ayutac 2022-05-05 12:02:58 +03:00
Ayutac
88dbd9b6f3
fixed tag in toast 2022-05-03 02:15:13 +02:00
Ayutac
71b438acca
Fixed the chainsaw bug (#2943)
* Fixed the chainsaw bug

* Fixed bugged solution, works now, tested :)
2022-05-03 01:55:37 +02:00
Ayutac
e4f56abdaa Renamed tinkerer to metallurgist and added custom texture 2022-05-03 00:53:00 +02:00
Ayutac
1bf6d0f71e
Shulker shell recipe fix, thanks to szumaster 2022-05-03 00:33:34 +02:00
Ayutac
074bfea680 Added Netherite nugget uu-recipe 2022-05-02 19:56:51 +02:00
Ayutac
283460c3c8 Added Netherite nugget, texture thanks to Spearkiller 2022-05-02 19:56:51 +02:00
Ayutac
c46e03b19f Updated upgrade textures, thanks to Spearkiller 2022-05-02 19:56:51 +02:00
AngelBottomless
85638d2e42
Fix Fluid Tanks generating static lag from trying to pull /push fluid from Items.AIR (#2935)
* Did you know this?

Tank units can just generate lags by existence

* add Valid inventory check

Very modded extension can declare RebornInventory with size 0 to only process fluids without items, for that case

* separate as function 

and more condition check to reduce extra lag

* Parentheses

Co-authored-by: Ayutac <skoch02@students.uni-mainz.de>
2022-05-01 10:10:28 +02:00
Ayutac
99e77a0678
fixed bug I introduced by accident 2022-04-29 14:29:32 +02: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
Ayutac
a6ae3a7984
Fixed #2921 (#2929)
by adding wart blocks and shroomlights to the blocks the industrial chainsaw searches for.

Tested, works. In review to make sure this is appropriate for the mod.
2022-04-28 09:48:48 +01:00
Ayutac
b95219b3ac
Disabled datagen logging for normal starts (#2926) 2022-04-28 09:48:01 +01:00
Ayutac
7f2cb5cb95
Added red sand -> soul sand via blast furnace (#2925) 2022-04-28 09:47:24 +01:00
Ayutac
adb3bb8d30
Made some advancements goals and unhid adv.m.block (#2922) 2022-04-28 09:46:53 +01:00
Ayutac
0b7bfd9a36
Added shulker shell recipe (#2919) 2022-04-28 09:46:28 +01:00
Ayutac
f4813951b7
Added elytra recipe (#2918) 2022-04-28 09:46:00 +01: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
deef1f3330
Rebalanced gunpowder and uu matter (#2916) 2022-04-28 09:44:25 +01:00
modmuss50
2ca8fa0e26 Fix release.yml 2022-04-20 23:54:46 +01:00
modmuss50
e5619fe71a Bump version. 2022-04-20 23:51:15 +01:00
modmuss50
22c29fea14 Replace all accessors with accesswideners. 2022-04-20 23:46:50 +01:00
modmuss50
2a5645bb19 Update fabric api 2022-04-20 23:31:06 +01:00
Ayutac
6d0288ea00
Canning patch (#2911)
* Update helium_coolant_cell_60k.json

* Update water_coolant_cell_10k.json
2022-04-20 23:27:23 +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
954882cafc
Corrected miss-named criterium.
Should change nothing during runtime.
2022-04-17 13:14:02 +02:00
Ayutac
aa57b22496
Updated rubber door texture ref, fixes #2894 2022-04-15 13:32:49 +02:00
Ayutac
95f7b72c71
Added rubber door texture
couldn't find it anywhere else
2022-04-15 13:28:14 +02:00
modmuss50
60fd7b1ab6 Replace MixinItemStack with new API in Fabric.
Also remove un-used ExtendedRecipeRemainder
2022-04-15 00:04:12 +01:00