Skip to content

Commit

Permalink
port to 2.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@reobf
reobf committed Dec 16, 2024
1 parent 42cf856 commit a2d05aa
Show file tree
Hide file tree
Showing 103 changed files with 1,755 additions and 1,483 deletions.
6 changes: 4 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@ Programmable Hatches Mod

其中你需要注意的是：

本Mod目前单文件适配GTNH整合包 2.6.0 2.6.1版本，2.7.0版本请下载带有gtnh270后缀的版本，不支持GTNH整合包 2.5.0 及以下的版本。
本Mod目前正在维护的版本支持GTNH整合包 2.7.0版本，不支持GTNH整合包 2.5.0 及以下的版本。

若最新版Mod不能在支持的整合包版本运行,请提issue。

同时，本Mod对2.5.1的支持已经终止，v0.0.18p28是最后一个明确支持2.5.1的版本，尽管在此之后的版本可能可以在2.5.1正常运行，但原则上不再处理仅在2.5.1出现的不兼容问题。
同时，本Mod对2.6.0与2.6.1的支持已经终止，最后一个明确支持2.6.0与2.6.1的版本是v0.0.20，之后的版本不可能在2.7.0以下的版本运行。

本Mod对2.5.1的支持已经终止，v0.0.18p28是最后一个明确支持2.5.1的版本，尽管在此之后的版本可能可以在2.5.1正常运行，但原则上不再处理仅在2.5.1出现的不兼容问题。

### 关于MOD语言

Expand Down
153 changes: 110 additions & 43 deletions dependencies.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,57 +34,124 @@
* For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph
*/
dependencies {

api("com.github.GTNewHorizons:NotEnoughEnergistics:1.5.1:dev")
api("com.github.GTNewHorizons:StructureLib:1.3.1:dev")
api('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.06:dev')
api("com.github.GTNewHorizons:StructureLib:1.4.0:dev")
api("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
api("com.github.GTNewHorizons:NotEnoughItems:2.5.27-GTNH:dev")
api("com.github.GTNewHorizons:GTNHLib:0.2.11:dev")
api("com.github.GTNewHorizons:ModularUI:1.1.42:dev")
api("com.github.GTNewHorizons:ModularUI2:2.1.2-1.7.10:dev")
api("com.github.GTNewHorizons:waila:1.7.3:dev")
api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-356-GTNH:dev")
api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.2.29-gtnh:dev")


api("com.github.GTNewHorizons:Avaritia:1.49:dev")
api("com.github.GTNewHorizons:Avaritiaddons:1.7.1-GTNH:dev")
api('com.github.GTNewHorizons:Angelica:1.0.0-alpha42:api') { transitive = false }
api("com.github.GTNewHorizons:AppleCore:3.3.0:dev") { transitive = false }
api("com.github.GTNewHorizons:NotEnoughItems:2.6.51-GTNH:dev")
api("com.github.GTNewHorizons:NotEnoughIds:2.1.6:dev")
api("com.github.GTNewHorizons:GTNHLib:0.5.22:dev")
api("com.github.GTNewHorizons:ModularUI:1.2.17:dev")
api("com.github.GTNewHorizons:ModularUI2:2.1.16-1.7.10:dev")
// api("com.github.GTNewHorizons:ModularUI2:99.99.99:dev")
api("com.github.GTNewHorizons:waila:1.8.2:dev")
api("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-501-GTNH:dev")
api("com.github.GTNewHorizons:AE2FluidCraft-Rework:1.3.51-gtnh:dev")
api('com.github.GTNewHorizons:Yamcl:0.6.0:dev')
api("com.github.GTNewHorizons:Postea:1.0.13:dev")

compileOnlyApi('com.github.GTNewHorizons:ThaumicTinkerer:2.10.2:dev')
compileOnlyApi("com.github.GTNewHorizons:Mobs-Info:0.4.7-GTNH:dev")
compileOnlyApi("com.github.GTNewHorizons:Navigator:1.0.15:dev")
api('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}
// Required to prevent an older bauble api from Extra Utilities from loading first in the javac classpath
compileOnly('com.github.GTNewHorizons:Baubles:1.0.4:dev') {transitive=false}

devOnlyNonPublishable("com.github.GTNewHorizons:Infernal-Mobs:1.10.0-GTNH:dev")

api("com.github.GTNewHorizons:Avaritia:1.56:dev")

api('com.github.GTNewHorizons:Angelica:1.0.0-beta26:api') { transitive = false }
api("com.github.GTNewHorizons:AppleCore:3.3.4:dev") { transitive = false }
api("com.github.GTNewHorizons:BuildCraft:7.1.39:dev") { transitive = false }
api("com.github.GTNewHorizons:EnderIO:2.7.4:dev") { transitive = false }

api("com.github.GTNewHorizons:ForestryMC:4.8.9:dev") { transitive = false }
api("com.github.GTNewHorizons:Railcraft:9.15.8:dev") { transitive = false }
api("com.github.GTNewHorizons:EnderIO:2.8.22:dev") { transitive = false }
api("com.github.GTNewHorizons:ForestryMC:4.9.19:dev") { transitive = false }
api("com.github.GTNewHorizons:ProjectRed:4.10.5-GTNH:dev") { transitive = false }
api("com.github.GTNewHorizons:Railcraft:9.15.15:dev") { transitive = false }

//compileOnly("TGregworks:TGregworks:1.7.10-GTNH-1.0.26:deobf") {transitive = false}
compileOnly("com.github.GTNewHorizons:ThaumicBases:1.7.7:dev") { transitive = false }
api("com.github.GTNewHorizons:EnderCore:0.4.6:dev") { transitive = false }
api("com.github.GTNewHorizons:Galacticraft:3.1.5-GTNH:dev") { transitive = false }
api("com.github.GTNewHorizons:TinkersConstruct:1.11.15-GTNH:dev") { transitive = true }
api("com.github.GTNewHorizons:Chisel:2.14.1-GTNH:dev") { transitive = false }
compileOnly('com.github.GTNewHorizons:VisualProspecting:1.3.28:dev') { transitive = false }
api("com.github.GTNewHorizons:Galaxy-Space-GTNH:1.1.100-GTNH:dev") { transitive = false }

api("com.github.GTNewHorizons:Galacticraft:3.2.8-GTNH:dev") { transitive = false }
api("com.github.GTNewHorizons:TinkersConstruct:1.12.16-GTNH:dev")

api("com.github.GTNewHorizons:Chisel:2.15.3-GTNH:dev") { transitive = false }
api("com.github.GTNewHorizons:Translocators:1.2.1:dev") { transitive = false }
api("curse.maven:cofh-core-69162:2388751") { transitive = false }
api("com.github.GTNewHorizons:Nuclear-Control:2.6.2:dev") { transitive = false }
api("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
api('com.github.GTNewHorizons:Botania:1.10.12-GTNH:dev') { transitive = false }
api('com.github.GTNewHorizons:HoloInventory:2.4.7-GTNH:dev') { transitive = false }
api('com.github.GTNewHorizons:BlockRenderer6343:1.1.6:dev')
api("com.google.auto.value:auto-value-annotations:1.10.1") { transitive = false }
api rfg.deobf("curse.maven:cofh-core-69162:2388751")
api("com.github.GTNewHorizons:Nuclear-Control:2.6.7:dev") { transitive = false }
api("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
implementation("com.github.GTNewHorizons:Hodgepodge:2.6.0:dev")
api('com.github.GTNewHorizons:Botania:1.12.1-GTNH:dev') { transitive = false }
api('com.github.GTNewHorizons:HoloInventory:2.4.13-GTNH:dev') { transitive = false }
api rfg.deobf("curse.maven:extra-utilities-225561:2264384")
compileOnly rfg.deobf('curse.maven:minefactory-reloaded-66672:2366150')
api("com.github.GTNewHorizons:OpenComputers:1.10.27-GTNH:dev") {transitive = false}
// https://www.curseforge.com/minecraft/mc-mods/advancedsolarpanels
api rfg.deobf('curse.maven:advsolar-362768:2885953')
api('com.github.GTNewHorizons:ThaumicEnergistics:1.6.27-GTNH:dev') {transitive = false}
api("com.github.GTNewHorizons:BloodMagic:1.6.9:dev") { transitive = false }
api("com.github.GTNewHorizons:CraftTweaker:3.4.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.7.0-GTNH:dev") { transitive = false }
compileOnly rfg.deobf("curse.maven:biomes-o-plenty-220318:2499612")

compileOnly('com.github.GTNewHorizons:SC2:2.2.0:dev') {transitive=false}
compileOnly('com.github.GTNewHorizons:Binnie:2.4.4:dev') {transitive = false}
api('curse.maven:PlayerAPI-228969:2248928') {transitive=false}
api('com.github.GTNewHorizons:BlockRenderer6343:1.2.16:dev'){transitive=false}

compileOnly("com.google.auto.value:auto-value-annotations:1.10.1") { transitive = false }
annotationProcessor("com.google.auto.value:auto-value:1.10.1")
api('com.github.GTNewHorizons:GTplusplus:1.11.58:dev')

api("com.github.GTNewHorizons:OpenComputers:1.9.14-GTNH:dev")
api('com.github.GTNewHorizons:GT5-Unofficial:5.09.45.163:dev')
api("com.github.GTNewHorizons:ForgeMultipart:1.4.8:dev") { transitive = false }
api("com.github.GTNewHorizons:ae2stuff:0.8.2-GTNH:dev")
api("com.github.GTNewHorizons:CraftTweaker:3.3.1:dev") { transitive = false }
api('com.github.GTNewHorizons:GigaGramFab:0.3.19:dev')

// For testing forestry integration (iApiary, combs, tree growth simulator)
// runtimeOnlyNonPublishable("com.github.GTNewHorizons:ForestryMC:4.9.19:dev")
// runtimeOnlyNonPublishable('com.github.GTNewHorizons:neiaddons:1.16.0:dev')
// runtimeOnlyNonPublishable('com.github.GTNewHorizons:MagicBees:2.8.5-GTNH:dev')
// runtimeOnlyNonPublishable('com.github.GTNewHorizons:Binnie:2.4.4:dev')

// testImplementation(platform('org.junit:junit-bom:5.9.2'))
// testImplementation('org.junit.jupiter:junit-jupiter')
// testImplementation("org.mockito:mockito-core:3.+")

// functionalTestImplementation(platform('org.junit:junit-bom:5.9.2'))
//functionalTestImplementation('org.junit.jupiter:junit-jupiter')
// functionalTestImplementation('org.junit.platform:junit-platform-engine')
// functionalTestImplementation('org.junit.platform:junit-platform-launcher')
// functionalTestImplementation('org.junit.platform:junit-platform-reporting')

runtimeOnlyNonPublishable("com.github.GTNewHorizons:DuraDisplay:1.3.4:dev")
api('com.github.GTNewHorizons:EnderIO:2.8.22:dev')

// For testing
//runtimeOnlyNonPublishable('com.github.GTNewHorizons:TCNEIAdditions:1.4.2:dev')

// Speeds up mod identification and loading in dev
// runtimeOnlyNonPublishable(rfg.deobf("CoreTweaks:CoreTweaks:0.3.3.2"))


api("com.github.GTNewHorizons:NotEnoughEnergistics:1.6.4:dev")
api("com.github.GTNewHorizons:OpenComputers:1.11.0-GTNH:dev")

api("com.github.GTNewHorizons:ForgeMultipart:1.5.0:dev") { transitive = false }
api("com.github.GTNewHorizons:ae2stuff:0.8.5-GTNH:dev")
api("com.github.GTNewHorizons:CraftTweaker:3.4.0:dev") { transitive = false }


api("com.github.GTNewHorizons:ProjectRed:4.9.3-GTNH:dev")
api("com.github.GTNewHorizons:MrTJPCore:1.1.6:dev")
api("com.github.GTNewHorizons:ProjectRed:4.10.5-GTNH:dev")
api("com.github.GTNewHorizons:MrTJPCore:1.2.1:dev")

api('com.github.GTNewHorizons:Navigator:1.0.12:dev')
api('com.github.GTNewHorizons:Navigator:1.0.15:dev')
runtimeOnlyNonPublishable(rfg.deobf('maven.modrinth:journeymap:5.2.6'))

api("com.github.GTNewHorizons:Baubles:1.0.4:dev")
api("com.github.GTNewHorizons:ironchest:6.0.85:dev")

api("com.github.GTNewHorizons:ironchest:6.0.87:dev")



////////



}
4 changes: 2 additions & 2 deletions src/main/java/reobf/proghatches/ae/BlockStorageProxy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import appeng.items.tools.quartz.ToolQuartzCuttingKnife;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.common.blocks.GT_Material_Machines;
import gregtech.common.blocks.MaterialMachines;
import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
Expand All @@ -35,7 +35,7 @@ public class BlockStorageProxy extends BlockContainer implements INameAndToolti
private IIcon blockIconAlt2;
public BlockStorageProxy() {

super(new GT_Material_Machines());
super(new MaterialMachines());

setHardness(1);
setHarvestLevel("pickaxe", 1);
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/reobf/proghatches/ae/ItemPartMAP2P.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import appeng.api.parts.IPartItem;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.GTValues;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
Expand Down Expand Up @@ -40,10 +40,10 @@ public IPart createPartFromItemStack(ItemStack is) {
public String getItemStackDisplayName(ItemStack stack) {
/*int damage=stack.getItemDamage();
if(damage>=1&&damage<=15){
return StatCollector.translateToLocalFormatted("item.proghatches.part.eu.source.superconduct.name",GT_Values.VN[damage-1]);
return StatCollector.translateToLocalFormatted("item.proghatches.part.eu.source.superconduct.name",GTValues.VN[damage-1]);
}
if(damage>=16&&damage<=30){
return StatCollector.translateToLocalFormatted("item.proghatches.part.eu.source.normal.name",GT_Values.VN[damage-16]);
return StatCollector.translateToLocalFormatted("item.proghatches.part.eu.source.normal.name",GTValues.VN[damage-16]);
} */
return super.getItemStackDisplayName(stack);
}
Expand Down
Loading

0 comments on commit a2d05aa

Please sign in to comment.