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

Code cleanup and refactoring before porting

Browse Source
This commit is contained in:
HypherionSA
2023-05-10 21:21:16 +02:00
parent 1dec8d130c
commit 8e72212bf6
134 changed files with 975 additions and 755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Fabric/src/main/java/me/hypherionmc/craterlib/CraterLibInitializer.java → Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibInitializer.java
View File

@@ -1,6 +1,6 @@
package me.hypherionmc.craterlib;
package com.hypherionmc.craterlib;
import me.hypherionmc.craterlib.common.FabricCommonHelper;
import com.hypherionmc.craterlib.common.FabricCommonHelper;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;

11
Fabric/src/main/java/me/hypherionmc/craterlib/CraterLibModMenuIntegration.java → Fabric/src/main/java/com/hypherionmc/craterlib/CraterLibModMenuIntegration.java
View File

@@ -1,18 +1,17 @@
package me.hypherionmc.craterlib;
package com.hypherionmc.craterlib;
import com.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
import com.hypherionmc.craterlib.core.config.ConfigController;
import com.hypherionmc.craterlib.core.config.ModuleConfig;
import com.hypherionmc.craterlib.core.config.annotations.NoConfigScreen;
import com.terraformersmc.modmenu.api.ConfigScreenFactory;
import com.terraformersmc.modmenu.api.ModMenuApi;
import me.hypherionmc.craterlib.client.gui.config.CraterConfigScreen;
import me.hypherionmc.craterlib.common.config.ConfigController;
import me.hypherionmc.craterlib.common.config.ModuleConfig;
import me.hypherionmc.craterlib.common.config.annotations.NoConfigScreen;
import java.util.HashMap;
import java.util.Map;
/**
* @author HypherionSA
* @date 06/08/2022
*/
public class CraterLibModMenuIntegration implements ModMenuApi {

2
Fabric/src/main/java/me/hypherionmc/craterlib/client/CraterLibClientInitializer.java → Fabric/src/main/java/com/hypherionmc/craterlib/client/CraterLibClientInitializer.java
View File

@@ -1,4 +1,4 @@
package me.hypherionmc.craterlib.client;
package com.hypherionmc.craterlib.client;
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;

13
Fabric/src/main/java/me/hypherionmc/craterlib/client/FabricClientHelper.java → Fabric/src/main/java/com/hypherionmc/craterlib/client/FabricClientHelper.java
View File

@@ -1,11 +1,11 @@
package me.hypherionmc.craterlib.client;
package com.hypherionmc.craterlib.client;
import me.hypherionmc.craterlib.api.rendering.CustomRenderType;
import me.hypherionmc.craterlib.common.item.BlockItemDyable;
import me.hypherionmc.craterlib.network.CraterPacket;
import me.hypherionmc.craterlib.platform.services.LibClientHelper;
import com.hypherionmc.craterlib.api.rendering.CustomRenderType;
import com.hypherionmc.craterlib.common.item.BlockItemDyable;
import com.hypherionmc.craterlib.core.network.CraterPacket;
import com.hypherionmc.craterlib.core.platform.services.LibClientHelper;
import com.hypherionmc.craterlib.util.ColorPropertyFunction;
import me.hypherionmc.craterlib.systems.reg.RegistryObject;
import me.hypherionmc.craterlib.util.ColorPropertyFunction;
import net.fabricmc.api.EnvType;
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
@@ -33,7 +33,6 @@ import java.util.function.Function;
/**
* @author HypherionSA
* @date 16/06/2022
*/
public class FabricClientHelper implements LibClientHelper {

9
Fabric/src/main/java/me/hypherionmc/craterlib/client/gui/widgets/FluidStackWidget.java → Fabric/src/main/java/com/hypherionmc/craterlib/client/gui/widgets/FluidStackWidget.java
View File

@@ -1,12 +1,11 @@
package me.hypherionmc.craterlib.client.gui.widgets;
package com.hypherionmc.craterlib.client.gui.widgets;
import com.hypherionmc.craterlib.systems.fluid.FluidTank;
import com.hypherionmc.craterlib.util.RenderUtils;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.PoseStack;
import me.hypherionmc.craterlib.systems.fluid.FluidTank;
import me.hypherionmc.craterlib.util.RenderUtils;
import net.fabricmc.fabric.api.transfer.v1.client.fluid.FluidVariantRendering;
import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.components.AbstractWidget;
import net.minecraft.client.gui.narration.NarrationElementOutput;
import net.minecraft.client.gui.screens.Screen;
@@ -19,7 +18,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.function.Supplier;
/**
* Modified from https://github.com/SleepyTrousers/EnderIO-Rewrite/blob/dev/1.18.x/enderio-machines/src/main/java/com/enderio/machines/client/FluidStackWidget.java
* Modified from <a href="https://github.com/SleepyTrousers/EnderIO-Rewrite/blob/dev/1.18.x/enderio-machines/src/main/java/com/enderio/machines/client/FluidStackWidget.java">...</a>
*/
public class FluidStackWidget extends AbstractWidget {

17
Fabric/src/main/java/me/hypherionmc/craterlib/common/FabricCommonHelper.java → Fabric/src/main/java/com/hypherionmc/craterlib/common/FabricCommonHelper.java
View File

@@ -1,11 +1,11 @@
package me.hypherionmc.craterlib.common;
package com.hypherionmc.craterlib.common;
import me.hypherionmc.craterlib.api.blockentities.caps.CapabilityHandler;
import me.hypherionmc.craterlib.api.blockentities.caps.ICraterCapProvider;
import me.hypherionmc.craterlib.network.CraterNetworkHandler;
import me.hypherionmc.craterlib.network.CraterPacket;
import me.hypherionmc.craterlib.network.FabricNetworkHandler;
import me.hypherionmc.craterlib.platform.services.LibCommonHelper;
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.CraterPacket;
import com.hypherionmc.craterlib.core.platform.services.LibCommonHelper;
import com.hypherionmc.craterlib.network.FabricNetworkHandler;
import net.fabricmc.fabric.api.networking.v1.PacketSender;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
import net.fabricmc.fabric.api.screenhandler.v1.ExtendedScreenHandlerFactory;
@@ -32,7 +32,6 @@ import java.util.function.Function;
/**
* @author HypherionSA
* @date 24/09/2022
*/
public class FabricCommonHelper implements LibCommonHelper {
@@ -85,7 +84,7 @@ public class FabricCommonHelper implements LibCommonHelper {
}
@Override
public <T> Optional<T> getCapabilityHandler(BlockEntity entity, Direction side, CapabilityHandler capability) {
public <T> Optional<T> getCapabilityHandler(BlockEntity entity, Direction side, CraterCapabilityHandler capability) {
if (entity instanceof ICraterCapProvider capProvider) {
return capProvider.getCapability(capability, side);
}

11
Fabric/src/main/java/me/hypherionmc/craterlib/common/FabricFluidHelper.java → Fabric/src/main/java/com/hypherionmc/craterlib/common/FabricFluidHelper.java
View File

@@ -1,9 +1,12 @@
package me.hypherionmc.craterlib.common;
package com.hypherionmc.craterlib.common;
import me.hypherionmc.craterlib.platform.services.LibFluidHelper;
import me.hypherionmc.craterlib.systems.fluid.*;
import com.hypherionmc.craterlib.core.platform.services.LibFluidHelper;
import com.hypherionmc.craterlib.core.systems.fluid.CraterFluidTank;
import com.hypherionmc.craterlib.core.systems.fluid.FluidHolder;
import com.hypherionmc.craterlib.core.systems.fluid.ICraterFluidHandler;
import com.hypherionmc.craterlib.systems.fluid.FabricFluidUtils;
import com.hypherionmc.craterlib.systems.fluid.FluidTank;
import net.fabricmc.fabric.api.transfer.v1.client.fluid.FluidVariantRendering;
import net.fabricmc.fabric.api.transfer.v1.fluid.FluidConstants;
import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
import net.fabricmc.fabric.impl.transfer.fluid.FluidVariantImpl;
import net.fabricmc.fabric.mixin.transfer.BucketItemAccessor;

11
Fabric/src/main/java/me/hypherionmc/craterlib/common/FabricLoaderHelper.java → Fabric/src/main/java/com/hypherionmc/craterlib/common/FabricLoaderHelper.java
View File

@@ -1,7 +1,7 @@
package me.hypherionmc.craterlib.common;
package com.hypherionmc.craterlib.common;
import me.hypherionmc.craterlib.platform.services.Environment;
import me.hypherionmc.craterlib.platform.services.ILoaderHelper;
import com.hypherionmc.craterlib.core.platform.services.Environment;
import com.hypherionmc.craterlib.core.platform.services.ILoaderHelper;
import net.fabricmc.loader.api.FabricLoader;
import net.minecraft.SharedConstants;
import net.minecraft.client.Minecraft;
@@ -19,11 +19,6 @@ public class FabricLoaderHelper implements ILoaderHelper {
return true;
}
@Override
public boolean isForge() {
return false;
}
@Override
public String getGameVersion() {
return SharedConstants.VERSION_STRING;

6
Fabric/src/main/java/me/hypherionmc/craterlib/mixin/MinecraftMixin.java → Fabric/src/main/java/com/hypherionmc/craterlib/mixin/MinecraftMixin.java
View File

@@ -1,6 +1,6 @@
package me.hypherionmc.craterlib.mixin;
package com.hypherionmc.craterlib.mixin;
import me.hypherionmc.craterlib.systems.internal.CreativeTabRegistry;
import com.hypherionmc.craterlib.core.systems.internal.CreativeTabRegistry;
import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroup;
import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
import net.minecraft.client.Minecraft;
@@ -18,7 +18,7 @@ public class MinecraftMixin {
@Inject(method = "<init>", at = @At("RETURN"))
private void injectCraterLateInit(GameConfig gameConfig, CallbackInfo ci) {
CreativeTabRegistry.getTABS().forEach(tab -> {
CreativeTabRegistry.getTabs().forEach(tab -> {
CreativeModeTab finalTab = FabricItemGroup.builder(tab.getResourceLocation())
.title(Component.translatable("itemGroup." +
tab.getResourceLocation().toString().replace(":", ".")

9
Fabric/src/main/java/me/hypherionmc/craterlib/network/FabricNetworkHandler.java → Fabric/src/main/java/com/hypherionmc/craterlib/network/FabricNetworkHandler.java
View File

@@ -1,8 +1,11 @@
package me.hypherionmc.craterlib.network;
package com.hypherionmc.craterlib.network;
import com.google.common.collect.Maps;
import me.hypherionmc.craterlib.platform.ClientPlatform;
import me.hypherionmc.craterlib.platform.Platform;
import com.hypherionmc.craterlib.core.network.CraterNetworkHandler;
import com.hypherionmc.craterlib.core.network.CraterPacket;
import com.hypherionmc.craterlib.core.network.PacketDirection;
import com.hypherionmc.craterlib.core.platform.ClientPlatform;
import com.hypherionmc.craterlib.core.platform.Platform;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;

2
Fabric/src/main/java/me/hypherionmc/craterlib/systems/fluid/FabricFluidUtils.java → Fabric/src/main/java/com/hypherionmc/craterlib/systems/fluid/FabricFluidUtils.java
View File

@@ -1,4 +1,4 @@
package me.hypherionmc.craterlib.systems.fluid;
package com.hypherionmc.craterlib.systems.fluid;
import net.fabricmc.fabric.api.transfer.v1.client.fluid.FluidVariantRendering;
import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;

4
Fabric/src/main/java/me/hypherionmc/craterlib/systems/fluid/FluidTank.java → Fabric/src/main/java/com/hypherionmc/craterlib/systems/fluid/FluidTank.java
View File

@@ -1,5 +1,7 @@
package me.hypherionmc.craterlib.systems.fluid;
package com.hypherionmc.craterlib.systems.fluid;
import com.hypherionmc.craterlib.core.systems.fluid.CraterFluidTank;
import com.hypherionmc.craterlib.core.systems.fluid.FluidHolder;
import net.fabricmc.fabric.api.transfer.v1.fluid.FluidVariant;
import net.fabricmc.fabric.api.transfer.v1.storage.Storage;
import net.fabricmc.fabric.api.transfer.v1.storage.StoragePreconditions;

1
Fabric/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.services.ILoaderHelper Normal file
View File

@@ -0,0 +1 @@
com.hypherionmc.craterlib.common.FabricLoaderHelper

1
Fabric/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.services.LibClientHelper Normal file
View File

@@ -0,0 +1 @@
com.hypherionmc.craterlib.client.FabricClientHelper

1
Fabric/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.services.LibCommonHelper Normal file
View File

@@ -0,0 +1 @@
com.hypherionmc.craterlib.common.FabricCommonHelper

1
Fabric/src/main/resources/META-INF/services/com.hypherionmc.craterlib.core.platform.services.LibFluidHelper Normal file
View File

@@ -0,0 +1 @@
com.hypherionmc.craterlib.common.FabricFluidHelper

1
Fabric/src/main/resources/META-INF/services/me.hypherionmc.craterlib.platform.services.ILoaderHelper
View File

@@ -1 +0,0 @@
me.hypherionmc.craterlib.common.FabricLoaderHelper

1
Fabric/src/main/resources/META-INF/services/me.hypherionmc.craterlib.platform.services.LibClientHelper
View File

@@ -1 +0,0 @@
me.hypherionmc.craterlib.client.FabricClientHelper

1
Fabric/src/main/resources/META-INF/services/me.hypherionmc.craterlib.platform.services.LibCommonHelper
View File

@@ -1 +0,0 @@
me.hypherionmc.craterlib.common.FabricCommonHelper

1
Fabric/src/main/resources/META-INF/services/me.hypherionmc.craterlib.platform.services.LibFluidHelper
View File

@@ -1 +0,0 @@
me.hypherionmc.craterlib.common.FabricFluidHelper

2
Fabric/src/main/resources/craterlib.fabric.mixins.json
View File

@@ -1,7 +1,7 @@
{
"required": true,
"minVersion": "0.8",
"package": "me.hypherionmc.craterlib.mixin",
"package": "com.hypherionmc.craterlib.mixin",
"compatibilityLevel": "JAVA_17",
"mixins": [
],

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

@@ -17,13 +17,13 @@
"environment": "*",
"entrypoints": {
"main": [
"me.hypherionmc.craterlib.CraterLibInitializer"
"com.hypherionmc.craterlib.CraterLibInitializer"
],
"client": [
"me.hypherionmc.craterlib.client.CraterLibClientInitializer"
"com.hypherionmc.craterlib.client.CraterLibClientInitializer"
],
"modmenu": [
"me.hypherionmc.craterlib.CraterLibModMenuIntegration"
"com.hypherionmc.craterlib.CraterLibModMenuIntegration"
]
},
"mixins": [