Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adjust hardcoded vanilla trades #104

Merged
merged 5 commits into from
Dec 17, 2024
Merged

adjust hardcoded vanilla trades #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e8622b4
adjust hardcoded vanilla trades
chochem Dec 17, 2024
a6eb880
add gt5 loaded check
chochem Dec 17, 2024
0756821
Update VanillaVillagerTradesLoader.java
kuba6000 Dec 17, 2024
4c353b3
bs
kuba6000 Dec 17, 2024
3245296
Update dependencies.gradle
kuba6000 Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,31 +35,31 @@
*/

dependencies {
api("com.github.GTNewHorizons:NotEnoughItems:2.6.34-GTNH:dev")
devOnlyNonPublishable("com.github.GTNewHorizons:EnderIO:2.8.17:dev")
api("com.github.GTNewHorizons:NotEnoughItems:2.6.51-GTNH:dev")
devOnlyNonPublishable("com.github.GTNewHorizons:EnderIO:2.8.22:dev")
devOnlyNonPublishable(rfg.deobf("curse.maven:Infernal-Mobs-227875:2227584"))
compileOnly("com.github.GTNewHorizons:BetterLoadingScreen:1.7.0-GTNH:dev") { transitive = false }
compileOnly("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Draconic-Evolution:1.3.9-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.9-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ThaumicHorizons:1.6.3:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:WirelessCraftingTerminal:1.11.6:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Hardcore-Ender-Expansion:1.11.2-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Botania:1.11.5-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:harvestcraft:1.2.1-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:OpenBlocks:1.10.1-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Draconic-Evolution:1.3.14-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.16-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ThaumicHorizons:1.6.5:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:WirelessCraftingTerminal:1.11.7:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Hardcore-Ender-Expansion:1.12.0-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Botania:1.12.1-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:harvestcraft:1.2.3-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:OpenBlocks:1.10.2-GTNH:dev") { transitive = false }
compileOnly('com.github.GTNewHorizons:OpenModsLib:0.11.1:dev') { transitive = false }
compileOnly("com.github.GTNewHorizons:BloodArsenal:1.3.2:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.3:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ThaumicTinkerer:2.10.1:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BloodArsenal:1.3.4:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:BloodMagic:1.6.9:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ThaumicTinkerer:2.10.2:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ForbiddenMagic:0.7.0-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Electro-Magic-Tools:1.5.12:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:WitchingGadgets:1.5.14-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.49.63:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Hardcore-Ender-Expansion:1.11.2-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.10:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ThaumicBases:1.7.5:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Electro-Magic-Tools:1.6.0:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:WitchingGadgets:1.5.17-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:GT5-Unofficial:5.09.51.09:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:Hardcore-Ender-Expansion:1.12.0-GTNH:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ForestryMC:4.9.19:dev") { transitive = false }
compileOnly("com.github.GTNewHorizons:ThaumicBases:1.8.0:dev") { transitive = false }
compileOnly(rfg.deobf("curse.maven:witchery-69673:2234410"))
compileOnly(rfg.deobf("curse.maven:Automagy-222153:2285272"))
compileOnly(rfg.deobf("curse.maven:edit-mob-drops-348932:4458014"))
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pluginManagement {
}

plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.29'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30'
}


8 changes: 7 additions & 1 deletion src/main/java/com/kuba6000/mobsinfo/loader/VanillaVillagerTradesLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

import com.kuba6000.mobsinfo.api.VillagerTrade;

import cpw.mods.fml.common.Loader;

public class VanillaVillagerTradesLoader {

public static HashMap<Integer, ArrayList<VillagerTrade>> vanillaTrades = new HashMap<>();
Expand Down Expand Up @@ -66,7 +68,11 @@ public static void init() {

{ // profession 2
ArrayList<VillagerTrade> recipes = new ArrayList<>();
recipes.add(new VillagerTrade(Items.emerald, null, Items.ender_eye, 0.3d));
// TODO: This file should not depend on other mods
// TODO: Add an API to do it instead!
if (!Loader.isModLoaded("dreamcraft")) {
recipes.add(new VillagerTrade(Items.emerald, null, Items.ender_eye, 0.3d));
}
recipes.add(new VillagerTrade(Items.emerald, null, Items.experience_bottle, 0.2d));
recipes.add(new VillagerTrade(Items.emerald, null, Items.redstone, 0.4d));
recipes.add(new VillagerTrade(Items.emerald, null, Item.getItemFromBlock(Blocks.glowstone), 0.3d));
Expand Down