Skip to content

Commit ad6ed28

Browse files
MrbyscoMrbysco
committed
Port to 1.20.4
1 parent 96db2a9 commit ad6ed28

19 files changed

+90
-108
lines changed

‎build.gradle

+6-6
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@ dependencies {
8484
//
8585
// runtimeOnly "mezz.jei:jei-${mc_version}-forge:${jei_version}"
8686

87-
implementation "curse.maven:jade-324717:4845321" //Jade (WAILA)
87+
// implementation "curse.maven:jade-324717:4980188" //Jade (WAILA)
8888
// implementation "curse.maven:TheOneProbe-245211:4579432" //The One Probe (TOP)
8989

90-
runtimeOnly "teamtwilight:twilightforest:${twilight_forest_version}:universal"
90+
// runtimeOnly "teamtwilight:twilightforest:${twilight_forest_version}:universal"
9191
}
9292

9393
jar {
@@ -139,7 +139,7 @@ if (System.getenv().CURSEFORGE_KEY) {
139139
mainFile.changelog = file("$project.rootDir/changelog.md")
140140
mainFile.changelogType = 'markdown'
141141

142-
mainFile.addOptional("jade")
142+
// mainFile.addOptional("jade")
143143
}
144144
}
145145

@@ -155,9 +155,9 @@ if (System.getenv().MODRINTH_KEY) {
155155
gameVersions = ["${mc_version}"]
156156
loaders = ["neoforge"]
157157

158-
dependencies {
159-
optional.project "jade"
160-
}
158+
// dependencies {
159+
// optional.project "jade"
160+
// }
161161
}
162162
}
163163

‎gradle.properties

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ org.gradle.jvmargs=-Xmx3G
44
org.gradle.daemon=false
55

66
# Base info
7-
mc_version=1.20.2
8-
neo_version=20.2.86
9-
mapping_channel=official
10-
mapping_version=1.20.2
7+
mc_version=1.20.4
8+
neo_version=20.4.109-beta
9+
neogradle.subsystems.parchment.minecraftVersion=1.20.3
10+
neogradle.subsystems.parchment.mappingsVersion=2023.12.31
1111
mod_group=com.mrbysco.telepastries
1212
mod_id=telepastries
1313
mod_archive_name=TelePastries
@@ -22,4 +22,4 @@ version=0.9.0
2222

2323
# Dependencies
2424
jei_version=15.2.0.23
25-
twilight_forest_version=4.4.1977
25+
twilight_forest_version=4.4.2066

‎src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.2 2023-12-09T19:08:07.7635854 Loot Tables
1+
// 1.20.4 2024-01-16T18:23:37.574514 Loot Tables
22
45c77a6d516d0d226b0e40eeb49a3613ecd9ce5a data/telepastries/loot_tables/blocks/custom_cake.json
33
466c7c84761ac5fbd61c289e0e469391364a001d data/telepastries/loot_tables/blocks/custom_cake2.json
44
e908d55d357142ade4575859318c07b045edcc61 data/telepastries/loot_tables/blocks/custom_cake3.json

‎src/generated/resources/.cache/5f7a6e59768229f56a4f1d0150f39d95d60a0c5c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.2 2023-12-09T19:10:36.5089363 Block States: telepastries
1+
// 1.20.4 2024-01-16T18:23:37.5725134 Block States: telepastries
22
e4ae4e78c657e28e3bf3f0af5ffa9395d0bd6582 assets/telepastries/blockstates/custom_cake.json
33
24c6c3c07ac7f6c8875f3b29a3a4642a2241f0c2 assets/telepastries/blockstates/custom_cake2.json
44
f4fa9a8dd20cb9901e76454597006d79cf526f0a assets/telepastries/blockstates/custom_cake3.json

‎src/generated/resources/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
// 1.20.2 2023-12-09T19:08:07.7640856 Recipes
2-
aaf2244a00fb3ddb9c203f2105d14c90f5df76ff data/telepastries/advancements/recipes/transportation/end_cake.json
3-
b89c3aaa93a3094803e5e0746cdfd3dd0c7ff1ec data/telepastries/advancements/recipes/transportation/nether_cake.json
4-
3ff1ccd05a75e89ddb35d46811408f295b093ee5 data/telepastries/advancements/recipes/transportation/overworld_cake.json
5-
050d99c5bbd8ed34d0df9b9b4e51c41f420e3260 data/telepastries/advancements/recipes/transportation/twilight_cake.json
6-
2e702249bfe1fac1758a20be86c7fb701ad71076 data/telepastries/recipes/end_cake.json
7-
10dd9c5fa1a806683b5f3211ab3b3d397b0cb09c data/telepastries/recipes/nether_cake.json
8-
79d0a776239f443fa259c13d96ee0440f12de07e data/telepastries/recipes/overworld_cake.json
9-
d0c44624cdbca29fc5e0adaba01b84907c519e1f data/telepastries/recipes/twilight_cake.json
1+
// 1.20.4 2024-01-16T18:23:37.5750148 Recipes
2+
1c83c40ba03fa6f5ca9e552a682f072d61e5c4c9 data/telepastries/advancements/recipes/transportation/end_cake.json
3+
945b6e68b78bb7c5cb9b47830dfcda46dc357c2c data/telepastries/advancements/recipes/transportation/nether_cake.json
4+
13d3d756490f7ca6c20988910bb42ac686c05c34 data/telepastries/advancements/recipes/transportation/overworld_cake.json
5+
225ee2cf0f3ceb7e0b5b2255d216e9383bd062d4 data/telepastries/advancements/recipes/transportation/twilight_cake.json
6+
3389032b4ac67f3fc31bec47bd50aa2a7762cd4e data/telepastries/recipes/end_cake.json
7+
c45b4e6108a244188ee42bf2693402fde7815348 data/telepastries/recipes/nether_cake.json
8+
262f4f0e0f53d68fc379f84c24e24457eb6c2e9d data/telepastries/recipes/overworld_cake.json
9+
574deb12684a023e08126bf849048123dfbc00ed data/telepastries/recipes/twilight_cake.json

‎src/generated/resources/.cache/d4088e117888d20aa4bf8cdc0e92df5acd4a5071

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// 1.20.2 2023-12-09T19:08:07.7595865 Item Models: telepastries
1+
// 1.20.4 2024-01-16T18:23:37.5705134 Item Models: telepastries
22
b6e497293761ab59f31c5c34d83ddacec295bb00 assets/telepastries/models/item/custom_cake.json
33
02a46cd1791553fa53d8d6f6a07dd5aac596211b assets/telepastries/models/item/custom_cake2.json
44
4ce73c18f2afd1f36f0f31bc07df8a36ea74e10c assets/telepastries/models/item/custom_cake3.json

‎src/generated/resources/data/telepastries/advancements/recipes/transportation/end_cake.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,5 @@
4343
"recipes": [
4444
"telepastries:end_cake"
4545
]
46-
},
47-
"sends_telemetry_event": false
46+
}
4847
}

‎src/generated/resources/data/telepastries/advancements/recipes/transportation/nether_cake.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,5 @@
4141
"recipes": [
4242
"telepastries:nether_cake"
4343
]
44-
},
45-
"sends_telemetry_event": false
44+
}
4645
}

‎src/generated/resources/data/telepastries/advancements/recipes/transportation/overworld_cake.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,5 @@
4141
"recipes": [
4242
"telepastries:overworld_cake"
4343
]
44-
},
45-
"sends_telemetry_event": false
44+
}
4645
}

‎src/generated/resources/data/telepastries/advancements/recipes/transportation/twilight_cake.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,5 @@
6262
"recipes": [
6363
"telepastries:twilight_cake"
6464
]
65-
},
66-
"sends_telemetry_event": false
65+
}
6766
}

‎src/generated/resources/data/telepastries/recipes/end_cake.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@
1616
],
1717
"result": {
1818
"item": "telepastries:end_cake"
19-
},
20-
"show_notification": true
19+
}
2120
}

‎src/generated/resources/data/telepastries/recipes/nether_cake.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@
1616
],
1717
"result": {
1818
"item": "telepastries:nether_cake"
19-
},
20-
"show_notification": true
19+
}
2120
}

‎src/generated/resources/data/telepastries/recipes/overworld_cake.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,5 @@
1616
],
1717
"result": {
1818
"item": "telepastries:overworld_cake"
19-
},
20-
"show_notification": true
19+
}
2120
}

‎src/generated/resources/data/telepastries/recipes/twilight_cake.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,5 @@
2525
],
2626
"result": {
2727
"item": "telepastries:twilight_cake"
28-
},
29-
"show_notification": true
28+
}
3029
}

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

+2-4
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,16 @@
99
import net.neoforged.fml.common.Mod;
1010
import net.neoforged.fml.config.ModConfig;
1111
import net.neoforged.fml.event.lifecycle.InterModEnqueueEvent;
12-
import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext;
1312
import net.neoforged.neoforge.common.NeoForge;
1413
import org.slf4j.Logger;
1514

1615
@Mod(Reference.MOD_ID)
1716
public class TelePastries {
1817
public static final Logger LOGGER = LogUtils.getLogger();
1918

20-
public TelePastries() {
21-
IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus();
19+
public TelePastries(IEventBus eventBus) {
2220
ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, TeleConfig.commonSpec);
23-
FMLJavaModLoadingContext.get().getModEventBus().register(TeleConfig.class);
21+
eventBus.register(TeleConfig.class);
2422

2523
eventBus.addListener(this::sendImc);
2624

‎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+
//}

‎src/main/java/com/mrbysco/telepastries/init/TeleRegistry.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ public class TeleRegistry {
3434
public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(Reference.MOD_ID);
3535
public static final DeferredRegister<CreativeModeTab> CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, Reference.MOD_ID);
3636

37-
public static final DeferredBlock<BlockNetherCake> NETHER_CAKE = BLOCKS.register("nether_cake", () -> new BlockNetherCake(BlockBehaviour.Properties.copy(Blocks.CAKE).strength(0.5F).sound(SoundType.WOOL)));
38-
public static final DeferredBlock<BlockEndCake> END_CAKE = BLOCKS.register("end_cake", () -> new BlockEndCake(BlockBehaviour.Properties.copy(Blocks.CAKE).strength(0.5F).sound(SoundType.WOOL)));
39-
public static final DeferredBlock<BlockOverworldCake> OVERWORLD_CAKE = BLOCKS.register("overworld_cake", () -> new BlockOverworldCake(BlockBehaviour.Properties.copy(Blocks.CAKE).strength(0.5F).sound(SoundType.WOOL)));
37+
public static final DeferredBlock<BlockNetherCake> NETHER_CAKE = BLOCKS.register("nether_cake", () -> new BlockNetherCake(BlockBehaviour.Properties.ofFullCopy(Blocks.CAKE).strength(0.5F).sound(SoundType.WOOL)));
38+
public static final DeferredBlock<BlockEndCake> END_CAKE = BLOCKS.register("end_cake", () -> new BlockEndCake(BlockBehaviour.Properties.ofFullCopy(Blocks.CAKE).strength(0.5F).sound(SoundType.WOOL)));
39+
public static final DeferredBlock<BlockOverworldCake> OVERWORLD_CAKE = BLOCKS.register("overworld_cake", () -> new BlockOverworldCake(BlockBehaviour.Properties.ofFullCopy(Blocks.CAKE).strength(0.5F).sound(SoundType.WOOL)));
4040

41-
public static final DeferredBlock<BlockTwilightCake> TWILIGHT_CAKE = BLOCKS.register("twilight_cake", () -> new BlockTwilightCake(BlockBehaviour.Properties.copy(Blocks.CAKE).strength(0.5F).sound(SoundType.WOOL)));
42-
public static final DeferredBlock<BlockLostCityCake> LOST_CITY_CAKE = BLOCKS.register("lost_city_cake", () -> new BlockLostCityCake(BlockBehaviour.Properties.copy(Blocks.CAKE).strength(0.5F).sound(SoundType.WOOL)));
43-
public static final DeferredBlock<BlockCustomCake> CUSTOM_CAKE = BLOCKS.register("custom_cake", () -> new BlockCustomCake(BlockBehaviour.Properties.copy(Blocks.CAKE).strength(0.5F).sound(SoundType.WOOL)));
44-
public static final DeferredBlock<BlockCustomCake2> CUSTOM_CAKE2 = BLOCKS.register("custom_cake2", () -> new BlockCustomCake2(BlockBehaviour.Properties.copy(Blocks.CAKE).strength(0.5F).sound(SoundType.WOOL)));
45-
public static final DeferredBlock<BlockCustomCake3> CUSTOM_CAKE3 = BLOCKS.register("custom_cake3", () -> new BlockCustomCake3(BlockBehaviour.Properties.copy(Blocks.CAKE).strength(0.5F).sound(SoundType.WOOL)));
41+
public static final DeferredBlock<BlockTwilightCake> TWILIGHT_CAKE = BLOCKS.register("twilight_cake", () -> new BlockTwilightCake(BlockBehaviour.Properties.ofFullCopy(Blocks.CAKE).strength(0.5F).sound(SoundType.WOOL)));
42+
public static final DeferredBlock<BlockLostCityCake> LOST_CITY_CAKE = BLOCKS.register("lost_city_cake", () -> new BlockLostCityCake(BlockBehaviour.Properties.ofFullCopy(Blocks.CAKE).strength(0.5F).sound(SoundType.WOOL)));
43+
public static final DeferredBlock<BlockCustomCake> CUSTOM_CAKE = BLOCKS.register("custom_cake", () -> new BlockCustomCake(BlockBehaviour.Properties.ofFullCopy(Blocks.CAKE).strength(0.5F).sound(SoundType.WOOL)));
44+
public static final DeferredBlock<BlockCustomCake2> CUSTOM_CAKE2 = BLOCKS.register("custom_cake2", () -> new BlockCustomCake2(BlockBehaviour.Properties.ofFullCopy(Blocks.CAKE).strength(0.5F).sound(SoundType.WOOL)));
45+
public static final DeferredBlock<BlockCustomCake3> CUSTOM_CAKE3 = BLOCKS.register("custom_cake3", () -> new BlockCustomCake3(BlockBehaviour.Properties.ofFullCopy(Blocks.CAKE).strength(0.5F).sound(SoundType.WOOL)));
4646
// public static final DeferredBlock<BlockHuntingDimensionCake> HUNTING_DIMENSION_CAKE = BLOCKS.register("hunting_dimension_cake", () -> new BlockHuntingDimensionCake("hunting_dimension_cake"));
4747

4848
public static final DeferredItem<CakeBlockItem> NETHER_CAKE_ITEM = ITEMS.register("nether_cake", () -> new CakeBlockItem(NETHER_CAKE.get(), new Item.Properties()));

‎src/main/resources/META-INF/mods.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
modLoader="javafml"
2-
loaderVersion="[1,)"
2+
loaderVersion="[2,)"
33
license="MIT"
44

55
[[mods]]
@@ -12,13 +12,13 @@ description='''Pastries that teleport players.'''
1212

1313
[[dependencies.telepastries]]
1414
modId="minecraft"
15-
mandatory=true
16-
versionRange="[1.20.2,1.21)"
15+
type="REQUIRED"
16+
versionRange="[1.20.4,1.21)"
1717
ordering="NONE"
1818
side="BOTH"
1919
[[dependencies.telepastries]]
2020
modId="neoforge"
21-
mandatory=true
22-
versionRange="[20.2.86,)"
21+
type="REQUIRED"
22+
versionRange="[20.4.70-beta,)"
2323
ordering="NONE"
2424
side="BOTH"

‎src/main/resources/pack.mcmeta

-8
This file was deleted.

0 commit comments

Comments
 (0)