Skip to content

Commit d4e689c

Browse files
MrbyscoMrbysco
committed
Update NeoForge and add back Jei/TOP support
1 parent 12ac409 commit d4e689c

File tree

5 files changed

+112
-110
lines changed

5 files changed

+112
-110
lines changed

‎build.gradle

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
id 'eclipse'
44
id 'idea'
55
id 'maven-publish'
6-
id 'net.neoforged.gradle.userdev' version '7.0.82'
6+
id 'net.neoforged.gradle.userdev' version '7.0.93'
77
id 'net.darkhax.curseforgegradle' version '1.1.17'
88
id 'com.modrinth.minotaur' version "2.+"
99
}
@@ -79,13 +79,13 @@ repositories {
7979
dependencies {
8080
implementation "net.neoforged:neoforge:${neo_version}"
8181

82-
// compileOnly "mezz.jei:jei-${mc_version}-common-api:${jei_version}"
83-
// compileOnly "mezz.jei:jei-${mc_version}-forge-api:${jei_version}"
84-
//
85-
// runtimeOnly "mezz.jei:jei-${mc_version}-forge:${jei_version}"
82+
compileOnly "mezz.jei:jei-${mc_version}-common-api:${jei_version}"
83+
compileOnly "mezz.jei:jei-${mc_version}-neoforge-api:${jei_version}"
8684

87-
// implementation "curse.maven:jade-324717:4980188" //Jade (WAILA)
88-
// implementation "curse.maven:TheOneProbe-245211:4579432" //The One Probe (TOP)
85+
runtimeOnly "mezz.jei:jei-${mc_version}-neoforge:${jei_version}"
86+
87+
implementation "curse.maven:jade-324717:5109393" //Jade (WAILA)
88+
implementation "curse.maven:TheOneProbe-245211:5084077" //The One Probe (TOP)
8989

9090
// runtimeOnly "teamtwilight:twilightforest:${twilight_forest_version}:universal"
9191
}

‎gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ org.gradle.daemon=false
55

66
# Base info
77
mc_version=1.20.4
8-
neo_version=20.4.109-beta
8+
neo_version=20.4.160-beta
99
neogradle.subsystems.parchment.minecraftVersion=1.20.3
1010
neogradle.subsystems.parchment.mappingsVersion=2023.12.31
1111
mod_group=com.mrbysco.telepastries
@@ -21,5 +21,5 @@ modrinth_id=FqHeaVGC
2121
version=0.9.1
2222

2323
# Dependencies
24-
jei_version=15.2.0.23
24+
jei_version=17.3.0.48
2525
twilight_forest_version=4.4.2066

‎src/main/java/com/mrbysco/telepastries/TelePastries.java

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package com.mrbysco.telepastries;
22

33
import com.mojang.logging.LogUtils;
4+
import com.mrbysco.telepastries.compat.top.TeleTOPCompat;
45
import com.mrbysco.telepastries.config.TeleConfig;
56
import com.mrbysco.telepastries.handler.ExplosionHandler;
67
import com.mrbysco.telepastries.init.TeleRegistry;
78
import net.neoforged.bus.api.IEventBus;
9+
import net.neoforged.fml.ModList;
810
import net.neoforged.fml.ModLoadingContext;
911
import net.neoforged.fml.common.Mod;
1012
import net.neoforged.fml.config.ModConfig;
@@ -30,8 +32,8 @@ public TelePastries(IEventBus eventBus) {
3032
}
3133

3234
public void sendImc(InterModEnqueueEvent event) {
33-
// if (ModList.get().isLoaded("theoneprobe")) {
34-
// TeleTOPCompat.register();
35-
// }
35+
if (ModList.get().isLoaded("theoneprobe")) {
36+
TeleTOPCompat.register();
37+
}
3638
}
3739
}

‎src/main/java/com/mrbysco/telepastries/compat/top/TeleTOPCompat.java

+54-54
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,54 @@
1-
//package com.mrbysco.telepastries.compat.top;
2-
//
3-
//import com.mrbysco.telepastries.Reference;
4-
//import com.mrbysco.telepastries.blocks.cake.BlockCakeBase;
5-
//import mcjty.theoneprobe.api.ElementAlignment;
6-
//import mcjty.theoneprobe.api.IProbeHitData;
7-
//import mcjty.theoneprobe.api.IProbeInfo;
8-
//import mcjty.theoneprobe.api.IProbeInfoProvider;
9-
//import mcjty.theoneprobe.api.ITheOneProbe;
10-
//import mcjty.theoneprobe.api.ProbeMode;
11-
//import net.minecraft.ChatFormatting;
12-
//import net.minecraft.network.chat.Component;
13-
//import net.minecraft.resources.ResourceLocation;
14-
//import net.minecraft.world.entity.player.Player;
15-
//import net.minecraft.world.item.ItemStack;
16-
//import net.minecraft.world.level.Level;
17-
//import net.minecraft.world.level.block.Block;
18-
//import net.minecraft.world.level.block.state.BlockState;
19-
//import net.neoforged.fml.InterModComms;
20-
//
21-
//import java.util.function.Function;
22-
//
23-
//public class TeleTOPCompat {
24-
// public static void register() {
25-
// InterModComms.sendTo("theoneprobe", "getTheOneProbe", GetTheOneProbe::new);
26-
// }
27-
//
28-
// public static final class GetTheOneProbe implements Function<ITheOneProbe, Void> {
29-
// @Override
30-
// public Void apply(ITheOneProbe input) {
31-
// input.registerProvider(new PastryInfo());
32-
// return null;
33-
// }
34-
// }
35-
//
36-
// public static final class PastryInfo implements IProbeInfoProvider {
37-
//
38-
// @Override
39-
// public ResourceLocation getID() {
40-
// return new ResourceLocation(Reference.MOD_ID, "main");
41-
// }
42-
//
43-
// @Override
44-
// public void addProbeInfo(ProbeMode mode, IProbeInfo probeInfo, Player player, Level world, BlockState blockState, IProbeHitData data) {
45-
// final Block block = world.getBlockState(data.getPos()).getBlock();
46-
// if (block instanceof BlockCakeBase) {
47-
// probeInfo.horizontal(probeInfo.defaultLayoutStyle().alignment(ElementAlignment.ALIGN_CENTER))
48-
// .item(new ItemStack(block))
49-
// .text(Component.literal("Bites: ").withStyle(ChatFormatting.GREEN))
50-
// .progress(6 - blockState.getValue(BlockCakeBase.BITES), 6);
51-
// }
52-
// }
53-
// }
54-
//}
1+
package com.mrbysco.telepastries.compat.top;
2+
3+
import com.mrbysco.telepastries.Reference;
4+
import com.mrbysco.telepastries.blocks.cake.BlockCakeBase;
5+
import mcjty.theoneprobe.api.ElementAlignment;
6+
import mcjty.theoneprobe.api.IProbeHitData;
7+
import mcjty.theoneprobe.api.IProbeInfo;
8+
import mcjty.theoneprobe.api.IProbeInfoProvider;
9+
import mcjty.theoneprobe.api.ITheOneProbe;
10+
import mcjty.theoneprobe.api.ProbeMode;
11+
import net.minecraft.ChatFormatting;
12+
import net.minecraft.network.chat.Component;
13+
import net.minecraft.resources.ResourceLocation;
14+
import net.minecraft.world.entity.player.Player;
15+
import net.minecraft.world.item.ItemStack;
16+
import net.minecraft.world.level.Level;
17+
import net.minecraft.world.level.block.Block;
18+
import net.minecraft.world.level.block.state.BlockState;
19+
import net.neoforged.fml.InterModComms;
20+
21+
import java.util.function.Function;
22+
23+
public class TeleTOPCompat {
24+
public static void register() {
25+
InterModComms.sendTo("theoneprobe", "getTheOneProbe", GetTheOneProbe::new);
26+
}
27+
28+
public static final class GetTheOneProbe implements Function<ITheOneProbe, Void> {
29+
@Override
30+
public Void apply(ITheOneProbe input) {
31+
input.registerProvider(new PastryInfo());
32+
return null;
33+
}
34+
}
35+
36+
public static final class PastryInfo implements IProbeInfoProvider {
37+
38+
@Override
39+
public ResourceLocation getID() {
40+
return new ResourceLocation(Reference.MOD_ID, "main");
41+
}
42+
43+
@Override
44+
public void addProbeInfo(ProbeMode mode, IProbeInfo probeInfo, Player player, Level world, BlockState blockState, IProbeHitData data) {
45+
final Block block = world.getBlockState(data.getPos()).getBlock();
46+
if (block instanceof BlockCakeBase) {
47+
probeInfo.horizontal(probeInfo.defaultLayoutStyle().alignment(ElementAlignment.ALIGN_CENTER))
48+
.item(new ItemStack(block))
49+
.text(Component.literal("Bites: ").withStyle(ChatFormatting.GREEN))
50+
.progress(6 - blockState.getValue(BlockCakeBase.BITES), 6);
51+
}
52+
}
53+
}
54+
}

‎src/main/java/com/mrbysco/telepastries/compat/waila/TeleWailaCompat.java

+44-44
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
1-
//package com.mrbysco.telepastries.compat.waila;
2-
//
3-
//import com.mrbysco.telepastries.Reference;
4-
//import com.mrbysco.telepastries.blocks.cake.BlockCakeBase;
5-
//import net.minecraft.ChatFormatting;
6-
//import net.minecraft.network.chat.Component;
7-
//import net.minecraft.resources.ResourceLocation;
8-
//import snownee.jade.api.BlockAccessor;
9-
//import snownee.jade.api.IBlockComponentProvider;
10-
//import snownee.jade.api.ITooltip;
11-
//import snownee.jade.api.IWailaClientRegistration;
12-
//import snownee.jade.api.IWailaCommonRegistration;
13-
//import snownee.jade.api.IWailaPlugin;
14-
//import snownee.jade.api.WailaPlugin;
15-
//import snownee.jade.api.config.IPluginConfig;
16-
//
17-
//@WailaPlugin
18-
//public class TeleWailaCompat implements IWailaPlugin {
19-
//
20-
// @Override
21-
// public void register(IWailaCommonRegistration registration) {
22-
// }
23-
//
24-
// @Override
25-
// public void registerClient(IWailaClientRegistration registration) {
26-
// registration.registerBlockComponent(PastryBodyHandler.INSTANCE, BlockCakeBase.class);
27-
// }
28-
//
29-
// public static class PastryBodyHandler implements IBlockComponentProvider {
30-
// private static final ResourceLocation BITES = new ResourceLocation(Reference.MOD_ID, "bites");
31-
//
32-
// public static final PastryBodyHandler INSTANCE = new PastryBodyHandler();
33-
//
34-
// @Override
35-
// public void appendTooltip(ITooltip iTooltip, BlockAccessor blockAccessor, IPluginConfig iPluginConfig) {
36-
// iTooltip.add(Component.literal("Bites: " + (6 - blockAccessor.getBlockState().getValue(BlockCakeBase.BITES)) + " / 6").withStyle(ChatFormatting.GRAY));
37-
// }
38-
//
39-
// @Override
40-
// public ResourceLocation getUid() {
41-
// return BITES;
42-
// }
43-
// }
44-
//}
1+
package com.mrbysco.telepastries.compat.waila;
2+
3+
import com.mrbysco.telepastries.Reference;
4+
import com.mrbysco.telepastries.blocks.cake.BlockCakeBase;
5+
import net.minecraft.ChatFormatting;
6+
import net.minecraft.network.chat.Component;
7+
import net.minecraft.resources.ResourceLocation;
8+
import snownee.jade.api.BlockAccessor;
9+
import snownee.jade.api.IBlockComponentProvider;
10+
import snownee.jade.api.ITooltip;
11+
import snownee.jade.api.IWailaClientRegistration;
12+
import snownee.jade.api.IWailaCommonRegistration;
13+
import snownee.jade.api.IWailaPlugin;
14+
import snownee.jade.api.WailaPlugin;
15+
import snownee.jade.api.config.IPluginConfig;
16+
17+
@WailaPlugin
18+
public class TeleWailaCompat implements IWailaPlugin {
19+
20+
@Override
21+
public void register(IWailaCommonRegistration registration) {
22+
}
23+
24+
@Override
25+
public void registerClient(IWailaClientRegistration registration) {
26+
registration.registerBlockComponent(PastryBodyHandler.INSTANCE, BlockCakeBase.class);
27+
}
28+
29+
public static class PastryBodyHandler implements IBlockComponentProvider {
30+
private static final ResourceLocation BITES = new ResourceLocation(Reference.MOD_ID, "bites");
31+
32+
public static final PastryBodyHandler INSTANCE = new PastryBodyHandler();
33+
34+
@Override
35+
public void appendTooltip(ITooltip iTooltip, BlockAccessor blockAccessor, IPluginConfig iPluginConfig) {
36+
iTooltip.add(Component.literal("Bites: " + (6 - blockAccessor.getBlockState().getValue(BlockCakeBase.BITES)) + " / 6").withStyle(ChatFormatting.GRAY));
37+
}
38+
39+
@Override
40+
public ResourceLocation getUid() {
41+
return BITES;
42+
}
43+
}
44+
}

0 commit comments

Comments
 (0)