diff --git a/build.gradle b/build.gradle index 56ac71071..d8e3a2d87 100644 --- a/build.gradle +++ b/build.gradle @@ -140,12 +140,12 @@ repositories { dependencies { minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}" - jarJar(group: 'com.tterrag.registrate', name: 'Registrate', version: '[MC1.18.2-1.1.3,)') { - jarJar.pin(it, project.registrate_version) + jarJar("com.tterrag.registrate:Registrate:${registrate_version}") { + jarJar.ranged(it, '[MC1.18.2-1.1.3,)') } // Uncomment once Forge fixes mixins for included jars - //jarJar(group: 'com.jozufozu.flywheel', name: "flywheel-forge-${flywheel_minecraft_version}", version: '[0.6.8,0.6.9)') { - // jarJar.pin(it, project.flywheel_version) + //jarJar("com.jozufozu.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}") { + // jarJar.ranged(it, '[0.6.8,0.6.9)') //} implementation fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}") @@ -218,6 +218,7 @@ jar { } task jarJarRelease { + group = 'jarjar' doLast { tasks.jarJar { classifier = '' diff --git a/src/main/java/com/simibubi/create/AllStitchedTextures.java b/src/main/java/com/simibubi/create/AllStitchedTextures.java deleted file mode 100644 index 5e8909404..000000000 --- a/src/main/java/com/simibubi/create/AllStitchedTextures.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.simibubi.create; - -import com.jozufozu.flywheel.core.StitchedSprite; - -public class AllStitchedTextures { - - public static final StitchedSprite SUPER_GLUE = new StitchedSprite(Create.asResource("entity/super_glue/slime")); - - public static void init() { - } -} diff --git a/src/main/java/com/simibubi/create/CreateClient.java b/src/main/java/com/simibubi/create/CreateClient.java index d20076543..a38cb4f7d 100644 --- a/src/main/java/com/simibubi/create/CreateClient.java +++ b/src/main/java/com/simibubi/create/CreateClient.java @@ -85,7 +85,6 @@ public class CreateClient { AllKeys.register(); AllBlockPartials.init(); - AllStitchedTextures.init(); PonderIndex.register(); PonderIndex.registerTags(); diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java index 764f9b643..23149f719 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/AbstractContraptionEntity.java @@ -10,8 +10,6 @@ import java.util.UUID; import javax.annotation.Nullable; -import com.simibubi.create.foundation.utility.ContraptionData; - import org.apache.commons.lang3.mutable.MutableInt; import org.apache.commons.lang3.tuple.MutablePair; @@ -37,6 +35,7 @@ import com.simibubi.create.foundation.collision.Matrix3d; import com.simibubi.create.foundation.mixin.accessor.ServerLevelAccessor; import com.simibubi.create.foundation.networking.AllPackets; import com.simibubi.create.foundation.utility.AngleHelper; +import com.simibubi.create.foundation.utility.ContraptionData; import com.simibubi.create.foundation.utility.VecHelper; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/StructureTransform.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/StructureTransform.java index e03b8b994..814007e2e 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/StructureTransform.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/StructureTransform.java @@ -130,7 +130,7 @@ public class StructureTransform { if (rotationAxis == Axis.Y) { if (block instanceof BellBlock) { - if (state.getValue(BlockStateProperties.BELL_ATTACHMENT) == BellAttachType.DOUBLE_WALL) + if (state.getValue(BlockStateProperties.BELL_ATTACHMENT) == BellAttachType.DOUBLE_WALL) state = state.setValue(BlockStateProperties.BELL_ATTACHMENT, BellAttachType.SINGLE_WALL); return state.setValue(BellBlock.FACING, rotation.rotate(state.getValue(BellBlock.FACING))); @@ -144,7 +144,8 @@ public class StructureTransform { EnumProperty faceProperty = FaceAttachedHorizontalDirectionalBlock.FACE; Direction stateFacing = state.getValue(facingProperty); AttachFace stateFace = state.getValue(faceProperty); - Direction forcedAxis = rotationAxis == Axis.Z ? Direction.EAST : Direction.SOUTH; + boolean z = rotationAxis == Axis.Z; + Direction forcedAxis = z ? Direction.WEST : Direction.SOUTH; if (stateFacing.getAxis() == rotationAxis && stateFace == AttachFace.WALL) return state; @@ -161,7 +162,7 @@ public class StructureTransform { continue; } - if (stateFacing.getAxisDirection() == AxisDirection.POSITIVE) { + if (stateFacing.getAxisDirection() == (z ? AxisDirection.NEGATIVE : AxisDirection.POSITIVE)) { state = state.setValue(faceProperty, AttachFace.FLOOR); continue; } diff --git a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java index 5b0d02320..3dd2ff7c1 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java +++ b/src/main/java/com/simibubi/create/content/contraptions/components/structureMovement/mounted/MinecartContraptionItem.java @@ -4,10 +4,6 @@ import java.util.List; import javax.annotation.Nullable; -import com.simibubi.create.foundation.utility.ContraptionData; - -import net.minecraft.network.chat.MutableComponent; - import org.apache.commons.lang3.tuple.MutablePair; import com.simibubi.create.AllItems; @@ -21,6 +17,7 @@ import com.simibubi.create.content.contraptions.components.structureMovement.Ori import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.config.AllConfigs; import com.simibubi.create.foundation.config.ContraptionMovementSetting; +import com.simibubi.create.foundation.utility.ContraptionData; import com.simibubi.create.foundation.utility.Lang; import com.simibubi.create.foundation.utility.NBTHelper; @@ -32,6 +29,7 @@ import net.minecraft.core.NonNullList; import net.minecraft.core.dispenser.DefaultDispenseItemBehavior; import net.minecraft.core.dispenser.DispenseItemBehavior; import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.chat.MutableComponent; import net.minecraft.tags.BlockTags; import net.minecraft.world.InteractionResult; import net.minecraft.world.entity.Entity; diff --git a/src/main/java/com/simibubi/create/content/logistics/trains/entity/Carriage.java b/src/main/java/com/simibubi/create/content/logistics/trains/entity/Carriage.java index d4e530695..12d25eea7 100644 --- a/src/main/java/com/simibubi/create/content/logistics/trains/entity/Carriage.java +++ b/src/main/java/com/simibubi/create/content/logistics/trains/entity/Carriage.java @@ -16,8 +16,6 @@ import java.util.function.Function; import javax.annotation.Nullable; -import net.minecraft.server.MinecraftServer; - import org.apache.commons.lang3.mutable.MutableDouble; import com.simibubi.create.content.contraptions.components.structureMovement.Contraption; @@ -37,6 +35,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.Tag; import net.minecraft.resources.ResourceKey; +import net.minecraft.server.MinecraftServer; import net.minecraft.server.level.ServerLevel; import net.minecraft.server.level.ServerPlayer; import net.minecraft.util.Mth; diff --git a/src/main/java/com/simibubi/create/foundation/mixin/accessor/NbtAccounterAccessor.java b/src/main/java/com/simibubi/create/foundation/mixin/accessor/NbtAccounterAccessor.java index c466f13fa..5174ff635 100644 --- a/src/main/java/com/simibubi/create/foundation/mixin/accessor/NbtAccounterAccessor.java +++ b/src/main/java/com/simibubi/create/foundation/mixin/accessor/NbtAccounterAccessor.java @@ -1,10 +1,10 @@ package com.simibubi.create.foundation.mixin.accessor; -import net.minecraft.nbt.NbtAccounter; - import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; +import net.minecraft.nbt.NbtAccounter; + @Mixin(NbtAccounter.class) public interface NbtAccounterAccessor { @Accessor("usage") diff --git a/src/main/java/com/simibubi/create/foundation/utility/ContraptionData.java b/src/main/java/com/simibubi/create/foundation/utility/ContraptionData.java index 66426bca9..083cb4eae 100644 --- a/src/main/java/com/simibubi/create/foundation/utility/ContraptionData.java +++ b/src/main/java/com/simibubi/create/foundation/utility/ContraptionData.java @@ -9,7 +9,6 @@ import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtAccounter; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.protocol.game.ClientboundContainerSetSlotPacket; -import net.minecraftforge.fml.ModList; public class ContraptionData { /**