QuImUfu/colourful_portals
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

fix issue with generated wool

Browse Source
This commit is contained in:
QuImUfu 2023-05-29 18:44:51 +02:00
parent 012164f197
commit 5d4baa167a
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
build.gradle
View File

@ -51,42 +51,31 @@ dependencies {
// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}" // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
// Dependency of Immersive Portals Core: // Dependency of Immersive Portals Core:
modImplementation("com.github.iPortalTeam.ImmersivePortalsMod:imm_ptl_core:${project.immersive_portals_version}") { include(modImplementation("com.github.iPortalTeam.ImmersivePortalsMod:imm_ptl_core:${project.immersive_portals_version}")) {
exclude(group: "net.fabricmc.fabric-api") exclude(group: "net.fabricmc.fabric-api")
exclude(group: "net.fabricmc.fabric-loader") exclude(group: "net.fabricmc.fabric-loader")
transitive(false) transitive(false)
} }
// Dependency of the Miscellaneous Utility Library from qouteall // Dependency of the Miscellaneous Utility Library from qouteall
modImplementation("com.github.iPortalTeam.ImmersivePortalsMod:q_misc_util:${project.immersive_portals_version}") { include(modImplementation("com.github.iPortalTeam.ImmersivePortalsMod:q_misc_util:${project.immersive_portals_version}")) {
exclude(group: "net.fabricmc.fabric-api") exclude(group: "net.fabricmc.fabric-api")
exclude(group: "net.fabricmc.fabric-loader") exclude(group: "net.fabricmc.fabric-loader")
transitive(false) transitive(false)
} }
//
// modImplementation("com.github.iPortalTeam.ImmersivePortalsMod:build:${project.immersive_portals_version}") {
// exclude(group: "net.fabricmc.fabric-api")
// exclude(group: "net.fabricmc.fabric-loader")
// transitive(false)
// }
modApi("dev.onyxstudios.cardinal-components-api:cardinal-components-base:${project.cardinal_components_version}") { include(modApi("dev.onyxstudios.cardinal-components-api:cardinal-components-base:${project.cardinal_components_version}")) {
exclude(group: "net.fabricmc.fabric-loader") exclude(group: "net.fabricmc.fabric-loader")
transitive(false) transitive(false)
} }
// Replace modImplementation with modApi if you expose components in your own API // Replace modImplementation with modApi if you expose components in your own API
modImplementation("dev.onyxstudios.cardinal-components-api:cardinal-components-level:${project.cardinal_components_version}") { include(modImplementation("dev.onyxstudios.cardinal-components-api:cardinal-components-level:${project.cardinal_components_version}")) {
exclude(group: "net.fabricmc.fabric-loader")
transitive(false)
}
// Includes Cardinal Components API as a Jar-in-Jar dependency (optional)
include("dev.onyxstudios.cardinal-components-api:cardinal-components-level:${project.cardinal_components_version}") {
exclude(group: "net.fabricmc.fabric-loader") exclude(group: "net.fabricmc.fabric-loader")
transitive(false) transitive(false)
} }
api("com.github.LlamaLad7:MixinExtras:0.2.0-beta.4") api("com.github.LlamaLad7:MixinExtras:0.2.0-beta.4")
annotationProcessor("com.github.LlamaLad7:MixinExtras:0.2.0-beta.4") include(annotationProcessor("com.github.LlamaLad7:MixinExtras:0.2.0-beta.4"))
include(modApi(platform("de.siphalor.tweed4:tweed4-bom-$project.minecraft_version_major:$project.tweed_version"))) include(modApi(platform("de.siphalor.tweed4:tweed4-bom-$project.minecraft_version_major:$project.tweed_version")))
// Pick any modules you want to use, e.g.: // Pick any modules you want to use, e.g.:
@ -98,7 +87,7 @@ dependencies {
include(modApi("de.siphalor.tweed4:tweed4-tailor-screen-$project.minecraft_version_major")) include(modApi("de.siphalor.tweed4:tweed4-tailor-screen-$project.minecraft_version_major"))
modImplementation("me.shedaniel.cloth:cloth-config-fabric:$project.cloth_config_version") { include(modImplementation("me.shedaniel.cloth:cloth-config-fabric:$project.cloth_config_version")) {
exclude(group: "net.fabricmc.fabric-api") exclude(group: "net.fabricmc.fabric-api")
} }

7
src/main/java/quimufu/colourful_portals/mixin/BlockChangeMixin.java
View File

@ -20,7 +20,8 @@ public class BlockChangeMixin {
@Inject(at = @At("RETURN"), method = "onBlockChanged") @Inject(at = @At("RETURN"), method = "onBlockChanged")
private void init(BlockPos pos, BlockState oldBlock, BlockState newBlock, CallbackInfo info) { private void init(BlockPos pos, BlockState oldBlock, BlockState newBlock, CallbackInfo info) {
if(((ServerWorld) (Object) this).isDebugWorld()) ServerWorld world = (ServerWorld) (Object) this;
if(world.isDebugWorld()|| !world.isChunkLoaded(pos))
return; return;
// This code is injected into the end of ServerWorld.onBlockChanged()V // This code is injected into the end of ServerWorld.onBlockChanged()V
if (oldBlock.getBlock() != newBlock.getBlock()) { if (oldBlock.getBlock() != newBlock.getBlock()) {
@ -28,14 +29,14 @@ public class BlockChangeMixin {
LOGGER.info("onBlockNew {} -> {}", oldBlock, newBlock); LOGGER.info("onBlockNew {} -> {}", oldBlock, newBlock);
Identifier blockId = Registries.BLOCK.getId(newBlock.getBlock()); Identifier blockId = Registries.BLOCK.getId(newBlock.getBlock());
ColourfulPortalsMod.LOGGER.info("Block change, new portal block: " + blockId); ColourfulPortalsMod.LOGGER.info("Block change, new portal block: " + blockId);
PortalManager.onPortalBlockPlaced(((ServerWorld) (Object) this), pos, blockId); PortalManager.onPortalBlockPlaced(world, pos, blockId);
} }
if (PORTAL_BLOCKS.contains(Registries.BLOCK.getId(oldBlock.getBlock()))) { if (PORTAL_BLOCKS.contains(Registries.BLOCK.getId(oldBlock.getBlock()))) {
LOGGER.info("onBlockOld {} -> {}", oldBlock, newBlock); LOGGER.info("onBlockOld {} -> {}", oldBlock, newBlock);
Identifier blockId = Registries.BLOCK.getId(oldBlock.getBlock()); Identifier blockId = Registries.BLOCK.getId(oldBlock.getBlock());
ColourfulPortalsMod.LOGGER.info("Block change, removed portal block: " + blockId); ColourfulPortalsMod.LOGGER.info("Block change, removed portal block: " + blockId);
PortalManager.onPortalBlockBroken(((ServerWorld) (Object) this), pos, blockId); PortalManager.onPortalBlockBroken(world, pos, blockId);
} }
} }