Skip to content

Commit

Permalink
Backport FAPI block particle fix for 1.19.2.
Browse files Browse the repository at this point in the history
- Backports the FAPI block particle fix to 1.19.2
- Requires Fabric API 0.77.0
- Minecraft 1.19.2 only (not 1.19 or 1.19.1)
  • Loading branch information
gniftygnome committed Dec 22, 2023
1 parent 3a998c2 commit e1796aa
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 106 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@
import com.terraformersmc.terraform.sign.block.TerraformSignBlock;
import com.terraformersmc.terrestria.init.TerrestriaBlocks;
import com.terraformersmc.terrestria.init.TerrestriaItems;
import com.terraformersmc.terrestria.tag.TerrestriaBlockTags;
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.api.EnvType;
import net.fabricmc.api.Environment;
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
import net.fabricmc.fabric.api.client.particle.v1.ParticleRenderEvents;
import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry;
import net.minecraft.block.Block;
import net.minecraft.client.color.block.BlockColorProvider;
Expand Down Expand Up @@ -44,6 +46,10 @@ public void onInitializeClient() {
// Load the client config if it hasn't been loaded already
Terrestria.getConfigManager().getClientConfig();

ParticleRenderEvents.ALLOW_BLOCK_DUST_TINT.register((state, world, pos) ->
!state.isOf(TerrestriaBlocks.ANDISOL.getGrassBlock()) &&
!state.isIn(TerrestriaBlockTags.SMALL_OAK_LOGS));

ColorProviderRegistry.BLOCK.register(
FOLIAGE_BLOCK_COLORS,
TerrestriaBlocks.RUBBER.leaves,
Expand Down

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion client/src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"license": "LGPL-3.0-only",
"icon": "assets/terrestria/icon.png",
"environment": "client",
"plugin": "com.terraformersmc.terrestria.mixin.TerrestriaClientMixinPlugin",
"mixins": [
"mixins.terrestria-client.json"
],
Expand Down
1 change: 0 additions & 1 deletion client/src/main/resources/mixins.terrestria-client.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
"package": "com.terraformersmc.terrestria.mixin",
"compatibilityLevel": "JAVA_17",
"client": [
"MixinBlockDustParticle"
],
"injectors": {
"defaultRequire": 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ private void addStoneDrops(StoneBlocks stoneBlock) {

private void addWoodDrops(WoodBlocks woodBlock, @Nullable SaplingBlock sapling) {
addDrop(woodBlock.button);
addDrop(woodBlock.door, BlockLootTableGenerator::addDoorDrop);
addDrop(woodBlock.door, BlockLootTableGenerator::doorDrops);
addDrop(woodBlock.fence);
addDrop(woodBlock.fenceGate);
addDrop(woodBlock.log);
Expand Down
16 changes: 8 additions & 8 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ org.gradle.jvmargs=-Xmx1G
maven_group=com.terraformersmc
archive_name=terrestria

minecraft_version=1.19.1
yarn_mappings=1.19.1+build.6
loader_version=0.14.9
fabric_version=0.58.0+1.19.1
minecraft_version=1.19.2
yarn_mappings=1.19.2+build.28
loader_version=0.14.25
fabric_version=0.77.0+1.19.2

# Terraform modules
terraform_biome_remapper_api_version=4.2.0
Expand All @@ -22,7 +22,7 @@ terrablender_version=1.19.2-2.0.1.128

# Project Metadata
project_name=Terrestria
project_url=https://www.curseforge.com/minecraft/mc-mods/terrestria
project_url=https://modrinth.com/mod/terrestria
# Explicitly link to a fixed commit so that the image links don't break in the future
project_logo=https://raw.githubusercontent.com/TerraformersMC/Terrestria/f2d93cc7fc09f26a0e8650702fa43e2cc59ef8d0/banners/Terrestria-logo-512x512.png
project_color=0x0041bb
Expand All @@ -32,14 +32,14 @@ default_release_type=alpha
# CurseForge Metadata
curseforge_slug=terrestria
curseforge_id=323974
curseforge_game_versions=1.19, 1.19.1, 1.19.2, Fabric
curseforge_game_versions=1.19.2, Fabric
curseforge_required_dependencies=fabric-api, terrablender-fabric
curseforge_optional_dependencies=

# Modrinth Metadata
modrinth_slug=terrestria
modrinth_id=lsUDPMOT
modrinth_game_versions=1.19, 1.19.1, 1.19.2
modrinth_game_versions=1.19.2
modrinth_mod_loaders=fabric
modrinth_required_dependencies=fabric-api
#modrinth_embedded_dependencies=terrablender
Expand All @@ -49,7 +49,7 @@ loader_icon=https://fabricmc.net/assets/logo.png
loader_name=Fabric

# Discord Emotes
curseforge_emote=<:curseforge:698031288845729802>
curseforge_emote=<:curseforge:1078567270239981628>
modrinth_emote=<:modrinth:802414390510354453>
github_emote=<:github:698031289223217152>

Expand Down
6 changes: 3 additions & 3 deletions src/main/resources/fabric.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"magneticflux-"
],
"contact": {
"homepage": "https://www.curseforge.com/minecraft/mc-mods/terrestria",
"homepage": "https://modrinth.com/mod/terrestria",
"sources": "https://github.com/TerraformersMC/Terrestria",
"issues": "https://github.com/TerraformersMC/Terrestria/issues"
},
Expand All @@ -29,8 +29,8 @@
"environment": "*",
"depends": {
"fabricloader": ">=0.12.12",
"fabric": ">=0.49.0",
"minecraft": ">=1.19",
"fabric-api": ">=0.77.0",
"minecraft": "1.19.2",
"java": ">=17"
}
}

0 comments on commit e1796aa

Please sign in to comment.