166 Commits

Author SHA1 Message Date
IntegratedQuantum
a29bb3c3b9
Rename EntityDataClass to BlockEntityType (#1464)
I also removed the legacy (java) blockEntity references.

fixes #1454

@Argmaster since you wrote the original code in #1224, please review and
check if the new names are fine for you.
2025-05-18 19:20:51 +02:00
Krzysztof Wiśniewski
6596835cf3
Tweak coal ore health (#1456) 2025-05-18 12:07:22 +02:00
IntegratedQuantum
4d62da9ae8 Rename solid to replacable
fixes #1358
2025-05-12 18:06:21 +02:00
IntegratedQuantum
a9a907313b Change cloth block tag to cloth
fixes #1095, the breaking speed was already adjusted previously
2025-05-09 17:53:43 +02:00
IntegratedQuantum
c7d938e965 Make tools with encased stone better at that stone type.
fixes #1398
2025-05-09 16:42:46 +02:00
IntegratedQuantum
c8ee037027 Make stones (except sandstone) not fragile
they are already bad enough as it is, and having them fragile too makes them even less likely to be used (and we do want them to be used, see e.g. #1398)
2025-05-08 21:59:17 +02:00
Carrie
93d5292338
Make iron darker, tweak copper, tweak gold block (#1411) 2025-05-07 18:20:11 +02:00
Carrie
2cf88669e7
Removed unused block textures (#1402) 2025-05-05 17:21:10 +02:00
Carrie
7fed896a77
Permafrost, cold grass, and osier (+ biome changes) (#1369)
* Permafrost, cold grass, osier, cold taiga, tweaks

* Tweak osier and cold grass item

* formatting

* Move cold_taiga to taiga/cold and migrate taiga/base

* Fix subbiomes
2025-05-04 12:39:44 +02:00
Carrie
900b52a02c
Resin assets (#1383)
* Resin assets

* resin_block = .wood

* Make resin block more frictiony
2025-05-04 12:34:17 +02:00
Carrie
a2911710a6
Add ladder assets (#1310) 2025-04-27 17:31:48 +02:00
Carrie
1c22c879f4
Ruby ore + diamond texture tweaks (#1349)
* Ruby blocks and item, tweaks to diamond textures

* Tweak ruby ore and add recipes

* Change ore height

* minHeight
2025-04-27 10:58:27 +02:00
IntegratedQuantum
05ab8a4a5b Make mushrooms degradable 2025-04-26 09:38:57 +02:00
IntegratedQuantum
f41504f684
Tool reparammarametetrizatation (#1332)
* Change how to specify tool parameters

* Some mild reparammarametetrizatation and pickaxes now only have one relevant tip.

* Ignore properties that couldn't be found instead of assigning some default

* Remove grip and strength from materials

* Ensure that all woods can break all stones, but not copper, and ensure that all stones tipped woods can break copper.

Also increased weight damage slightly

* Reparammamaramamararara

* Update shover and axe (mostly copied from the pickaxe with less damage)

* Remove the unused FunctionType struct.

* Remove named slots from axe
2025-04-24 21:57:12 +02:00
Carrie
f0bfe30c0e
Allow ores on obsidian (#1305) 2025-04-23 22:43:58 +02:00
Krzysztof Wiśniewski
a4584d5e96
Add void block (#1324)
* Add void block

* Apply review change requests
2025-04-22 19:18:45 +02:00
Carrie
332e9f57f0
Add silver ore (#1306)
* Add silver ore, ingot, block, lower gold ore

* Add recipes, make gold and silver ore values different
2025-04-16 12:36:26 +02:00
Carrie
d4e187e5af
Redistribute ores (#1304) 2025-04-14 09:27:54 +02:00
Carrie
da3ffce871
Big mushroom blocks (#1299)
* Add big mushroom blocks, tweak mushrooms to match

* Add mushroom branches, make glimmergill cap emissive, add recipes, material vals

* Tweak blockHealth
2025-04-13 16:50:23 +02:00
Carrie
871b635cae
Sulfur ore, block, and torches (#1287)
* Sulfur ore, block, and torches

* Tweak block health

* Add material values, brighten sulfur block
2025-04-13 16:45:05 +02:00
Carrie
747a2dc957
Add copper ore and make iron generate deeper (#1268)
* Add copper ore and redistribute ores

* Add copper recipes

* Revert ore redistrib, nerf copper
2025-04-04 17:32:15 +02:00
Krzysztof Wiśniewski
098115ad53
Block Entity Data (#1224)
* Implement VTable for entity data

* Make storage variable global

* Connect onInteract event

* Remove chest poc

* Revert "Remove chest poc"

This reverts commit 49759687dba180cbdf9609cfd942d2363991c4d5.

* Separate client and server callbacks

* Fix formatting issues

* Apply review requests

* Add assert and todo

* Apply review requests

* Remove chest textures

* Fix plenty of bugs in implementation

* Update src/entity_data.zig

Co-authored-by: IntegratedQuantum <43880493+IntegratedQuantum@users.noreply.github.com>

* Update src/entity_data.zig

Co-authored-by: IntegratedQuantum <43880493+IntegratedQuantum@users.noreply.github.com>

* Do not trigger onInteract while shifting

* Apply review requests

* Apply review change requests

* Update src/game.zig

Co-authored-by: IntegratedQuantum <43880493+IntegratedQuantum@users.noreply.github.com>

---------

Co-authored-by: IntegratedQuantum <43880493+IntegratedQuantum@users.noreply.github.com>
2025-03-31 20:07:31 +02:00
Carrie
8d54e187cf
Convert leaf piles into texturePiles (#1242)
* Convert leaf piles to texturePiles, add to biomes, reduce break time

* Fix rotation name, tweak yellow leaf pile texture, delete unused leaf pile textures
2025-03-28 19:57:19 +01:00
Carrie
dc902b3909
Add chest textures (#1245) 2025-03-27 16:41:28 +01:00
IntegratedQuantum
005fb6a3aa Fix missing newline 2025-03-24 20:38:58 +01:00
Krzysztof Wiśniewski
f5a2e3d3c1
Revert "Remove sbb blocks" (#1226)
This reverts commit 65cee0ef1202b3a85f9ac2799dc0f6b902fa4074.
2025-03-24 19:11:10 +01:00
IntegratedQuantum
42268c4b22 Allow branches to have a shell model that's always rendered and add leafy branches for all wood types. 2025-03-23 20:21:37 +01:00
Carrie
8f0693f7b0
Lily pads / adjust water reflectivity (#1221)
* Add lily pads and reduce water reflectivity

* tweka water reflectivity
2025-03-23 19:36:31 +01:00
Krzysztof Wiśniewski
07f5d823dd
Add pile rotation mode (#1216)
* Add pile rotation mode

* Fix formatting issues

* Rename to .zig.zon

* Update textures to those provided by ikabood-kee

* Add gradual block breaking

* Adapt to new model and texture changes

* New duckweed textures

* Add configurable state count

* Rename to texturePile

* Add moreData storage

* Apply review suggestions

---------

Co-authored-by: Carrie <carriecapp9@gmail.com>
2025-03-23 19:35:38 +01:00
IntegratedQuantum
1268f8e95e Allow specifying all 16 model textures via its index
fixes #1144
2025-03-22 14:26:59 +01:00
Carrie
302544bbcb
Add cactus flowers, tussock, and cactus top texture (#1195)
* Add cactus flowers, tussock, and cactus top texture

* minor cactus flower texture tweaks

* Gradient cactus flower
2025-03-19 21:45:12 +01:00
Carrie
32269f1f84
New branch textures (#1200)
* Birch branch and start of mahogany branch textures

* Do all the other ones and tweka mahogany
2025-03-13 20:59:22 +01:00
OneAvargeCoder193
35fedba2c6
Change branches so that the textures can be rotated (#1183)
* add pipes, which are like branches but you can have different textures on each mode

* fix formatting

* remove testing block

* fix more formatting issues

* fix more formatting issues

* simplify fromRelPos

* fix fromRelPos and give pipe same properties as branch

* fix flashing dots caused by floating point inaccuracies

* remove debug object

* fix formatting issues

* fix a couple things

* remove debug textures

* fix formatting and also make dir an enum

* fix more formatting issues

* remove branches

* rename pipe to branch

* remove floating point fix

* remove branch model

* Add back branches and add temporary textures

* add back the branches

* fix some stuff

* small changes

* fix compiler error

---------

Co-authored-by: Carrie <carriecapp9@gmail.com>
2025-03-12 18:27:28 +01:00
Carrie
3c7231cb43
Darken grass plants for better contrast (#1182)
* Make grass plants darker for better contrast

* Make grass plants blend into grass blocks
2025-03-09 12:57:38 +01:00
IntegratedQuantum
b303244773
Run the zon format check with our zig fmt (#1175)
* Format all the zon assets to prepare for running the the format check with our zig fmt

* Update ci.yml

* Remove zon files from the old formatter

* Add a formatting violation to test the CI

* Undo the check
2025-03-07 22:34:55 +01:00
Carrie
f9c5e4bb98
Glimmergills and Glimmergill caves (#1174)
* Add glimmergills and glimmergill caves

* Lower glimmergill cave height

* Formatting
2025-03-07 22:07:44 +01:00
Carrie
81bb084997
Branches for all wood types + item textures and recipes (#1149)
* Add all branch variants, item textures, recipes

* Delete unused textures

* Fix indentation
2025-03-06 21:32:39 +01:00
Carrie
b497133967
Mushrooms: Bolete and Toadstool (#1165)
* Add bolete and toadstool

* Add item textures and add to biomes
2025-03-06 20:34:47 +01:00
IntegratedQuantum
8a86b8f0c7 Remove the empty migrations file, since it causes errors. 2025-03-05 22:23:03 +01:00
Krzysztof Wiśniewski
0236451ac8
Add block migrations to mitigate damage after block renames (#1125)
* Add block  migrations logic

* TEMP: Example migration

* Adjust block migrations according to review

* Fix indentation in example file

* Remove unused migration enums

* Fix indentation in example file

* Extract asset ID creation to separate function

* Remove example migration

* Restore readAllFilesInAddons to shrink the diff

* Revert "Extract asset ID creation to separate function"

This reverts commit 3fea996152bd464643a9d84a52008e568f726f34.

* Shrink diff in assets.zig

* Fix migration behavior with empty migration map

* Restore birch_log.png

* Shrink diff

* Fix use of commonBlocksMigrations

* Remove biome and item migrations code

* Remove Palette changes

* Apply review suggestions

* Fix use after free in migration code

* Revert readAllZonFilesInAddons back to how it was but with migrations included

* Remove stray whitespace

* Remove stray defer

* Fix style issues

* Apply review suggestions

* Fix formatting issues

* Apply review suggestions

* Apply review suggestions

* Remove addon name from migrations

* Change migration notation to list of objects

* Apply review suggestions

* Apply review suggestions

* Apply review suggestions
2025-03-05 19:43:43 +01:00
IntegratedQuantum
72a68d6b6d Allow specifying the side model for the torch rotation.
fixes #1016
2025-03-04 19:02:17 +01:00
Krzysztof Wiśniewski
c4a4d29a07
Add branch block type (#1118)
* Add branch block type

* Fix tabs

* Degenerate quads by setting them (.5,.5,.5)

* Add directional branch connecting

* Fix branches connecting to non-solid blocks

* Simplify branchTransform

* No automatic connections to solid blocks

* Use Neighbor to express branch connections

* Allow manual modification of branch connections

* Update branch model to have solid ends

* Tweak block connecting logic

* Tweak comments

* Tweak branch model UV

* Update branch debug texture

* Remove extra faces on connections

* Apply review suggestions

* Exclude viewThrough blocks from branch updateData

* Revert "Exclude viewThrough blocks from branch updateData"

This reverts commit 5942870253e841669c26db959e956fe416d77b9e.

* Apply review suggestions

* Snakes not allowed

* Fix style issues

* Apply review suggestions

* Fix formatting issue
2025-03-03 17:00:42 +01:00
ikabod-kee
ef1a33f6d5
Pickaxe Rebalance (2) (#1128)
* Pickaxe Rebalance (2)

* Changed ore health

* Can you believe I forgot marble?

* Fix indentation and fix duplicate entry in void_stone.zig

---------

Co-authored-by: IntegratedQuantum <jahe788@gmail.com>
2025-03-01 16:28:15 +01:00
IntegratedQuantum
e7b3bf5727 Introduce block resistance, remove breakingPower and rename power to damage.
fixes #935
2025-02-28 21:32:47 +01:00
Carrie
b660a26b19
Uranium ore, ingots and blocks (#1127)
* Add uranium assets

* Redesign raw uranium to resemble the ore better

* Fix formatting
2025-02-28 17:44:25 +01:00
IntegratedQuantum
163db4929a Introduce modifiers that allow changing the power based on the block type.
Basically https://github.com/PixelGuys/Cubyz/issues/172#issuecomment-2685028175
2025-02-26 23:02:18 +01:00
IntegratedQuantum
54c2d2afc6 Replace blockClass with block tags.
This allows defining custom block tags, and multiple of them.

fixes #948
2025-02-26 21:11:08 +01:00
Carrie
fb0f028c3c
Gold ore, ingot, and block (#1110)
* Gold ore, ingot, and block

* Texture tweaks and add recipes

* Ikabod's balancing

* Change like 4 pixels of gold ore item
2025-02-26 19:43:31 +01:00
IntegratedQuantum
7145aca964 Support simple modifiers (currently they can only change tool stats one time) 2025-02-25 21:26:17 +01:00
Carrie
5b0e476fff
Unique Baobab leaves and leafElongation in savannah (#1101) 2025-02-23 21:22:32 +01:00