maciek/TechReborn
maciek/TechReborn
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5611 commits 1 branch 0 tags 80 MiB
Commit graph

4730 commits

Author SHA1 Message Date
modmuss50
e5b5c399ef Even more gui cleanup, remove most RenderSystem calls 2023-05-31 19:21:36 +01:00
modmuss50
7499ad6f90 More loot tables 2023-05-31 19:21:36 +01:00
modmuss50
93b9c22cf7 Fix fishing station crash 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
modmuss50
876c6154e1 Loot changes - main compiles 2023-05-31 19:21:36 +01:00
modmuss50
d1e62b2fed More rubber block settings 2023-05-31 19:21:36 +01:00
modmuss50
42d9a0445c More 1.20 work. 2023-05-31 19:21:36 +01:00
modmuss50
133f64ac9f Start on new block settings. 2023-05-31 19:21:36 +01:00
modmuss50
503ed7ee49 Start on 1.20 2023-05-31 19:21:36 +01:00
modmuss50
34784f94d9 Fix build + crash 2023-03-18 12:47:35 +00:00
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
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
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
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
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
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
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
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
ayutac
19c381a333 corrected painting tool height 2022-11-15 17:02:03 +01:00
modmuss50
12a729234c Appearance fixes and improvements. 2022-11-14 08:56:54 +00:00
ayutac
c30db3317c new storage fronts by Spearkiller 2022-11-09 15:56:01 +01:00
ayutac
013718e60f proper GPS texture by Spearkiller 2022-11-09 12:38:53 +01:00
modmuss50
878aa0a74d Support new fabric block appearance API 2022-11-08 08:58:13 +00:00
Ayutac
3d5300e908
added GPS by Ayutac (#3054) 
* added GPS by Ayutac

* removed the broken tooltip

Co-authored-by: ayutac <fly.high.android@gmail.com>
 2022-11-08 08:48:37 +00:00
Ayutac
f9bf648bfe
fixed a sawmill bug by Ayutac (#3052) 
Stone stairs and stone slabs could be grinded to sawmill dust

Co-authored-by: ayutac <fly.high.android@gmail.com>
 2022-11-08 08:48:28 +00:00
modmuss50
10ebd36920 Fix build 2022-09-26 21:44:09 +01:00
modmuss50
b4c2940db8 More datagen 2022-09-26 19:40:08 +01:00
modmuss50
c97cadeea2 Update Fabric API and make use of its new features. 2022-09-26 18:40:45 +01:00
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