Commit graph

34 commits

Author SHA1 Message Date
modmuss50
4ee192b4cd Gui cleanup 2023-05-31 19:21:36 +01:00
modmuss50
0171ef9778 Update REI support. 2023-05-31 19:21:36 +01:00
modmuss50
82c84c7a88 Remove more dead UI code. 2023-05-31 19:21:36 +01:00
modmuss50
8f8de066f6 Nuke fixes and improvements 2023-05-31 19:21:36 +01:00
modmuss50
9c3ef46665 Fix iron furnace xp button tooltip 2023-05-31 19:21:36 +01:00
modmuss50
53a299b12a Cleanup imports 2023-05-31 19:21:36 +01:00
modmuss50
e5b5c399ef Even more gui cleanup, remove most RenderSystem calls 2023-05-31 19:21:36 +01:00
modmuss50
2f07306d90 Some simple fixes 2023-05-31 19:21:36 +01:00
modmuss50
08f75889ec It runs, sort of... 2023-05-31 19:21:36 +01:00
modmuss50
027be66230 TR ui work 2023-05-31 19:21:36 +01: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
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
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
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
4c037bd80b Add some basic spotless formatting rules. 2022-12-18 12:10:22 +00:00
modmuss50
d0a2abefa5 Update Gradle + deps. Use spotless for license header checks. 2022-12-18 12:01:21 +00: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
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
12a729234c Appearance fixes and improvements. 2022-11-14 08:56:54 +00:00
drcrazy
dde6da28e6 Add REI Exclusion zones. Closes #2626 2022-08-25 04:00:48 +03:00
drcrazy
6a72d5011a Fix recycler recipe display. 2022-08-08 17:14:30 +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
modmuss50
f3177b691a Revert buildscript changes, will bring back once 0.13 loom is ready. 2022-06-27 22:48:24 +01:00
modmuss50
abcac85d0e Cleanup modcompat code, initial build setup for JEI support. 2022-06-24 00:12:30 +01:00
drcrazy
6cde366510 Bump deps 2022-06-06 18:56:16 +03: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
c3622cb263 Split client and server. 2022-05-19 21:45:31 +01:00