Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make 1.20.1 fabric runable #220

Open
wants to merge 247 commits into
base: 1.20.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 246 commits
Commits
Show all changes
247 commits
Select commit Hold shift + click to select a range
f83e7ea
fixed #1789
GizmoTheMoonPig Apr 25, 2023
4615bb9
fixed #1785
GizmoTheMoonPig Apr 26, 2023
7f9638b
fixed #1784
GizmoTheMoonPig Apr 26, 2023
5c861fd
dont run as many cap calls on every entity, hopefully addresses #1788
GizmoTheMoonPig Apr 26, 2023
cf9462e
fixed #1783
GizmoTheMoonPig Apr 26, 2023
038120a
ACTUALLY bring back our curios and ToP compat
GizmoTheMoonPig Apr 27, 2023
652459f
Update azure-pipelines.yml
Tamaized Apr 27, 2023
2deff35
Update azure-pipelines.yml
Tamaized Apr 27, 2023
9d13c23
Added custom death animation for the Lich
jodlodi Apr 27, 2023
2ae0c6b
Fixed some packet code in urGhast class
jodlodi Apr 27, 2023
653c46d
Set up for Naga death animation
jodlodi Apr 29, 2023
b5da650
Added custom death animation for the Naga
jodlodi May 1, 2023
8555c20
Altered some Ur-Ghast particle math, fixed error
jodlodi May 1, 2023
5d17bfe
Changed flip degree logic to be cleaner
jodlodi May 1, 2023
92bdb82
TFBiomeProvider refactor begins
Drullkus Mar 12, 2023
24af2bc
Small biome choice cleanup
Drullkus Mar 12, 2023
df41821
More cleanups with biome layers
Drullkus Mar 12, 2023
11e41f7
More unboxing, add missing Override annotations, re-labelling
Drullkus Mar 13, 2023
a3ee58f
Port Biome Source refactors to 1.19.4
Drullkus Apr 29, 2023
c1e67a1
Begin abstracting biome layers into datapack
Drullkus Apr 29, 2023
d02d606
Fully refactor Biome Layers for datapack & datagen
Drullkus Apr 29, 2023
2bae9d9
Parameterize `GenLayerTFRiverMix` into `FilteredBiomeLayer`
Drullkus Apr 29, 2023
922ead2
Ew unmapped param names (and other sanity renames)
Drullkus Apr 29, 2023
a4d5cfd
`GenLayerTFBiomes` -> `RandomBiomeLayer` Parameterization
Drullkus Apr 29, 2023
dfeb9bf
`GenLayerTFThornBorder`->`BorderLayer` Parameterization
Drullkus Apr 29, 2023
e4a5aa8
Make unused Median layer accessible for datapacks
Drullkus Apr 29, 2023
b5c385b
Forgot to datagen these
Drullkus Apr 29, 2023
47055cc
L
Drullkus Apr 29, 2023
9ca2dd4
These default methods don't really make sense
Drullkus Apr 30, 2023
4a75d0b
Parameterize Key Biomes for datapacks
Drullkus Apr 30, 2023
1855b61
Parameterize Companion Biomes for datapacks
Drullkus Apr 30, 2023
7215c69
Datagen vs VCS :skull:
Drullkus Apr 30, 2023
512f215
`GenLayerTFStream`>`PartitioningBiomeLayer` parameterization & fix Th…
Drullkus Apr 30, 2023
a6bd4ee
Class & json schema renames
Drullkus Apr 30, 2023
658dad9
prevent other mods from moving certain blocks
GizmoTheMoonPig May 2, 2023
adfeaf5
implemented #1792
GizmoTheMoonPig May 2, 2023
3ef8fcd
Add orElseGet to Biome Source to re-enable older worlds to load
Drullkus May 2, 2023
751919b
greatly reduce monster spawns in progression biomes
GizmoTheMoonPig May 4, 2023
ed60d86
update JEI to fix datagen
GizmoTheMoonPig May 4, 2023
042e3a9
fixed #1793, fixed #1794
GizmoTheMoonPig May 4, 2023
ea23162
fixed #1791
GizmoTheMoonPig May 4, 2023
267c334
fixed a few issues with mobs damaging players
GizmoTheMoonPig May 4, 2023
ad4647f
fixed #1797
GizmoTheMoonPig May 5, 2023
ead7f57
Lower Void Horizon Y-Threshold from 63 to 0
Drullkus May 10, 2023
66e738a
fixed #1801
GizmoTheMoonPig May 10, 2023
25ca0da
fixed #1802
GizmoTheMoonPig May 10, 2023
ace9ea8
update classic mcmeta file
GizmoTheMoonPig May 12, 2023
ab66f40
some changes to the Naga's block breaking behavior
GizmoTheMoonPig May 12, 2023
421858b
fixed redcap arms changing position when attacking
GizmoTheMoonPig May 12, 2023
44019b4
dont render the lich on fire if its dying
GizmoTheMoonPig May 12, 2023
48a183a
New Crowdin updates (#1795)
Team-Twilight-Crowdin May 16, 2023
6b86709
Update update.json
Tamaized May 18, 2023
5bb1e07
Fixed minoshroom holding it's axe with it's elbow
jodlodi May 23, 2023
c261431
Fixed minoshroom clipping its arms though its body
jodlodi May 23, 2023
9cd7de8
Fixed the dark stream skipping up and down when the player moves vert…
jodlodi May 23, 2023
312793a
Random missing @Override
jodlodi May 24, 2023
dd8fb0a
Fixed boss health bars not setting to 0 on death
jodlodi May 24, 2023
15de17b
datagen english lang file and sounds.json file
GizmoTheMoonPig May 30, 2023
14cb0a9
add new command to generate hint books for debugging
GizmoTheMoonPig May 30, 2023
e821e12
add proper error message for our command
GizmoTheMoonPig May 30, 2023
c77341a
fixed hint books having an improperly formatted author
GizmoTheMoonPig May 30, 2023
21f5b0b
set hint books to use tattered status
GizmoTheMoonPig May 30, 2023
2b62454
reintroduce ur-ghast tears playing a sound when breaking
GizmoTheMoonPig May 30, 2023
e11d5a9
make trophies appear at a 45 degree angle when paused
GizmoTheMoonPig May 30, 2023
892dd54
add upside down language file
GizmoTheMoonPig May 30, 2023
f4d901e
fixed flask tooltip
GizmoTheMoonPig May 30, 2023
7b1442c
New Crowdin updates (#1813)
Team-Twilight-Crowdin May 30, 2023
825f9a9
update crowdin.yml
GizmoTheMoonPig May 30, 2023
a80cee9
Update crowdin.yml
GizmoTheMoonPig May 30, 2023
bfc148a
Shrink Boss Spawner for mitigating wonky hitbox issues
Drullkus Jun 1, 2023
1c42cfe
add randomium support
GizmoTheMoonPig Jun 5, 2023
fd45f78
fixed incorrect minotaur arm position
GizmoTheMoonPig Jun 5, 2023
1898f7e
functional 1.20 port
GizmoTheMoonPig Jun 11, 2023
94535d9
added hanging sign recipes, corrected other recipe names
GizmoTheMoonPig Jun 11, 2023
9850f1b
reimplement jade compat
GizmoTheMoonPig Jun 12, 2023
3d4fea0
fixed redstone being applicable to e115 in a non full block state
GizmoTheMoonPig Jun 12, 2023
0637d38
fixed magic map icon rendering
GizmoTheMoonPig Jun 12, 2023
57d86ab
fixed TF structures not placing with the /place command
GizmoTheMoonPig Jun 12, 2023
930fa48
bump forge and MC versions, add back curios compat
GizmoTheMoonPig Jun 14, 2023
1329946
fixed empty dark forest
GizmoTheMoonPig Jun 14, 2023
a3763dd
fixed yeti armor
GizmoTheMoonPig Jun 14, 2023
64aaaf0
added piglin skull candle
GizmoTheMoonPig Jun 14, 2023
b3aac8b
split vanishing block into unbreakable and breakable variants
GizmoTheMoonPig Jun 14, 2023
2a3a747
another pass through materials, customize instruments
GizmoTheMoonPig Jun 14, 2023
1ebe904
fixed tab placement
GizmoTheMoonPig Jun 15, 2023
4e86c67
fixed #1829
GizmoTheMoonPig Jun 16, 2023
cf7bd4f
Keepsake Casket textures for non-JAPPA style
Drullkus Jun 16, 2023
02265f2
Transformation Door textures for non-JAPPA style
Drullkus Jun 17, 2023
7ba9f52
7
Tamaized Jun 30, 2023
6a285b9
Fixed block and chain not saving its ItemStack
jodlodi Jul 1, 2023
6d03249
update forge and deps, bring back TOP compat
GizmoTheMoonPig Jul 2, 2023
5659f4e
recipe fixes
GizmoTheMoonPig Jul 2, 2023
8fe8d7e
do registry datagen a better way
GizmoTheMoonPig Jul 2, 2023
1ae0833
make knight phantom hitbox change based on visibility
GizmoTheMoonPig Jul 2, 2023
2ebe7d4
fixed #1830
GizmoTheMoonPig Jul 2, 2023
f8aa32e
rewrite home point logic to use globalpos instead
GizmoTheMoonPig Jul 4, 2023
ce5f4d8
make entities use getEntityData() instead of just entityData
GizmoTheMoonPig Jul 4, 2023
5f8b16a
clean up a few todos
GizmoTheMoonPig Jul 4, 2023
e9e6e48
fixed chain hitboxes being way too big
GizmoTheMoonPig Jul 4, 2023
0235d03
import cleanup
GizmoTheMoonPig Jul 4, 2023
a419cf9
bump forge, fix tab sorting
GizmoTheMoonPig Jul 7, 2023
f8f6d9c
fixed glacier having a hot temperature
GizmoTheMoonPig Jul 7, 2023
6ea8327
rebalanced falling ice damage
GizmoTheMoonPig Jul 7, 2023
9a35f3d
use description instead
GizmoTheMoonPig Jul 7, 2023
dcab0d6
a marker file might work better instead
GizmoTheMoonPig Jul 7, 2023
62fca31
bump forge to stable
GizmoTheMoonPig Jul 7, 2023
4a4b586
fixed trophies bringing the game to its knees
GizmoTheMoonPig Jul 8, 2023
07d11ce
removed twisted stone from nyi tag
GizmoTheMoonPig Jul 8, 2023
d4c4f69
clean up protection packet
GizmoTheMoonPig Jul 8, 2023
035ce60
museum curator compat!
GizmoTheMoonPig Jul 8, 2023
af48986
correct mods.toml
GizmoTheMoonPig Jul 10, 2023
e310943
re-enable discord build announcements
GizmoTheMoonPig Jul 10, 2023
a57d0bb
fixed boss loot not appearing
GizmoTheMoonPig Jul 10, 2023
ff3a60d
Fix conditional
Tamaized Jul 10, 2023
b769259
New Crowdin updates (#1837)
Team-Twilight-Crowdin Jul 10, 2023
eaca18a
fixed typo
GizmoTheMoonPig Jul 10, 2023
be0d811
Fix ISTER being constructed repeatedly each frame
Drullkus Jul 12, 2023
6f954e2
Add ISTER to resource manager reloading
Drullkus Jul 12, 2023
b32c1f1
Switch Hollow Hill feature placement to using a triangle grid, instea…
Drullkus Jul 13, 2023
e27376c
fixed ur-ghast flight
GizmoTheMoonPig Jul 15, 2023
d00ad2d
fixed bosses with death animations keeling over
GizmoTheMoonPig Jul 15, 2023
ea85e22
fixed ur-ghasts playing tantrum sounds at the wrong pitch
GizmoTheMoonPig Jul 15, 2023
919d7b4
added config option to make bosses drop items normally again
GizmoTheMoonPig Jul 15, 2023
62b43d2
fixed spiral brick jank in courtyards
GizmoTheMoonPig Jul 15, 2023
4011450
update data versions on nbt files
GizmoTheMoonPig Jul 15, 2023
c2c323a
fixed spiral brick item model
GizmoTheMoonPig Jul 16, 2023
8bdf683
Update mods.toml
GizmoTheMoonPig Jul 17, 2023
aa1f5b5
fixed hardcoded naga speed, see #1491
GizmoTheMoonPig Jul 17, 2023
4246ff9
fixed naga hitboxes, eye height, and segment positions
GizmoTheMoonPig Jul 17, 2023
93702a2
fixed #1845
GizmoTheMoonPig Jul 19, 2023
2fd41ac
naga fight overhaul!
GizmoTheMoonPig Jul 19, 2023
88c28de
Hmmmm
Tamaized Jul 19, 2023
bac8858
Fixed torchberry plants having collision
jodlodi Jul 20, 2023
aaa5a06
Fixed stone spikes on trees (again)
jodlodi Jul 21, 2023
7461b95
Fixed stone spikes generating floating
jodlodi Jul 21, 2023
e32b0de
Below 2
jodlodi Jul 21, 2023
e474a43
fixed protection effect outside the stronghold
GizmoTheMoonPig Jul 23, 2023
6713e91
fixed the quest ram not staying in the grove
GizmoTheMoonPig Jul 23, 2023
0b51c6c
Cloud update (read description)
jodlodi Jul 24, 2023
d12cff3
Tick only if area is loaded
jodlodi Jul 24, 2023
8527062
Snow clouds now snow!
jodlodi Jul 24, 2023
7dbc3f1
Update update.json
Tamaized Jul 25, 2023
8076c9d
Made biome restrictions data-driven
jodlodi Jul 26, 2023
8d53902
Cleaned up logic
jodlodi Jul 26, 2023
4c167c6
Whoops
jodlodi Jul 27, 2023
f046087
Added acid rain damage type and death message
jodlodi Jul 27, 2023
8bd89ce
fixed acid rain rendering very dim due to altitude
jodlodi Jul 27, 2023
bb45ec0
Fixd locked structure barrier flickering & jumping
jodlodi Jul 27, 2023
c637453
merge forge 1.20
TropheusJ Jul 27, 2023
4a42880
gradle stuff
TropheusJ Jul 27, 2023
44696ed
fix AW
TropheusJ Jul 27, 2023
91eaa2a
client events and model stuff
TropheusJ Jul 28, 2023
02e40d0
fix qm
TropheusJ Jul 28, 2023
91db811
many assorted things
TropheusJ Jul 28, 2023
e377c28
merge 1.19
TropheusJ Jul 28, 2023
15f1836
Added giant block outlines for giant contexts
jodlodi Jul 28, 2023
bb47859
Giants can now step up a whole block
jodlodi Jul 28, 2023
b9b9d6c
Bunch of giant pickaxe block breaking changes
jodlodi Jul 28, 2023
9234ac8
fix DataGenerators
TropheusJ Jul 29, 2023
ebd6149
Re-implemented old models for Giant items
jodlodi Jul 29, 2023
33a769f
fixed a couple uncrafting rendering issues
GizmoTheMoonPig Jul 30, 2023
2e646a6
rewrote uncrafting recipe datagen
GizmoTheMoonPig Jul 30, 2023
f1aaf6d
fixed model loop in giant tools
GizmoTheMoonPig Jul 30, 2023
b074023
fixed #1853
GizmoTheMoonPig Jul 31, 2023
90fc341
fix ao
GizmoTheMoonPig Jul 31, 2023
c35aa0f
properly sync progression gamerule when changed
GizmoTheMoonPig Jul 31, 2023
7f23476
Use vanilla rainSoundTime instead of custom
jodlodi Aug 1, 2023
36056ee
Fixed horizontal cherry logs missing grass color
jodlodi Aug 1, 2023
ad1a640
Gave players the ability to crawl into hollow logs
jodlodi Aug 1, 2023
b0f8f57
Fixed #1824
jodlodi Aug 3, 2023
6d2ece4
Eh, put the breaks at the end, saves 1 iteration
jodlodi Aug 3, 2023
364582a
Fix yetis not throwing properly
jodlodi Aug 4, 2023
bacc8f8
Fixed timewood clock using wrong config for range
jodlodi Aug 4, 2023
80f4225
Made cloud blocks only precipitate 32 blocks down
jodlodi Aug 4, 2023
21c4121
update build.gradle to use neoforge
GizmoTheMoonPig Aug 5, 2023
8292cb4
version fix maybe
GizmoTheMoonPig Aug 5, 2023
1fa83a1
ok actually fix it
GizmoTheMoonPig Aug 5, 2023
e27d304
fix embed
GizmoTheMoonPig Aug 5, 2023
37de848
neoforge
GizmoTheMoonPig Aug 5, 2023
c2962e1
ASM fix
jodlodi Aug 5, 2023
b5476e7
Fixed every TF sign using Twilight Oak for walls
jodlodi Aug 5, 2023
00938f4
Internal changes to cloud rendering
jodlodi Aug 7, 2023
cee2cc5
Not yet implemented some upcoming stuff
jodlodi Aug 8, 2023
1debd5c
clean up firefly particle code, add varied colors
GizmoTheMoonPig Aug 10, 2023
cdd10fb
Fixes #1860
jodlodi Aug 11, 2023
d6520d1
Fixed extended banisters lighting error
jodlodi Aug 12, 2023
acfe77f
Reduce rate of cloud position checks
jodlodi Aug 13, 2023
9468cd5
Added range config for cloud blocks
jodlodi Aug 14, 2023
a44b1d5
Fixed rain particles
jodlodi Aug 14, 2023
f696a65
Fixed #1862
jodlodi Aug 16, 2023
45cbb33
Fixed #1800
jodlodi Aug 16, 2023
11ffa86
Sign NBT to Sign AT
jodlodi Aug 16, 2023
e637204
Implemented #479 via a client config
jodlodi Aug 17, 2023
b1ce89c
Fixed #1478
jodlodi Aug 17, 2023
baedfaf
Fixed out of bounds crash in precipitation render
jodlodi Aug 18, 2023
b01f170
revert variable change to mods.toml
GizmoTheMoonPig Aug 18, 2023
9f8b1d4
update dimension lang entry
GizmoTheMoonPig Aug 18, 2023
63544e6
Client Cloud config can now sync to Common config
jodlodi Aug 18, 2023
38b4ce2
Added blockTag for clouds
jodlodi Aug 18, 2023
abcab5e
Fixed #1865
jodlodi Aug 18, 2023
0e708e1
fixed #1847 and message about candelabras not having a BE when loaded…
GizmoTheMoonPig Aug 18, 2023
8eff1b1
fixed underground mobs spawning in structures
GizmoTheMoonPig Aug 18, 2023
fafb0ad
bump neo and deps
GizmoTheMoonPig Aug 18, 2023
9036552
fixed #1857
GizmoTheMoonPig Aug 18, 2023
deb678a
this was bothering me
jodlodi Aug 18, 2023
edc034d
Fixed Twisted Stone Pillar connections
jodlodi Aug 18, 2023
c85ec37
add twisted pillar recipe and remove NYI tooltip
GizmoTheMoonPig Aug 18, 2023
003c15b
Fixed wrong face being culled
jodlodi Aug 18, 2023
824b881
Fixed pillar connecting when they shouldn't
jodlodi Aug 18, 2023
f697be7
[WIP] Wrought Iron Fence
Andromander Aug 19, 2023
ce374f7
Fixed Death Tomes having ice cubes 1 meter below
jodlodi Aug 20, 2023
1f0dda3
Death tomes can now be placed on lecterns
jodlodi Aug 20, 2023
51a5ab5
some more fence work
GizmoTheMoonPig Aug 20, 2023
ce28b52
rotatable finial
GizmoTheMoonPig Aug 20, 2023
330cde9
fix z-fighting
GizmoTheMoonPig Aug 20, 2023
937d74d
Fixed game crashing when waterlogging finials
jodlodi Aug 20, 2023
97c29af
added a config option to completely disable uncrafting table
GizmoTheMoonPig Aug 21, 2023
bee68aa
fixed uncrafting and recrafting costs
GizmoTheMoonPig Aug 21, 2023
de7d83a
clean up UncraftingRecipe
GizmoTheMoonPig Aug 21, 2023
4af6f99
rename conditions to be consistent
GizmoTheMoonPig Aug 21, 2023
c68a4f4
correct config comments
GizmoTheMoonPig Aug 21, 2023
6490fd0
fixed finial datagen
GizmoTheMoonPig Aug 21, 2023
41e73ea
add JEI to runtime
GizmoTheMoonPig Aug 21, 2023
f5b4413
baked force fields and reworked their shapes
jodlodi Aug 23, 2023
5b676fe
Fixed force field faces always culling
jodlodi Aug 25, 2023
965a0a9
Fixed force field connections being inconsistent
jodlodi Aug 25, 2023
896f8d5
Fixed some returns being wrongfully static
jodlodi Aug 25, 2023
a69343b
Fixed force fields acting funky with castle doors
jodlodi Aug 25, 2023
409423c
Merge pull request #1872 from TeamTwilight/feature/force-fields/baked…
jodlodi Aug 25, 2023
b7408df
make registries show up in registryaccess
GizmoTheMoonPig Aug 25, 2023
d220a7e
Better run configs
Tamaized Aug 25, 2023
d46b059
I copied from the wrong project
Tamaized Aug 25, 2023
a8838f5
Let the game generate a random uuid instead
Tamaized Aug 25, 2023
0815555
Fixed missing name for the entity version of magic paintings
jodlodi Aug 25, 2023
ecc10d9
Added multiplier for opacity mods and added some
jodlodi Aug 25, 2023
d7be8b4
Fixed view angle parallax scrolling too hard if standing right next t…
jodlodi Aug 25, 2023
945dfe9
Added "Darkness"
jodlodi Aug 25, 2023
291c794
Layer static import, for clarity
jodlodi Aug 25, 2023
e7dbbb1
merge forge 1.20
TropheusJ Aug 31, 2023
85182bb
move some simple things into fabric api
IAFEnvoy Jul 31, 2024
224736f
worked but buggy
IAFEnvoy Aug 2, 2024
4bac471
fix some models and multipart display
IAFEnvoy Aug 2, 2024
6d501bd
fix castle door render
IAFEnvoy Aug 2, 2024
2cebda1
fix server launching issue
IAFEnvoy Aug 11, 2024
829f634
fix item rendering
IAFEnvoy Aug 11, 2024
7aa58d1
remove dead code and optimize some using
IAFEnvoy Aug 12, 2024
e63d8de
forget to set format to using tab :(
IAFEnvoy Sep 29, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
35 changes: 18 additions & 17 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
//file:noinspection GradlePackageVersionRange
plugins {
id "fabric-loom" version "1.2.+"
id "io.github.juuxel.loom-quiltflower" version "1.+"
id "org.quiltmc.quilt-mappings-on-loom" version "4.2.0"
id "fabric-loom" version "1.6-SNAPSHOT"
id "maven-publish"
}

Expand All @@ -24,17 +22,17 @@ sourceSets.main.resources {

repositories {
mavenLocal() // test builds of Porting Lib
maven { url = "https://maven.quiltmc.org/repository/release" } // QM
maven { url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/" } // Forge Config API Port
maven { url = "https://api.modrinth.com/maven" } // LazyDFU, Suggestion Tweaker
maven { url = "https://maven.shedaniel.me/" } // Cloth Config
maven { url = "https://maven.wispforest.io" } // TOP
maven { url = "https://storage.googleapis.com/devan-maven/" }
maven { url = "https://maven.terraformersmc.com/releases/" } // Mod Menu, Trinkets, EMI
maven { url = "https://mvn.devos.one/snapshots/" } // Porting Lib, Forge Tags, Tinkers, Mantle
maven { url = "https://mvn.devos.one/releases/" } // Porting Lib, Forge Tags, Tinkers, Mantle
maven { url = "https://maven.ladysnake.org/releases" } // Cardinal Components API
maven { url = "https://maven.parchmentmc.net/" } // Parchment
maven { url = "https://maven.jamieswhiteshirt.com/libs-release" } // Reach Entity Attributes
maven { url = "https://jitpack.io" } // Fabric ASM, Mixin Extras
maven { url = "https://dvs1.progwml6.com/files/maven/" } // JEI
maven { url 'https://maven.blamejared.com' } // Botany Pots, Bookself
maven { // Jade
Expand All @@ -44,23 +42,29 @@ repositories {
}
}
maven { url = "https://maven.wispforest.io"}
maven { url "https://maven.vram.io" }
maven { url = "https://jitpack.io" } // Fabric ASM, Mixin Extras
}

dependencies {
// dev env
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings(loom.officialMojangMappings())
mappings(loom.layered {
it.mappings("org.quiltmc:quilt-mappings:${project.minecraft_version}+build.${project.qm_version}:intermediary-v2")
it.parchment("org.parchmentmc.data:parchment-${project.minecraft_version}:${project.parchment_version}@zip")
it.officialMojangMappings { nameSyntheticMembers = false }
})
modImplementation("net.fabricmc:fabric-loader:${project.loader_version}")

modLocalRuntime("com.terraformersmc:modmenu:${project.modmenu_version}") { exclude(group: "net.fabricmc.fabric-api") }
modLocalRuntime("maven.modrinth:suggestion-tweaker:${project.suggestion_tweaker_version}+fabric")
modLocalRuntime("me.shedaniel.cloth:cloth-config-fabric:${project.cloth_config_version}") { exclude(group: "net.fabricmc.fabric-api") } // for Suggestion Tweaker

// dependencies
for (String module in port_lib_modules.split(",")) {
modApi(include("io.github.fabricators_of_create.Porting-Lib:$module:$port_lib_version"))
}

modImplementation("net.fabricmc.fabric-api:fabric-api:${project.fabric_version}")
modImplementation(include("io.github.fabricators_of_create.Porting-Lib:Porting-Lib:${project.port_lib_version}+${project.minecraft_version}"))
modImplementation(include("io.github.tropheusj:serialization-hooks:${project.serialization_hooks_version}"))
modImplementation(include("fuzs.forgeconfigapiport:forgeconfigapiport-fabric:${project.config_api_version}"))
modImplementation(include("dev.onyxstudios.cardinal-components-api:cardinal-components-base:${project.cca_version}"))
modImplementation(include("dev.onyxstudios.cardinal-components-api:cardinal-components-entity:${project.cca_version}"))
Expand All @@ -72,19 +76,15 @@ dependencies {
implementation(include("javax.annotation:javax.annotation-api:1.3.2"))
implementation(include("com.google.code.findbugs:jsr305:3.0.2"))

implementation ('net.fabricmc:tiny-remapper:0.8.6+local')

modImplementation "io.vram:canvas-fabric:19.4.2586"

// compat
modImplementation("dev.emi:trinkets:${project.trinkets_version}")
// EMI
modCompileOnly("dev.emi:emi:${project.emi_version}") { transitive = false }
modCompileOnly("dev.emi:emi-fabric:${project.emi_version}") { transitive = false }
// JEI
// FIXME remapping issues with API jar
// deps.modCompileOnly("mezz.jei:jei-${project.minecraft_version}-common-api:${project.jei_version}") { transitive = false }
// deps.modCompileOnly("mezz.jei:jei-${project.minecraft_version}-fabric-api:${project.jei_version}") { transitive = false }
modCompileOnly("mezz.jei:jei-1.19.3-fabric:${project.jei_version}") { transitive = false }
modCompileOnly("mezz.jei:jei-${project.minecraft_version}-fabric:${project.jei_version}") { transitive = false }
// REI
modCompileOnly("me.shedaniel.cloth:basic-math:0.6.0") { transitive = false }
modCompileOnly("dev.architectury:architectury-fabric:${project.architectury_version}") { transitive = false }
Expand All @@ -93,11 +93,12 @@ dependencies {
// Jade
modImplementation("curse.maven:jade-324717:${jade_id}")
// TOP
modCompileOnly("mcjty.theoneprobe:theoneprobe-fabric:${top_version}")
// No longer update
// modCompileOnly("mcjty.theoneprobe:theoneprobe-fabric:${top_version}")

String recipeViewer = project.recipe_viewer
if (recipeViewer == "emi") {
modLocalRuntime("dev.emi:emi:${project.emi_version}") { transitive = false }
modLocalRuntime("dev.emi:emi-fabric:${project.emi_version}") { transitive = false }
} else if (recipeViewer == "jei") {
modLocalRuntime("mezz.jei:jei-${project.minecraft_version}-fabric:${project.jei_version}") { transitive = false }
} else if (recipeViewer == "rei") {
Expand Down
5 changes: 3 additions & 2 deletions crowdin.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
files:
- source: /src/main/resources/assets/twilightforest/lang/en_us.json
- source: /src/generated/resources/assets/twilightforest/lang/en_us.json
translation: /src/main/resources/assets/twilightforest/lang/%locale_with_underscore%.json
languages_mapping:
locale_with_underscore:
Expand Down Expand Up @@ -97,13 +97,14 @@ files:
qya-AA: qya_aa
ro: ro_ro
ru: ru_ru
ry: ry_ua
ry-UA: ry_ua
se: se_no
sk: sk_sk
sl: sl_si
so: so_so
sq: sq_al
sr: sr_sp
sr-CS: sr_cs
sv-SE: sv_se
ta: ta_in
th: th_th
Expand Down
56 changes: 29 additions & 27 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,54 +4,56 @@ org.gradle.jvmargs=-Xmx4G

# suppress inspection "UnusedProperty" for whole file
# Mod Properties
mod_version=4.2
mod_version=4.3
mod_id=twilightforest
group_name=com.github.teamtwilight.twilightforest

#Versions
minecraft_version=1.19.4
minecraft_version=1.20.1
# https://fabricmc.net/develop/
fabric_version=0.75.0+1.19.4
loader_version=0.14.18
fabric_version=0.86.0+1.20.1
loader_version=0.15.11

# setup
# https://lambdaurora.dev/tools/import_quilt.html
qm_version = 7
# https://parchmentmc.org/docs/getting-started
parchment_version = 2022.12.18
qm_version = 21
# https://github.com/ParchmentMC/Parchment
parchment_version = 2023.07.23
# https://www.curseforge.com/minecraft/mc-mods/forge-config-api-port-fabric
config_api_version = 6.0.2
# https://github.com/Fabricators-of-Create/Porting-Lib
port_lib_version = 2.1.985
config_api_version = 8.0.0
# https://modrinth.com/mod/cardinal-components-api
cca_version = 5.1.0
cca_version = 5.2.2

# https://github.com/Fabricators-of-Create/Porting-Lib
port_lib_version = 2.3.4+1.20.1
port_lib_modules = accessors,base,data,entity,extensions,lazy_registration,models,networking,tags,transfer,utility,model_generators,model_builders,loot,registries

# compat
# https://github.com/emilyploszaj/trinkets/releases
trinkets_version = 3.6.0
# https://github.com/Alpha-s-Stuff/TinkersConstruct
tcon_version=3.5.0.DEV.e04c6fa
trinkets_version = 3.7.1

# dev env mods
# https://modrinth.com/mod/modmenu
modmenu_version = 6.1.0-rc.4
modmenu_version = 7.2.2
# https://modrinth.com/mod/suggestion-tweaker
suggestion_tweaker_version = 1.19.1-1.3.1
suggestion_tweaker_version = 1.20-1.5.2
# for REI and suggestion tweaker - https://modrinth.com/mod/cloth-config
cloth_config_version = 9.0.94
cloth_config_version = 11.1.118

# https://www.curseforge.com/minecraft/mc-mods/jade/files/all
jade_id = 5530010
# https://www.curseforge.com/minecraft/mc-mods/the-one-probe-fabric/files
# No longer update
#top_version = 1.19-6.0.0

# for REI - https://www.curseforge.com/minecraft/mc-mods/architectury-api
architectury_version = 8.1.75
architectury_version = 9.2.14
# https://www.curseforge.com/minecraft/mc-mods/roughly-enough-items
rei_version=11.0.597
rei_version=12.1.740
# https://github.com/emilyploszaj/emi/releases/
emi_version = 0.7.2+1.19.4
emi_version = 1.1.10+1.20.1
# https://www.curseforge.com/minecraft/mc-mods/jei/files/all
jei_version = 12.0.2.2
serialization_hooks_version = 0.3.22
# https://www.curseforge.com/minecraft/mc-mods/jade/files/all
jade_id = 4438356
# https://www.curseforge.com/minecraft/mc-mods/the-one-probe-fabric/files
top_version = 1.19-6.0.0
jei_version = 15.8.2.25

# What recipe viewer to use ('emi', 'rei', or 'jei'. if you change it, don't push it)
recipe_viewer = rei
recipe_viewer = emi
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading