Commit graph

4381 commits

Author SHA1 Message Date
Lorenz Voßgätter
bdf906c4fc
Fix texture for Greenhouse. Thanks to LauchInterceptor 2021-12-21 01:40:23 +03:00
Lorenz Voßgätter
4e17a341c3
Rubber leaves are mineable with a hoe now (#2668) Thanks to LauchInterceptor 2021-12-21 01:30:56 +03:00
drcrazy
a166affd51 Fix mining speed for unpowered rock cutter. Closes #2597 2021-12-19 23:24:26 +03:00
Ayutac
47fe351ecb
Added Silver Armor. Textures by Xanthian. (#2659). Thanks to Ayutac
Silver is 2 times as durable as gold (still less than iron), -5 of gold's enchantability (still more than diamond and netherite) and cannot pacify/distract piglins. Also, it looks very fancy.
2021-12-19 16:38:05 +03:00
Ayutac
5eab27bead
Fixed activation of root advancement. (#2658) 2021-12-19 12:37:50 +00:00
drcrazy
774d42d944 Fixed some warnings 2021-12-19 04:19:46 +03:00
Jose
a0d827fa3b
TR ores fixes (#2654). Thanks to josilo
* Remove deprecated breakByTool() function. Closes #2609

* Removed leftover unused imports

* Set correct BlockSoundGroup for deepslate ores

* Fix tin tool tag
2021-12-19 03:54:47 +03:00
Ayutac
8d2c181b17
Simplified centrifuging meat with tags (#2651). Thanks to Ayutac
* Simplified centrifuging meat with tags

* Fixed Recipe File Name Typo
2021-12-17 21:53:26 +03:00
Jose
06321451b8
Add missing tags to deepslate ores (#2650). Thanks to josilo 2021-12-17 21:37:05 +03:00
equal-l2
dec9b8287d
Fix chainsaws don't work for non-wood materials (#2646). Thanks to equal-l2 2021-12-12 21:10:07 +03:00
xanthian
52e43da3a8
Fix lamps missing textures (#2634)
* Update lamp_incandescent.json

* Update lamp_incandescent_on.json

* Update lamp_led.json

* Update lamp_led_on.json
2021-12-07 12:54:27 +00:00
Technici4n
7d9fb6d414
Use custom tool materials (#2631)
* Use custom tool materials

* Separate jackhammer materials
2021-12-07 12:53:39 +00:00
modmuss50
d7cb40ccbd Fix disabling ore gen, also disabling rubber tree gen... 2021-12-06 20:35:06 +00:00
xanthian
fb29f4b329
Particle Fix (#2628)
Adds corrected texture for breaking particles for lamps
2021-12-05 00:40:49 +00:00
modmuss50
45e79fe7b3 Fix licenses 2021-12-03 19:02:55 +00:00
modmuss50
f7f8127ba0 Move some smelting and blasting recipes to data gen. 2021-12-03 17:34:42 +00:00
modmuss50
58423c560d Remove old scripts that were used to generate a lot of the existing data.
If needed again they should be rewritten using the datagen mod.
2021-12-03 16:00:41 +00:00
modmuss50
89b47b33fd Add base datagen sourceset 2021-12-03 15:58:43 +00:00
xanthian
f86c7c8202
Animated Generators (#2624)
* Update industrial_tank_unit.json

* Update industrial_tank_unit.json

* Update industrial_tank_unit.json

added orientable variants

* Update advanced_tank_unit.json

* Update basic_tank_unit.json

* Update creative_tank_unit.json

* Update quantum_tank_unit.json

* Update basic_tank_unit.json

* Update advanced_tank_unit.json

* Update industrial_tank_unit.json

* Update basic_tank_unit.json

* Update advanced_tank_unit.json

* Update creative_tank_unit.json

* Update quantum_tank_unit.json

* Update watermill_top_on.png.mcmeta

add additional frames from the sprite, mill animation completes a continuous 360 degree motion rather than back and forth 180 degrees

* Update watermill_side_on.png.mcmeta

adds basic 4 frame animation for side, previous 31 frame sprite was stationary

* Add files via upload

animated 4 frame side

* Delete watermill_side_on.png

* Add files via upload

new 4 frame sprite

* Animated generator textures

added generator side animated texture, which also adds to the gas turbine.
Changed the side texture to be static do easily identify the front

updated semi fluid generator top and side textures to be animated, stuck with existing colour palette although it made no sense :P
2021-11-30 12:16:28 +00:00
xanthian
3d3877b5f1
added dragon siphon animated textures (#2623). Thanks to Xanthian 2021-11-28 18:11:17 +03:00
modmuss50
898298b4d1 Remove unused/broken block loot tables. 2021-11-28 14:22:52 +00:00
xanthian
ededc3b9d0
Orientable Tank blocks (#2618)
* Update industrial_tank_unit.json

* Update industrial_tank_unit.json

* Update industrial_tank_unit.json

added orientable variants

* Update advanced_tank_unit.json

* Update basic_tank_unit.json

* Update creative_tank_unit.json

* Update quantum_tank_unit.json

* Update basic_tank_unit.json

* Update advanced_tank_unit.json

* Update industrial_tank_unit.json

* Update basic_tank_unit.json

* Update advanced_tank_unit.json

* Update creative_tank_unit.json

* Update quantum_tank_unit.json

* Update watermill_top_on.png.mcmeta

add additional frames from the sprite, mill animation completes a continuous 360 degree motion rather than back and forth 180 degrees

* Update watermill_side_on.png.mcmeta

adds basic 4 frame animation for side, previous 31 frame sprite was stationary

* Add files via upload

animated 4 frame side

* Delete watermill_side_on.png

* Add files via upload

new 4 frame sprite
2021-11-28 14:20:52 +00:00
modmuss50
27c684d376 Add tooltip for ore generation depths.
Will only work in SP for now, will need to create a packet to send the data from the server.
2021-11-28 14:14:35 +00:00
modmuss50
5ce0881f56 Add config to disable ore and/or rubber tree generation 2021-11-28 13:39:05 +00:00
modmuss50
262473bd69 Fix breaking drain with wrench, closes #2608 2021-11-26 21:14:01 +00:00
modmuss50
3e1f1b394a Allow covering waterlogged cables. Closes #2610 2021-11-26 21:09:09 +00:00
modmuss50
4a839ae74f Fix cable covers getting used up in creative. 2021-11-26 21:08:18 +00:00
modmuss50
8b24b8439a Replace MixinItemRenderer by the new 1.17 vanilla API. Fixes #2602 2021-11-26 21:06:45 +00:00
modmuss50
6c12d752fe Fix deepslate ores not dropping anything. 2021-11-26 20:16:10 +00:00
modmuss50
3752154bcd Add a simple tool to visualise ore distribution. 2021-11-26 20:01:08 +00:00
modmuss50
98bfb7b958 Deepslate ore gen improvements. 2021-11-17 23:19:38 +00:00
modmuss50
6f8282b188 Add deepslate ores 2021-11-17 22:40:02 +00:00
modmuss50
dd79effe80 Finish rubber trees. 2021-11-17 21:28:26 +00:00
modmuss50
e1093d782a First pass at world gen, rubber tree needs further work, ideally depends on fab api changes. 2021-11-16 23:54:31 +00:00
modmuss50
4a2e81550f Port to 1.18-pre2 without worldgen 2021-11-16 22:38:31 +00:00
KySoto
2fc6856826
Added deepslate variants of vanilla ores (#2600)
* Added deepslate variants of vanilla ores
* Update src/main/resources/data/c/tags/items/lapis_ores.json
Oof thanks for that catch
Co-authored-by: modmuss50 <modmuss50@gmail.com>
* Update coal_ores.json
forgot to add deepslate coal to the tag update
Co-authored-by: KySoto <kysoto2@gmail.com>
Co-authored-by: modmuss50 <modmuss50@gmail.com>
2021-11-11 10:30:15 +03:00
drcrazy
9dad64722c Fix potted rubber sapling name and drop. Closes #2596 2021-11-10 16:55:10 +03:00
modmuss50
a221d757aa Dont use fabric impl classes. 2021-11-06 12:32:17 +00:00
nalepamarcin
94ef6d1562
Fix missing hitbox of single block cable (#2593)
It prevented user from destroying last cable piece as it could not
be hit without being connected to other cable or a machine.

Bug was introduced in commit f39c619c "Fix cable shape computation".
2021-11-03 23:12:04 +01:00
Technici4n
7b4306a883
Fix #2569: make IDSU work properly with the new energy API (#2588) 2021-11-02 15:59:23 +01:00
Technici4n
b300456e77
Fix #2574: Use the fabric item API for auto input and auto output (#2585)
* Fix #2574: Use the fabric item API for auto input and auto output

* Only auto-insert at most 4 items at once
2021-10-31 18:14:26 +01:00
Technici4n
5a9d974eda Fix AE2 recipes: remove old charged certus, add deepslate certus support, fix dupe bugwhen grinding crystals 2021-10-22 18:40:31 +02:00
drcrazy
36203239e1 Cables with different transfer rate shouldn't connect. Closes #2572 2021-10-22 09:11:45 +03:00
Technici4n
165d27cfda
Set creative tank amount to capacity on tick. Fix #2558. Thanks to Technici4n
* Set creative tank amount to capacity on tick. Fix #2558.
* Remove FluidValue.INFINITE
* Was better with the /1000
2021-10-08 08:49:19 +03:00
Technici4n
f39c619c22
Fix cable shape computation. Closes #2435. Thanks to Technici4n
* Fix cable shape computation. Closes #2435.
* Remove unused import
2021-10-08 08:48:11 +03:00
Technici4n
99c46f0a56 Use new AE2 tag for certus quartz crystals 2021-10-03 23:06:56 +02:00
drcrazy
3c050b2105 Use exchangeStack method in fluid pickup. 2021-09-20 14:01:49 +03:00
Justin Vitale
f8c224ecf5 Add closing brackets to fusion reactor state text 2021-09-20 20:04:28 +10:00
drcrazy
4c4881e7e5 Cells should work on caludron. Closes #2490 2021-09-20 05:38:43 +03:00
Dave Smith
6b89b08ff0
Adds compressor recipe for empty cell -> compressed air cell (#2505) 2021-09-20 01:50:25 +03:00
Dave Smith
7d85960a4a
Fix 2509; reviewed all ticking entities to ensure consistency in checks (#2510) 2021-09-20 01:48:41 +03:00
drcrazy
42f0d5ce42 Smelt iron block to refined iron block. Closes #2487 2021-09-17 23:20:11 +03:00
drcrazy
5261d9f11f Bauxite should be mined with iron pickaxe. Closes #2489 2021-09-17 22:59:33 +03:00
drcrazy
69626d279b Sawdust got usage in recipes 2021-09-17 22:33:22 +03:00
Dave Smith
69be970d72
Removed unnecessary getFacingEnum method; super does all this stuff already and is more correct (#2502) 2021-09-17 18:28:29 +10:00
Technici4n
9fb725bdc5
Buff solar panels a bit (#2501)
* Buff solar panels

* First two tiers don't produce energy at night

Co-authored-by: Dave Smith <dizzyd@dizzyd.com>
2021-09-16 23:46:07 +02:00
Dave Smith
56dcc4dd16
Add support for solar energy scaling during day (#2497) 2021-09-16 23:45:38 +02:00
Dave Smith
dcca103f9a
Fix #2407: Enable overfill checking on fusion reactor energy stored (#2495) 2021-09-16 22:31:54 +02:00
Dave Smith
41422f4a66
Fix #2478; make sure to use correct units when calculating fuel usage per tick (#2499) 2021-09-16 22:25:02 +02:00
Technici4n
086ad25a47
Network energy cables (#2493) 2021-09-16 22:23:41 +02:00
Dave Smith
9d6890946d
Fix issue 2496; don't tick watermill on client side (#2498) 2021-09-15 20:40:16 +03:00
modmuss50
8c6a0155e7 Add a basic gametest to test the grinder. 2021-09-01 23:08:42 +01:00
modmuss50
6c3b461e11 Fix build and update deps 2021-09-01 21:17:58 +01:00
Technici4n
3e2b0e11ae
Initial migration to V2 Energy API (#2474)
* Initial Energy API refactor

* Allow charging in energy storage BEs

* Remove maven for experimental fabric

Co-authored-by: modmuss50 <modmuss50@gmail.com>
2021-09-01 21:14:15 +01:00
drcrazy
a9850d0d61 Rock cutter is available earlier for ppl used to modded ore doubling. Closes #2463 2021-08-14 01:11:12 +03:00
drcrazy
7d415eb163 Smelt raw iridium in Industrial Blast Furnace. Closes #2467 2021-08-14 00:21:18 +03:00
drcrazy
cb747b0b67 Raw metal blocks are now smeltable. Closes #2446 2021-08-14 00:09:13 +03:00
drcrazy
38aaeabf3c Fix powered tools combat stats. Closes #2468 2021-08-12 17:22:43 +03:00
Technici4n
fd9d776b43
Initial move to the fabric fluid API (#2465) 2021-08-05 20:51:11 +01:00
modmuss50
482fe4f01f Update Trinkets api 2021-07-23 00:43:57 +01:00
modmuss50
548c12eee8 Cleanup worldgen code, should fix a lot of issues with other mods. Configuration will come later. 2021-07-20 20:16:10 +01:00
modmuss50
08e504a607 Update Gradle, loom. Give it more memory. 2021-07-20 19:15:03 +01:00
modmuss50
66c70e7e96 Fix conflicts with mojang's mappings 2021-07-20 19:03:30 +01:00
modmuss50
2ae5e8ff5b Finish 1.17.1 port 2021-07-20 19:01:38 +01:00
drcrazy
08a2cdb081 First pass on 1.17.1 update. 13 errors left 2021-07-20 03:38:43 +03:00
drcrazy
3edf36e0ef Decrease carbon footprint of Solid fuel generator. Improvement due to #2403 2021-07-19 21:04:45 +03:00
drcrazy
0932b86811 Revert fix for corner. I was looking on a wrong line on debug screen. Closes #2450 2021-07-19 16:40:46 +03:00
drcrazy
cb6c6337a8 Fix some warnings. 2021-07-19 16:15:49 +03:00
drcrazy
9cb90bb56d Bronze small dust is gone. 2021-07-19 10:55:40 +03:00
drcrazy
163d41ad85 Aluminium and brass small dusts are gone 2021-07-19 10:49:20 +03:00
drcrazy
c319e66b81 Silver and lead small dusts are gone. 2021-07-19 10:33:11 +03:00
drcrazy
1dde0f962d Fix centrifuge recipes for brass, bronze and electrum. 2021-07-18 13:51:41 +03:00
drcrazy
0cab865fdb Gold and Tin small dusts are gone. 2021-07-18 13:45:07 +03:00
drcrazy
a05b497cb2 Raw metals got "c" tags. Closes #2448 2021-07-16 02:15:43 +03:00
drcrazy
c70a8b4eb4 More loot tables for the god of loot tables. Closes #2454 2021-07-16 01:36:25 +03:00
Yan Chubikov
8c57ae4a4e
DashLoader compatibility (#2453). Thanks to alphaqu 2021-07-16 00:59:12 +03:00
Technici4n
779a2c8b60
Make 1 copper block give 9 copper plates (#2449). Thanks to Technici4n!
Copper blocks were changed to 9 copper ingots at some point during the snapshots.
2021-07-16 00:58:09 +03:00
drcrazy
b8715ecdda Gold small dust is gone. All hail gold nugget. 2021-07-07 16:28:03 +03:00
drcrazy
f9f911bf04 Fix cell rendering for modded spriteless fluids. Closes #2429 2021-07-07 14:12:34 +03:00
drcrazy
f9381b5e01 Change speed increase to time decrease. Closes #2438 2021-07-05 21:11:03 +03:00
drcrazy
5d1d5f79bb FIx breaking speed to TR ores. Closes #2425 2021-07-05 20:52:05 +03:00
drcrazy
53cd1d8f6b Fix ore drop. Closes #2427 2021-07-05 12:00:54 +03:00
drcrazy
23868443b5 Iron small dust is gone. All hail iron nugget. 2021-07-05 11:39:02 +03:00
drcrazy
5eef35551a Fix recipe outputs display in REI. Closes #2417 2021-07-03 01:11:18 +03:00
drcrazy
399f267b43 Probably fix attempt to grow rubber tree not on server. Closes #2418 and #2357 2021-07-02 22:46:49 +03:00
drcrazy
15b354fd65 Autocrafting table got proper orientation. Closes #2419 2021-07-02 17:02:00 +03:00
drcrazy
729b645cd7 Nerf clay block in extractor. Closes #2421 2021-07-02 14:18:18 +03:00
drcrazy
45725217a5 Fix end stone bricks recipe. Closes #2394 2021-07-01 20:58:23 +03:00
drcrazy
05d8c2ccc6 Fix step down buttons for Fusion reactor. Closes #2412 2021-07-01 20:37:45 +03:00
drcrazy
d5f995e7e9 Fix corner calculation for GreenhouseController 2021-06-29 12:07:29 +03:00