Skip to content

Commit

Permalink
Fix merge for 1.18
Browse files Browse the repository at this point in the history
  • Loading branch information
hlysine committed Feb 4, 2025
1 parent 4803c10 commit 6119678
Show file tree
Hide file tree
Showing 223 changed files with 3,145 additions and 3,154 deletions.
6 changes: 2 additions & 4 deletions common/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,8 @@ dependencies {
modCompileOnly("net.fabricmc.fabric-api:fabric-api:${fabric_api_version}")
modCompileOnly("mezz.jei:jei-${minecraft_version}-common-api:${jei_common_version}")

modCompileOnly("curse.maven:additional-placements-fabric-930469:${additionalplacements_fabric_curse_id}")
modCompileOnly("curse.maven:embeddium-908741:${embeddium_curse_id}")
modCompileOnly("curse.maven:selene-499980:${moonlight_curse_fabric_id}")
modCompileOnly("curse.maven:vertical-slabs-compat-724387:${vertical_slabs_curse_fabric_id}")
modCompileOnly("curse.maven:additional-placements-fabric-930469:${additionalplacements_curse_id}")
modCompileOnly("maven.modrinth:sodium:${sodium_fabric_version}")

annotationProcessor(implementation("io.github.llamalad7:mixinextras-common:${mixin_extras_version}"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public BlockState getConnectiveMaterial(BlockAndTintGetter reader, BlockState fr
}

if (toState.getBlock() instanceof ICopycatBlock toCopycat) {
if (toCopycat.isIgnoredConnectivitySide(reader, toState, face, toPos, fromPos))
if (toCopycat.isIgnoredConnectivitySide(reader, toState, face, toPos, fromPos, fromState))
return null;
}

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -62,23 +62,15 @@ private void isIgnoredConnectivitySide(BlockAndTintGetter reader, BlockState sta
cir.setReturnValue(!checkConnection(reader, toPos, fromPos, reader.getBlockState(toPos)));
}

@Inject(
method = "canConnectTexturesToward",
at = @At("RETURN"),
cancellable = true
)
private void canConnectTexturesToward(BlockAndTintGetter reader, BlockPos fromPos, BlockPos toPos, BlockState fromState, CallbackInfoReturnable<Boolean> cir) {
if (cir.getReturnValue()) {
return;
}
@Override
public boolean canConnectTexturesToward(BlockAndTintGetter reader, BlockPos fromPos, BlockPos toPos, BlockState fromState) {
BlockState toState = reader.getBlockState(toPos);

if (toState.getBlock() instanceof ICopycatBlock) {
cir.setReturnValue(true);
return;
return true;
}

cir.setReturnValue(checkConnection(reader, fromPos, toPos, fromState));
return checkConnection(reader, fromPos, toPos, fromState);
}

public boolean supportsExternalFaceHiding(BlockState state) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import com.simibubi.create.content.decoration.bracket.BracketBlock;
import net.minecraft.core.Registry;
import net.minecraft.data.BuiltinRegistries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Unique;
Expand All @@ -20,7 +22,7 @@
public class BlockStateBaseCacheMixin {

@Unique
private static final ResourceLocation COPYCAT_BASE = new ResourceLocation(Mods.CREATE.id(), "copycat_base");
private static final TagKey<Block> COPYCAT_BASE = TagKey.create(Registry.BLOCK.key(), new ResourceLocation(Mods.CREATE.id(), "copycat_base"));

@WrapOperation(
method = "<init>",
Expand All @@ -29,7 +31,7 @@ public class BlockStateBaseCacheMixin {
private boolean canCopycatOcclude(BlockState instance,
Operation<Boolean> original) {
try {
if (instance.getBlockHolder().is(COPYCAT_BASE)) {
if (instance.is(COPYCAT_BASE)) {
return false;
}
} catch (IllegalStateException e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import net.minecraft.core.Registry;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockBehaviour;
import org.spongepowered.asm.mixin.Mixin;
import net.minecraft.world.level.block.state.BlockState;
Expand All @@ -17,7 +18,7 @@
public class BlockStateBaseMixin {

@Unique
private static final ResourceLocation COPYCAT_BASE = new ResourceLocation(Mods.CREATE.id(), "copycat_base");
private static final TagKey<Block> COPYCAT_BASE = TagKey.create(Registry.BLOCK.key(), new ResourceLocation(Mods.CREATE.id(), "copycat_base"));

@Inject(
method = "canOcclude",
Expand All @@ -27,7 +28,7 @@ public class BlockStateBaseMixin {
private void customOcclusion(CallbackInfoReturnable<Boolean> cir) {
BlockState instance = (BlockState) (Object) this;
try {
if (instance.getBlockHolder().is(COPYCAT_BASE)) {
if (instance.is(COPYCAT_BASE)) {
cir.setReturnValue(false);
}
} catch (IllegalStateException e) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import net.minecraft.core.Direction;
import com.simibubi.create.content.decoration.copycat.CopycatBlock;
import net.minecraft.world.level.BlockAndTintGetter;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.phys.shapes.VoxelShape;
import org.spongepowered.asm.mixin.Mixin;
Expand Down Expand Up @@ -81,18 +82,25 @@ private void getAppearance(BlockAndTintGetter reader, BlockState reference, Dire
}
}

@WrapOperation(
at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/block/Block;isFaceFull(Lnet/minecraft/world/phys/shapes/VoxelShape;Lnet/minecraft/core/Direction;)Z"),
method = "isBeingBlocked"
@Inject(
method = "isBeingBlocked",
at = @At("HEAD"),
cancellable = true
)
private boolean isFaceFull(VoxelShape shape, Direction face, Operation<Boolean> original, BlockState state, BlockAndTintGetter reader, BlockPos pos, BlockPos otherPos,
Direction face2) {
private void isFaceFull(BlockState state, BlockAndTintGetter reader, BlockPos pos, BlockPos otherPos, Direction face, CallbackInfoReturnable<Boolean> cir) {
Direction face2 = face.getOpposite();
BlockPos blockingPos = otherPos.relative(face2);
BlockState otherState = reader.getBlockState(otherPos);
BlockState blockingState = reader.getBlockState(blockingPos);
if (blockingState.getBlock() instanceof ICopycatBlock)
return BlockFaceUtils.faceMatch(reader, otherState, otherPos, blockingState, blockingPos, face2);
return original.call(shape, face);
if (blockingState.getBlock() instanceof ICopycatBlock) {
if (!BlockFaceUtils.faceMatch(reader, otherState, otherPos, blockingState, blockingPos, face2)) {
cir.setReturnValue(false);
return;
}
}
if (!Block.isFaceFull(blockingState.getShape(reader, otherPos.relative(face)), face2)) {
cir.setReturnValue(false);
}
}


Expand Down
1 change: 0 additions & 1 deletion common/src/main/resources/copycats-common.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"compat.rubidium.BlockOcclusionCacheMixin",
"compat.rubidium.BlockRendererMixin",
"compat.rubidium.WorldSliceAccessor",
"compat.verticalslabcompat.CutBlockTypeRegistryMixin",
"copycat.VoxelShapeAccessor",
"copycat.cogwheel.CogWheelBlockItemMixin",
"copycat.door.BlockHelperMixin",
Expand Down
2 changes: 0 additions & 2 deletions fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ dependencies {
modLocalRuntime("maven.modrinth:sodium:${sodium_fabric_version}")
// modLocalRuntime("maven.modrinth:extended-cogwheels:${extended_cogwheels_fabric_version}")
modLocalRuntime("curse.maven:spark-361579:${spark_fabric_curse_id}")
modCompileOnly("curse.maven:selene-499980:${moonlight_curse_fabric_id}")
modCompileOnly("curse.maven:vertical-slabs-compat-724387:${vertical_slabs_curse_fabric_id}")
modImplementation("curse.maven:additional-placements-fabric-930469:${additionalplacements_fabric_curse_id}")

annotationProcessor(implementation(include("io.github.llamalad7:mixinextras-fabric:${mixin_extras_version}")))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,15 @@
"block.copycats.copycat_block": "\u029E\u0254o\u05DF\u15FA \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_board": "p\u0279\u0250o\u15FA \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_byte": "\u01DD\u0287\u028E\u15FA \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_byte_panel": "\u05DF\u01DDu\u0250\u0500 \u01DD\u0287\u028E\u15FA \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_corner_slice": "\u01DD\u0254\u0131\u05DFS \u0279\u01DDu\u0279o\u0186 \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_door": "\u0279oo\u15E1 \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_fence": "\u01DD\u0254u\u01DD\u2132 \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_fence_gate": "\u01DD\u0287\u0250\u2141 \u01DD\u0254u\u01DD\u2132 \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_flat_pane": "\u01DDu\u0250\u0500 \u0287\u0250\u05DF\u2132 \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_fluid_pipe": "\u01DDd\u0131\u0500 p\u0131n\u05DF\u2132 \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_folding_door": "\u0279oo\u15E1 bu\u0131p\u05DFo\u2132 \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_ghost_block": "\u029E\u0254o\u05DF\u15FA \u0287so\u0265\u2141 \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_glass_fluid_pipe": "\u01DDd\u0131\u0500 p\u0131n\u05DF\u2132 ss\u0250\u05DF\u2141 \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_half_layer": "\u0279\u01DD\u028E\u0250\uA780 \u025F\u05DF\u0250H \u0287\u0250\u0254\u028Edo\u0186",
Expand All @@ -20,15 +24,19 @@
"block.copycats.copycat_large_cogwheel": "\u05DF\u01DD\u01DD\u0265\u028Dbo\u0186 \u01DDb\u0279\u0250\uA780 \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_layer": "\u0279\u01DD\u028E\u0250\uA780 \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_light_weighted_pressure_plate": "\u01DD\u0287\u0250\u05DF\u0500 \u01DD\u0279nss\u01DD\u0279\u0500 p\u01DD\u0287\u0265b\u0131\u01DDM \u0287\u0265b\u0131\uA780 \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_pane": "\u01DDu\u0250\u0500 \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_shaft": "\u0287\u025F\u0250\u0265S \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_slab": "q\u0250\u05DFS \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_slice": "\u01DD\u0254\u0131\u05DFS \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_sliding_door": "\u0279oo\u15E1 bu\u0131p\u0131\u05DFS \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_slope": "\u01DDdo\u05DFS \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_slope_layer": "\u0279\u01DD\u028E\u0250\uA780 \u01DDdo\u05DFS \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_stacked_half_layer": "\u0279\u01DD\u028E\u0250\uA780 \u025F\u05DF\u0250H p\u01DD\u029E\u0254\u0250\u0287S \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_stairs": "s\u0279\u0131\u0250\u0287S \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_stone_button": "uo\u0287\u0287n\u15FA \u01DDuo\u0287S \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_stone_pressure_plate": "\u01DD\u0287\u0250\u05DF\u0500 \u01DD\u0279nss\u01DD\u0279\u0500 \u01DDuo\u0287S \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_trapdoor": "\u0279oopd\u0250\u0279\u27D8 \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_vertical_half_layer": "\u0279\u01DD\u028E\u0250\uA780 \u025F\u05DF\u0250H \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_vertical_slice": "\u01DD\u0254\u0131\u05DFS \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_vertical_slope": "\u01DDdo\u05DFS \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B \u0287\u0250\u0254\u028Edo\u0186",
"block.copycats.copycat_vertical_stairs": "s\u0279\u0131\u0250\u0287S \u05DF\u0250\u0254\u0131\u0287\u0279\u01DD\u039B \u0287\u0250\u0254\u028Edo\u0186",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
{
"advancements": [
{
"fabric:load_conditions": [
{
"condition": "copycats:feature_enabled",
"feature": "copycats:copycat_beam",
"invert": false
}
],
"advancement": {
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"copycats:stonecutting/copycat_beam"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "c:zinc_ingots"
"tag": "c:ingots/zinc"
}
]
},
"trigger": "minecraft:inventory_changed"
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "copycats:stonecutting/copycat_beam"
},
"trigger": "minecraft:recipe_unlocked"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"copycats:stonecutting/copycat_beam"
]
}
},
"fabric:load_conditions": [
{
"condition": "copycats:feature_enabled",
"feature": "copycats:copycat_beam",
"invert": false
}
]
]
}
}
]
}
Original file line number Diff line number Diff line change
@@ -1,45 +1,45 @@
{
"advancements": [
{
"fabric:load_conditions": [
{
"condition": "copycats:feature_enabled",
"feature": "copycats:copycat_block",
"invert": false
}
],
"advancement": {
"parent": "minecraft:recipes/root",
"rewards": {
"recipes": [
"copycats:stonecutting/copycat_block"
]
},
"criteria": {
"has_item": {
"trigger": "minecraft:inventory_changed",
"conditions": {
"items": [
{
"tag": "c:zinc_ingots"
"tag": "c:ingots/zinc"
}
]
},
"trigger": "minecraft:inventory_changed"
}
},
"has_the_recipe": {
"trigger": "minecraft:recipe_unlocked",
"conditions": {
"recipe": "copycats:stonecutting/copycat_block"
},
"trigger": "minecraft:recipe_unlocked"
}
}
},
"requirements": [
[
"has_item",
"has_the_recipe"
]
],
"rewards": {
"recipes": [
"copycats:stonecutting/copycat_block"
]
}
},
"fabric:load_conditions": [
{
"condition": "copycats:feature_enabled",
"feature": "copycats:copycat_block",
"invert": false
}
]
]
}
}
]
}
Loading

0 comments on commit 6119678

Please sign in to comment.