Skip to content

Update for drops rework #1

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 #1

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
4 changes: 4 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,10 @@ minecraft {
}
}

sourceSets.main.resources {
srcDir("src/generated/resources")
}

dependencies {
minecraft "net.minecraftforge:forge:${mcVersion}-${property("forgeVersion")}"

Expand Down
130 changes: 130 additions & 0 deletions src/generated/resources/data/dtupgradeaquatic/loot_tables/blocks/river_leaves.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
{
"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": "upgrade_aquatic:river_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"
}
]
}
]
}
]
},
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:table_bonus",
"enchantment": "minecraft:fortune",
"chances": [
0.02,
0.022222223,
0.025,
0.033333335,
0.1
]
}
],
"functions": [
{
"function": "minecraft:set_count",
"count": {
"min": 1.0,
"max": 2.0,
"type": "minecraft:uniform"
}
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "minecraft:stick"
}
],
"conditions": [
{
"condition": "minecraft:inverted",
"term": {
"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
}
}
]
}
}
]
}
}
]
}
]
}
39 changes: 39 additions & 0 deletions src/generated/resources/data/dtupgradeaquatic/loot_tables/trees/branches/river.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"type": "dynamictrees:branches",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "dynamictrees:multiply_logs_count"
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "upgrade_aquatic:river_log"
}
]
},
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "dynamictrees:multiply_sticks_count"
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "minecraft:stick"
}
]
}
]
}
39 changes: 39 additions & 0 deletions src/generated/resources/data/dtupgradeaquatic/loot_tables/trees/branches/stripped_river.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"type": "dynamictrees:branches",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "dynamictrees:multiply_logs_count"
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "upgrade_aquatic:stripped_river_log"
}
]
},
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"functions": [
{
"function": "dynamictrees:multiply_sticks_count"
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "minecraft:stick"
}
]
}
]
}
66 changes: 66 additions & 0 deletions src/generated/resources/data/dtupgradeaquatic/loot_tables/trees/leaves/river.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
"type": "dynamictrees:leaves",
"pools": [
{
"rolls": 1,
"entries": [
{
"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"
}
]
}
]
},
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "minecraft:table_bonus",
"enchantment": "minecraft:fortune",
"chances": [
0.02,
0.022222223,
0.025,
0.033333335,
0.1
]
}
],
"functions": [
{
"function": "minecraft:set_count",
"count": {
"min": 1.0,
"max": 2.0,
"type": "minecraft:uniform"
}
},
{
"function": "minecraft:explosion_decay"
}
],
"name": "minecraft:stick"
}
]
}
]
}
20 changes: 20 additions & 0 deletions src/generated/resources/data/dtupgradeaquatic/loot_tables/trees/voluntary/mulberry.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"type": "dynamictrees:voluntary",
"pools": [
{
"rolls": 1,
"entries": [
{
"type": "minecraft:item",
"conditions": [
{
"condition": "dynamictrees:voluntary_seed_drop_chance",
"rarity": 1.0
}
],
"name": "dtupgradeaquatic:mulberry_seed"
}
]
}
]
}
0 ...trees/tags/blocks/branches_that_burn.json → ...ctrees/tags/items/branches_that_burn.json
View file
Open in desktop
File renamed without changes.
18 changes: 4 additions & 14 deletions src/main/java/maxhyper/dtupgradeaquatic/DynamicTreesUpgradeAquatic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@

import com.ferreusveritas.dynamictrees.api.GatherDataHelper;
import com.ferreusveritas.dynamictrees.api.registry.RegistryHandler;
import com.ferreusveritas.dynamictrees.blocks.leaves.LeavesProperties;
import com.ferreusveritas.dynamictrees.blocks.rootyblocks.SoilProperties;
import com.ferreusveritas.dynamictrees.init.DTConfigs;
import com.ferreusveritas.dynamictrees.trees.Family;
import com.ferreusveritas.dynamictrees.trees.Species;
import com.minecraftabnormals.upgrade_aquatic.core.registry.UAFeatures;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.ISeedReader;
Expand All @@ -27,8 +23,8 @@

// The value here should match an entry in the META-INF/mods.toml file
@Mod(DynamicTreesUpgradeAquatic.MOD_ID)
public class DynamicTreesUpgradeAquatic
{
public class DynamicTreesUpgradeAquatic {

public static final String MOD_ID = "dtupgradeaquatic";

public DynamicTreesUpgradeAquatic() {
Expand Down Expand Up @@ -67,14 +63,8 @@ private void clientSetup(final FMLClientSetupEvent event) {
}

public void gatherData(final GatherDataEvent event) {
GatherDataHelper.gatherAllData(
MOD_ID,
event,
SoilProperties.REGISTRY,
Family.REGISTRY,
Species.REGISTRY,
LeavesProperties.REGISTRY
);;
GatherDataHelper.gatherTagData(MOD_ID, event);
GatherDataHelper.gatherLootData(MOD_ID, event);
}

}
6 changes: 0 additions & 6 deletions src/main/resources/data/dynamictrees/tags/blocks/leaves.json
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions src/main/resources/data/dynamictrees/tags/blocks/saplings.json
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions src/main/resources/data/dynamictrees/tags/blocks/stripped_branches_that_burn.json
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions src/main/resources/data/dynamictrees/tags/items/seeds.json
View file
Open in desktop

This file was deleted.

Loading