Skip to content

Update for drops rework #2

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

Merged
merged 1 commit into from
Aug 27, 2022
Merged

Update for drops rework #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 12 additions & 6 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ repositories {
maven {
url "https://harleyoconnor.com/maven"
}
maven {
name "blamejared"
url "https://maven.blamejared.com/"
}
flatDir {
dirs("libs")
}
Expand Down Expand Up @@ -124,10 +128,12 @@ dependencies {
// Not sure if we need this one, what is a "forge" anyway?
minecraft "net.minecraftforge:forge:${mcVersion}-${property("forgeVersion")}"

// Compile Hwyla API, but don't include in runtime.
compileOnly fg.deobf("mcp.mobius.waila:Hwyla:${property("hwylaVersion")}:api")
// At runtime, use the full Hwyla mod.
runtimeOnly fg.deobf("mcp.mobius.waila:Hwyla:${property("hwylaVersion")}")
// Temp as TehNut Maven is down.
implementation(fg.deobf("curse.maven:hwyla-253449:3033593"))
// // Compile Hwyla API, but don't include in runtime.
// compileOnly fg.deobf("mcp.mobius.waila:Hwyla:${property("hwylaVersion")}:api")
// // At runtime, use the full Hwyla mod.
// runtimeOnly fg.deobf("mcp.mobius.waila:Hwyla:${property("hwylaVersion")}")

// Compile JEI API, but don't include in runtime.
compileOnly fg.deobf("mezz.jei:jei-${mcVersion}:${property("jeiVersion")}:api")
Expand All @@ -142,8 +148,8 @@ dependencies {
// Compile Dynamic Trees Plus
runtimeOnly fg.deobf("com.ferreusveritas.dynamictreesplus:DynamicTreesPlus-${mcVersion}:${property("dynamicTreesPlusVersion")}")

implementation fg.deobf("curse.maven:autoreglib-250363:3326041")
implementation fg.deobf("curse.maven:quark-243121:3538744")
implementation fg.deobf("vazkii.autoreglib:AutoRegLib:${property("arlVersion")}")
implementation fg.deobf("vazkii.quark:Quark:${property("quarkVersion")}")

runtimeOnly fg.deobf("curse.maven:cc-tweaked-282001:3236650")

Expand Down
10 changes: 6 additions & 4 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@ modVersion=2.1.2
group=com.maxhyper.dtquark

mcVersion=1.16.5
forgeVersion=36.2.22
forgeVersion=36.2.34

dynamicTreesVersion=0.10.0-Beta32.6
dynamicTreesPlusVersion=0.1.0-Beta12
dynamicTreesVersion=0.10.0-Beta-LR6
dynamicTreesPlusVersion=0.1.0-Beta-LR1
hwylaVersion=1.10.11-B78_1.16.2
jeiVersion=7.7.0.104
jeiVersion=7.7.1.139
arlVersion=1.6-49.90
quarkVersion=r2.4-322.1
suggestionProviderFixVersion=1.0.0
patchouliVersion=1.16.4-50

Expand Down
1 change: 0 additions & 1 deletion src/main/java/maxhyper/dtquark/DynamicTreesQuark.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ private void clientSetup(final FMLClientSetupEvent event) {
}

public void gatherData(final GatherDataEvent event) {
Resources.MANAGER.gatherData();
GatherDataHelper.gatherAllData(
MOD_ID,
event,
Expand Down
66 changes: 66 additions & 0 deletions src/main/resources/data/dtquark/loot_tables/blocks/fiery_blossom_leaves.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:alternative",
"terms": [
{
"condition": "minecraft:match_tool",
"predicate": {
"item": "minecraft:shears"
}
},
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
]
}
],
"name": "quark:red_blossom_leaves"
},
{
"type": "dynamictrees:seed_item",
"conditions": [
{
"condition": "minecraft:survives_explosion"
},
{
"condition": "minecraft:table_bonus",
"enchantment": "minecraft:fortune",
"chances": [
0.015625,
0.03125,
0.046875,
0.0625
]
},
{
"condition": "dynamictrees:seasonal_seed_drop_chance"
}
]
}
]
}
]
}
]
}
66 changes: 66 additions & 0 deletions src/main/resources/data/dtquark/loot_tables/blocks/frosty_blossom_leaves.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:alternative",
"terms": [
{
"condition": "minecraft:match_tool",
"predicate": {
"item": "minecraft:shears"
}
},
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
]
}
],
"name": "quark:blue_blossom_leaves"
},
{
"type": "dynamictrees:seed_item",
"conditions": [
{
"condition": "minecraft:survives_explosion"
},
{
"condition": "minecraft:table_bonus",
"enchantment": "minecraft:fortune",
"chances": [
0.015625,
0.03125,
0.046875,
0.0625
]
},
{
"condition": "dynamictrees:seasonal_seed_drop_chance"
}
]
}
]
}
]
}
]
}
66 changes: 66 additions & 0 deletions src/main/resources/data/dtquark/loot_tables/blocks/serene_blossom_leaves.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:alternative",
"terms": [
{
"condition": "minecraft:match_tool",
"predicate": {
"item": "minecraft:shears"
}
},
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
]
}
],
"name": "quark:lavender_blossom_leaves"
},
{
"type": "dynamictrees:seed_item",
"conditions": [
{
"condition": "minecraft:survives_explosion"
},
{
"condition": "minecraft:table_bonus",
"enchantment": "minecraft:fortune",
"chances": [
0.015625,
0.03125,
0.046875,
0.0625
]
},
{
"condition": "dynamictrees:seasonal_seed_drop_chance"
}
]
}
]
}
]
}
]
}
66 changes: 66 additions & 0 deletions src/main/resources/data/dtquark/loot_tables/blocks/sunny_blossom_leaves.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
"type": "minecraft:block",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:alternatives",
"children": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:alternative",
"terms": [
{
"condition": "minecraft:match_tool",
"predicate": {
"item": "minecraft:shears"
}
},
{
"condition": "minecraft:match_tool",
"predicate": {
"enchantments": [
{
"enchantment": "minecraft:silk_touch",
"levels": {
"min": 1
}
}
]
}
}
]
}
],
"name": "quark:yellow_blossom_leaves"
},
{
"type": "dynamictrees:seed_item",
"conditions": [
{
"condition": "minecraft:survives_explosion"
},
{
"condition": "minecraft:table_bonus",
"enchantment": "minecraft:fortune",
"chances": [
0.015625,
0.03125,
0.046875,
0.0625
]
},
{
"condition": "dynamictrees:seasonal_seed_drop_chance"
}
]
}
]
}
]
}
]
}
Loading