firstdarkdev/CraterLib
1
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Activity

[CHORE] Port to 1.20.3/4

Browse Source
This commit is contained in:
HypherionSA
2023-12-07 21:33:19 +02:00
parent 19852fbecd
commit 8aa8c3b62c
14 changed files with 33 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.jenkins/Jenkinsfile.deploy
View File

@@ -9,7 +9,7 @@ pipeline {
stage("Notify Discord") { stage("Notify Discord") {
steps { steps {
discordSend webhookURL: env.FDD_WH_ADMIN, discordSend webhookURL: env.FDD_WH_ADMIN,
title: "Deploy Started: CraterLib 1.20.2 Deploy #${BUILD_NUMBER}", title: "Deploy Started: CraterLib 1.20.3 Deploy #${BUILD_NUMBER}",
link: env.BUILD_URL, link: env.BUILD_URL,
result: 'SUCCESS', result: 'SUCCESS',
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})" description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
@@ -38,7 +38,7 @@ pipeline {
deleteDir() deleteDir()
discordSend webhookURL: env.FDD_WH_ADMIN, discordSend webhookURL: env.FDD_WH_ADMIN,
title: "CraterLib 1.20.2 Deploy #${BUILD_NUMBER}", title: "CraterLib 1.20.3 Deploy #${BUILD_NUMBER}",
link: env.BUILD_URL, link: env.BUILD_URL,
result: currentBuild.currentResult, result: currentBuild.currentResult,
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})\nStatus: ${currentBuild.currentResult}" description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})\nStatus: ${currentBuild.currentResult}"

4
.jenkins/Jenkinsfile.snapshot
View File

@@ -13,7 +13,7 @@ pipeline {
stage("Notify Discord") { stage("Notify Discord") {
steps { steps {
discordSend webhookURL: env.SSS_WEBHOOK, discordSend webhookURL: env.SSS_WEBHOOK,
title: "Deploy Started: ${projectName} 1.20.2 Deploy #${BUILD_NUMBER}", title: "Deploy Started: ${projectName} 1.20.3 Deploy #${BUILD_NUMBER}",
link: env.BUILD_URL, link: env.BUILD_URL,
result: 'SUCCESS', result: 'SUCCESS',
description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})" description: "Build: [${BUILD_NUMBER}](${env.BUILD_URL})"
@@ -54,7 +54,7 @@ pipeline {
versionName: "Snapshot 1.0.${BUILD_NUMBER}", versionName: "Snapshot 1.0.${BUILD_NUMBER}",
version: "1.0.${BUILD_NUMBER}", version: "1.0.${BUILD_NUMBER}",
modLoaders: "forge|neoforge|fabric|quilt", modLoaders: "forge|neoforge|fabric|quilt",
minecraftVersions: "1.20.2", minecraftVersions: "1.20.3",
failWebhook: env.SSS_WEBHOOK, failWebhook: env.SSS_WEBHOOK,
publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}" publishWebhooks: "${env.SSS_WEBHOOK}|${env.FDD_WH}"

4
Common/src/main/java/com/hypherionmc/craterlib/client/gui/config/widgets/InternalConfigButton.java
View File

@@ -23,7 +23,7 @@ public class InternalConfigButton extends AbstractButton {
} }
@Override @Override
public void render(@NotNull GuiGraphics poseStack, int i, int j, float f) { protected void renderWidget(GuiGraphics arg, int i, int j, float f) {
if (cancel) { if (cancel) {
setMessage(Component.translatable(screen.isEdited() ? "t.clc.cancel_discard" : "gui.cancel")); setMessage(Component.translatable(screen.isEdited() ? "t.clc.cancel_discard" : "gui.cancel"));
} else { } else {
@@ -31,7 +31,7 @@ public class InternalConfigButton extends AbstractButton {
active = screen.isEdited() && !hasErrors; active = screen.isEdited() && !hasErrors;
setMessage(Component.translatable(hasErrors ? "t.clc.error" : "t.clc.save")); setMessage(Component.translatable(hasErrors ? "t.clc.error" : "t.clc.save"));
} }
super.render(poseStack, i, j, f); super.renderWidget(arg, i, j, f);
} }
@Override @Override

9
Common/src/main/java/com/hypherionmc/craterlib/mixin/events/CommandMixin.java
View File

@@ -9,6 +9,7 @@ import net.minecraft.commands.Commands;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
@Mixin(Commands.class) @Mixin(Commands.class)
@@ -16,21 +17,21 @@ public class CommandMixin {
@Inject(method = "performCommand", @Inject(method = "performCommand",
at = @At(value = "INVOKE", at = @At(value = "INVOKE",
target = "Lcom/mojang/brigadier/CommandDispatcher;execute(Lcom/mojang/brigadier/ParseResults;)I", target = "Lnet/minecraft/commands/Commands;finishParsing(Lcom/mojang/brigadier/ParseResults;Ljava/lang/String;Lnet/minecraft/commands/CommandSourceStack;)Lcom/mojang/brigadier/context/ContextChain;",
shift = At.Shift.BEFORE shift = At.Shift.BEFORE
), cancellable = true ), cancellable = true
) )
private void injectCommandEvent(ParseResults<CommandSourceStack> stackParseResults, String command, CallbackInfoReturnable<Integer> cir) { private void injectCommandEvent(ParseResults<CommandSourceStack> stackParseResults, String command, CallbackInfo ci) {
CraterCommandEvent commandEvent = new CraterCommandEvent(stackParseResults, command); CraterCommandEvent commandEvent = new CraterCommandEvent(stackParseResults, command);
CraterEventBus.INSTANCE.postEvent(commandEvent); CraterEventBus.INSTANCE.postEvent(commandEvent);
if (commandEvent.wasCancelled()) { if (commandEvent.wasCancelled()) {
cir.setReturnValue(1); ci.cancel();
return; return;
} }
if (commandEvent.getException() != null) { if (commandEvent.getException() != null) {
Throwables.throwIfUnchecked(commandEvent.getException()); Throwables.throwIfUnchecked(commandEvent.getException());
cir.setReturnValue(1); ci.cancel();
} }
} }

2
Fabric/src/main/resources/fabric.mod.json
View File

@@ -34,7 +34,7 @@
"depends": { "depends": {
"fabricloader": ">=0.14.21", "fabricloader": ">=0.14.21",
"fabric-api": "*", "fabric-api": "*",
"minecraft": ">=1.20.2", "minecraft": ">=1.20.3",
"java": ">=17" "java": ">=17"
} }
} }

6
Forge/src/main/resources/META-INF/mods.toml
View File

@@ -1,5 +1,5 @@
modLoader = "javafml" modLoader = "javafml"
loaderVersion = "[46,)" loaderVersion = "[49,)"
license = "MIT" license = "MIT"
issueTrackerURL="https://github.com/firstdarkdev/craterLib/issues" issueTrackerURL="https://github.com/firstdarkdev/craterLib/issues"
@@ -19,13 +19,13 @@ displayTest = "MATCH_VERSION"
[[dependencies.${mod_id}]] [[dependencies.${mod_id}]]
modId = "forge" modId = "forge"
mandatory = true mandatory = true
versionRange = "[46,)" versionRange = "[49,)"
ordering = "NONE" ordering = "NONE"
side = "BOTH" side = "BOTH"
[[dependencies.${mod_id}]] [[dependencies.${mod_id}]]
modId = "minecraft" modId = "minecraft"
mandatory = true mandatory = true
versionRange = "[1.20.2,1.21)" versionRange = "[1.20.3,1.21)"
ordering = "NONE" ordering = "NONE"
side = "BOTH" side = "BOTH"

2
Forge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.ClientPlatform
View File

@@ -1 +1 @@
com.hypherionmc.craterlib.client.NeoForgeClientHelper com.hypherionmc.craterlib.client.ForgeClientHelper

2
Forge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.CommonPlatform
View File

@@ -1 +1 @@
com.hypherionmc.craterlib.common.NeoForgeCommonHelper com.hypherionmc.craterlib.common.ForgeCommonHelper

2
Forge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.CraterFluidHelper
View File

@@ -1 +1 @@
com.hypherionmc.craterlib.common.NeoForgeFluidHelper com.hypherionmc.craterlib.common.ForgeFluidHelper

2
Forge/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.ModloaderEnvironment
View File

@@ -1 +1 @@
com.hypherionmc.craterlib.common.NeoForgeLoaderHelper com.hypherionmc.craterlib.common.ForgeLoaderHelper

11
NeoForge/src/main/java/com/hypherionmc/craterlib/common/NeoForgeCommonHelper.java
View File

@@ -1,13 +1,9 @@
package com.hypherionmc.craterlib.common; package com.hypherionmc.craterlib.common;
import com.hypherionmc.craterlib.api.blockentity.caps.CraterCapabilityHandler; import com.hypherionmc.craterlib.api.blockentity.caps.CraterCapabilityHandler;
import com.hypherionmc.craterlib.api.blockentity.caps.ICraterCapProvider;
import com.hypherionmc.craterlib.core.network.CraterNetworkHandler; import com.hypherionmc.craterlib.core.network.CraterNetworkHandler;
import com.hypherionmc.craterlib.core.platform.CommonPlatform; import com.hypherionmc.craterlib.core.platform.CommonPlatform;
import com.hypherionmc.craterlib.core.systems.fluid.ICraterFluidHandler;
import com.hypherionmc.craterlib.network.NeoForgeNetworkHandler; import com.hypherionmc.craterlib.network.NeoForgeNetworkHandler;
import com.hypherionmc.craterlib.systems.energy.NeoForgeEnergyReader;
import com.hypherionmc.craterlib.systems.fluid.NeoForgeFluidReader;
import net.minecraft.core.Direction; import net.minecraft.core.Direction;
import net.minecraft.network.FriendlyByteBuf; import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
@@ -19,7 +15,6 @@ import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.inventory.MenuType; import net.minecraft.world.inventory.MenuType;
import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.BlockEntity;
import net.neoforged.neoforge.common.capabilities.Capabilities;
import net.neoforged.neoforge.common.extensions.IMenuTypeExtension; import net.neoforged.neoforge.common.extensions.IMenuTypeExtension;
import net.neoforged.neoforge.server.ServerLifecycleHooks; import net.neoforged.neoforge.server.ServerLifecycleHooks;
import org.apache.commons.lang3.function.TriFunction; import org.apache.commons.lang3.function.TriFunction;
@@ -28,7 +23,6 @@ import org.jetbrains.annotations.Nullable;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer; import java.util.function.Consumer;
/** /**
@@ -67,7 +61,8 @@ public class NeoForgeCommonHelper implements CommonPlatform {
@Override @Override
public <T> Optional<T> getCapabilityHandler(BlockEntity entity, Direction side, CraterCapabilityHandler capability) { public <T> Optional<T> getCapabilityHandler(BlockEntity entity, Direction side, CraterCapabilityHandler capability) {
if (capability == CraterCapabilityHandler.ENERGY) { // TODO Fix This
/*if (capability == CraterCapabilityHandler.ENERGY) {
AtomicReference<NeoForgeEnergyReader> energyReference = new AtomicReference<>(); AtomicReference<NeoForgeEnergyReader> energyReference = new AtomicReference<>();
entity.getCapability(Capabilities.ENERGY, side).ifPresent(storage -> energyReference.set(new NeoForgeEnergyReader(storage))); entity.getCapability(Capabilities.ENERGY, side).ifPresent(storage -> energyReference.set(new NeoForgeEnergyReader(storage)));
@@ -83,7 +78,7 @@ public class NeoForgeCommonHelper implements CommonPlatform {
if (entity instanceof ICraterCapProvider capProvider) { if (entity instanceof ICraterCapProvider capProvider) {
return capProvider.getCapability(capability, side); return capProvider.getCapability(capability, side);
} }*/
return Optional.empty(); return Optional.empty();
} }

25
NeoForge/src/main/java/com/hypherionmc/craterlib/mixin/BlockEntityMixin.java
View File

@@ -1,33 +1,16 @@
package com.hypherionmc.craterlib.mixin; package com.hypherionmc.craterlib.mixin;
import com.hypherionmc.craterlib.api.blockentity.caps.CraterCapabilityHandler;
import com.hypherionmc.craterlib.api.blockentity.caps.ICraterCapProvider;
import com.hypherionmc.craterlib.common.blockentity.CraterBlockEntity; import com.hypherionmc.craterlib.common.blockentity.CraterBlockEntity;
import com.hypherionmc.craterlib.core.systems.energy.CustomEnergyStorage;
import com.hypherionmc.craterlib.core.systems.fluid.ICraterFluidHandler;
import com.hypherionmc.craterlib.core.systems.inventory.SimpleInventory;
import com.hypherionmc.craterlib.systems.energy.NeoForgeEnergyWrapper;
import com.hypherionmc.craterlib.systems.fluid.NeoForgeWrappedFluidTank;
import com.hypherionmc.craterlib.systems.inventory.NeoForgeInventoryWrapper;
import net.minecraft.core.Direction;
import net.neoforged.neoforge.common.capabilities.Capabilities;
import net.neoforged.neoforge.common.capabilities.Capability;
import net.neoforged.neoforge.common.capabilities.ICapabilityProvider;
import net.neoforged.neoforge.common.util.LazyOptional;
import net.neoforged.neoforge.items.wrapper.SidedInvWrapper;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import java.util.Optional;
/** /**
* @author HypherionSA * @author HypherionSA
*/ */
// TODO Fix This
@Mixin(CraterBlockEntity.class) @Mixin(CraterBlockEntity.class)
public class BlockEntityMixin implements ICapabilityProvider { public class BlockEntityMixin /*implements ICapabilityProvider*/ {
@Override /*@Override
public @NotNull <T> LazyOptional<T> getCapability(@NotNull Capability<T> cap, @Nullable Direction side) { public @NotNull <T> LazyOptional<T> getCapability(@NotNull Capability<T> cap, @Nullable Direction side) {
ICraterCapProvider capProvider = (ICraterCapProvider) this; ICraterCapProvider capProvider = (ICraterCapProvider) this;
@@ -53,5 +36,5 @@ public class BlockEntityMixin implements ICapabilityProvider {
} }
return LazyOptional.empty(); return LazyOptional.empty();
} }*/
} }

4
NeoForge/src/main/resources/META-INF/mods.toml
View File

@@ -19,13 +19,13 @@ displayTest = "MATCH_VERSION"
[[dependencies.${mod_id}]] [[dependencies.${mod_id}]]
modId = "neoforge" modId = "neoforge"
mandatory = true mandatory = true
versionRange = "[20.2,)" versionRange = "[20.3,)"
ordering = "NONE" ordering = "NONE"
side = "BOTH" side = "BOTH"
[[dependencies.${mod_id}]] [[dependencies.${mod_id}]]
modId = "minecraft" modId = "minecraft"
mandatory = true mandatory = true
versionRange = "[1.20.2,1.21)" versionRange = "[1.20.3,1.21)"
ordering = "NONE" ordering = "NONE"
side = "BOTH" side = "BOTH"

10
gradle.properties
View File

@@ -10,17 +10,17 @@ mod_id=craterlib
mod_name=CraterLib mod_name=CraterLib
# Shared # Shared
minecraft_version=1.20.2 minecraft_version=1.20.3
# Fabric # Fabric
fabric_loader=0.14.22 fabric_loader=0.15.0
fabric_api=0.89.0+1.20.2 fabric_api=0.91.1+1.20.3
# Forge # Forge
forge_version=48.0.6 forge_version=49.0.2
# NeoForged # NeoForged
neoforge_version=64-beta neoforge_version=8-beta
# Dependencies # Dependencies
mod_menu_version=8.0.0-beta.2 mod_menu_version=8.0.0-beta.2