From 3fb6e71ec8a0ad4086584782c624fea6aa43e26b Mon Sep 17 00:00:00 2001 From: zelophed Date: Fri, 17 Jan 2025 14:52:52 +0100 Subject: [PATCH] remove references to catnip as a mod --- build.gradle | 28 ++----------------- gradle.properties | 1 - .../chassis/ChassisRangeDisplay.java | 14 +++++----- .../glue/SuperGlueSelectionHandler.java | 13 +++++---- .../minecart/CouplingRenderer.java | 6 ++-- .../contraptions/pulley/RopePulleyVisual.java | 6 ++-- .../girder/GirderWrenchBehavior.java | 5 ++-- .../goggles/GoggleOverlayRenderer.java | 5 ++-- .../equipment/zapper/ZapperRenderHandler.java | 4 +-- .../WorldshaperRenderHandler.java | 4 +-- .../content/kinetics/KineticDebugger.java | 6 ++-- .../content/kinetics/base/ShaftVisual.java | 2 +- .../kinetics/base/SingleRotatingVisual.java | 2 +- .../content/kinetics/belt/BeltSlicer.java | 5 ++-- .../ChainConveyorConnectionHandler.java | 9 +++--- .../ChainConveyorInteractionHandler.java | 5 ++-- .../kinetics/crank/HandCrankVisual.java | 2 +- .../crank/ValveHandleBlockEntity.java | 3 +- .../deployer/DeployerActorVisual.java | 2 +- .../kinetics/flywheel/FlywheelVisual.java | 2 +- .../ArmInteractionPointHandler.java | 5 ++-- .../content/kinetics/saw/SawVisual.java | 2 +- .../BracketedKineticBlockModel.java | 3 +- .../waterwheel/LargeWaterWheelBlockItem.java | 5 ++-- .../logistics/depot/EjectorTargetHandler.java | 7 +++-- .../FactoryPanelConnectionHandler.java | 4 +-- .../PackagePortTargetSelectionHandler.java | 14 +++++----- .../LogisticallyLinkedClientHandler.java | 4 +-- .../displayLink/ClickToLinkBlockItem.java | 5 ++-- .../content/redstone/link/LinkRenderer.java | 4 +-- .../LinkedControllerClientHandler.java | 5 ++-- .../cannon/SchematicannonRenderer.java | 2 +- .../client/SchematicAndQuillHandler.java | 3 +- .../create/content/trains/CubeParticle.java | 4 +-- .../trains/bogey/StandardBogeyVisual.java | 2 +- .../content/trains/entity/TrainRelocator.java | 7 +++-- .../trains/graph/TrackGraphVisualizer.java | 19 ++++++------- .../content/trains/track/TrackPlacement.java | 17 +++++------ .../EdgeInteractionRenderer.java | 4 +-- .../filtering/FilteringRenderer.java | 4 +-- .../scrollValue/ScrollValueRenderer.java | 6 ++-- .../command/ClearBufferCacheCommand.java | 5 ++-- .../command/HighlightPacket.java | 5 ++-- src/main/resources/META-INF/mods.toml | 7 ----- 44 files changed, 126 insertions(+), 141 deletions(-) diff --git a/build.gradle b/build.gradle index 89d9b78bb1..0dfc5b5c2d 100644 --- a/build.gradle +++ b/build.gradle @@ -24,19 +24,14 @@ base { } boolean inMultiModWorkspace = rootProject.hasProperty('multiModWorkspace.enabled') -boolean catnipInWorkspace = rootProject.hasProperty('multiModWorkspace.catnip') boolean ponderInWorkspace = rootProject.hasProperty('multiModWorkspace.ponder') -if (catnipInWorkspace) { - evaluationDependsOn(":catnip:Forge") -} - if (ponderInWorkspace) { evaluationDependsOn(":ponder:Forge") } project.logger.lifecycle("MultiModWorkspace ${inMultiModWorkspace ? 'enabled' : 'disabled'} for project ${project.name}.") -project.logger.lifecycle("Dependencies included in Workspace: [Catnip: ${catnipInWorkspace}], [Ponder: ${ponderInWorkspace}]") +project.logger.lifecycle("Dependencies included in Workspace: [Ponder: ${ponderInWorkspace}]") mixin { add sourceSets.main, 'create.refmap.json' @@ -94,20 +89,13 @@ minecraft { property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg" arg '-mixin.config=create.mixins.json' - arg '-mixin.config=catnip.mixins.json' + arg '-mixin.config=ponder.mixins.json' mods { create { source sourceSets.main } - if (catnipInWorkspace) { - catnip { - source project(":catnip:Common").sourceSets.main - source project(":catnip:Forge").sourceSets.main - } - } - if (ponderInWorkspace) { ponder { source project(":ponder:Common").sourceSets.main @@ -193,7 +181,7 @@ repositories { } } maven { - // Location of the maven for Ponder, Catnip + // Location of the maven for Ponder name = 'createmod maven' url 'https://maven.createmod.net' } @@ -233,9 +221,6 @@ dependencies { jarJar.ranged(it, '[1.0,2.0)') } - jarJar("net.createmod.catnip:Catnip-Forge-${minecraft_version}:${catnip_version}") { - jarJar.ranged(it, '[0.7.5,)') - } jarJar("net.createmod.ponder:Ponder-Forge-${minecraft_version}:${ponder_version}") { jarJar.ranged(it, '[0.7.5,)') } @@ -249,13 +234,6 @@ dependencies { compileOnly fg.deobf("dev.engine_room.flywheel:flywheel-forge-api-${flywheel_minecraft_version}:${flywheel_version}") runtimeOnly fg.deobf("dev.engine_room.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}") - if (catnipInWorkspace) { - implementation project(":catnip:Common") - implementation project(":catnip:Forge") - } else { - implementation fg.deobf("net.createmod.catnip:Catnip-Forge-${minecraft_version}:${catnip_version}") - } - if (ponderInWorkspace) { implementation project(":ponder:Common") implementation project(":ponder:Forge") diff --git a/gradle.properties b/gradle.properties index 06c7b19a44..a421e83e91 100644 --- a/gradle.properties +++ b/gradle.properties @@ -28,7 +28,6 @@ jei_minecraft_version = 1.20.1 jei_version = 15.10.0.39 curios_minecraft_version = 1.20.1 curios_version = 5.3.1 -catnip_version = 0.8.42 ponder_version = 0.8.16 mixin_extras_version = 0.4.1 diff --git a/src/main/java/com/simibubi/create/content/contraptions/chassis/ChassisRangeDisplay.java b/src/main/java/com/simibubi/create/content/contraptions/chassis/ChassisRangeDisplay.java index 3b9c1c23f3..247339bc5a 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/chassis/ChassisRangeDisplay.java +++ b/src/main/java/com/simibubi/create/content/contraptions/chassis/ChassisRangeDisplay.java @@ -14,7 +14,7 @@ import com.simibubi.create.AllItems; import com.simibubi.create.AllKeys; import com.simibubi.create.AllSpecialTextures; -import net.createmod.catnip.CatnipClient; +import net.createmod.catnip.utility.outliner.Outliner; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.world.entity.player.Player; @@ -35,7 +35,7 @@ public class ChassisRangeDisplay { public Entry(ChassisBlockEntity be) { this.be = be; timer = DISPLAY_TIME; - CatnipClient.OUTLINER.showCluster(getOutlineKey(), createSelection(be)) + Outliner.getInstance().showCluster(getOutlineKey(), createSelection(be)) .colored(0xFFFFFF) .disableLineNormals() .lineWidth(1 / 16f) @@ -97,7 +97,7 @@ public class ChassisRangeDisplay { Entry entry = entries.get(pos); if (tickEntry(entry, hasWrench)) iterator.remove(); - CatnipClient.OUTLINER.keep(entry.getOutlineKey()); + Outliner.getInstance().keep(entry.getOutlineKey()); } for (Iterator iterator = groupEntries.iterator(); iterator.hasNext();) { @@ -107,7 +107,7 @@ public class ChassisRangeDisplay { if (group == lastHoveredGroup) lastHoveredGroup = null; } - CatnipClient.OUTLINER.keep(group.getOutlineKey()); + Outliner.getInstance().keep(group.getOutlineKey()); } if (!hasWrench) @@ -173,9 +173,9 @@ public class ChassisRangeDisplay { GroupEntry hoveredGroup = new GroupEntry(chassis); for (ChassisBlockEntity included : hoveredGroup.includedBEs) - CatnipClient.OUTLINER.remove(Pair.of(included.getBlockPos(), 1)); + Outliner.getInstance().remove(Pair.of(included.getBlockPos(), 1)); - groupEntries.forEach(entry -> CatnipClient.OUTLINER.remove(entry.getOutlineKey())); + groupEntries.forEach(entry -> Outliner.getInstance().remove(entry.getOutlineKey())); groupEntries.clear(); entries.clear(); groupEntries.add(hoveredGroup); @@ -186,7 +186,7 @@ public class ChassisRangeDisplay { BlockPos pos = chassis.getBlockPos(); GroupEntry entry = getExistingGroupForPos(pos); if (entry != null) - CatnipClient.OUTLINER.remove(entry.getOutlineKey()); + Outliner.getInstance().remove(entry.getOutlineKey()); groupEntries.clear(); entries.clear(); diff --git a/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueSelectionHandler.java b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueSelectionHandler.java index 19cee16f3b..2bd74e4627 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueSelectionHandler.java +++ b/src/main/java/com/simibubi/create/content/contraptions/glue/SuperGlueSelectionHandler.java @@ -12,8 +12,8 @@ import com.simibubi.create.content.contraptions.chassis.AbstractChassisBlock; import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.foundation.utility.RaycastHelper; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.utility.outliner.Outliner; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.player.LocalPlayer; @@ -28,6 +28,7 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.HitResult.Type; import net.minecraft.world.phys.Vec3; + import net.minecraftforge.common.ForgeMod; public class SuperGlueSelectionHandler { @@ -63,7 +64,7 @@ public class SuperGlueSelectionHandler { if (clusterCooldown > 0) { if (clusterCooldown == 25) player.displayClientMessage(Components.immutableEmpty(), true); - CatnipClient.OUTLINER.keep(clusterOutlineSlot); + Outliner.getInstance().keep(clusterOutlineSlot); clusterCooldown--; } @@ -97,7 +98,7 @@ public class SuperGlueSelectionHandler { for (SuperGlueEntity glueEntity : glueNearby) { boolean h = clusterCooldown == 0 && glueEntity == selected; AllSpecialTextures faceTex = h ? AllSpecialTextures.GLUE : null; - CatnipClient.OUTLINER.showAABB(glueEntity, glueEntity.getBoundingBox()) + Outliner.getInstance().showAABB(glueEntity, glueEntity.getBoundingBox()) .colored(h ? HIGHLIGHT : PASSIVE) .withFaceTextures(faceTex, faceTex) .disableLineNormals() @@ -152,13 +153,13 @@ public class SuperGlueSelectionHandler { .sendStatus(player); if (currentSelectionBox != null) - CatnipClient.OUTLINER.showAABB(bbOutlineSlot, currentSelectionBox) + Outliner.getInstance().showAABB(bbOutlineSlot, currentSelectionBox) .colored(canReach && canAfford && !cancel ? HIGHLIGHT : FAIL) .withFaceTextures(AllSpecialTextures.GLUE, AllSpecialTextures.GLUE) .disableLineNormals() .lineWidth(1 / 16f); - CatnipClient.OUTLINER.showCluster(clusterOutlineSlot, currentCluster) + Outliner.getInstance().showCluster(clusterOutlineSlot, currentCluster) .colored(0x4D9162) .disableLineNormals() .lineWidth(1 / 64f); @@ -258,7 +259,7 @@ public class SuperGlueSelectionHandler { player.level().playSound(player, hoveredPos, SoundEvents.ITEM_FRAME_ADD_ITEM, SoundSource.BLOCKS, 0.75f, 1); if (currentCluster != null) - CatnipClient.OUTLINER.showCluster(clusterOutlineSlot, currentCluster) + Outliner.getInstance().showCluster(clusterOutlineSlot, currentCluster) .colored(0xB5F2C6) .withFaceTextures(AllSpecialTextures.GLUE, AllSpecialTextures.HIGHLIGHT_CHECKERED) .disableLineNormals() diff --git a/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingRenderer.java b/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingRenderer.java index 7da8dfb831..522ad44a04 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingRenderer.java +++ b/src/main/java/com/simibubi/create/content/contraptions/minecart/CouplingRenderer.java @@ -9,12 +9,12 @@ import com.simibubi.create.content.contraptions.minecart.capability.MinecartCont import com.simibubi.create.content.kinetics.KineticDebugger; import dev.engine_room.flywheel.lib.transform.TransformStack; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; import net.createmod.catnip.utility.AnimationTickHolder; import net.createmod.catnip.utility.Couple; import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.utility.outliner.Outliner; import net.createmod.catnip.utility.theme.Color; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; @@ -227,13 +227,13 @@ public class CouplingRenderer { int color = Color.mixColors(0xabf0e9, 0xee8572, (float) Mth .clamp(Math.abs(first.getCouplingLength(true) - connectedCenter.distanceTo(mainCenter)) * 8, 0, 1)); - CatnipClient.OUTLINER.showLine(mainCart.getId() + "", mainCenter, connectedCenter) + Outliner.getInstance().showLine(mainCart.getId() + "", mainCenter, connectedCenter) .colored(color) .lineWidth(1 / 8f); Vec3 point = mainCart.position() .add(0, yOffset, 0); - CatnipClient.OUTLINER.showLine(mainCart.getId() + "_dot", point, point.add(0, 1 / 128f, 0)) + Outliner.getInstance().showLine(mainCart.getId() + "_dot", point, point.add(0, 1 / 128f, 0)) .colored(0xffffff) .lineWidth(1 / 4f); } diff --git a/src/main/java/com/simibubi/create/content/contraptions/pulley/RopePulleyVisual.java b/src/main/java/com/simibubi/create/content/contraptions/pulley/RopePulleyVisual.java index f877d1c652..d89ded5150 100644 --- a/src/main/java/com/simibubi/create/content/contraptions/pulley/RopePulleyVisual.java +++ b/src/main/java/com/simibubi/create/content/contraptions/pulley/RopePulleyVisual.java @@ -13,7 +13,7 @@ import dev.engine_room.flywheel.lib.instance.InstanceTypes; import dev.engine_room.flywheel.lib.instance.TransformedInstance; import dev.engine_room.flywheel.lib.model.Models; import net.createmod.catnip.render.SpriteShiftEntry; -import net.createmod.catnip.render.VirtualRenderHelper; +import net.createmod.ponder.render.VirtualRenderHelper; public class RopePulleyVisual extends AbstractPulleyVisual { public RopePulleyVisual(VisualizationContext context, PulleyBlockEntity blockEntity, float partialTick) { @@ -54,10 +54,10 @@ public class RopePulleyVisual extends AbstractPulleyVisual { protected boolean isRunning() { return PulleyRenderer.isPulleyRunning(blockEntity); } - + @Override protected SpriteShiftEntry getCoilAnimation() { return AllSpriteShifts.ROPE_PULLEY_COIL; } - + } diff --git a/src/main/java/com/simibubi/create/content/decoration/girder/GirderWrenchBehavior.java b/src/main/java/com/simibubi/create/content/decoration/girder/GirderWrenchBehavior.java index 140ac8bda5..780b6ed387 100644 --- a/src/main/java/com/simibubi/create/content/decoration/girder/GirderWrenchBehavior.java +++ b/src/main/java/com/simibubi/create/content/decoration/girder/GirderWrenchBehavior.java @@ -9,10 +9,10 @@ import org.jetbrains.annotations.Nullable; import com.simibubi.create.AllBlocks; import com.simibubi.create.AllItems; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.utility.Iterate; import net.createmod.catnip.utility.Pair; import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.utility.outliner.Outliner; import net.createmod.catnip.utility.placement.IPlacementHelper; import net.createmod.catnip.utility.theme.Color; import net.minecraft.client.Minecraft; @@ -28,6 +28,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; + import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -91,7 +92,7 @@ public class GirderWrenchBehavior { .getNormal()) .scale(0.1 * normalMultiplier)); - CatnipClient.OUTLINER.showAABB("girderWrench", new AABB(corner1, corner2)) + Outliner.getInstance().showAABB("girderWrench", new AABB(corner1, corner2)) .lineWidth(1 / 32f) .colored(new Color(127, 127, 127)); } diff --git a/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleOverlayRenderer.java b/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleOverlayRenderer.java index 9988290791..421c5a41f9 100644 --- a/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleOverlayRenderer.java +++ b/src/main/java/com/simibubi/create/content/equipment/goggles/GoggleOverlayRenderer.java @@ -20,12 +20,12 @@ import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; import com.simibubi.create.infrastructure.config.CClient; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.gui.element.BoxElement; import net.createmod.catnip.gui.element.GuiGameElement; import net.createmod.catnip.utility.Iterate; import net.createmod.catnip.utility.lang.Components; import net.createmod.catnip.utility.outliner.Outline; +import net.createmod.catnip.utility.outliner.Outliner; import net.createmod.catnip.utility.outliner.Outliner.OutlineEntry; import net.createmod.catnip.utility.theme.Color; import net.minecraft.client.Minecraft; @@ -44,6 +44,7 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; + import net.minecraftforge.client.gui.overlay.ForgeGui; import net.minecraftforge.client.gui.overlay.IGuiOverlay; @@ -51,7 +52,7 @@ public class GoggleOverlayRenderer { public static final IGuiOverlay OVERLAY = GoggleOverlayRenderer::renderOverlay; - private static final Map outlines = CatnipClient.OUTLINER.getOutlines(); + private static final Map outlines = Outliner.getInstance().getOutlines(); public static int hoverTicks = 0; public static BlockPos lastHovered = null; diff --git a/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperRenderHandler.java b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperRenderHandler.java index 118ca2b2dc..086ba2dbc9 100644 --- a/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperRenderHandler.java +++ b/src/main/java/com/simibubi/create/content/equipment/zapper/ZapperRenderHandler.java @@ -9,7 +9,7 @@ import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.math.Axis; import com.simibubi.create.AllSoundEvents; -import net.createmod.catnip.CatnipClient; +import net.createmod.catnip.utility.outliner.Outliner; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.particles.ParticleTypes; @@ -38,7 +38,7 @@ public class ZapperRenderHandler extends ShootableGadgetRenderHandler { return; cachedBeams.forEach(beam -> { - CatnipClient.OUTLINER.endChasingLine(beam, beam.start, beam.end, 1 - beam.itensity, false) + Outliner.getInstance().endChasingLine(beam, beam.start, beam.end, 1 - beam.itensity, false) .disableLineNormals() .colored(0xffffff) .lineWidth(beam.itensity * 1 / 8f); diff --git a/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperRenderHandler.java b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperRenderHandler.java index 07de94f09b..b24fa1f202 100644 --- a/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperRenderHandler.java +++ b/src/main/java/com/simibubi/create/content/equipment/zapper/terrainzapper/WorldshaperRenderHandler.java @@ -7,8 +7,8 @@ import java.util.function.Supplier; import com.simibubi.create.AllItems; import com.simibubi.create.AllSpecialTextures; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.utility.NBTHelper; +import net.createmod.catnip.utility.outliner.Outliner; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.core.BlockPos; @@ -31,7 +31,7 @@ public class WorldshaperRenderHandler { if (renderedPositions == null) return; - CatnipClient.OUTLINER.showCluster("terrainZapper", renderedPositions.get()) + Outliner.getInstance().showCluster("terrainZapper", renderedPositions.get()) .colored(0xbfbfbf) .disableLineNormals() .lineWidth(1 / 32f) diff --git a/src/main/java/com/simibubi/create/content/kinetics/KineticDebugger.java b/src/main/java/com/simibubi/create/content/kinetics/KineticDebugger.java index d5f2d00c79..5c5e042e43 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/KineticDebugger.java +++ b/src/main/java/com/simibubi/create/content/kinetics/KineticDebugger.java @@ -5,9 +5,9 @@ import com.simibubi.create.content.kinetics.base.KineticBlockEntity; import com.simibubi.create.content.kinetics.base.KineticBlockEntityRenderer; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.render.SuperByteBufferCache; import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.utility.outliner.Outliner; import net.createmod.catnip.utility.theme.Color; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; @@ -45,7 +45,7 @@ public class KineticDebugger { .getBlockSupportShape(world, toOutline); if (be.getTheoreticalSpeed() != 0 && !shape.isEmpty()) - CatnipClient.OUTLINER.chaseAABB("kineticSource", shape.bounds() + Outliner.getInstance().chaseAABB("kineticSource", shape.bounds() .move(toOutline)) .lineWidth(1 / 16f) .colored(be.hasSource() ? Color.generateFromLong(be.network).getRGB() : 0xffcc00); @@ -55,7 +55,7 @@ public class KineticDebugger { Vec3 vec = Vec3.atLowerCornerOf(Direction.get(AxisDirection.POSITIVE, axis) .getNormal()); Vec3 center = VecHelper.getCenterOf(be.getBlockPos()); - CatnipClient.OUTLINER.showLine("rotationAxis", center.add(vec), center.subtract(vec)) + Outliner.getInstance().showLine("rotationAxis", center.add(vec), center.subtract(vec)) .lineWidth(1 / 16f); } diff --git a/src/main/java/com/simibubi/create/content/kinetics/base/ShaftVisual.java b/src/main/java/com/simibubi/create/content/kinetics/base/ShaftVisual.java index a6c7fad018..0c832dc322 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/base/ShaftVisual.java +++ b/src/main/java/com/simibubi/create/content/kinetics/base/ShaftVisual.java @@ -2,7 +2,7 @@ package com.simibubi.create.content.kinetics.base; import dev.engine_room.flywheel.api.model.Model; import dev.engine_room.flywheel.api.visualization.VisualizationContext; -import net.createmod.catnip.render.VirtualRenderHelper; +import net.createmod.ponder.render.VirtualRenderHelper; public class ShaftVisual extends SingleRotatingVisual { diff --git a/src/main/java/com/simibubi/create/content/kinetics/base/SingleRotatingVisual.java b/src/main/java/com/simibubi/create/content/kinetics/base/SingleRotatingVisual.java index 0a065eefdf..0869fc9e2d 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/base/SingleRotatingVisual.java +++ b/src/main/java/com/simibubi/create/content/kinetics/base/SingleRotatingVisual.java @@ -7,7 +7,7 @@ import com.simibubi.create.foundation.render.AllInstanceTypes; import dev.engine_room.flywheel.api.instance.Instance; import dev.engine_room.flywheel.api.model.Model; import dev.engine_room.flywheel.api.visualization.VisualizationContext; -import net.createmod.catnip.render.VirtualRenderHelper; +import net.createmod.ponder.render.VirtualRenderHelper; public class SingleRotatingVisual extends KineticBlockEntityVisual { diff --git a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltSlicer.java b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltSlicer.java index f9e217801f..05c2d92e5c 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/belt/BeltSlicer.java +++ b/src/main/java/com/simibubi/create/content/kinetics/belt/BeltSlicer.java @@ -15,9 +15,9 @@ import com.simibubi.create.content.kinetics.belt.transport.TransportedItemStack; import com.simibubi.create.foundation.block.ProperWaterloggedBlock; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.utility.VecHelper; import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.utility.outliner.Outliner; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; @@ -40,6 +40,7 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; + import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -479,7 +480,7 @@ public class BeltSlicer { mc.player.displayClientMessage(Components.immutableEmpty(), true); if (feedback.bb != null) - CatnipClient.OUTLINER.chaseAABB("BeltSlicer", feedback.bb) + Outliner.getInstance().chaseAABB("BeltSlicer", feedback.bb) .lineWidth(1 / 16f) .colored(feedback.color); } diff --git a/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorConnectionHandler.java b/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorConnectionHandler.java index fd5d965572..b9cca4539f 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorConnectionHandler.java +++ b/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorConnectionHandler.java @@ -7,9 +7,9 @@ import com.simibubi.create.content.equipment.blueprint.BlueprintOverlayRenderer; import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.utility.Iterate; import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.utility.outliner.Outliner; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; @@ -31,6 +31,7 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.HitResult.Type; import net.minecraft.world.phys.Vec3; + import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.entity.player.PlayerInteractEvent; @@ -190,10 +191,10 @@ public class ChainConveyorConnectionHandler { .normalize() .scale(.875); - CatnipClient.OUTLINER.showLine("chain_connect_line", from.add(normal), to.add(normal)) + Outliner.getInstance().showLine("chain_connect_line", from.add(normal), to.add(normal)) .lineWidth(1 / 16f) .colored(color); - CatnipClient.OUTLINER.showLine("chain_connect_line_1", from.subtract(normal), to.subtract(normal)) + Outliner.getInstance().showLine("chain_connect_line_1", from.subtract(normal), to.subtract(normal)) .lineWidth(1 / 16f) .colored(color); @@ -206,7 +207,7 @@ public class ChainConveyorConnectionHandler { for (int i = 0; i < 8; i++) { Vec3 v = VecHelper.rotate(new Vec3(0, .125 + y * .75, 1.25), 22.5 + i * 45, Axis.Y) .add(Vec3.atBottomCenterOf(pos)); - CatnipClient.OUTLINER.showLine(key + y + i, prevV, v) + Outliner.getInstance().showLine(key + y + i, prevV, v) .lineWidth(1 / 16f) .colored(color); prevV = v; diff --git a/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorInteractionHandler.java b/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorInteractionHandler.java index e559057a39..7cf03d896d 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorInteractionHandler.java +++ b/src/main/java/com/simibubi/create/content/kinetics/chainConveyor/ChainConveyorInteractionHandler.java @@ -15,8 +15,8 @@ import com.simibubi.create.content.logistics.packagePort.PackagePortTargetSelect import com.simibubi.create.foundation.utility.RaycastHelper; import com.simibubi.create.foundation.utility.TickBasedCache; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.utility.WorldAttached; +import net.createmod.catnip.utility.outliner.Outliner; import net.createmod.catnip.utility.theme.Color; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; @@ -26,6 +26,7 @@ import net.minecraft.world.item.ItemStack; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; + import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RenderHighlightEvent; import net.minecraftforge.common.ForgeMod; @@ -103,7 +104,7 @@ public class ChainConveyorInteractionHandler { selectedBakedPosition = bestShape.getVec(bestLift, selectedChainPosition); if (!isWrench) { - CatnipClient.OUTLINER + Outliner.getInstance() .chaseAABB("ChainPointSelection", new AABB(selectedBakedPosition, selectedBakedPosition)) .colored(Color.WHITE) .lineWidth(1 / 6f) diff --git a/src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankVisual.java b/src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankVisual.java index 00d3c1751d..7e4742bb51 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankVisual.java +++ b/src/main/java/com/simibubi/create/content/kinetics/crank/HandCrankVisual.java @@ -13,7 +13,7 @@ import dev.engine_room.flywheel.api.visualization.VisualizationContext; import dev.engine_room.flywheel.lib.instance.InstanceTypes; import dev.engine_room.flywheel.lib.instance.TransformedInstance; import dev.engine_room.flywheel.lib.visual.SimpleDynamicVisual; -import net.createmod.catnip.render.VirtualRenderHelper; +import net.createmod.ponder.render.VirtualRenderHelper; import net.minecraft.core.Direction; import net.minecraft.world.level.block.state.properties.BlockStateProperties; diff --git a/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlockEntity.java b/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlockEntity.java index 9bd8f41d2b..772e686372 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlockEntity.java +++ b/src/main/java/com/simibubi/create/content/kinetics/crank/ValveHandleBlockEntity.java @@ -19,9 +19,9 @@ import com.simibubi.create.foundation.utility.CreateLang; import dev.engine_room.flywheel.api.model.Model; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.render.VirtualRenderHelper; import net.createmod.catnip.utility.VecHelper; import net.createmod.catnip.utility.lang.Components; +import net.createmod.ponder.render.VirtualRenderHelper; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -36,6 +36,7 @@ import net.minecraft.world.level.block.entity.BlockEntityType; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.Vec3; + import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; diff --git a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerActorVisual.java b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerActorVisual.java index b8e01e8ac2..ed96ea0a4f 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerActorVisual.java +++ b/src/main/java/com/simibubi/create/content/kinetics/deployer/DeployerActorVisual.java @@ -19,11 +19,11 @@ import dev.engine_room.flywheel.lib.instance.InstanceTypes; import dev.engine_room.flywheel.lib.instance.TransformedInstance; import dev.engine_room.flywheel.lib.model.Models; import dev.engine_room.flywheel.lib.model.baked.PartialModel; -import net.createmod.catnip.render.VirtualRenderHelper; import net.createmod.catnip.utility.AnimationTickHolder; import net.createmod.catnip.utility.NBTHelper; import net.createmod.catnip.utility.VecHelper; import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.ponder.render.VirtualRenderHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.util.Mth; diff --git a/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelVisual.java b/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelVisual.java index 81274b8d15..80cefd7847 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelVisual.java +++ b/src/main/java/com/simibubi/create/content/kinetics/flywheel/FlywheelVisual.java @@ -14,8 +14,8 @@ import dev.engine_room.flywheel.lib.instance.InstanceTypes; import dev.engine_room.flywheel.lib.instance.TransformedInstance; import dev.engine_room.flywheel.lib.transform.TransformStack; import dev.engine_room.flywheel.lib.visual.SimpleDynamicVisual; -import net.createmod.catnip.render.VirtualRenderHelper; import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.ponder.render.VirtualRenderHelper; import net.minecraft.core.Direction; public class FlywheelVisual extends KineticBlockEntityVisual implements SimpleDynamicVisual { diff --git a/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmInteractionPointHandler.java b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmInteractionPointHandler.java index 401c2bca7c..d7577d7ffb 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmInteractionPointHandler.java +++ b/src/main/java/com/simibubi/create/content/kinetics/mechanicalArm/ArmInteractionPointHandler.java @@ -11,7 +11,7 @@ import com.simibubi.create.AllPackets; import com.simibubi.create.content.kinetics.mechanicalArm.ArmInteractionPoint.Mode; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.CatnipClient; +import net.createmod.catnip.utility.outliner.Outliner; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; @@ -25,6 +25,7 @@ import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.shapes.VoxelShape; + import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -201,7 +202,7 @@ public class ArmInteractionPointHandler { int color = point.getMode() .getColor(); - CatnipClient.OUTLINER.showAABB(point, shape.bounds() + Outliner.getInstance().showAABB(point, shape.bounds() .move(pos)) .colored(color) .lineWidth(1 / 16f); diff --git a/src/main/java/com/simibubi/create/content/kinetics/saw/SawVisual.java b/src/main/java/com/simibubi/create/content/kinetics/saw/SawVisual.java index 2b8d6b366d..75294af4d6 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/saw/SawVisual.java +++ b/src/main/java/com/simibubi/create/content/kinetics/saw/SawVisual.java @@ -7,7 +7,7 @@ import com.simibubi.create.content.kinetics.base.SingleRotatingVisual; import dev.engine_room.flywheel.api.model.Model; import dev.engine_room.flywheel.api.visualization.VisualizationContext; import dev.engine_room.flywheel.lib.model.Models; -import net.createmod.catnip.render.VirtualRenderHelper; +import net.createmod.ponder.render.VirtualRenderHelper; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; import net.minecraft.world.level.LevelAccessor; diff --git a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockModel.java b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockModel.java index 93a58a58ee..02518d8633 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockModel.java +++ b/src/main/java/com/simibubi/create/content/kinetics/simpleRelays/BracketedKineticBlockModel.java @@ -6,7 +6,7 @@ import java.util.List; import com.simibubi.create.content.decoration.bracket.BracketedBlockEntityBehaviour; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; -import net.createmod.catnip.render.VirtualRenderHelper; +import net.createmod.ponder.render.VirtualRenderHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.RenderType; import net.minecraft.client.renderer.block.model.BakedQuad; @@ -16,6 +16,7 @@ import net.minecraft.core.Direction; import net.minecraft.util.RandomSource; import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.block.state.BlockState; + import net.minecraftforge.client.model.BakedModelWrapper; import net.minecraftforge.client.model.data.ModelData; import net.minecraftforge.client.model.data.ModelProperty; diff --git a/src/main/java/com/simibubi/create/content/kinetics/waterwheel/LargeWaterWheelBlockItem.java b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/LargeWaterWheelBlockItem.java index 5a91354a03..67cd8f3f78 100644 --- a/src/main/java/com/simibubi/create/content/kinetics/waterwheel/LargeWaterWheelBlockItem.java +++ b/src/main/java/com/simibubi/create/content/kinetics/waterwheel/LargeWaterWheelBlockItem.java @@ -2,8 +2,8 @@ package com.simibubi.create.content.kinetics.waterwheel; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.utility.outliner.Outliner; import net.minecraft.client.player.LocalPlayer; import net.minecraft.core.BlockPos; import net.minecraft.core.Direction; @@ -15,6 +15,7 @@ import net.minecraft.world.item.context.BlockPlaceContext; import net.minecraft.world.level.block.Block; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.Vec3; + import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.DistExecutor; @@ -48,7 +49,7 @@ public class LargeWaterWheelBlockItem extends BlockItem { .getNormal()); if (!(context.getPlayer()instanceof LocalPlayer localPlayer)) return; - CatnipClient.OUTLINER.showAABB(Pair.of("waterwheel", pos), new AABB(pos).inflate(1) + Outliner.getInstance().showAABB(Pair.of("waterwheel", pos), new AABB(pos).inflate(1) .deflate(contract.x, contract.y, contract.z)) .colored(0xFF_ff5d6c); CreateLang.translate("large_water_wheel.not_enough_space") diff --git a/src/main/java/com/simibubi/create/content/logistics/depot/EjectorTargetHandler.java b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorTargetHandler.java index 9fa59bc71d..a76f861c63 100644 --- a/src/main/java/com/simibubi/create/content/logistics/depot/EjectorTargetHandler.java +++ b/src/main/java/com/simibubi/create/content/logistics/depot/EjectorTargetHandler.java @@ -8,9 +8,9 @@ import com.simibubi.create.AllPackets; import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.utility.AnimationTickHolder; import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.utility.outliner.Outliner; import net.createmod.catnip.utility.theme.Color; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; @@ -33,6 +33,7 @@ import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.HitResult.Type; import net.minecraft.world.phys.Vec3; import net.minecraft.world.phys.shapes.VoxelShape; + import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -211,7 +212,7 @@ public class EjectorTargetHandler { ClientLevel world = mc.level; AABB bb = new AABB(0, 0, 0, 1, 0, 1).move(currentSelection.offset(-validX, -yDiff, -validZ)); - CatnipClient.OUTLINER.chaseAABB("valid", bb) + Outliner.getInstance().chaseAABB("valid", bb) .colored(intColor) .lineWidth(1 / 16f); @@ -261,7 +262,7 @@ public class EjectorTargetHandler { BlockState state = world.getBlockState(pos); VoxelShape shape = state.getShape(world, pos); AABB boundingBox = shape.isEmpty() ? new AABB(BlockPos.ZERO) : shape.bounds(); - CatnipClient.OUTLINER.showAABB("target", boundingBox.move(pos)) + Outliner.getInstance().showAABB("target", boundingBox.move(pos)) .colored(0xffcb74) .lineWidth(1 / 16f); } diff --git a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelConnectionHandler.java b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelConnectionHandler.java index 7d78012693..af159bd8bb 100644 --- a/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelConnectionHandler.java +++ b/src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelConnectionHandler.java @@ -9,9 +9,9 @@ import com.simibubi.create.foundation.block.WrenchableDirectionalBlock; import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.utility.AnimationTickHolder; import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.utility.outliner.Outliner; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; @@ -159,7 +159,7 @@ public class FactoryPanelConnectionHandler { return; } - CatnipClient.OUTLINER.showAABB(connectingFrom, connectingFromBox) + Outliner.getInstance().showAABB(connectingFrom, connectingFromBox) .colored(AnimationTickHolder.getTicks() % 16 > 8 ? 0x38b764 : 0xa7f070) .lineWidth(1 / 16f); diff --git a/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortTargetSelectionHandler.java b/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortTargetSelectionHandler.java index 3ef705e192..2428cb0bd1 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortTargetSelectionHandler.java +++ b/src/main/java/com/simibubi/create/content/logistics/packagePort/PackagePortTargetSelectionHandler.java @@ -7,8 +7,8 @@ import com.simibubi.create.content.trains.station.StationBlockEntity; import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.utility.AnimationTickHolder; +import net.createmod.catnip.utility.outliner.Outliner; import net.createmod.catnip.utility.theme.Color; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; @@ -75,7 +75,7 @@ public class PackagePortTargetSelectionHandler { LocalPlayer player = mc.player; boolean isPostbox = AllItemTags.POSTBOXES.matches(player.getMainHandItem()); boolean isWrench = AllItemTags.WRENCH.matches(player.getMainHandItem()); - + if (!isWrench) { if (activePackageTarget == null) return; @@ -101,16 +101,16 @@ public class PackagePortTargetSelectionHandler { return; Color color = new Color(0x9ede73); animateConnection(mc, source, target, color); - CatnipClient.OUTLINER.chaseAABB("ChainPointSelected", new AABB(target, target)) + Outliner.getInstance().chaseAABB("ChainPointSelected", new AABB(target, target)) .colored(color) .lineWidth(1 / 5f) .disableLineNormals(); return; } - + Vec3 target = exactPositionOfTarget; if (blockRayTraceResult.getType() == Type.MISS) { - CatnipClient.OUTLINER.chaseAABB("ChainPointSelected", new AABB(target, target)) + Outliner.getInstance().chaseAABB("ChainPointSelected", new AABB(target, target)) .colored(0x9ede73) .lineWidth(1 / 5f) .disableLineNormals(); @@ -131,7 +131,7 @@ public class PackagePortTargetSelectionHandler { .color(color.getRGB()) .sendStatus(player); - CatnipClient.OUTLINER.chaseAABB("ChainPointSelected", new AABB(target, target)) + Outliner.getInstance().chaseAABB("ChainPointSelected", new AABB(target, target)) .colored(color) .lineWidth(1 / 5f) .disableLineNormals(); @@ -140,7 +140,7 @@ public class PackagePortTargetSelectionHandler { .canBeReplaced()) return; - CatnipClient.OUTLINER.chaseAABB("TargetedFrogPos", new AABB(pos).contract(0, 1, 0) + Outliner.getInstance().chaseAABB("TargetedFrogPos", new AABB(pos).contract(0, 1, 0) .deflate(0.125, 0, 0.125)) .colored(color) .lineWidth(1 / 16f) diff --git a/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticallyLinkedClientHandler.java b/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticallyLinkedClientHandler.java index 1bd998668a..925d97f172 100644 --- a/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticallyLinkedClientHandler.java +++ b/src/main/java/com/simibubi/create/content/logistics/packagerLink/LogisticallyLinkedClientHandler.java @@ -6,8 +6,8 @@ import org.apache.commons.lang3.tuple.Pair; import com.simibubi.create.foundation.blockEntity.SmartBlockEntity; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.utility.AnimationTickHolder; +import net.createmod.catnip.utility.outliner.Outliner; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; import net.minecraft.nbt.CompoundTag; @@ -46,7 +46,7 @@ public class LogisticallyLinkedClientHandler { .size(); i++) { AABB aabb = shape.toAabbs() .get(i); - CatnipClient.OUTLINER.showAABB(Pair.of(behaviour, i), aabb.inflate(-1 / 128f) + Outliner.getInstance().showAABB(Pair.of(behaviour, i), aabb.inflate(-1 / 128f) .move(be.getBlockPos()), 2) .lineWidth(1 / 32f) .disableLineNormals() diff --git a/src/main/java/com/simibubi/create/content/redstone/displayLink/ClickToLinkBlockItem.java b/src/main/java/com/simibubi/create/content/redstone/displayLink/ClickToLinkBlockItem.java index 5ab65126fd..d791446bd0 100644 --- a/src/main/java/com/simibubi/create/content/redstone/displayLink/ClickToLinkBlockItem.java +++ b/src/main/java/com/simibubi/create/content/redstone/displayLink/ClickToLinkBlockItem.java @@ -3,7 +3,7 @@ package com.simibubi.create.content.redstone.displayLink; import com.simibubi.create.AllSoundEvents; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.CatnipClient; +import net.createmod.catnip.utility.outliner.Outliner; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; @@ -20,6 +20,7 @@ import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.shapes.VoxelShape; + import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.event.entity.player.PlayerInteractEvent; @@ -154,7 +155,7 @@ public abstract class ClickToLinkBlockItem extends BlockItem { lastShownPos = selectedPos; } - CatnipClient.OUTLINER.showAABB("target", lastShownAABB) + Outliner.getInstance().showAABB("target", lastShownAABB) .colored(0xffcb74) .lineWidth(1 / 16f); } diff --git a/src/main/java/com/simibubi/create/content/redstone/link/LinkRenderer.java b/src/main/java/com/simibubi/create/content/redstone/link/LinkRenderer.java index cf1d20ad5f..c154ff1373 100644 --- a/src/main/java/com/simibubi/create/content/redstone/link/LinkRenderer.java +++ b/src/main/java/com/simibubi/create/content/redstone/link/LinkRenderer.java @@ -14,9 +14,9 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.utility.Iterate; import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.utility.outliner.Outliner; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.MultiBufferSource; @@ -64,7 +64,7 @@ public class LinkRenderer { if (!empty) box.wideOutline(); - CatnipClient.OUTLINER.showOutline(Pair.of(Boolean.valueOf(first), pos), box.transform(transform)) + Outliner.getInstance().showOutline(Pair.of(Boolean.valueOf(first), pos), box.transform(transform)) .highlightFace(result.getDirection()); if (!hit) diff --git a/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerClientHandler.java b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerClientHandler.java index 56fd5f3891..fa78fc0543 100644 --- a/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerClientHandler.java +++ b/src/main/java/com/simibubi/create/content/redstone/link/controller/LinkedControllerClientHandler.java @@ -20,9 +20,9 @@ import com.simibubi.create.foundation.item.TooltipHelper; import com.simibubi.create.foundation.utility.ControlsUtil; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.utility.FontHelper.Palette; import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.utility.outliner.Outliner; import net.minecraft.ChatFormatting; import net.minecraft.client.KeyMapping; import net.minecraft.client.Minecraft; @@ -33,6 +33,7 @@ import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; import net.minecraft.world.item.ItemStack; import net.minecraft.world.phys.shapes.VoxelShape; + import net.minecraftforge.client.gui.overlay.ForgeGui; import net.minecraftforge.client.gui.overlay.IGuiOverlay; @@ -189,7 +190,7 @@ public class LinkedControllerClientHandler { VoxelShape shape = mc.level.getBlockState(selectedLocation) .getShape(mc.level, selectedLocation); if (!shape.isEmpty()) - CatnipClient.OUTLINER.showAABB("controller", shape.bounds() + Outliner.getInstance().showAABB("controller", shape.bounds() .move(selectedLocation)) .colored(0xB73C2D) .lineWidth(1 / 16f); diff --git a/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonRenderer.java b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonRenderer.java index f82a511f4b..ab69eb1454 100644 --- a/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonRenderer.java +++ b/src/main/java/com/simibubi/create/content/schematics/cannon/SchematicannonRenderer.java @@ -13,7 +13,7 @@ import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRender import dev.engine_room.flywheel.api.visualization.VisualizationManager; import net.createmod.catnip.render.CachedBuffers; import net.createmod.catnip.render.SuperByteBuffer; -import net.createmod.catnip.render.VirtualRenderHelper; +import net.createmod.ponder.render.VirtualRenderHelper; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.MultiBufferSource; import net.minecraft.client.renderer.RenderType; diff --git a/src/main/java/com/simibubi/create/content/schematics/client/SchematicAndQuillHandler.java b/src/main/java/com/simibubi/create/content/schematics/client/SchematicAndQuillHandler.java index a056b5100b..db72b88344 100644 --- a/src/main/java/com/simibubi/create/content/schematics/client/SchematicAndQuillHandler.java +++ b/src/main/java/com/simibubi/create/content/schematics/client/SchematicAndQuillHandler.java @@ -16,7 +16,6 @@ import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.foundation.utility.RaycastHelper; import com.simibubi.create.foundation.utility.RaycastHelper.PredicateTraceResult; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.gui.ScreenOpener; import net.createmod.catnip.utility.AnimationTickHolder; import net.createmod.catnip.utility.VecHelper; @@ -231,7 +230,7 @@ public class SchematicAndQuillHandler { } private Outliner outliner() { - return CatnipClient.OUTLINER; + return Outliner.getInstance(); } } diff --git a/src/main/java/com/simibubi/create/content/trains/CubeParticle.java b/src/main/java/com/simibubi/create/content/trains/CubeParticle.java index 6d6dfc7dbb..f07b163ef7 100644 --- a/src/main/java/com/simibubi/create/content/trains/CubeParticle.java +++ b/src/main/java/com/simibubi/create/content/trains/CubeParticle.java @@ -8,7 +8,7 @@ import com.mojang.blaze3d.vertex.Tesselator; import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.blaze3d.vertex.VertexFormat; -import net.createmod.catnip.enums.CatnipSpecialTextures; +import net.createmod.ponder.enums.PonderSpecialTextures; import net.minecraft.client.Camera; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.particle.Particle; @@ -44,7 +44,7 @@ public class CubeParticle extends Particle { private static final ParticleRenderType RENDER_TYPE = new ParticleRenderType() { @Override public void begin(BufferBuilder builder, TextureManager textureManager) { - CatnipSpecialTextures.BLANK.bind(); + PonderSpecialTextures.BLANK.bind(); // transparent, additive blending RenderSystem.depthMask(false); diff --git a/src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyVisual.java b/src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyVisual.java index deead25eb8..40bfee9c31 100644 --- a/src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyVisual.java +++ b/src/main/java/com/simibubi/create/content/trains/bogey/StandardBogeyVisual.java @@ -14,8 +14,8 @@ import dev.engine_room.flywheel.api.visualization.VisualizationContext; import dev.engine_room.flywheel.lib.instance.InstanceTypes; import dev.engine_room.flywheel.lib.instance.TransformedInstance; import dev.engine_room.flywheel.lib.model.Models; -import net.createmod.catnip.render.VirtualRenderHelper; import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.ponder.render.VirtualRenderHelper; import net.minecraft.core.Direction; import net.minecraft.nbt.CompoundTag; diff --git a/src/main/java/com/simibubi/create/content/trains/entity/TrainRelocator.java b/src/main/java/com/simibubi/create/content/trains/entity/TrainRelocator.java index b701e3425a..6004d09a7b 100644 --- a/src/main/java/com/simibubi/create/content/trains/entity/TrainRelocator.java +++ b/src/main/java/com/simibubi/create/content/trains/entity/TrainRelocator.java @@ -33,9 +33,9 @@ import com.simibubi.create.content.trains.track.TrackBlockOutline.BezierPointSel import com.simibubi.create.foundation.item.TooltipHelper; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.utility.Couple; import net.createmod.catnip.utility.Pair; +import net.createmod.catnip.utility.outliner.Outliner; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.player.LocalPlayer; @@ -50,6 +50,7 @@ import net.minecraft.world.phys.AABB; import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.Vec3; + import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.client.event.InputEvent; @@ -122,7 +123,7 @@ public class TrainRelocator { for (int i = 0; i < toVisualise.size() - 1; i++) { Vec3 vec1 = toVisualise.get(i).add(offset); Vec3 vec2 = toVisualise.get(i + 1).add(offset); - CatnipClient.OUTLINER.showLine(Pair.of(relocating, i), vec1.add(0, -.925f, 0), vec2.add(0, -.925f, 0)) + Outliner.getInstance().showLine(Pair.of(relocating, i), vec1.add(0, -.925f, 0), vec2.add(0, -.925f, 0)) .colored(lastHoveredResult || i != toVisualise.size() - 2 ? 0x95CD41 : 0xEA5C2B) .disableLineNormals() .lineWidth(i % 2 == 1 ? 1 / 6f : 1 / 4f); @@ -270,7 +271,7 @@ public class TrainRelocator { @OnlyIn(Dist.CLIENT) public static void visualise(Train train, int i, Vec3 v1, Vec3 v2, boolean valid) { - CatnipClient.OUTLINER.showLine(Pair.of(train, i), v1.add(0, -.825f, 0), v2.add(0, -.825f, 0)) + Outliner.getInstance().showLine(Pair.of(train, i), v1.add(0, -.825f, 0), v2.add(0, -.825f, 0)) .colored(valid ? 0x95CD41 : 0xEA5C2B) .disableLineNormals() .lineWidth(i % 2 == 1 ? 1 / 6f : 1 / 4f); diff --git a/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphVisualizer.java b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphVisualizer.java index d72f986b91..be4e12f435 100644 --- a/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphVisualizer.java +++ b/src/main/java/com/simibubi/create/content/trains/graph/TrackGraphVisualizer.java @@ -14,7 +14,6 @@ import com.simibubi.create.content.trains.signal.SignalEdgeGroup; import com.simibubi.create.content.trains.signal.TrackEdgePoint; import com.simibubi.create.content.trains.track.BezierConnection; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.utility.Pair; import net.createmod.catnip.utility.outliner.Outliner; import net.createmod.catnip.utility.theme.Color; @@ -36,7 +35,7 @@ public class TrackGraphVisualizer { return; Vec3 camera = cameraEntity.getEyePosition(); - Outliner outliner = CatnipClient.OUTLINER; + Outliner outliner = Outliner.getInstance(); Map allGroups = Create.RAILWAYS.sided(null).signalEdgeGroups; float width = 1 / 8f; @@ -239,7 +238,7 @@ public class TrackGraphVisualizer { Vec3 yOffset = new Vec3(0, 3 / 16f, 0); Vec3 v1 = location.add(yOffset); Vec3 v2 = v1.add(node.normal.scale(3 / 16f)); - CatnipClient.OUTLINER.showLine(Integer.valueOf(node.netId), v1, v2) + Outliner.getInstance().showLine(Integer.valueOf(node.netId), v1, v2) .colored(Color.mixColors(Color.WHITE, graph.color, 1)) .lineWidth(1 / 8f); @@ -255,7 +254,7 @@ public class TrackGraphVisualizer { if (!edge.node1.location.dimension.equals(edge.node2.location.dimension)) { v1 = location.add(yOffset); v2 = v1.add(node.normal.scale(3 / 16f)); - CatnipClient.OUTLINER.showLine(Integer.valueOf(node.netId), v1, v2) + Outliner.getInstance().showLine(Integer.valueOf(node.netId), v1, v2) .colored(Color.mixColors(Color.WHITE, graph.color, 1)) .lineWidth(1 / 4f); continue; @@ -268,15 +267,15 @@ public class TrackGraphVisualizer { if (extended) { Vec3 materialPos = edge.getPosition(graph, 0.5) .add(0, 1, 0); - CatnipClient.OUTLINER.showItem(Pair.of(edge, edge.edgeData), materialPos, + Outliner.getInstance().showItem(Pair.of(edge, edge.edgeData), materialPos, edge.getTrackMaterial() .asStack()); - CatnipClient.OUTLINER.showAABB(edge.edgeData, AABB.ofSize(materialPos, .25, 0, .25) + Outliner.getInstance().showAABB(edge.edgeData, AABB.ofSize(materialPos, .25, 0, .25) .move(0, -0.5, 0)) .lineWidth(1 / 16f) .colored(graph.color); } - CatnipClient.OUTLINER.showLine(edge, edge.getPosition(graph, 0) + Outliner.getInstance().showLine(edge, edge.getPosition(graph, 0) .add(yOffset), edge.getPosition(graph, 1) .add(yOffset)) @@ -290,9 +289,9 @@ public class TrackGraphVisualizer { if (extended) { Vec3 materialPos = edge.getPosition(graph, 0.5) .add(0, 1, 0); - CatnipClient.OUTLINER.showItem(Pair.of(edge, edge.edgeData), materialPos, edge.getTrackMaterial() + Outliner.getInstance().showItem(Pair.of(edge, edge.edgeData), materialPos, edge.getTrackMaterial() .asStack()); - CatnipClient.OUTLINER.showAABB(edge.edgeData, AABB.ofSize(materialPos, .25, 0, .25) + Outliner.getInstance().showAABB(edge.edgeData, AABB.ofSize(materialPos, .25, 0, .25) .move(0, -0.5, 0)) .lineWidth(1 / 16f) .colored(graph.color); @@ -300,7 +299,7 @@ public class TrackGraphVisualizer { for (int i = 0; i <= turn.getSegmentCount(); i++) { Vec3 current = edge.getPosition(graph, i * 1f / turn.getSegmentCount()); if (previous != null) - CatnipClient.OUTLINER + Outliner.getInstance() .showLine(Pair.of(edge, previous), previous.add(yOffset), current.add(yOffset)) .colored(graph.color) .lineWidth(1 / 16f); diff --git a/src/main/java/com/simibubi/create/content/trains/track/TrackPlacement.java b/src/main/java/com/simibubi/create/content/trains/track/TrackPlacement.java index 5862c5831f..b5d1fede48 100644 --- a/src/main/java/com/simibubi/create/content/trains/track/TrackPlacement.java +++ b/src/main/java/com/simibubi/create/content/trains/track/TrackPlacement.java @@ -14,7 +14,6 @@ import com.simibubi.create.foundation.utility.BlockHelper; import com.simibubi.create.foundation.utility.CreateLang; import com.simibubi.create.infrastructure.config.AllConfigs; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.utility.Couple; import net.createmod.catnip.utility.Iterate; import net.createmod.catnip.utility.Pair; @@ -22,6 +21,7 @@ import net.createmod.catnip.utility.VecHelper; import net.createmod.catnip.utility.animation.LerpedFloat; import net.createmod.catnip.utility.animation.LerpedFloat.Chaser; import net.createmod.catnip.utility.math.AngleHelper; +import net.createmod.catnip.utility.outliner.Outliner; import net.createmod.catnip.utility.theme.Color; import net.minecraft.ChatFormatting; import net.minecraft.client.Minecraft; @@ -50,6 +50,7 @@ import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.HitResult; import net.minecraft.world.phys.HitResult.Type; import net.minecraft.world.phys.Vec3; + import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.items.ItemHandlerHelper; @@ -653,11 +654,11 @@ public class TrackPlacement { } if (hints != null && !hints.either(Collection::isEmpty)) { - CatnipClient.OUTLINER.showCluster("track_valid", hints.getFirst()) + Outliner.getInstance().showCluster("track_valid", hints.getFirst()) .withFaceTexture(AllSpecialTextures.THIN_CHECKERED) .colored(0x95CD41) .lineWidth(0); - CatnipClient.OUTLINER.showCluster("track_invalid", hints.getSecond()) + Outliner.getInstance().showCluster("track_invalid", hints.getSecond()) .withFaceTexture(AllSpecialTextures.THIN_CHECKERED) .colored(0xEA5C2B) .lineWidth(0); @@ -737,13 +738,13 @@ public class TrackPlacement { .scale(0.5f); Vec3 middle2 = rail2.add(previous2) .scale(0.5f); - CatnipClient.OUTLINER + Outliner.getInstance() .showLine(Pair.of(key, i * 2), VecHelper.lerp(s, middle1, previous1), VecHelper.lerp(s, middle1, rail1)) .colored(railcolor) .disableLineNormals() .lineWidth(lw); - CatnipClient.OUTLINER + Outliner.getInstance() .showLine(Pair.of(key, i * 2 + 1), VecHelper.lerp(s, middle2, previous2), VecHelper.lerp(s, middle2, rail2)) .colored(railcolor) @@ -756,8 +757,8 @@ public class TrackPlacement { } for (int i = segCount + 1; i <= lastLineCount; i++) { - CatnipClient.OUTLINER.remove(Pair.of(key, i * 2)); - CatnipClient.OUTLINER.remove(Pair.of(key, i * 2 + 1)); + Outliner.getInstance().remove(Pair.of(key, i * 2)); + Outliner.getInstance().remove(Pair.of(key, i * 2 + 1)); } lastLineCount = segCount; @@ -766,7 +767,7 @@ public class TrackPlacement { @OnlyIn(Dist.CLIENT) private static void line(int id, Vec3 v1, Vec3 o1, Vec3 ex) { int color = Color.mixColors(0xEA5C2B, 0x95CD41, animation.getValue()); - CatnipClient.OUTLINER.showLine(Pair.of("start", id), v1.subtract(o1), v1.add(ex)) + Outliner.getInstance().showLine(Pair.of("start", id), v1.subtract(o1), v1.add(ex)) .lineWidth(1 / 8f) .disableLineNormals() .colored(color); diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionRenderer.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionRenderer.java index fffc0bfa30..e15c5a1fc7 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/edgeInteraction/EdgeInteractionRenderer.java @@ -11,9 +11,9 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueBox; import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.utility.VecHelper; import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.utility.outliner.Outliner; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.BlockPos; @@ -80,7 +80,7 @@ public class EdgeInteractionRenderer { ValueBox box = new ValueBox(Components.immutableEmpty(), bb, pos).passive(!hit) .transform(new EdgeValueBoxTransform(offset)) .wideOutline(); - CatnipClient.OUTLINER.showOutline("edge", box) + Outliner.getInstance().showOutline("edge", box) .highlightFace(face); if (!hit) diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringRenderer.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringRenderer.java index fc055722fb..46bd094a75 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/filtering/FilteringRenderer.java @@ -16,10 +16,10 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxRenderer; import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform; import com.simibubi.create.foundation.blockEntity.behaviour.ValueBoxTransform.Sided; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.utility.Iterate; import net.createmod.catnip.utility.Pair; import net.createmod.catnip.utility.VecHelper; +import net.createmod.catnip.utility.outliner.Outliner; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.client.renderer.MultiBufferSource; @@ -89,7 +89,7 @@ public class FilteringRenderer { ValueBox box = new ItemValueBox(label, bb, pos, filter, behaviour.getCountLabelForValueBox()); box.passive(!hit || behaviour.bypassesInput(mainhandItem)); - CatnipClient.OUTLINER + Outliner.getInstance() .showOutline(Pair.of("filter" + behaviour.netId(), pos), box.transform(behaviour.slotPositioning)) .lineWidth(1 / 64f) .withFaceTexture(hit ? AllSpecialTextures.THIN_CHECKERED : null) diff --git a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueRenderer.java b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueRenderer.java index 7568f35098..e450cfc9cb 100644 --- a/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueRenderer.java +++ b/src/main/java/com/simibubi/create/foundation/blockEntity/behaviour/scrollValue/ScrollValueRenderer.java @@ -13,8 +13,8 @@ import com.simibubi.create.foundation.blockEntity.behaviour.ValueBox.IconValueBo import com.simibubi.create.foundation.blockEntity.behaviour.ValueBox.TextValueBox; import com.simibubi.create.foundation.utility.CreateLang; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.utility.lang.Components; +import net.createmod.catnip.utility.outliner.Outliner; import net.minecraft.client.Minecraft; import net.minecraft.client.multiplayer.ClientLevel; import net.minecraft.core.BlockPos; @@ -50,7 +50,7 @@ public class ScrollValueRenderer { continue; if (!behaviour.isActive()) { - CatnipClient.OUTLINER.remove(behaviour); + Outliner.getInstance().remove(behaviour); continue; } @@ -98,7 +98,7 @@ public class ScrollValueRenderer { box.passive(!highlight) .wideOutline(); - CatnipClient.OUTLINER.showOutline(behaviour, box.transform(behaviour.slotPositioning)) + Outliner.getInstance().showOutline(behaviour, box.transform(behaviour.slotPositioning)) .highlightFace(face); } diff --git a/src/main/java/com/simibubi/create/infrastructure/command/ClearBufferCacheCommand.java b/src/main/java/com/simibubi/create/infrastructure/command/ClearBufferCacheCommand.java index b91f2e965b..41fd164c52 100644 --- a/src/main/java/com/simibubi/create/infrastructure/command/ClearBufferCacheCommand.java +++ b/src/main/java/com/simibubi/create/infrastructure/command/ClearBufferCacheCommand.java @@ -3,10 +3,11 @@ package com.simibubi.create.infrastructure.command; import com.mojang.brigadier.builder.ArgumentBuilder; import com.simibubi.create.CreateClient; -import net.createmod.catnip.CatnipClient; import net.createmod.catnip.utility.lang.Components; +import net.createmod.ponder.PonderClient; import net.minecraft.commands.CommandSourceStack; import net.minecraft.commands.Commands; + import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.DistExecutor; @@ -26,7 +27,7 @@ public class ClearBufferCacheCommand { @OnlyIn(Dist.CLIENT) private static void execute() { - CatnipClient.invalidateRenderers(); + PonderClient.invalidateRenderers(); CreateClient.invalidateRenderers(); } } diff --git a/src/main/java/com/simibubi/create/infrastructure/command/HighlightPacket.java b/src/main/java/com/simibubi/create/infrastructure/command/HighlightPacket.java index 343b83c467..42ec509823 100644 --- a/src/main/java/com/simibubi/create/infrastructure/command/HighlightPacket.java +++ b/src/main/java/com/simibubi/create/infrastructure/command/HighlightPacket.java @@ -3,11 +3,12 @@ package com.simibubi.create.infrastructure.command; import com.simibubi.create.AllSpecialTextures; import com.simibubi.create.foundation.networking.SimplePacketBase; -import net.createmod.catnip.CatnipClient; +import net.createmod.catnip.utility.outliner.Outliner; import net.minecraft.client.Minecraft; import net.minecraft.core.BlockPos; import net.minecraft.network.FriendlyByteBuf; import net.minecraft.world.phys.shapes.Shapes; + import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.DistExecutor; @@ -43,7 +44,7 @@ public class HighlightPacket extends SimplePacketBase { if (Minecraft.getInstance().level == null || !Minecraft.getInstance().level.isLoaded(pos)) return; - CatnipClient.OUTLINER.showAABB("highlightCommand", Shapes.block() + Outliner.getInstance().showAABB("highlightCommand", Shapes.block() .bounds() .move(pos), 200) .lineWidth(1 / 32f) diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml index 4c66cec392..4b0f1c22a1 100644 --- a/src/main/resources/META-INF/mods.toml +++ b/src/main/resources/META-INF/mods.toml @@ -37,13 +37,6 @@ ${mod_description} ordering="AFTER" side="CLIENT" -[[dependencies.create]] - modId="catnip" - mandatory=true - versionRange="[0.8,)" - ordering="AFTER" - side="BOTH" - [[dependencies.create]] modId="ponder" mandatory=true