From 385c2eff9399efe19767b201e3b1378dc05b0945 Mon Sep 17 00:00:00 2001 From: miozune Date: Sat, 7 Sep 2024 23:09:21 +0900 Subject: [PATCH 1/2] Update & cleanup build --- .gitignore | 9 +++++++- dependencies.gradle | 12 +++++------ gradle.properties | 21 ++----------------- settings.gradle | 2 +- src/main/java/logisticspipes/LPConstants.java | 2 -- .../java/logisticspipes/LogisticsPipes.java | 2 +- .../blocks/LogisticsSecurityTileEntity.java | 4 ++-- .../blocks/LogisticsSolderingTileEntity.java | 4 ++-- .../LogisticsPowerJunctionTileEntity.java | 4 ++-- .../LogisticsPowerProviderTileEntity.java | 4 ++-- .../pipes/basic/LogisticsTileGenericPipe.java | 3 ++- 11 files changed, 28 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index 75c41f65d..5e80e0ae5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ .gradle .settings /.idea/ +/.vscode/ /run/ /build/ /eclipse/ @@ -25,7 +26,13 @@ whitelist.json *.iml *.ipr *.iws -src/main/resources/mixins.*.json +src/main/resources/mixins.*([!.]).json *.bat *.DS_Store !gradlew.bat +.factorypath +addon.local.gradle +addon.local.gradle.kts +addon.late.local.gradle +addon.late.local.gradle.kts +layout.json diff --git a/dependencies.gradle b/dependencies.gradle index e8d3819a3..f4e6483a4 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,23 +2,23 @@ dependencies { api('com.github.GTNewHorizons:BuildCraft:7.1.39:dev') - implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.47:dev') + implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.74:dev') implementation('com.github.GTNewHorizons:NotEnoughItems:2.6.34-GTNH:dev') implementation('com.github.GTNewHorizons:ModularUI2:2.1.3-1.7.10:dev') implementation('com.github.GTNewHorizons:CodeChickenLib:1.3.0:dev') - compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.22-GTNH:api') { transitive = false } - compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-445-GTNH:api') { transitive = false } - compileOnly('com.github.GTNewHorizons:StorageDrawers:1.13.9-GTNH:api') { transitive = false } + compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.23-GTNH:api') { transitive = false } + compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-452-GTNH:api') { transitive = false } + compileOnly('com.github.GTNewHorizons:StorageDrawers:1.13.11-GTNH:api') { transitive = false } compileOnly('com.github.GTNewHorizons:Jabba:1.4.6:dev') { transitive = false } - compileOnly('com.github.GTNewHorizons:ironchest:6.0.85:dev') { transitive = false } + compileOnly('com.github.GTNewHorizons:ironchest:6.0.86:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ForestryMC:4.9.10:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:EnderIO:2.8.17:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:EnderCore:0.4.6:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:EnderStorage:1.6.0:dev') { transitive = false } compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:api') { transitive = false } compileOnly('com.github.GTNewHorizons:Binnie:2.4.1:dev') { transitive = false } - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.55:dev') { transitive = false } + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.74:dev') { transitive = false } compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') { transitive = false } compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') { transitive = false } diff --git a/gradle.properties b/gradle.properties index d208fdc67..18d47f4d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -50,27 +50,10 @@ enableGenericInjection = false # Generate a class with a String field for the mod version named as defined below. # If generateGradleTokenClass is empty or not missing, no such class will be generated. # If gradleTokenVersion is empty or missing, the field will not be present in the class. -generateGradleTokenClass = +generateGradleTokenClass = logisticspipes.Tags # Name of the token containing the project's current version to generate/replace. -gradleTokenVersion = GRADLETOKEN_VERSION - -# [DEPRECATED] Mod ID replacement token. -gradleTokenModId = - -# [DEPRECATED] Mod name replacement token. -gradleTokenModName = - -# [DEPRECATED] Mod Group replacement token. -gradleTokenGroupName = - -# [DEPRECATED] -# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java -# public static final String VERSION = "GRADLETOKEN_VERSION"; -# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's -# version in @Mod([...], version = VERSION, [...]). -# Leave these properties empty to skip individual token replacements. -replaceGradleTokenInFile = LPConstants.java +gradleTokenVersion = VERSION # In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can # leave this property empty. diff --git a/settings.gradle b/settings.gradle index f59e0dfbc..28ded766b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,7 +16,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.26' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.27' } diff --git a/src/main/java/logisticspipes/LPConstants.java b/src/main/java/logisticspipes/LPConstants.java index 73a2313c9..4729ef18d 100644 --- a/src/main/java/logisticspipes/LPConstants.java +++ b/src/main/java/logisticspipes/LPConstants.java @@ -12,8 +12,6 @@ private LPConstants() {} public static final float BC_PIPE_MAX_POS = 0.75F; public static final boolean DEBUG = false; - public static final String MCVersion = "1.7.10"; - public static final String VERSION = "GRADLETOKEN_VERSION"; public static final boolean DEV_BUILD = false; public static int pipeModel = -1; diff --git a/src/main/java/logisticspipes/LogisticsPipes.java b/src/main/java/logisticspipes/LogisticsPipes.java index 397cdc03b..29120f559 100644 --- a/src/main/java/logisticspipes/LogisticsPipes.java +++ b/src/main/java/logisticspipes/LogisticsPipes.java @@ -155,7 +155,7 @@ @Mod( modid = "LogisticsPipes", name = "Logistics Pipes", - version = LPConstants.VERSION, + version = Tags.VERSION, dependencies = "required-after:Forge@[10.12.1.1079,);" + "required-after:BuildCraft|Core@[7.1.34,);" + "required-after:BuildCraft|Transport;" + "required-after:BuildCraft|Silicon;" diff --git a/src/main/java/logisticspipes/blocks/LogisticsSecurityTileEntity.java b/src/main/java/logisticspipes/blocks/LogisticsSecurityTileEntity.java index 95f40fdca..3de86e462 100644 --- a/src/main/java/logisticspipes/blocks/LogisticsSecurityTileEntity.java +++ b/src/main/java/logisticspipes/blocks/LogisticsSecurityTileEntity.java @@ -20,8 +20,8 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import logisticspipes.LPConstants; import logisticspipes.LogisticsPipes; +import logisticspipes.Tags; import logisticspipes.api.IRoutedPowerProvider; import logisticspipes.interfaces.IGuiOpenControler; import logisticspipes.interfaces.IGuiTileEntity; @@ -364,7 +364,7 @@ private boolean useEnergy(int amount) { @Override public void func_145828_a(CrashReportCategory par1CrashReportCategory) { super.func_145828_a(par1CrashReportCategory); - par1CrashReportCategory.addCrashSection("LP-Version", LPConstants.VERSION); + par1CrashReportCategory.addCrashSection("LP-Version", Tags.VERSION); } public World getWorld() { diff --git a/src/main/java/logisticspipes/blocks/LogisticsSolderingTileEntity.java b/src/main/java/logisticspipes/blocks/LogisticsSolderingTileEntity.java index 4293bd066..a03289643 100644 --- a/src/main/java/logisticspipes/blocks/LogisticsSolderingTileEntity.java +++ b/src/main/java/logisticspipes/blocks/LogisticsSolderingTileEntity.java @@ -11,7 +11,7 @@ import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.util.ForgeDirection; -import logisticspipes.LPConstants; +import logisticspipes.Tags; import logisticspipes.config.Configs; import logisticspipes.interfaces.ICraftingResultHandler; import logisticspipes.interfaces.IGuiOpenControler; @@ -427,7 +427,7 @@ public boolean isItemValidForSlot(int i, ItemStack itemstack) { @Override public void func_145828_a(CrashReportCategory par1CrashReportCategory) { super.func_145828_a(par1CrashReportCategory); - par1CrashReportCategory.addCrashSection("LP-Version", LPConstants.VERSION); + par1CrashReportCategory.addCrashSection("LP-Version", Tags.VERSION); } @Override diff --git a/src/main/java/logisticspipes/blocks/powertile/LogisticsPowerJunctionTileEntity.java b/src/main/java/logisticspipes/blocks/powertile/LogisticsPowerJunctionTileEntity.java index 4f76d6d2e..e4b99297f 100644 --- a/src/main/java/logisticspipes/blocks/powertile/LogisticsPowerJunctionTileEntity.java +++ b/src/main/java/logisticspipes/blocks/powertile/LogisticsPowerJunctionTileEntity.java @@ -12,7 +12,7 @@ import cofh.api.energy.IEnergyHandler; import cpw.mods.fml.common.Optional; import ic2.api.energy.tile.IEnergySink; -import logisticspipes.LPConstants; +import logisticspipes.Tags; import logisticspipes.api.ILogisticsPowerProvider; import logisticspipes.blocks.LogisticsSolidTileEntity; import logisticspipes.config.Configs; @@ -307,7 +307,7 @@ public boolean isHUDExistent() { @Override public void func_145828_a(CrashReportCategory par1CrashReportCategory) { super.func_145828_a(par1CrashReportCategory); - par1CrashReportCategory.addCrashSection("LP-Version", LPConstants.VERSION); + par1CrashReportCategory.addCrashSection("LP-Version", Tags.VERSION); } @Override diff --git a/src/main/java/logisticspipes/blocks/powertile/LogisticsPowerProviderTileEntity.java b/src/main/java/logisticspipes/blocks/powertile/LogisticsPowerProviderTileEntity.java index eabb3ba00..ffc3630af 100644 --- a/src/main/java/logisticspipes/blocks/powertile/LogisticsPowerProviderTileEntity.java +++ b/src/main/java/logisticspipes/blocks/powertile/LogisticsPowerProviderTileEntity.java @@ -13,7 +13,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; -import logisticspipes.LPConstants; +import logisticspipes.Tags; import logisticspipes.blocks.LogisticsSolidTileEntity; import logisticspipes.gui.hud.HUDPowerLevel; import logisticspipes.interfaces.IBlockWatchingHandler; @@ -360,7 +360,7 @@ public void updateClients() { @Override public void func_145828_a(CrashReportCategory par1CrashReportCategory) { super.func_145828_a(par1CrashReportCategory); - par1CrashReportCategory.addCrashSection("LP-Version", LPConstants.VERSION); + par1CrashReportCategory.addCrashSection("LP-Version", Tags.VERSION); } public void handlePowerPacket(float float1) { diff --git a/src/main/java/logisticspipes/pipes/basic/LogisticsTileGenericPipe.java b/src/main/java/logisticspipes/pipes/basic/LogisticsTileGenericPipe.java index 3c24ca590..7a4d1cb2a 100644 --- a/src/main/java/logisticspipes/pipes/basic/LogisticsTileGenericPipe.java +++ b/src/main/java/logisticspipes/pipes/basic/LogisticsTileGenericPipe.java @@ -47,6 +47,7 @@ import li.cil.oc.api.network.SidedEnvironment; import logisticspipes.LPConstants; import logisticspipes.LogisticsPipes; +import logisticspipes.Tags; import logisticspipes.api.ILPPipe; import logisticspipes.api.ILPPipeTile; import logisticspipes.api.IMUICompatiblePipe; @@ -282,7 +283,7 @@ public void func_145828_a(CrashReportCategory par1CrashReportCategory) { e.printStackTrace(); } } - par1CrashReportCategory.addCrashSection("LP-Version", LPConstants.VERSION); + par1CrashReportCategory.addCrashSection("LP-Version", Tags.VERSION); if (pipe != null) { par1CrashReportCategory.addCrashSection("Pipe", pipe.getClass().getCanonicalName()); if (pipe.transport != null) { From f9e898285b64234d287adbe64e7c507a5006440f Mon Sep 17 00:00:00 2001 From: miozune Date: Sat, 7 Sep 2024 23:09:36 +0900 Subject: [PATCH 2/2] Update MUI2 --- dependencies.gradle | 2 +- src/main/java/logisticspipes/compat/ModularUIHelper.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index f4e6483a4..5c203ad3e 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -4,7 +4,7 @@ dependencies { api('com.github.GTNewHorizons:BuildCraft:7.1.39:dev') implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.74:dev') implementation('com.github.GTNewHorizons:NotEnoughItems:2.6.34-GTNH:dev') - implementation('com.github.GTNewHorizons:ModularUI2:2.1.3-1.7.10:dev') + implementation('com.github.GTNewHorizons:ModularUI2:2.1.5-1.7.10:dev') implementation('com.github.GTNewHorizons:CodeChickenLib:1.3.0:dev') compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.23-GTNH:api') { transitive = false } diff --git a/src/main/java/logisticspipes/compat/ModularUIHelper.java b/src/main/java/logisticspipes/compat/ModularUIHelper.java index f9c296738..e1e86dca6 100644 --- a/src/main/java/logisticspipes/compat/ModularUIHelper.java +++ b/src/main/java/logisticspipes/compat/ModularUIHelper.java @@ -4,7 +4,7 @@ import net.minecraft.world.World; import com.cleanroommc.modularui.drawable.UITexture; -import com.cleanroommc.modularui.factory.TileEntityGuiFactory; +import com.cleanroommc.modularui.factory.GuiFactories; import logisticspipes.LogisticsPipes; import logisticspipes.pipes.basic.CoreUnroutedPipe; @@ -18,6 +18,6 @@ public static void openPipeUI(EntityPlayer player, CoreUnroutedPipe pipe) { World world = pipe.getWorld(); if (world == null || world.isRemote) return; - TileEntityGuiFactory.open(player, pipe.getX(), pipe.getY(), pipe.getZ()); + GuiFactories.tileEntity().open(player, pipe.getX(), pipe.getY(), pipe.getZ()); } }