Skip to content

Commit 7e6043c

Browse files
getItemFromBlockgetItemFromBlock
committed
[edited] ported to 1.20.1, it was awfully long
[removed] compat for Controllable until I figure out how to make it work
1 parent 2cc5a4d commit 7e6043c

36 files changed

+321
-364
lines changed

‎build.gradle‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,11 @@ buildscript {
33
// These repositories are only for Gradle plugins, put any other repositories in the repository block further below
44
maven { url = 'https://maven.minecraftforge.net' }
55
mavenCentral()
6+
jcenter()
7+
maven { url = 'https://repo.spongepowered.org/repository/maven-public' }
68
}
79
dependencies {
10+
811
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
912
}
1013
}
@@ -15,8 +18,9 @@ plugins {
1518
}
1619
apply plugin: 'net.minecraftforge.gradle'
1720

21+
jarJar.enable()
1822

19-
version = '1.19.2-1.2.2'
23+
version = '1.20.1-1.2.2'
2024
group = 'com.getItemFromBlock.create_tweaked_controllers' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
2125
archivesBaseName = 'create_tweaked_controllers'
2226

@@ -38,7 +42,7 @@ minecraft {
3842
//
3943
// Use non-default mappings at your own risk. They may not always work.
4044
// Simply re-run your setup task after changing the mappings to update your workspace.
41-
mappings channel: 'official', version: '1.19.2'
45+
mappings channel: 'official', version: '1.20.1'
4246

4347
// accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default.
4448

@@ -160,12 +164,24 @@ repositories {
160164
name = 'tterrag maven'
161165
url = 'https://maven.tterrag.com/'
162166
}
163-
167+
/*
164168
maven {
165169
// JEI
166170
name 'Progwm16 maven'
167171
url 'https://dvs1.progwml6.com/files/maven'
168172
}
173+
*/
174+
maven {
175+
// location of the maven that hosts JEI files since January 2023
176+
// location of the maven for Vazkii's mods
177+
name = "Jared's maven"
178+
url = "https://maven.blamejared.com/"
179+
}
180+
maven {
181+
// location of maven for CC: Tweaked
182+
name = "squiddev"
183+
url = "https://squiddev.cc/maven/"
184+
}
169185
}
170186

171187
dependencies {
@@ -180,15 +196,17 @@ dependencies {
180196
implementation fg.deobf("com.tterrag.registrate:Registrate:${registrate_version}")
181197

182198
//CONTROLLABLE COMPAT
183-
compileOnly fg.deobf("curse.maven:controllable-${controllable_version}")
199+
compileOnly(fg.deobf("curse.maven:controllable-${controllable_version}"))
184200

185201
//JEI
186-
compileOnly fg.deobf("mezz.jei:jei-${jei_mc_version}-common-api:${jei_version}")
187-
compileOnly fg.deobf("mezz.jei:jei-${jei_mc_version}-forge-api:${jei_version}")
188-
runtimeOnly fg.deobf("mezz.jei:jei-${jei_mc_version}-forge:${jei_version}")
202+
compileOnly(fg.deobf("mezz.jei:jei-${jei_mc_version}-common-api:${jei_version}"))
203+
compileOnly(fg.deobf("mezz.jei:jei-${jei_mc_version}-forge-api:${jei_version}"))
204+
runtimeOnly(fg.deobf("mezz.jei:jei-${jei_mc_version}-forge:${jei_version}"))
189205

190206
// CC TWEAKED COMPAT
191-
compileOnly fg.deobf("curse.maven:cc-tweaked-${cc_tweaked_version}")
207+
compileOnly("cc.tweaked:cc-tweaked-${cc_tweaked_mc_version}-core-api:${cc_tweaked_version}")
208+
compileOnly fg.deobf("cc.tweaked:cc-tweaked-${cc_tweaked_mc_version}-forge-api:${cc_tweaked_version}")
209+
runtimeOnly fg.deobf("cc.tweaked:cc-tweaked-${cc_tweaked_mc_version}-forge:${cc_tweaked_version}")
192210

193211
//MIXINS
194212
if (System.getProperty('idea.sync.active') != 'true') {

‎gradle.properties‎

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

66
modid = create_tweaked_controllers
7-
modversion = 1.19.2-1.2.2
7+
modversion = 1.20.1-1.2.2
88

9-
minecraft_version = 1.19.2
10-
minecraft_range = [1.19.2,1.20)
11-
forge_version = 43.2.0
12-
loader_range = [43,)
13-
forge_range = [43.2.0,)
9+
minecraft_version = 1.20.1
10+
minecraft_range = [1.20.1,1.21)
11+
forge_version = 47.1.43
12+
loader_range = [47,)
13+
forge_range = [47.1.43,)
1414

1515
mixingradle_version = 0.7-SNAPSHOT
1616
mixin_version = 0.8.5
1717

18-
jei_mc_version=1.19
19-
jei_version = 11.0.0.206
18+
jei_mc_version = 1.20.1
19+
jei_version = 15.2.0.22
2020

21-
controllable_version = 317269:4376751
21+
controllable_version = 317269:4598985
2222

23-
create_minecraft_version = 1.19.2
24-
flywheel_minecraft_version = 1.19.2
25-
create_version = 0.5.1.c-36
26-
flywheel_version = 0.6.9-18
27-
registrate_version = MC1.19-1.1.5
23+
cc_tweaked_mc_version = 1.20.1
24+
cc_tweaked_version = 1.105.0
2825

29-
create_range = [0.5.1.a,)
26+
create_minecraft_version = 1.20.1
27+
flywheel_minecraft_version = 1.20.1
28+
create_version = 0.5.1.e-22
29+
flywheel_version = 0.6.10-7
30+
registrate_version = MC1.20-1.3.3
3031

31-
cc_tweaked_version = 282001:4630524
32+
create_range = [0.5.1.a,)
3233

3334
# GitHub information
3435
github_project = getItemFromBlock/Create-Tweaked-Controllers

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public CreateTweakedControllers()
4141
forgeEventBus.register(this);
4242
eventBus.addListener(CreateTweakedControllers::init);
4343
REGISTRATE.registerEventListeners(eventBus);
44-
ModTab.register();
44+
ModTab.register(eventBus);
4545
ModItems.register();
4646
ModBlocks.register();
4747
ModBlockEntityTypes.register();

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

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

33
import com.getitemfromblock.create_tweaked_controllers.item.ModItems;
4-
import com.simibubi.create.foundation.data.CreateRegistrate;
4+
5+
import net.minecraft.core.registries.Registries;
6+
import net.minecraft.network.chat.Component;
57
import net.minecraft.world.item.CreativeModeTab;
6-
import net.minecraft.world.item.ItemStack;
8+
import net.minecraft.world.item.CreativeModeTabs;
9+
import net.minecraftforge.eventbus.api.IEventBus;
10+
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
11+
import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
12+
import net.minecraftforge.registries.DeferredRegister;
13+
import net.minecraftforge.registries.RegistryObject;
714

15+
@EventBusSubscriber(bus = Bus.MOD)
816
public class ModTab
917
{
10-
public static final CreativeModeTab MOD_TAB = new CreativeModeTab(CreateTweakedControllers.ID + ".base")
11-
{
12-
@Override
13-
public ItemStack makeIcon()
18+
private static final DeferredRegister<CreativeModeTab> REGISTER =
19+
DeferredRegister.create(Registries.CREATIVE_MODE_TAB, CreateTweakedControllers.ID);
20+
21+
public static final RegistryObject<CreativeModeTab> MOD_TAB = REGISTER.register("base",
22+
() -> CreativeModeTab.builder()
23+
.title(Component.translatable("itemGroup." + CreateTweakedControllers.ID + ".base"))
24+
.withTabsBefore(CreativeModeTabs.SPAWN_EGGS)
25+
.icon(ModItems.TWEAKED_LINKED_CONTROLLER::asStack)
26+
.displayItems((displayParams, output) ->
1427
{
15-
return ModItems.TWEAKED_LINKED_CONTROLLER.asStack();
16-
}
17-
};
18-
private static final CreateRegistrate REGISTRATE = CreateTweakedControllers.registrate();
28+
output.accept(ModItems.TWEAKED_LINKED_CONTROLLER.get());
29+
})
30+
.build());
1931

20-
static {
21-
REGISTRATE.creativeModeTab(() -> MOD_TAB, "Create: Tweaked Controllers");
32+
public static void register(IEventBus modEventBus)
33+
{
34+
REGISTER.register(modEventBus);
2235
}
23-
24-
public static void register() {}
2536
}

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

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

3-
import com.simibubi.create.foundation.data.CreateRegistrate;
43
import com.tterrag.registrate.util.entry.BlockEntry;
54
import net.minecraft.world.level.block.Blocks;
65
import static com.simibubi.create.foundation.data.TagGen.axeOnly;
@@ -10,11 +9,14 @@
109

1110
public class ModBlocks
1211
{
13-
private static final
14-
CreateRegistrate REGISTRATE = CreateTweakedControllers.registrate().creativeModeTab(() -> ModTab.MOD_TAB);
12+
13+
static
14+
{
15+
CreateTweakedControllers.registrate().setCreativeTab(ModTab.MOD_TAB);
16+
}
1517

1618
public static final BlockEntry<TweakedLecternControllerBlock> TWEAKED_LECTERN_CONTROLLER =
17-
REGISTRATE.block("tweaked_lectern_controller", TweakedLecternControllerBlock::new)
19+
CreateTweakedControllers.registrate().block("tweaked_lectern_controller", TweakedLecternControllerBlock::new)
1820
.initialProperties(() -> Blocks.LECTERN)
1921
.transform(axeOnly())
2022
.blockstate((c, p) -> p.horizontalBlock(c.get(), p.models()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ public void dropController(BlockState state)
314314
public static boolean playerInRange(Player player, Level world, BlockPos pos)
315315
{
316316
//double modifier = world.isRemote ? 0 : 1.0;
317-
double reach = 0.4*player.getAttributeValue(ForgeMod.REACH_DISTANCE.get());// + modifier;
317+
double reach = 0.4*player.getAttributeValue(ForgeMod.BLOCK_REACH.get());// + modifier;
318318
return player.distanceToSqr(Vec3.atCenterOf(pos)) < reach*reach;
319319
}
320320

‎src/main/java/com/getitemfromblock/create_tweaked_controllers/compat/Controllable/ControllerHandler.java‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
import com.getitemfromblock.create_tweaked_controllers.CreateTweakedControllers;
66
import com.getitemfromblock.create_tweaked_controllers.controller.TweakedLinkedControllerClientHandler;
77

8-
import com.mrcrayfish.controllable.event.ControllerEvent;
9-
import com.mrcrayfish.controllable.event.GatherActionsEvent;
8+
import com.mrcrayfish.controllable.event.Value;
9+
import com.mrcrayfish.controllable.event.ControllerEvents;
1010
import com.mrcrayfish.controllable.client.Action;
11-
import com.mrcrayfish.controllable.client.ButtonBinding;
12-
import com.mrcrayfish.controllable.client.ButtonBindings;
11+
import com.mrcrayfish.controllable.client.binding.ButtonBinding;
12+
import com.mrcrayfish.controllable.client.binding.ButtonBindings;
1313

1414
import net.minecraftforge.api.distmarker.Dist;
1515
import net.minecraftforge.api.distmarker.OnlyIn;
@@ -18,8 +18,9 @@
1818
@OnlyIn(Dist.CLIENT)
1919
public class ControllerHandler
2020
{
21+
/*
2122
@SubscribeEvent
22-
public void onButtonInput(ControllerEvent.ButtonInput event)
23+
public void onButtonInput(ControllerEvents.Button event)
2324
{
2425
if(event.getState() && event.getButton() != ButtonBindings.USE_ITEM.getButton() && TweakedLinkedControllerClientHandler.MODE != TweakedLinkedControllerClientHandler.Mode.IDLE)
2526
{
@@ -28,16 +29,15 @@ public void onButtonInput(ControllerEvent.ButtonInput event)
2829
}
2930
3031
@SubscribeEvent
31-
public void onMoveEvent(ControllerEvent.Move event)
32+
public void onMoveEvent(ControllerEvents.UpdateMovement event)
3233
{
3334
if(TweakedLinkedControllerClientHandler.MODE == TweakedLinkedControllerClientHandler.Mode.IDLE)
3435
return;
35-
3636
event.setCanceled(true);
3737
}
3838
3939
@SubscribeEvent
40-
public void onTurnEvent(ControllerEvent.Turn event)
40+
public void onTurnEvent(ControllerEvents.UpdateCamera event)
4141
{
4242
if(TweakedLinkedControllerClientHandler.MODE == TweakedLinkedControllerClientHandler.Mode.IDLE)
4343
return;
@@ -46,7 +46,7 @@ public void onTurnEvent(ControllerEvent.Turn event)
4646
}
4747
4848
@SubscribeEvent
49-
public void onAvailableActions(GatherActionsEvent event)
49+
public void onAvailableActions(ControllerEvents.GatherActions event)
5050
{
5151
if(TweakedLinkedControllerClientHandler.MODE == TweakedLinkedControllerClientHandler.Mode.IDLE)
5252
return;
@@ -56,4 +56,5 @@ public void onAvailableActions(GatherActionsEvent event)
5656
actionMap.remove(ButtonBindings.OPEN_INVENTORY);
5757
actionMap.put(ButtonBindings.USE_ITEM, new Action(CreateTweakedControllers.translateDirect("keybind.controller_exit"), Action.Side.LEFT));
5858
}
59+
*/
5960
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
import net.minecraft.client.Minecraft;
1515
import net.minecraft.client.renderer.MultiBufferSource;
16-
import net.minecraft.client.renderer.block.model.ItemTransforms.TransformType;
1716
import net.minecraft.client.renderer.blockentity.BlockEntityRendererProvider;
1817
import net.minecraft.core.Direction;
18+
import net.minecraft.world.item.ItemDisplayContext;
1919
import net.minecraft.world.item.ItemStack;
2020

2121
public class TweakedLecternControllerRenderer extends SafeBlockEntityRenderer<TweakedLecternControllerBlockEntity>
@@ -31,7 +31,7 @@ protected void renderSafe(TweakedLecternControllerBlockEntity be, float partialT
3131
{
3232

3333
ItemStack stack = ModItems.TWEAKED_LINKED_CONTROLLER.asStack();
34-
TransformType transformType = TransformType.NONE;
34+
ItemDisplayContext transformType = ItemDisplayContext.NONE;
3535
CustomRenderedItemModel mainModel = (CustomRenderedItemModel)Minecraft.getInstance()
3636
.getItemRenderer()
3737
.getModel(stack, be.getLevel(), null, 0);

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.getitemfromblock.create_tweaked_controllers.packet.TweakedLinkedControllerButtonPacket;
2121
import com.getitemfromblock.create_tweaked_controllers.packet.TweakedLinkedControllerStopLecternPacket;
2222
import com.mojang.blaze3d.platform.InputConstants;
23-
import com.mojang.blaze3d.vertex.PoseStack;
2423
import com.simibubi.create.AllSoundEvents;
2524
import com.simibubi.create.CreateClient;
2625
import com.simibubi.create.content.redstone.link.LinkBehaviour;
@@ -30,6 +29,7 @@
3029

3130
import net.minecraft.ChatFormatting;
3231
import net.minecraft.client.Minecraft;
32+
import net.minecraft.client.gui.GuiGraphics;
3333
import net.minecraft.client.gui.screens.Screen;
3434
import net.minecraft.client.player.LocalPlayer;
3535
import net.minecraft.core.BlockPos;
@@ -42,7 +42,7 @@
4242
public class TweakedLinkedControllerClientHandler
4343
{
4444

45-
public static final IGuiOverlay OVERLAY = TweakedLinkedControllerClientHandler::renderOverlay;
45+
public static final IGuiOverlay OVERLAY = TweakedLinkedControllerClientHandler::renderOverlay;
4646

4747
public static Mode MODE = Mode.IDLE;
4848
public static int PACKET_RATE = 5;
@@ -205,11 +205,11 @@ public static void tick()
205205
{
206206
if ((pressedKeys & ~buttonStates) != 0)
207207
{
208-
AllSoundEvents.CONTROLLER_CLICK.playAt(player.level, player.blockPosition(), 1f, .75f, true);
208+
AllSoundEvents.CONTROLLER_CLICK.playAt(player.level(), player.blockPosition(), 1f, .75f, true);
209209
}
210210
if ((buttonStates & ~pressedKeys) != 0)
211211
{
212-
AllSoundEvents.CONTROLLER_CLICK.playAt(player.level, player.blockPosition(), 1f, .5f, true);
212+
AllSoundEvents.CONTROLLER_CLICK.playAt(player.level(), player.blockPosition(), 1f, .5f, true);
213213
}
214214
ModPackets.channel.sendToServer(new TweakedLinkedControllerButtonPacket(pressedKeys, lecternPos));
215215
buttonPacketCooldown = PACKET_RATE;
@@ -284,7 +284,7 @@ public static void tick()
284284
}
285285
}
286286

287-
public static void renderOverlay(ForgeGui gui, PoseStack poseStack, float partialTicks, int width1,
287+
public static void renderOverlay(ForgeGui gui, GuiGraphics graphics, float partialTicks, int width1,
288288
int height1) {
289289
Minecraft mc = Minecraft.getInstance();
290290
if (mc.options.hideGui)
@@ -293,7 +293,7 @@ public static void renderOverlay(ForgeGui gui, PoseStack poseStack, float partia
293293
if (MODE != Mode.BIND)
294294
return;
295295

296-
poseStack.pushPose();
296+
graphics.pose().pushPose();
297297
Screen tooltipScreen = new Screen(Components.immutableEmpty()) {};
298298
tooltipScreen.init(mc, width1, height1);
299299

@@ -312,9 +312,9 @@ public static void renderOverlay(ForgeGui gui, PoseStack poseStack, float partia
312312
int y = height1 - height - 24;
313313

314314
// TODO
315-
tooltipScreen.renderComponentTooltip(poseStack, list, x, y);
315+
graphics.renderComponentTooltip(Minecraft.getInstance().font, list, x, y);
316316

317-
poseStack.popPose();
317+
graphics.pose().popPose();
318318
}
319319

320320
public enum Mode

0 commit comments

Comments
 (0)