Skip to content
This repository has been archived by the owner on Nov 24, 2024. It is now read-only.

Commit

Permalink
(1.19.X) Datagen and png optimisation andd 1.19 stuff (#783)
Browse files Browse the repository at this point in the history
* Move aspen and baobab

* Move blue enchanted

- Finish datagen for wood

* Move bulbis

* Move cherry

* More datagen

* Move cika

* Move cypress

* Move ebony

* Yes

* Baobab del

* BlueEnchanted del

* Bulbis del

* Cherry del

* Cika del

* Cypress del

* Ebony del

* Hmm

* Hmm, datagen all models

* Allow blockstate gen

* Remove generatable block states

* Blockstates!

* Delete bulbis_stem.json

* Move ether

* Move green enchanted

* Move holly

* Generate models

* Remove duplicate recipes

* Imparius stuff

* Move mahogany

* Move mangrove

* Update mangrove and mahogany

* Allow planks to have `_top` textures

* Add palm

* Yes

* Add stripped logs and wood

* Pine

* Rainbow eucalyptus

* Redwood

* Generate jsons

* Willow

* Witch hazel

* Zelkova

* Generate data

* Sythian

* Generate data

* Yes

* Hmm, pots

* hmm

* Fix some more assets

* Fix

* Add missing models

* Nightshade

* Compress pngs

* Skyris

* Maple and lament

* Jacaranda

* Datagen!

* Docs

* Datagen loottables

* Loot tables

* Make boats drop a table

* Copy datagen'd tags

* Fix fetch moving files

* Move advancments and lang gen

* Add ourselves into the credits

* Fixes

* Fix logs tag

* Rerun generators

* Fixed leaves overlay textures

* Fix datagen leaves code

* Merge

* Merge

* Remove manual assets

* Move sign textures

* Datagen signs

* Remove manual sign loot tables

* Sign recipes

* Sign recipes

* (1.18.X) Sign Recipes (#800)

* Remove old sign recipes

* Add new sign recipes

* Add sticks tag

* -Added missing fir sign texture

* Revert "Merge upstream"

This reverts commit 56708a6, reversing
changes made to 080cca9.

* Update sign.png

* Re-add flower pot

* Make datagen compile

* Update BYGWoodAssetsProvider.java

* This is cursed.. nothing works anymore

* runData

* Fix another crash

* Move some registries

* FIx invoker

Co-authored-by: AOCAWOL <[email protected]>
  • Loading branch information
Matyrobbrt and AOCAWOL authored Jun 8, 2022
1 parent aa7288f commit 7ff3f62
Show file tree
Hide file tree
Showing 8,777 changed files with 96,513 additions and 66,458 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,4 @@ build

# other
eclipse
run
/Forge/src/generated/
/Common/src/generated/
/Fabric/src/generated/
run
7 changes: 7 additions & 0 deletions Common/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
plugins {
id('java')
id('org.spongepowered.gradle.vanilla') version '0.2.1-SNAPSHOT'
id('com.matyrobbrt.pngoptimiser') version '0.1.0'
}

archivesBaseName = "${mod_name}-common-${minecraft_version}"

tasks.register('optimise', com.matyrobbrt.gradle.pngoptimiser.task.OptimisePNGTask) {
file(fileTree(dir: sourceSets.main.resources.srcDirs[0], includes: ['**/*.png']))
option 'i', 0
}

minecraft {
accessWideners(project.file("src/main/resources/byg.aw"))
version(minecraft_version)
Expand Down Expand Up @@ -37,6 +43,7 @@ processResources {
filesMatching(['pack.mcmeta']) {
expand buildProps
}
exclude '.cache/cache'
}

tasks.withType(Javadoc) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
// 1.19 2022-06-08T20:08:31.1944278 Tags for minecraft:item
9ad18a5f91a85156fdb4a0fe04bfced0a85190f6 data/byg/tags/items/bookshelves.json
ef89ece741f37ca4edef1a32af40e5bd5fef30ed data/byg/tags/items/mushrooms.json
f9741f495c31cbca5e778b6b8fef1011d144397c data/byg/tags/items/sticks.json
7703e5d02c2746bdbbbc0ed84ca702ba0ffbf08f data/byg/tags/items/wood/aspen_logs.json
6e452e56808f54cc00f849724e4c707876b8dc62 data/byg/tags/items/wood/baobab_logs.json
2f4f003fcf3e0abe5f6910af3f84a2c23f861755 data/byg/tags/items/wood/blue_enchanted_logs.json
60471b0693276a23d3e570d946ae8b281a670967 data/byg/tags/items/wood/bulbis_logs.json
6025faea67820ec5603c746f11158ada99723aad data/byg/tags/items/wood/cherry_logs.json
0c2e6ad3ab992852d39b97b7e68c3b9f5163a200 data/byg/tags/items/wood/cika_logs.json
c4c46b42bcbfb2d5f9fdc30ca094140f3ca55669 data/byg/tags/items/wood/cypress_logs.json
40aded7130bc80f71359616f444235b1d84269b1 data/byg/tags/items/wood/ebony_logs.json
19bceb41a62f2024bdb7079aa69a2990b5afb49c data/byg/tags/items/wood/embur_logs.json
0a9d1609711a1eaf2c4896b3c2771b2048b3834b data/byg/tags/items/wood/ether_logs.json
def5f419deab903798347c2bbc6b67fc6050c0bb data/byg/tags/items/wood/fir_logs.json
15e6e7aed0a9615d4470f7d2499734f117846e67 data/byg/tags/items/wood/green_enchanted_logs.json
5675baabec6f48813b01ad90224966f04e63e1ff data/byg/tags/items/wood/holly_logs.json
477df1cf06cfe87245f7dfbee2703103540354c3 data/byg/tags/items/wood/imparius_logs.json
f25c6968ff68cb356a0223c0c7d87c6bd98fe365 data/byg/tags/items/wood/jacaranda_logs.json
dddfc92c770ad7f92a3bbdf9bcc91bce4261347e data/byg/tags/items/wood/lament_logs.json
bc209ef504cd8e1f9bb684ca72923ddbf4eddacc data/byg/tags/items/wood/mahogany_logs.json
43bac38b67128575b270ceaea927bf628d7f9859 data/byg/tags/items/wood/mangrove_logs.json
2c0ab0d6b8e69b49a963860699e7dd105c7de5e8 data/byg/tags/items/wood/maple_logs.json
778d3a63d8cce3649f87a7e084ea24229c85cfd1 data/byg/tags/items/wood/nightshade_logs.json
5d48ee13f5e465f19a7b3efa6691763b0f53592e data/byg/tags/items/wood/palm_logs.json
54cf56b00b4bb1a2a860f813021e229fc65fe3b6 data/byg/tags/items/wood/palo_verde_logs.json
94f72a755c3831ec716034a60afbd6e062135dea data/byg/tags/items/wood/pine_logs.json
5f624f68a4e536875061508b262c2d130e75ae4b data/byg/tags/items/wood/rainbow_eucalyptus_logs.json
1f83b1a5783ea13aec0600e7812d4f78d1953881 data/byg/tags/items/wood/redwood_logs.json
0c8ce69039282be5f6b814248b8397590423af8e data/byg/tags/items/wood/skyris_logs.json
2233f58716ca83938f2fd3b85cc1d5cba070d8e1 data/byg/tags/items/wood/sythian_logs.json
b5444de87b7a8a3d8cf1a1d93d8e0f785a2ebbd3 data/byg/tags/items/wood/willow_logs.json
d9bee530cb743b4401ddc0ae6e746db1446cb58c data/byg/tags/items/wood/witch_hazel_logs.json
905fafa6eeb610de1832dd4816b99b1f102dc7d4 data/byg/tags/items/wood/withering_oak_logs.json
c45f5216a4bfbe4957d094bbbe5e0c7200697677 data/byg/tags/items/wood/zelkova_logs.json
9181040a1a8b0c49323dfd10308aa71ce9b5d38b data/minecraft/tags/items/buttons.json
411e2fb5471ebd29a09a36e86eaf61b18455d688 data/minecraft/tags/items/leaves.json
33b235c8f4002c5dbd589c5fe366c207db40bf00 data/minecraft/tags/items/logs.json
2b8005337c8db298e3e8bea249c881029f2bbfef data/minecraft/tags/items/logs_that_burn.json
783bd34843ae1ebe7eee31074eef9ceb8f2d9243 data/minecraft/tags/items/planks.json
694444607939e5deac55f0e05c9a2fcf754c7418 data/minecraft/tags/items/sand.json
a906b2923bd4e6c1a32969ee526d6117df7026b5 data/minecraft/tags/items/saplings.json
35133e95f1c8fdd7a1c21afcc231fc0bffefb9a8 data/minecraft/tags/items/slabs.json
5963df094b99da0ee350cf32a6123322b62e6cac data/minecraft/tags/items/stairs.json
d505ea1e4ce2cbe58f05bae318c443daea5b68ab data/minecraft/tags/items/trapdoors.json
9181040a1a8b0c49323dfd10308aa71ce9b5d38b data/minecraft/tags/items/wooden_buttons.json
8f7ff378ccfcaaebc4a0222ee7e11cecb44f7d9e data/minecraft/tags/items/wooden_doors.json
4d32f5855aeee653ff9b92b88865c88b08fa782f data/minecraft/tags/items/wooden_fences.json
e3b5e4bd8dc3d019e1ccda81d4d5cba553ebc2e8 data/minecraft/tags/items/wooden_pressure_plates.json
c9f4a4e34c5fabc6838bd4d6017c7f93aa5ca00c data/minecraft/tags/items/wooden_slabs.json
6c66002027cbd32fc13f9df0493a7783888303d5 data/minecraft/tags/items/wooden_stairs.json
d505ea1e4ce2cbe58f05bae318c443daea5b68ab data/minecraft/tags/items/wooden_trapdoors.json
Loading

0 comments on commit 7ff3f62

Please sign in to comment.