Skip to content

Commit d83dae5

Browse files
committed
More port work. Removed every dependency which does not exist for 1.20.4 and I touched a bit the new capability system
1 parent 273e1ab commit d83dae5

40 files changed

+134
-1081
lines changed

build.gradle

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ repositories {
156156
url = "https://maven.tterrag.com/"
157157
content {
158158
includeGroup("com.simibubi.create")
159-
includeGroup("com.jozufozu.flywheel")
160159
includeGroup("com.tterrag.registrate")
161160
}
162161
}
@@ -214,64 +213,60 @@ dependencies {
214213
compileOnly "org.jetbrains:annotations:${jb_annotations}"
215214
implementation "net.neoforged:neoforge:${neo_version}"
216215
implementation "cc.tweaked:cc-tweaked-${minecraft_version}-forge:${cc_version}"
217-
// Compile-time API required
218-
// Ae2
219-
compileOnly "appeng:appliedenergistics2-forge:${appliedenergistics_version}"
220-
// Curios
221-
compileOnly "top.theillusivec4.curios:curios-forge:${curios_version}:api"
216+
222217
// Minimal requirements end
223218

224219
// Extended requirements
225220
// We don't use the api since we need a specific class from mekanism
226221
compileOnly "mekanism:Mekanism:${mekanism_version}"
227222
runtimeOnly "mekanism:Mekanism:${mekanism_version}"
228223

229-
// runtimeOnly "mekanism:Mekanism:${mekanism_version}"// core
230-
231224
// Applied Energistics 2
232-
runtimeOnly "appeng:appliedenergistics2-forge:${appliedenergistics_version}"
225+
runtimeOnly "appeng:appliedenergistics2-neoforge:${appliedenergistics_version}"
226+
compileOnly "appeng:appliedenergistics2-neoforge:${appliedenergistics_version}"
233227

234228
// Applied Mekanistics
235229
implementation "curse.maven:applied-mekanistics-574300:${appliedmekanistics_version}"
236230

237231
// Curios
238232
runtimeOnly "top.theillusivec4.curios:curios-forge:${curios_version}"
233+
compileOnly "top.theillusivec4.curios:curios-forge:${curios_version}:api"
239234

240235
// Refined Storage
241-
//implementation "com.refinedmods:refinedstorage:${refinedstorage_version}"
236+
implementation "curse.maven:refined-storage-243076:${refinedstorage_version}"
242237

243238
// AE2 Things
244-
compileOnly "curse.maven:ae2things-609977:${ae2things_version}-sources"
245-
runtimeOnly "curse.maven:ae2things-609977:${ae2things_version}-sources"
239+
//compileOnly "curse.maven:ae2things-609977:${ae2things_version}-sources"
240+
//runtimeOnly "curse.maven:ae2things-609977:${ae2things_version}-sources"
246241

247242
// AE2 Additions
248-
compileOnly "curse.maven:ae-additions-493962:${ae2additions_version}"
249-
runtimeOnly "curse.maven:ae-additions-493962:${ae2additions_version}"
243+
//compileOnly "curse.maven:ae-additions-493962:${ae2additions_version}"
244+
//runtimeOnly "curse.maven:ae-additions-493962:${ae2additions_version}"
250245

251246
//implementation "thedarkcolour:kotlinforforge:${kotlinforforge_version}"
252247

253248
// Botania
254-
compileOnly "vazkii.botania:Botania:${botania_version}"
255-
runtimeOnly "vazkii.botania:Botania:${botania_version}"
249+
//compileOnly "vazkii.botania:Botania:${botania_version}"
250+
//runtimeOnly "vazkii.botania:Botania:${botania_version}"
256251

257252
// Minecolonies
258253
// Remove/Comment this section if you want to use runData.
259-
runtimeOnly "com.ldtteam:minecolonies:${minecolonies_version}"
260-
runtimeOnly "com.ldtteam:structurize:${structurize_version}"
261-
runtimeOnly "com.ldtteam:domum_ornamentum:${domumornamentum_version}:universal"
262-
runtimeOnly "com.ldtteam:blockui:${blockui_version}"
254+
//runtimeOnly "com.ldtteam:minecolonies:${minecolonies_version}"
255+
//runtimeOnly "com.ldtteam:structurize:${structurize_version}"
256+
//runtimeOnly "com.ldtteam:domum_ornamentum:${domumornamentum_version}:universal"
257+
//runtimeOnly "com.ldtteam:blockui:${blockui_version}"
263258

264-
compileOnly "com.ldtteam:minecolonies:${minecolonies_version}"
265-
compileOnly "com.ldtteam:structurize:${structurize_version}"
266-
compileOnly "com.ldtteam:domum_ornamentum:${domumornamentum_version}:universal"
267-
compileOnly "com.ldtteam:blockui:${blockui_version}"
259+
//compileOnly "com.ldtteam:minecolonies:${minecolonies_version}"
260+
//compileOnly "com.ldtteam:structurize:${structurize_version}"
261+
//compileOnly "com.ldtteam:domum_ornamentum:${domumornamentum_version}:universal"
262+
//compileOnly "com.ldtteam:blockui:${blockui_version}"
268263

269264
//Patchouli
270-
runtimeOnly "vazkii.patchouli:Patchouli:${patchouli_version}-FORGE"
265+
//runtimeOnly "vazkii.patchouli:Patchouli:${patchouli_version}-FORGE"
271266

272267
// Create
273-
compileOnly "com.simibubi.create:create-1.20.1:${create_version}:all"
274-
runtimeOnly "com.simibubi.create:create-1.20.1:${create_version}:all"
268+
//compileOnly "com.simibubi.create:create-1.20.1:${create_version}:all"
269+
//runtimeOnly "com.simibubi.create:create-1.20.1:${create_version}:all"
275270

276271
//Powah
277272
implementation "curse.maven:powah-633483:${powah_version}"
@@ -291,11 +286,11 @@ dependencies {
291286
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:${junit_version}"
292287
// Testing stuff
293288
// JEI
294-
//implementation "mezz.jei:jei-${jei_version}"
289+
implementation "mezz.jei:jei-${jei_version}"
295290

296291
// Create Crafts & Additions
297-
compileOnly "curse.maven:createaddition-439890:${createadditions_version}"
298-
runtimeOnly "curse.maven:createaddition-439890:${createadditions_version}"
292+
//compileOnly "curse.maven:createaddition-439890:${createadditions_version}"
293+
//runtimeOnly "curse.maven:createaddition-439890:${createadditions_version}"
299294
}
300295

301296

gradle.properties

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ ttoolkit_version=0.1.3
2222

2323
# Mod dependencies
2424
cc_version=1.110.2
25-
curios_version=5.2.0+1.20.1
25+
curios_version=7.4.3+1.20.4
2626
minecolonies_version=1.20.1-1.1.472-BETA
27-
appliedenergistics_version=15.0.9-beta
27+
appliedenergistics_version=17.13.0-beta
2828
patchouli_version=1.20.1-84
29-
refinedstorage_version=1.12.3
29+
refinedstorage_version=5165548
3030
botania_version=1.20.1-443-FORGE
3131
create_version=0.5.1.f-27
3232
createca_version=5099757
33-
mekanism_version=1.20.1-10.4.2.16
33+
mekanism_version=1.20.4-10.5.20.41
3434
ae2things_version=4616683
3535
powah_version=4638301
3636
ae2additions_version=5077081
3737
kotlinforforge_version=4.10.0
38-
appliedmekanistics_version=4842281
38+
appliedmekanistics_version=5294358
3939

4040
# Mod dependencies which are needed for other mods
4141
# For minecolonies
@@ -44,9 +44,6 @@ multipiston_version=1.20-1.2.30-ALPHA
4444
blockui_version=1.20.1-0.0.101-ALPHA
4545
domumornamentum_version=1.20-1.0.150-BETA
4646

47-
# For Create
48-
flywheel_version=0.6.8.a-1
49-
5047
# Mod dependencies for testing stuff(Only used in the dev environment)
51-
jei_version=1.20.1-forge:15.2.0.22
48+
jei_version=1.20.4-neoforge:17.3.1.5
5249
createadditions_version=5099752

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

src/main/java/de/srendi/advancedperipherals/AdvancedPeripherals.java

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
package de.srendi.advancedperipherals;
22

3+
import dan200.computercraft.api.peripheral.PeripheralCapability;
34
import de.srendi.advancedperipherals.common.addons.APAddons;
5+
import de.srendi.advancedperipherals.common.blocks.base.PeripheralBlockEntity;
46
import de.srendi.advancedperipherals.common.configuration.APConfig;
57
import de.srendi.advancedperipherals.common.setup.Registration;
6-
78
import de.srendi.advancedperipherals.network.APNetworking;
89
import net.minecraft.resources.ResourceLocation;
910
import net.neoforged.bus.api.IEventBus;
1011
import net.neoforged.fml.ModLoadingContext;
1112
import net.neoforged.fml.common.Mod;
1213
import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
13-
import net.neoforged.fml.javafmlmod.FMLJavaModLoadingContext;
14+
import net.neoforged.neoforge.capabilities.Capabilities;
15+
import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
1416
import org.apache.logging.log4j.Level;
1517
import org.apache.logging.log4j.LogManager;
1618
import org.apache.logging.log4j.Logger;
@@ -53,4 +55,21 @@ public void commonSetup(FMLCommonSetupEvent event) {
5355
APNetworking.init();
5456
}
5557

58+
public void registerCapabilities(RegisterCapabilitiesEvent event) {
59+
Registration.BLOCK_ENTITIES.getEntries().forEach((entry) -> {
60+
event.registerBlockEntity(
61+
PeripheralCapability.get(),
62+
entry.get(),
63+
(blockEntity, side) -> ((PeripheralBlockEntity<?>) blockEntity).createCapPeripheral());
64+
event.registerBlockEntity(
65+
Capabilities.ItemHandler.BLOCK,
66+
entry.get(),
67+
(blockEntity, side) -> ((PeripheralBlockEntity<?>) blockEntity).createItemHandler());
68+
event.registerBlockEntity(
69+
Capabilities.FluidHandler.BLOCK,
70+
entry.get(),
71+
(blockEntity, side) -> ((PeripheralBlockEntity<?>) blockEntity).createFluidHandler());
72+
});
73+
}
74+
5675
}

src/main/java/de/srendi/advancedperipherals/client/ClientNetworking.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package de.srendi.advancedperipherals.client;
22

3-
import dan200.computercraft.shared.network.NetworkMessage;
4-
import dan200.computercraft.shared.network.server.ServerNetworkContext;
53
import de.srendi.advancedperipherals.network.base.IPacket;
64
import net.minecraft.client.Minecraft;
75
import net.minecraft.client.multiplayer.ClientPacketListener;

src/main/java/de/srendi/advancedperipherals/common/addons/APAddons.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import de.srendi.advancedperipherals.AdvancedPeripherals;
44
import de.srendi.advancedperipherals.common.addons.refinedstorage.RefinedStorage;
5-
import net.neoforged.eventbus.api.SubscribeEvent;
5+
import net.neoforged.bus.api.SubscribeEvent;
66
import net.neoforged.fml.ModList;
77
import net.neoforged.fml.common.Mod;
88
import net.neoforged.fml.event.lifecycle.InterModEnqueueEvent;

0 commit comments

Comments
 (0)