Skip to content
This repository has been archived by the owner on Jun 25, 2023. It is now read-only.

Commit

Permalink
updated mantle, fixed block tags not generating, generated block tags
Browse files Browse the repository at this point in the history
  • Loading branch information
screret committed May 3, 2023
1 parent 487609f commit f51cfea
Show file tree
Hide file tree
Showing 185 changed files with 1,823 additions and 33 deletions.
6 changes: 5 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ loom {
accessWidenerPath = file("src/main/resources/tinkers.accesswidener")

runs {
client {
vmArg "-Dlog4j.configurationFile=${file("log4j2.xml")}"
}

datagen {
client()

Expand Down Expand Up @@ -144,7 +148,7 @@ dependencies {
modImplementation(include("curse.maven:forge-config-api-port-fabric-547434:${forge_config_version}"))
modImplementation("com.github.AlphaMode:fakeconfig:master-SNAPSHOT") { exclude(group: "net.fabricmc.fabric-api") }
modImplementation("com.github.AlphaMode:fakeconfigtoml:fb8d12b") { exclude(group: "net.fabricmc.fabric-api") }
include(modImplementation(files("libs/Mantle-1.19.2-1.9.DEV.37333e3c.jar")))
include(modImplementation(files("libs/Mantle-1.19.2-1.9.DEV.2bf39ad2.jar")))
include("io.github.tropheusj:serialization-hooks:0.3.26")
modImplementation(include("io.github.tropheusj:milk-lib:1.0.51"))
modImplementation(include("com.jamieswhiteshirt:reach-entity-attributes:${project.reach_entity_attributes_version}"))
Expand Down
Binary file not shown.
29 changes: 29 additions & 0 deletions log4j2.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="WARN" packages="com.mojang.logging,com.mojang.util,net.fabricmc.loader.impl.launch.knot.Knot">
<Appenders>
<Console name="SysOut" target="SYSTEM_OUT">
<PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
</Console>
<Queue name="ServerGuiConsole">
<PatternLayout pattern="[%d{HH:mm:ss} %level]: %msg%n" />
</Queue>
<RollingRandomAccessFile name="File" fileName="logs/latest.log" filePattern="logs/%d{yyyy-MM-dd}-%i.log.gz">
<PatternLayout pattern="[%d{HH:mm:ss}] [%t/%level]: %msg%n" />
<Policies>
<TimeBasedTriggeringPolicy />
<OnStartupTriggeringPolicy />
</Policies>
<DefaultRolloverStrategy max="1000"/>
</RollingRandomAccessFile>
</Appenders>
<Loggers>
<Logger level="debug" name="com.mojang"/>
<Logger level="debug" name="net.minecraft"/>
<Logger level="debug" name="net.fabricmc"/>
<Root level="all">
<AppenderRef ref="SysOut"/>
<AppenderRef ref="File"/>
<AppenderRef ref="ServerGuiConsole"/>
</Root>
</Loggers>
</Configuration>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2023-05-03T16:08:57.9652516 Tags for minecraft:item
// 1.19.2 2023-05-03T18:29:12.193288 Tags for minecraft:item
2fd24e5c7ca9a9cfd069192a4c100ff9a1ffceb3 data\tconstruct\tags\items\modifiable\multipart.json
8a23702b05296c8af5014d6aa6e9265ded85c7d9 data\c\tags\items\storage_blocks\rose_gold.json
8a23702b05296c8af5014d6aa6e9265ded85c7d9 data\c\tags\items\glass_panes\colorless.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2023-05-03T16:08:57.9977515 Tinkers' Construct World Recipes
// 1.19.2 2023-05-03T18:29:12.1427898 Tinkers' Construct World Recipes
e95c80f89e3818f9b02fc6fb21b9ee95637d8c2f data\tconstruct\recipes\world\wood\greenheart\stairs.json
a250435f8ce9b54d78b47dcee5534b4da306fb69 data\tconstruct\recipes\world\wood\bloodshroom\pressure_plate.json
6e141e104b90f830b3b04069b5cb326be637d1cc data\tconstruct\recipes\common\slime\ichor\congealed.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2023-05-03T16:08:57.9947532 Tags for minecraft:worldgen/biome
// 1.19.2 2023-05-03T18:29:12.1992881 Tags for minecraft:worldgen/biome
c2b7ee8eddb12f639902238a4c0fcf8b61b1528d data\tconstruct\tags\worldgen\biome\islands\enderslime.json
54a471c7ae6beba51f1b4bfd207374dad298da2f data\tconstruct\tags\worldgen\biome\islands\skyslime.json
d079b44eb9f4335df31c4b98d5c3179f594dc8a6 data\tconstruct\tags\worldgen\biome\islands\blood.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2023-05-03T16:08:57.9972515 Tinkers' Construct Fluid Tooltip Provider
// 1.19.2 2023-05-03T18:29:12.1457876 Tinkers' Construct Fluid Tooltip Provider
fb9453d6 assets\tconstruct\mantle\fluid_tooltips\foundry.json
9a97ee94 assets\tconstruct\mantle\fluid_tooltips\potion.json
e5339421 assets\tconstruct\mantle\fluid_tooltips\small_gems.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2023-05-03T16:08:57.9927528 Global Loot Modifiers : tconstruct
// 1.19.2 2023-05-03T18:29:12.1987917 Global Loot Modifiers : tconstruct
d65529a778f7bd1c08495ba5af6c83ec73b45117 data\tconstruct\loot_modifiers\lustrous\silver.json
ec73cfc2bdcc3d9d8f6ce36146ccc3d27bc29d38 data\tconstruct\loot_modifiers\lustrous\tin.json
400c5427f3b3365a631ed3550a7655980c5b9b9c data\tconstruct\loot_modifiers\lustrous\tungsten.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2023-05-03T16:08:57.9737519 Tinkers' Construct Smeltery Recipes
// 1.19.2 2023-05-03T18:29:12.1477874 Tinkers' Construct Smeltery Recipes
aa0e0344596666d439383923b31bfa9a447ea0ee data\tconstruct\recipes\smeltery\melting\metal\rose_gold\wire.json
e0e4cbb3ad3ba1c0e8aafa71cc9c79d3f7ed8a9a data\tconstruct\recipes\smeltery\casting\metal\amethyst_bronze\block.json
4901aed5fb0a54a133f3172c40f0005228b7991e data\tconstruct\recipes\smeltery\casting\metal\iron\coin_sand_cast.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2023-05-03T16:08:57.955253 Tinkers' Construct Common Recipes
// 1.19.2 2023-05-03T18:29:12.1962888 Tinkers' Construct Common Recipes
9562545f778fae44a131d3de11e01a4ba7516bb4 data\tconstruct\advancements\recipes\tconstruct\general\common\glass\red_clear_stained_glass.json
5bf12dcb4551dc9ed849d9c34f33f314b4d18dc0 data\tconstruct\recipes\common\copper_platform_waxing_unaffected.json
67546e573f6698dc6a7685bbe856bdd4835c6c29 data\tconstruct\advancements\recipes\tconstruct\general\common\glass\brown_clear_stained_glass_pane.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2023-05-03T16:08:57.9967519 Tinkers' Construct Fluid Container Transfer
// 1.19.2 2023-05-03T18:29:12.1472889 Tinkers' Construct Fluid Container Transfer
c727e6c6 data\tconstruct\mantle\fluid_transfer\rabbit_stew_fill.json
d7cba5f6 data\tconstruct\mantle\fluid_transfer\venom_bottle_fill.json
dec8eb02 data\tconstruct\mantle\fluid_transfer\potion_water.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2023-05-03T16:08:57.9627525 Tinkers' Construct Gadget Recipes
// 1.19.2 2023-05-03T18:29:12.1407889 Tinkers' Construct Gadget Recipes
98109ee21bb5dc0344967da664895853bfbe71a7 data\tconstruct\recipes\gadgets\cake\earth.json
d6cffc0cf3689b96412518aa63f77320535b8ddf data\tconstruct\recipes\gadgets\cake\ender.json
f9b0add7b2a8f9da2485390c1e7fd9a4039b8fd8 data\tconstruct\advancements\recipes\tconstruct\gadgets\gadgets\fancy_frame\reversed_reversed_gold.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2023-05-03T16:08:57.9937519 Tinkers' Construct Table Recipes
// 1.19.2 2023-05-03T18:29:12.1957886 Tinkers' Construct Table Recipes
f7be4073d8cb5ce3a95772b0e3683a15f9ea2bc2 data\tconstruct\recipes\tables\tinker_station_damaging\lingering_one.json
615e98d444a28584de012fa046b022da05b386f4 data\tconstruct\recipes\tables\modifier_worktable.json
941c71165d6458535ab2d986988f88e92844f629 data\tconstruct\recipes\tables\tinker_station_repair.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2023-05-03T16:08:57.9957515 Tinkers' Construct Advancements
// 1.19.2 2023-05-03T18:29:12.1662878 Tinkers' Construct Advancements
ce6ab07b data\tconstruct\advancements\smeltery\abilities.json
c951831e data\tconstruct\advancements\tools\tool_smith.json
8d0138f3 data\tconstruct\advancements\world\clay_island.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
// 1.19.2 2023-05-03T16:08:57.9952527 Tags for minecraft:block_entity_type
// 1.19.2 2023-05-03T18:29:12.1392871 Tags for minecraft:block_entity_type
5e75ed6c8d0c8031e9eb574c945acba3386bc65e data\tconstruct\tags\block_entity_type\crafting_station_blacklist.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2023-05-03T16:08:57.9997512 TConstruct LootTables
// 1.19.2 2023-05-03T18:29:12.1902916 TConstruct LootTables
7c610c36afa6dedbc209b3bc5f1e58e9341c8e4e data\tconstruct\loot_tables\blocks\nahuatl_slab.json
f5ba74d9c80b7592d0f9ee40108298872a55cc41 data\tconstruct\loot_tables\blocks\chiseled_scorched_bricks.json
da0e8654c030e58c62279c85cf0d71d955777463 data\tconstruct\loot_tables\blocks\greenheart_button.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2023-05-03T16:08:57.9687529 Tags for minecraft:fluid
// 1.19.2 2023-05-03T18:29:12.1672874 Tags for minecraft:fluid
579704151f92dea80df404cbc5eb9827d81a4461 data\c\tags\fluids\molten_steel.json
e77d9e70acb9b72d42a075d356449e1d898158f2 data\tconstruct\tags\fluids\molten_soulsteel.json
1b51c4f23d7f2c50d4198a9b8b19c9a70ca3ee45 data\tconstruct\tags\fluids\rabbit_stew.json
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// 1.19.2 2023-05-03T16:08:57.9642515 Tags for minecraft:entity_type
// 1.19.2 2023-05-03T18:29:12.1462881 Tags for minecraft:entity_type
a104d9e73a1ccd89eca8971ce21eefbbb7d82c54 data\c\tags\entity_types\creepers.json
8baae05908de3b7b01b6c8bbf01664641fb50650 data\c\tags\entity_types\illagers.json
fd38fdeaee44893aa121e6e005f0a7c9a2096f91 data\c\tags\entity_types\slimes.json
Expand Down
6 changes: 6 additions & 0 deletions src/generated/resources/data/c/tags/blocks/andesite.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:andesite"
]
}
6 changes: 6 additions & 0 deletions src/generated/resources/data/c/tags/blocks/basalt.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:basalt"
]
}
6 changes: 6 additions & 0 deletions src/generated/resources/data/c/tags/blocks/blackstone.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:blackstone"
]
}
7 changes: 7 additions & 0 deletions src/generated/resources/data/c/tags/blocks/deepslate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"replace": false,
"values": [
"minecraft:deepslate",
"minecraft:cobbled_deepslate"
]
}
6 changes: 6 additions & 0 deletions src/generated/resources/data/c/tags/blocks/diorite.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"minecraft:diorite"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"replace": false,
"values": [
"tconstruct:greenheart_fence_gate",
"tconstruct:skyroot_fence_gate",
"tconstruct:bloodshroom_fence_gate"
]
}
8 changes: 8 additions & 0 deletions src/generated/resources/data/c/tags/blocks/fences/wooden.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"replace": false,
"values": [
"tconstruct:greenheart_fence",
"tconstruct:skyroot_fence",
"tconstruct:bloodshroom_fence"
]
}
6 changes: 6 additions & 0 deletions src/generated/resources/data/c/tags/blocks/glass/black.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tconstruct:black_clear_stained_glass"
]
}
6 changes: 6 additions & 0 deletions src/generated/resources/data/c/tags/blocks/glass/blue.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tconstruct:blue_clear_stained_glass"
]
}
6 changes: 6 additions & 0 deletions src/generated/resources/data/c/tags/blocks/glass/brown.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tconstruct:brown_clear_stained_glass"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tconstruct:clear_glass"
]
}
6 changes: 6 additions & 0 deletions src/generated/resources/data/c/tags/blocks/glass/cyan.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tconstruct:cyan_clear_stained_glass"
]
}
6 changes: 6 additions & 0 deletions src/generated/resources/data/c/tags/blocks/glass/gray.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tconstruct:gray_clear_stained_glass"
]
}
6 changes: 6 additions & 0 deletions src/generated/resources/data/c/tags/blocks/glass/green.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tconstruct:green_clear_stained_glass"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tconstruct:light_blue_clear_stained_glass"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tconstruct:light_gray_clear_stained_glass"
]
}
6 changes: 6 additions & 0 deletions src/generated/resources/data/c/tags/blocks/glass/lime.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tconstruct:lime_clear_stained_glass"
]
}
6 changes: 6 additions & 0 deletions src/generated/resources/data/c/tags/blocks/glass/magenta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tconstruct:magenta_clear_stained_glass"
]
}
6 changes: 6 additions & 0 deletions src/generated/resources/data/c/tags/blocks/glass/orange.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tconstruct:orange_clear_stained_glass"
]
}
6 changes: 6 additions & 0 deletions src/generated/resources/data/c/tags/blocks/glass/pink.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tconstruct:pink_clear_stained_glass"
]
}
6 changes: 6 additions & 0 deletions src/generated/resources/data/c/tags/blocks/glass/purple.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tconstruct:purple_clear_stained_glass"
]
}
6 changes: 6 additions & 0 deletions src/generated/resources/data/c/tags/blocks/glass/red.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tconstruct:red_clear_stained_glass"
]
}
22 changes: 22 additions & 0 deletions src/generated/resources/data/c/tags/blocks/glass/silica.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"replace": false,
"values": [
"tconstruct:clear_glass",
"tconstruct:white_clear_stained_glass",
"tconstruct:orange_clear_stained_glass",
"tconstruct:magenta_clear_stained_glass",
"tconstruct:light_blue_clear_stained_glass",
"tconstruct:yellow_clear_stained_glass",
"tconstruct:lime_clear_stained_glass",
"tconstruct:pink_clear_stained_glass",
"tconstruct:gray_clear_stained_glass",
"tconstruct:light_gray_clear_stained_glass",
"tconstruct:cyan_clear_stained_glass",
"tconstruct:purple_clear_stained_glass",
"tconstruct:blue_clear_stained_glass",
"tconstruct:brown_clear_stained_glass",
"tconstruct:green_clear_stained_glass",
"tconstruct:red_clear_stained_glass",
"tconstruct:black_clear_stained_glass"
]
}
6 changes: 6 additions & 0 deletions src/generated/resources/data/c/tags/blocks/glass/white.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tconstruct:white_clear_stained_glass"
]
}
6 changes: 6 additions & 0 deletions src/generated/resources/data/c/tags/blocks/glass/yellow.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tconstruct:yellow_clear_stained_glass"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tconstruct:black_clear_stained_glass_pane"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tconstruct:blue_clear_stained_glass_pane"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tconstruct:brown_clear_stained_glass_pane"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tconstruct:clear_glass_pane"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"tconstruct:cyan_clear_stained_glass_pane"
]
}
Loading

0 comments on commit f51cfea

Please sign in to comment.