Commit graph

5631 commits

Author SHA1 Message Date
AngelBottomless
8b527dbead
add shulker extraction and fix storing techreborn storage (#3111)
* add shulker extraction and fix storing techreborn storage

Only accept when nbt is null.
Adds shulker-extracting support

* fix when storeItemStack was empty

* fix inputting stack at first

* Use MC pair

---------

Co-authored-by: modmuss50 <modmuss50@gmail.com>
2023-03-18 12:35:56 +00:00
Maxim Varfolomeyev
9841d3332d
Add Pump (#3092)
* basic setup for pump

* added proper outward scanner for blocks

* added changes from Spotless

* moved pump to tier2 package
increased energy storage
changed order of checks for lava/water

* added advanced_machine_frame to the recipe as is proper for tier 2

* decreased energy consumption
added config to iterate inwards by default

* fixed one-over block
removed extensive debug logging

* added display of depth and range to GUI
changed minimum range to 0 (pumps directly below)
extracted fluid detection and sound event logic into separate methods
removed delay in search for the next block to pump
added destruction of fully waterlogged blocks (kelp, stairs, fences etc), they drop their default item

* found incorrect reset when range/depth were changed. fixed
optimized check for pumping elapsed time
muffle upgrade now properly silences full tank and not-enough-energy cases
simplified checks for fluid (should work for any properly implemented types)
rewrote checks for failure conditions (failed for quad-overclock setup)

* added "exhausted" label to GUI
added i10n for GUI labels
removed sound sfx for not-enough-energy and tank-not-accepting-fluid failure events

* removed debug logging
updated textures with animation

* updated textures and animation

* grouped fields together and moved constructors and classes
rewrote sound selection + muffled pump now gives no sound at all

* changed replacement blocks for end and nether to endstone and blackstone
added pump block into the functional tab of creative menu

* added pump block into the functional tab of creative menu

* conflict resolved
2023-03-18 12:27:44 +00:00
AngelBottomless
0b3eb68038
optimize RollingMachineBlockEntity (#3124) 2023-03-18 12:21:39 +00:00
AngelBottomless
f3a6e7a21f
leave free space for creative tank (#3125) 2023-03-18 12:20:36 +00:00
AngelBottomless
92fce93890
prevent spamming packets (#3126)
1/20 less laggier tm
2023-03-18 12:19:53 +00:00
modmuss50
82978076d9 Set curseforge version 2023-03-14 19:32:01 +00:00
modmuss50
cd8572193d Update energy 2023-03-14 19:31:41 +00:00
modmuss50
ab50a9fd95 1.19.4 stable 2023-03-14 19:31:41 +00:00
Ayutac
08502cd6bc Port/1.19.4 new recipes (#3120)
* Added cherry recipes to sawmill

* Added extractor recipes for new flowers
2023-03-14 19:31:41 +00:00
Ayutac
b52c489976 fixed orange tulip extraction recipe 2023-03-14 19:31:41 +00:00
modmuss50
7c3beb2d1a Fix build. 2023-03-14 19:31:41 +00:00
modmuss50
759c3fbfc3 1.19.4-pre1 2023-03-14 19:31:41 +00:00
jlortiz0
32e719115b Fix chemical reactor concrete powder recipe
Fixes bug introduced in 07547df where trying to dye concrete powder in a chemical reactor results in carpet.
2023-02-07 07:47:35 +01:00
modmuss50
0169651414 Only validate GUI types from TR. 2023-02-02 16:10:48 +00:00
modmuss50
4be0031344 Cleanup @Environment annotations. 2023-02-01 22:30:16 +00:00
modmuss50
d305a7f092 Auto convert grinder recipes to datagen 2023-02-01 22:11:21 +00:00
modmuss50
acccaaa84c Update to loom 1.1 2023-02-01 21:09:48 +00:00
modmuss50
0f8d3a8ccc Data gen alloy smelter recipes 2023-01-23 15:05:45 +00:00
Mark
3982da5c63
Remove old code 2023-01-19 18:53:07 +00:00
ayutac
e29371c82c Fixes #3104 2023-01-10 08:09:30 +01:00
ayutac
2e6f8539fd changed the upgrader textures so that their display matches the new storage unit textures 2023-01-09 08:28:33 +01:00
ayutac
4ae5dfbc8d added solar panels to the other generators 2023-01-08 14:59:05 +01:00
Spearkiller
529b374ecb
Updated Nanosaber sprites and models (#3064). Thanks to Spearkiller.
* updated nanosaber.json

* updated nanosaber.json

* updated nanosaber.png
2022-12-27 11:02:05 +03:00
modmuss50
9faa008939 Fix crash. Closes #3091 2022-12-18 12:29:17 +00:00
Ayutac
ad81e8cc8c
1.19 fishing station (#3071)
* added fishing station w/o recipe or functionality

* added render cutout

* fixed model parent

* added config stuff and water check

* added inventory

* added functionality

* added fishing station to vanilla creative menu

* fixed GUI rendering

* added recipe+advancement

* fixed hotbar icon

Co-authored-by: modmuss50 <modmuss50@gmail.com>
2022-12-18 12:24:10 +00:00
modmuss50
0aa4126966 Remove access widener now provided via fabric API 2022-12-18 12:16:31 +00:00
Ayutac
ac7f8c8496
added uu matter recipe provider hook and some examples (#3072)
* added uu matter recipe provider hook and some examples

* added uu matter recipe provider hook and some examples

* fix formatting

Co-authored-by: modmuss50 <modmuss50@gmail.com>
2022-12-18 12:14:02 +00:00
Ayutac
39f2fa9229
made ore gen more configurable (#3086) 2022-12-18 12:11:31 +00:00
modmuss50
4c037bd80b Add some basic spotless formatting rules. 2022-12-18 12:10:22 +00:00
modmuss50
d2e4b92984 Remove santa hat easter egg.
It has served it purpose well for a number of years.
2022-12-18 12:04:57 +00:00
modmuss50
d0a2abefa5 Update Gradle + deps. Use spotless for license header checks. 2022-12-18 12:01:21 +00:00
Ayutac
80616eb05c
Added debug tool to OP tab (#3089)
* added debug tool to OP tab

* small refactoring

Co-authored-by: ayutac <fly.high.android@gmail.com>
2022-12-09 10:29:04 +01:00
Ayutac
3e24025acc
Fixes #3087 and keeps #3083 fixed 2022-12-08 13:32:38 +01:00
modmuss50
573ba92920
1.19.3 port (#3074)
* Start on 1.19.3 port

* Client runs, kinda

* Fix crash when opening item group

* Fix dynamic models

* Add atlas config for slot sprites

* Ore :)

* Rubber tree's, lakes and ore cleanup

* Add blocks to item group

* Fix rubber tree sapling

* added vanilla creative and missing peridot pickaxe (#3076)

* added vanilla creative and missing peridot pickaxe

* some small tweaks

Co-authored-by: ayutac <fly.high.android@gmail.com>

* added bamboo saw mill datagen recipes (#3077)

* added bamboo saw mill datagen recipes

* fixed datagen error

Co-authored-by: ayutac <fly.high.android@gmail.com>

* 1.19.3-rc1

* 1.19.3 port villager housing (#3082)

* added NBTs for the houses

* added the houses, theoretically

* added the houses, practically

* made house gen configurable

Co-authored-by: ayutac <fly.high.android@gmail.com>

* Fixes #3083

* reordered TR creative tab and small tweaks to the rest (#3081)

* reordered TR creative tab and small tweaks to the rest

* small bugfix

Co-authored-by: ayutac <fly.high.android@gmail.com>

* 1.19.3

* Bump version

Co-authored-by: Ayutac <skoch02@students.uni-mainz.de>
Co-authored-by: ayutac <fly.high.android@gmail.com>
2022-12-07 16:28:29 +00:00
modmuss50
7b7fba96c5 Bump version 2022-11-21 10:34:48 +00:00
modmuss50
fa51d633b6 Update energy 2022-11-21 10:33:03 +00:00
Ayutac
a6aadc3ec3
Fixed elevator recipe 2022-11-20 18:10:15 +01:00
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
10468e762e
Fixed #2580 (#3069)
Disabled putting storage units into other storage units.

The overflow can still be triggered in other ways, but players must be very deliberate for that...

Co-authored-by: ayutac <fly.high.android@gmail.com>
2022-11-20 16:31:31 +00:00
Ayutac
7be590d01d
Fixed #3049 (#3068)
Blocks now drop the first non-silktouch entry in their loot tables if there is one, and only in quantity of 1.
That means usual blocks will drop themselves, stone/deepslate drop their cobbled version, amethyst bud and sculk drop nothing, ore blocks drop one of their raw metal/gem

Co-authored-by: ayutac <fly.high.android@gmail.com>
2022-11-20 16:31:04 +00: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
Ayutac
d84eec20cb
Fixes #2887: PoweredCraftingHandler#onCraft doesn't check for overflow (#3065) 2022-11-17 23:58:14 +01:00
Technici4n
268de10661 Fix #3002: Crash when IDSU energy storage is queried on the client 2022-11-17 13:33:36 +01: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
357c86940d Add none solid covers tag 2022-11-16 21:04:02 +00:00
Ayutac
086e416157
added blockdrop datagen (#3061)
Co-authored-by: ayutac <fly.high.android@gmail.com>
2022-11-16 20:38:02 +00:00