Skip to content

Commit bdb6570

Browse files
getItemFromBlockgetItemFromBlock
committed
Updated to use create 6.0.0, bumped version in the process
1 parent 0935bd3 commit bdb6570

26 files changed

+121
-108
lines changed

‎build.gradle‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,20 @@ repositories {
167167
}
168168
}
169169

170+
maven {
171+
// Create, Ponder, Flywheel
172+
url = "https://maven.createmod.net"
173+
}
174+
170175
maven {
171-
//CREATE
172-
name = 'tterrag maven'
173-
url = 'https://maven.tterrag.com/'
174-
}
176+
// Registrate
177+
url = "https://maven.tterrag.com"
178+
}
179+
180+
maven {
181+
// ForgeConfigAPIPort
182+
url = "https://raw.githubusercontent.com/Fuzss/modresources/main/maven/"
183+
}
175184
/*
176185
maven {
177186
// JEI
@@ -199,9 +208,11 @@ dependencies {
199208
minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
200209

201210
//CREATE
202-
implementation fg.deobf("com.simibubi.create:create-${create_minecraft_version}:${create_version}:slim") { transitive = false }
203-
implementation fg.deobf("com.jozufozu.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}")
204-
implementation fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}")
211+
implementation(fg.deobf("com.simibubi.create:create-${create_minecraft_version}:${create_version}") { transitive = false })
212+
implementation(fg.deobf("net.createmod.ponder:Ponder-Forge-${create_minecraft_version}:${ponder_version}"))
213+
compileOnly(fg.deobf("dev.engine-room.flywheel:flywheel-forge-api-${flywheel_minecraft_version}:${flywheel_version}"))
214+
runtimeOnly(fg.deobf("dev.engine-room.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}"))
215+
implementation(fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}"))
205216

206217
//CONTROLLABLE COMPAT
207218
compileOnly(fg.deobf("curse.maven:controllable-${controllable_version}"))

‎gradle.properties‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx3G
44
org.gradle.daemon=false
55

66
modid = create_tweaked_controllers
7-
modversion = 1.20.1-1.2.4
7+
modversion = 1.20.1-1.2.5
88

99
minecraft_version = 1.20.1
1010
minecraft_range = [1.20.1,1.21)
@@ -26,8 +26,9 @@ cc_tweaked_version = 1.105.0
2626

2727
create_minecraft_version = 1.20.1
2828
flywheel_minecraft_version = 1.20.1
29-
create_version = 0.5.1.e-22
30-
flywheel_version = 0.6.10-7
29+
create_version = 6.0.0-4
30+
ponder_version = 1.0.36
31+
flywheel_version = 1.0.0-215
3132
registrate_version = MC1.20-1.3.3
3233

3334
create_range = [0.5.1.a,)

‎src/main/java/com/getitemfromblock/create_tweaked_controllers/CreateTweakedControllers.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@
88
import com.getitemfromblock.create_tweaked_controllers.packet.ModPackets;
99
import com.simibubi.create.Create;
1010
import com.simibubi.create.foundation.data.CreateRegistrate;
11-
import com.simibubi.create.foundation.utility.Components;
12-
import com.simibubi.create.foundation.utility.Lang;
13-
import com.simibubi.create.foundation.utility.LangBuilder;
11+
import net.createmod.catnip.lang.LangBuilder;
1412

1513
import net.minecraft.network.chat.MutableComponent;
14+
import net.minecraft.network.chat.Component;
1615
import net.minecraft.resources.ResourceLocation;
1716
import net.minecraftforge.api.distmarker.Dist;
1817
import net.minecraftforge.common.MinecraftForge;
@@ -68,12 +67,12 @@ public static ResourceLocation asResource(String path)
6867

6968
public static MutableComponent translateDirect(String key, Object... args)
7069
{
71-
return Components.translatable(CreateTweakedControllers.ID + "." + key, Lang.resolveBuilders(args));
70+
return Component.translatable(CreateTweakedControllers.ID + "." + key, LangBuilder.resolveBuilders(args));
7271
}
7372

7473
public static MutableComponent translateDirectRaw(String key, Object... args)
7574
{
76-
return Components.translatable(key, Lang.resolveBuilders(args));
75+
return Component.translatable(key, LangBuilder.resolveBuilders(args));
7776
}
7877

7978
public static LangBuilder builder()

‎src/main/java/com/getitemfromblock/create_tweaked_controllers/block/TweakedLecternControllerBlock.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.getitemfromblock.create_tweaked_controllers.ModBlockEntityTypes;
66
import com.getitemfromblock.create_tweaked_controllers.item.ModItems;
77
import com.simibubi.create.AllSoundEvents;
8-
import com.simibubi.create.content.schematics.requirement.ISpecialBlockItemRequirement;
8+
import com.simibubi.create.api.schematic.requirement.SpecialBlockItemRequirement;
99
import com.simibubi.create.content.schematics.requirement.ItemRequirement;
1010
import com.simibubi.create.foundation.block.IBE;
1111

@@ -25,8 +25,8 @@
2525
import net.minecraft.world.phys.HitResult;
2626

2727
public class TweakedLecternControllerBlock extends LecternBlock
28-
implements IBE<TweakedLecternControllerBlockEntity>, ISpecialBlockItemRequirement
29-
{
28+
implements IBE<TweakedLecternControllerBlockEntity>, SpecialBlockItemRequirement
29+
{
3030

3131
public TweakedLecternControllerBlock(Properties properties)
3232
{

‎src/main/java/com/getitemfromblock/create_tweaked_controllers/controller/TweakedLecternControllerRenderer.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.getitemfromblock.create_tweaked_controllers.controller;
22

3-
import com.jozufozu.flywheel.util.transform.TransformStack;
3+
import dev.engine_room.flywheel.lib.transform.TransformStack;
44
import com.mojang.blaze3d.vertex.PoseStack;
55
import com.getitemfromblock.create_tweaked_controllers.block.TweakedLecternControllerBlock;
66
import com.getitemfromblock.create_tweaked_controllers.block.TweakedLecternControllerBlockEntity;
@@ -9,7 +9,7 @@
99
import com.simibubi.create.foundation.blockEntity.renderer.SafeBlockEntityRenderer;
1010
import com.simibubi.create.foundation.item.render.CustomRenderedItemModel;
1111
import com.simibubi.create.foundation.item.render.PartialItemModelRenderer;
12-
import com.simibubi.create.foundation.utility.AngleHelper;
12+
import net.createmod.catnip.math.AngleHelper;
1313

1414
import net.minecraft.client.Minecraft;
1515
import net.minecraft.client.renderer.MultiBufferSource;
@@ -40,13 +40,13 @@ protected void renderSafe(TweakedLecternControllerBlockEntity be, float partialT
4040
boolean renderDepression = be.isUsedBy(Minecraft.getInstance().player);
4141

4242
Direction facing = be.getBlockState().getValue(TweakedLecternControllerBlock.FACING);
43-
TransformStack msr = TransformStack.cast(ms);
43+
var msr = TransformStack.of(ms);
4444

4545
ms.pushPose();
4646
msr.translate(0.5, 1.45, 0.5);
47-
msr.rotateY(AngleHelper.horizontalAngle(facing) - 90);
47+
msr.rotateYDegrees(AngleHelper.horizontalAngle(facing) - 90);
4848
msr.translate(0.28, 0, 0);
49-
msr.rotateZ(-22.0);
49+
msr.rotateZDegrees(-22.0f);
5050
TweakedLinkedControllerItemRenderer.renderInLectern(stack, mainModel, renderer, transformType, ms, light, active, renderDepression);
5151
ms.popPose();
5252
}

‎src/main/java/com/getitemfromblock/create_tweaked_controllers/controller/TweakedLinkedControllerClientHandler.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@
2121
import com.getitemfromblock.create_tweaked_controllers.packet.TweakedLinkedControllerStopLecternPacket;
2222
import com.mojang.blaze3d.platform.InputConstants;
2323
import com.simibubi.create.AllSoundEvents;
24-
import com.simibubi.create.CreateClient;
2524
import com.simibubi.create.content.redstone.link.LinkBehaviour;
2625
import com.simibubi.create.foundation.blockEntity.behaviour.BlockEntityBehaviour;
27-
import com.simibubi.create.foundation.utility.Components;
2826
import com.simibubi.create.foundation.utility.ControlsUtil;
27+
import net.createmod.catnip.outliner.Outliner;
2928

3029
import net.minecraft.ChatFormatting;
3130
import net.minecraft.client.Minecraft;
@@ -34,6 +33,7 @@
3433
import net.minecraft.client.player.LocalPlayer;
3534
import net.minecraft.core.BlockPos;
3635
import net.minecraft.network.chat.Component;
36+
import net.minecraft.network.chat.CommonComponents;
3737
import net.minecraft.world.item.ItemStack;
3838
import net.minecraft.world.phys.shapes.VoxelShape;
3939
import net.minecraftforge.client.gui.overlay.ForgeGui;
@@ -246,7 +246,7 @@ public static void tick()
246246
VoxelShape shape = mc.level.getBlockState(selectedLocation)
247247
.getShape(mc.level, selectedLocation);
248248
if (!shape.isEmpty())
249-
CreateClient.OUTLINER.showAABB("controller", shape.bounds()
249+
Outliner.getInstance().showAABB("controller", shape.bounds()
250250
.move(selectedLocation))
251251
.colored(0x0104FF)
252252
.lineWidth(1 / 16f);
@@ -294,7 +294,7 @@ public static void renderOverlay(ForgeGui gui, GuiGraphics graphics, float parti
294294
return;
295295

296296
graphics.pose().pushPose();
297-
Screen tooltipScreen = new Screen(Components.immutableEmpty()) {};
297+
Screen tooltipScreen = new Screen(CommonComponents.EMPTY) {};
298298
tooltipScreen.init(mc, width1, height1);
299299

300300
List<Component> list = new ArrayList<>();

‎src/main/java/com/getitemfromblock/create_tweaked_controllers/controller/TweakedLinkedControllerServerHandler.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import com.simibubi.create.content.redstone.link.LinkBehaviour;
1414
import com.simibubi.create.content.redstone.link.RedstoneLinkNetworkHandler.Frequency;
1515
import com.simibubi.create.foundation.advancement.AllAdvancements;
16-
import com.simibubi.create.foundation.utility.Couple;
17-
import com.simibubi.create.foundation.utility.IntAttached;
18-
import com.simibubi.create.foundation.utility.WorldAttached;
16+
import net.createmod.catnip.data.Couple;
17+
import net.createmod.catnip.data.IntAttached;
18+
import net.createmod.catnip.data.WorldAttached;
1919

2020
import net.minecraft.core.BlockPos;
2121
import net.minecraft.world.level.LevelAccessor;

‎src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/ControllerButton.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import org.joml.Vector3f;
66

77
import com.mojang.blaze3d.systems.RenderSystem;
8-
import com.simibubi.create.foundation.gui.element.ScreenElement;
9-
import com.simibubi.create.foundation.gui.widget.AbstractSimiWidget;
8+
import net.createmod.catnip.gui.element.ScreenElement;
9+
import net.createmod.catnip.gui.widget.AbstractSimiWidget;
1010

1111
import net.minecraft.client.gui.GuiGraphics;
1212
import net.minecraft.network.chat.Component;

‎src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/ControllerButtonRenderer.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
import com.getitemfromblock.create_tweaked_controllers.CreateTweakedControllers;
66
import com.mojang.blaze3d.vertex.PoseStack;
77
import com.mojang.blaze3d.vertex.VertexConsumer;
8-
import com.simibubi.create.foundation.gui.element.DelegatedStencilElement;
9-
import com.simibubi.create.foundation.gui.element.ScreenElement;
10-
import com.simibubi.create.foundation.utility.Color;
8+
import net.createmod.catnip.gui.element.DelegatedStencilElement;
9+
import net.createmod.catnip.gui.element.ScreenElement;
10+
import net.createmod.catnip.theme.Color;
1111

1212
import net.minecraft.client.gui.GuiGraphics;
1313
import net.minecraft.client.renderer.LightTexture;

‎src/main/java/com/getitemfromblock/create_tweaked_controllers/gui/DigitIcon.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import org.joml.Vector3f;
66

77
import com.mojang.blaze3d.systems.RenderSystem;
8-
import com.simibubi.create.foundation.gui.element.ScreenElement;
9-
import com.simibubi.create.foundation.gui.widget.AbstractSimiWidget;
8+
import net.createmod.catnip.gui.element.ScreenElement;
9+
import net.createmod.catnip.gui.widget.AbstractSimiWidget;
1010

1111
import net.minecraft.client.gui.GuiGraphics;
1212
import net.minecraft.network.chat.Component;

0 commit comments

Comments
 (0)