Commit graph

4718 commits

Author SHA1 Message Date
modmuss50
f58a4adb3c Small datagen work towards block models.
Waiting on a Fabric PR to complete this.
2022-09-16 22:12:48 +01:00
modmuss50
01cddda4dd Move a lot of tags to datagen 2022-09-15 22:42:09 +01:00
modmuss50
75c9fc9ba3 Update deps 2022-09-10 22:12:10 +01:00
drcrazy
105ab0bd77 Update OC upgrade description. Closes #2606 2022-08-28 14:44:20 +03:00
drcrazy
dde6da28e6 Add REI Exclusion zones. Closes #2626 2022-08-25 04:00:48 +03:00
Tomatobird8
db499e60b2
Add missing zombie villager textures. Thanks to Tomatobird8 2022-08-19 02:23:34 +03:00
drcrazy
b7e131870a Chainsaw breaks leaves faster. Closes #2860 2022-08-18 17:58:07 +03:00
drcrazy
2f1413dfba Decrease enery used to produce methane cells. Closes #2622 2022-08-10 16:32:21 +03:00
drcrazy
5ad2a74977 Fix unused imports. 2022-08-10 11:18:53 +03:00
drcrazy
9239b46412 Oil lakes are back. Closes #2307 2022-08-10 02:58:52 +03:00
modmuss50
9c8c28d025 Update min minecraft version 2022-08-08 23:20:01 +01:00
drcrazy
cb257b105b Fluid Cells to play more nicely in creative. 2022-08-09 01:06:33 +03:00
modmuss50
e401fa5a97 1.19.2 + gradle cleanup 2022-08-08 23:04:22 +01:00
drcrazy
6a72d5011a Fix recycler recipe display. 2022-08-08 17:14:30 +03:00
drcrazy
1ac4881bfa Update Industrial Grinder advancement. Closes #3017 2022-08-08 16:03:25 +03:00
drcrazy
389cf2efbc Greenhouse can harvest glow berries. Closes #2577 2022-08-08 14:37:05 +03:00
drcrazy
c8e04537a0 Do not store player heads in storages. Closes #2888 2022-08-07 16:15:08 +03:00
drcrazy
3509947e93 Fix retrieval items with NBT. Closes #2810 2022-08-07 02:34:48 +03:00
drcrazy
e30d618d86 Fix storage units wrenching. Closes #2889 2022-08-06 03:12:12 +03:00
shedaniel
554a63dbba
Remove usage of REI internals (#3019)
Signed-off-by: shedaniel <daniel@shedaniel.me>
2022-08-04 20:15:54 +01: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
drcrazy
4461b5d782 Use storage upgrader on upgrade. Closes #2993 2022-07-24 11:30:14 +03:00
drcrazy
735da1338e Fix storage upgrade. Closes #2999 2022-07-24 05:05:22 +03:00
drcrazy
48a35be5d0 Fix drop for BlockBreaker. Closes #3008 2022-07-22 00:41:09 +03:00
drcrazy
33da2ad59e Fix peridot ore drop. Closes #2995 2022-07-02 15:18:41 +03:00
goldenapple3
e6224a62f5
Fix alloy centrifuge recipes. Thanks to goldenapple3, 2022-07-02 12:10:54 +03:00
drcrazy
72b41bcec1 Removed compressor recipe for iridium alloy plate. 2022-07-02 11:43:41 +03:00
modmuss50
f3177b691a Revert buildscript changes, will bring back once 0.13 loom is ready. 2022-06-27 22:48:24 +01:00
Jakub Kubík
3865555b78
feat(recipes): support bauxite dusts from other mods (#2992) 2022-06-25 00:49:17 +02:00
modmuss50
abcac85d0e Cleanup modcompat code, initial build setup for JEI support. 2022-06-24 00:12:30 +01:00
modmuss50
497c0134a6 Actually fix crash with byg. 2022-06-14 20:31:07 +01:00
drcrazy
a8b7fb36b9 Allow transfer between same rate cables. Closes #2965 2022-06-13 03:04:14 +03:00
drcrazy
e4d398e600 Fix fishing junk loot 2022-06-13 00:55:16 +03:00
drcrazy
ea40f55430 Scrap added to fishing junk loot table. 2022-06-12 12:30:23 +03:00
Ayutac
907aae5fb6
Reworking UU matter. Thanks to Autac
* started reworking UU matter

* added mangrove stuff

* added deepslate ores and rebalanced redstone ore

* added moss block creation

* added dripleaf creation

* added gilded blackstone and nether gold creation

* bit more ordered

* added sea lantern and removed a grinder recipe

* improved folder structure

* fixed bugs
2022-06-11 23:46:57 +03:00
Ayutac
db8915d89d
Removed ingot->raw recipes and toasts. Thanks to Ayutac. 2022-06-11 18:06:52 +03:00
Ayutac
e06f07650a
Improved gravel recipes. Thanks to Ayutac. 2022-06-11 18:06:19 +03:00
Ayutac
9420187a85 removed lignite compat 2022-06-09 21:55:58 +02: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
0845d6618b Support id ingredients, and load conditions in datagen. 2022-06-01 22:34:53 +01:00
Ayutac
0bcd2bec03
Implemented Unit Upgraders. Thanks to Ayutac.
* Started working on upgraders

* debug so game doesn't crash anymore

* orientation is saved now

* duplication bug removed

* added model files, lang entries and recipes+toasts
2022-06-01 06:01:51 +03:00
WaffleDevsAlt
d339f61d4d
Add silicon to the fluid replicator's recipes. Thanks to WaffleDevsAlt 2022-06-01 05:20:10 +03:00
modmuss50
ebaddaca59 Fix TR villagers. 2022-05-27 15:20:06 +01:00
Ayutac
f3942a023e fixes #2807 2022-05-26 17:36:50 +02: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
Ayutac
6e46807c05 Update ModLoot.java 2022-05-26 14:22:55 +02:00
Ayutac
381820d2f4
Added treetap to furnace fuel (#2963)
* Update FuelRecipes.java

Needs testing, edited via web interface!

* fixed the bug I hope

works now
2022-05-26 14:10:35 +02:00
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
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
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
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
drcrazy
cf6a8ae72c Fix Iridiyum advancement. Closes #2878 2022-04-06 12:41:12 +03: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
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
AngelBottomless
5dbad187ef
Dispenser Scrap Box related bug fix. Thanks to aria1th.
* Cache World-common recipe and use it

solves weird recipe errors and small performance improvement 
Expects : RebornRecipes are Immutable

* okay what is that split?

this actually solves recipe getting evaporated by modifying recipe object itself
2022-04-01 09:54:42 +03: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
Ayutac
3f28d3903f
Added fishing junk loot (#2869)
Rubber and tree tap
2022-03-30 12:23:55 +03:00
Simon
fa0b47c0a8
Fix #2811 Iron Furnace recipe reset did not reset progress. Thanks to SimonFlapse 2022-03-30 12:23:42 +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
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
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
Simon
037851ba3d
Fix #2872 Converted Nickel Dust advancement to Nugget. Thanks to SimonFlapse. 2022-03-27 16:17:40 +03:00
Simon
c61398c950
Fix #2850 Fetching cooking time based on recipe. Thanks to SimonFlapse
* Added new method cookingTime(), replacing totalCookingTime
* Added GameTest for validating smelting times
2022-03-27 16:15:22 +03:00
Ayutac
d2c146b257
Fixed file ending to .json 2022-03-25 14:20:55 +01:00
Ayutac
eab74f9745
Fixed file ending to .json 2022-03-25 14:20:33 +01:00
Ayutac
ad9fb6ca28
Replaced crafting_table with c:workbench, thanks to Xanthian 2022-03-25 12:33:52 +01:00
Ayutac
dbd0cd72f4
Replace blockus:barrels with c:wooden_barrels, thanks to Xanthian 2022-03-25 12:29:59 +01:00
Technici4n
5eb8890d94
Cable optimization: use BlockApiCache to get adjacent BE. Thanks Technici4n 2022-03-25 10:38:58 +03:00
Ayutac
cfff12afd6
Made drain speed configurable for #2863. Thanks to Ayutac. 2022-03-25 10:28:14 +03:00
xanthian
3ad1e4237f
Delete src/main/resources/data/blockus/tags/items directory 2022-03-24 09:14:17 +00:00
xanthian
f1bb48ee57
Update auto_crafting_table.json 2022-03-23 18:22:19 +00:00
xanthian
36fd7b5368
Create workbench 2022-03-23 18:21:15 +00:00
xanthian
87eb6edf21
Create wooden_barrels 2022-03-23 18:18:38 +00:00
xanthian
bf0b9fc196
Update crude_storage_unit.json
removed blockus c: tag
2022-03-23 17:54:30 +00: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
40f4785816 Fix possible server crash. 2022-03-04 16:07:37 +00:00
modmuss50
85757e7854 Remove autoswitch api as the API broke, and I cannot find a working latest version on jitpack or cursemaven. I can bring this back once fixed, right now this is breaking the build. 2022-03-04 16:06:41 +00:00
modmuss50
0a8e34d9c6 Add ClientNetworkManager 2022-03-02 14:39:30 +00:00
Ayutac
08ed4abcd4
Resin Basin updated. Thanks to Spearkiller and Ayutac. (#2777)
* Resin Basin updated. Thanks to Spearkiller and Ayutac.

Hitbox has been updated to half a block, better matching the model.
Item model has been updated by Spearkiller to look nice.
There was a weird inconsistency about the amount of sap given to player depending on either putting it into an inventory or breaking the block.

Right click to harvest basin didn't work as intended, so removed for now.

Also it seems the block states (full/pouring/pouringTime) are not saved via nbt?

Also also wow the warnings.

* Added removal of sap from basin when right -clicking.

The error was me not understanding that "setFullState" had nothing to do with the variable "isFull". My bad, my bad.

For some reason one right click triggers the onUse twice, and previously I didn't correctly update the sap after the first one, but now it should work. Testing went off without a hitch.
2022-03-02 14:33:27 +00:00
modmuss50
612657ecf4 Even more client/server cleanup. 2022-03-02 14:32:52 +00:00
modmuss50
9c390e40a5 Revert manual.png removal. 2022-03-02 14:22:26 +00:00
modmuss50
0296c59393 More client/server cleanup. 2022-03-02 14:20:34 +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
xanthian
89e0c6b0cf
add c:workbench
to include compat for byg, betterx and other mods with added crafting tables
2022-03-01 12:35:29 +00:00
xanthian
e653d28a7d
add c:wooden_barrels to recipe
tested in dev working fine, 
betterx, blockus, eden ring, vanilla and other mods barrels all accepted as viable recipe
2022-03-01 12:11:34 +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
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
drcrazy
21515c8908 Check for ability to output from side. Closes #2822 2022-02-26 01:25:00 +03:00
drcrazy
0ece1d570c IndGrinder recipes for Iridium ore 2022-02-20 12:39:25 +03:00
ErrorSys
774f7709ef
Change Primary output to Raw Iridium. Thanks to ErrorSys.
Changes primary output to 2x raw iridium as other recipes that use mercury with this machine generally have a greater output than just with water.
Makes more sense to have the raw ore as the output from this machine instead of an ingot, which you would usually get from a furnace of some type.
2022-02-20 12:35:19 +03:00
AngelBottomless
1a4895e525
Fixes Invalid recipe lag by caching validity of recipe. Thanks to aria1th.
reduces 5mspt -> 0.01mspt
2022-02-20 12:26:07 +03:00
drcrazy
df8706381b Fix coolant cells recipe 2022-02-18 23:28:22 +03: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
3b6e1d1d89
Removed empty line in crafting recipe. Thanks to Ayutac 2022-02-18 13:55:28 +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
Ayutac
805b5418db
Removed empty line from crafting recipe. Thanks to Ayutac. 2022-02-18 13:53:17 +03:00
Ayutac
eadd16c4be
Added 2 canning machine recipes for coolant cells. Thanks to Ayutac
Hopefully this can ease the construction of those.
2022-02-18 13:52:39 +03:00
Ayutac
07f8722d83
rebalanced tank capacities. Thanks to Ayutac.
I increased the capacity of tanks to be even remotely considered an alternative to storage units with cells. I kept the values conservative since increasing is always an option, but decreasing might cause item loss.

Changes:
Basic Tank: 35 -> 128 (about 3.5 times)
Advanced Tank: 200 -> 512 (about 2.5 times)
Industrial Tank: 500 -> 1024 (about 2 times)

I oriented myself at the storage unit steps, which are quadrupled with each tier until advanced, then doubled to industrial.

While I was at it, I changed everything to powers of 2 with the shift operator (so other code readers aren't too confused about seemingly arbitrary values) and added explaining comments.
2022-02-18 13:49:39 +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