Fix #4576

VazkiiMods · Jan 14, 2024 · 3462c84 · 3462c84
1 parent 4ab77cb
commit 3462c84
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 33 deletions.
diff --git a/src/main/java/org/violetmoon/quark/content/world/module/AncientWoodModule.java b/src/main/java/org/violetmoon/quark/content/world/module/AncientWoodModule.java
@@ -1,17 +1,5 @@
 package org.violetmoon.quark.content.world.module;
 
-import com.google.common.base.Functions;
-import com.google.common.collect.ImmutableSet;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.ComposterBlock;
-import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
-import net.minecraft.world.level.material.MapColor;
-import net.minecraft.world.level.storage.loot.BuiltInLootTables;
-import net.minecraft.world.level.storage.loot.entries.LootItem;
-import net.minecraft.world.level.storage.loot.entries.LootPoolEntryContainer;
 import com.google.common.base.Functions;
 import com.google.common.collect.ImmutableSet;
 import net.minecraft.core.registries.Registries;
@@ -45,7 +33,6 @@
 import org.violetmoon.zeta.module.ZetaLoadModule;
 import org.violetmoon.zeta.module.ZetaModule;
 import org.violetmoon.zeta.util.Hint;
-import org.violetmoon.zeta.world.PassthruTreeGrower;
 import org.violetmoon.zeta.world.PassthroughTreeGrower;
 
 @ZetaLoadModule(category = "world")
@@ -101,7 +88,7 @@ public void register(ZRegister event) {
 		ancient_leaves = new ZetaLeavesBlock(woodSet.name, this, MapColor.PLANT);
 		ancient_sapling = new ZetaSaplingBlock("ancient", this, new PassthroughTreeGrower(configuredFeatureKey)); //actually called "ancient_sapling"
 
-		FuelHandler.addFuel(ancient_sapling, 100);
+		Quark.ZETA.fuel.addFuel(ancient_sapling, 100);
 
 		event.getVariantRegistry().addFlowerPot(ancient_sapling, "ancient_sapling", Functions.identity()); //actually "potted_ancient_sapling"
 

diff --git a/src/main/java/org/violetmoon/quark/content/world/module/BlossomTreesModule.java b/src/main/java/org/violetmoon/quark/content/world/module/BlossomTreesModule.java
@@ -11,21 +11,10 @@
 import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
 import net.minecraft.world.level.material.MapColor;
 import net.minecraftforge.common.Tags;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.tags.BiomeTags;
-import net.minecraft.world.level.block.ComposterBlock;
-import net.minecraft.world.level.block.grower.AbstractTreeGrower;
-import net.minecraft.world.level.levelgen.GenerationStep.Decoration;
-import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
-import net.minecraft.world.level.material.MapColor;
-import net.minecraftforge.common.Tags;
 import org.violetmoon.quark.base.Quark;
 import org.violetmoon.quark.base.handler.WoodSetHandler;
 import org.violetmoon.quark.base.handler.WoodSetHandler.WoodSet;
-import org.violetmoon.quark.base.world.WorldGenHandler;
-import org.violetmoon.quark.base.world.WorldGenWeights;
+import org.violetmoon.quark.base.util.QuarkWorldGenWeights;
 import org.violetmoon.quark.content.world.block.BlossomLeavesBlock;
 import org.violetmoon.quark.content.world.config.BlossomTreeConfig;
 import org.violetmoon.quark.content.world.gen.BlossomTreeGenerator;
@@ -38,14 +27,9 @@
 import org.violetmoon.zeta.event.play.loading.ZGatherHints;
 import org.violetmoon.zeta.module.ZetaLoadModule;
 import org.violetmoon.zeta.module.ZetaModule;
-import org.violetmoon.zeta.world.PassthruTreeGrower;
-
-import java.util.ArrayList;
-import java.util.List;
-import org.violetmoon.quark.base.handler.FuelHandler;
-import org.violetmoon.quark.base.util.QuarkWorldGenWeights;
 import org.violetmoon.zeta.world.PassthroughTreeGrower;
 import org.violetmoon.zeta.world.WorldGenHandler;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -109,7 +93,7 @@ private BlossomTree make(ZRegister event, String regname, MapColor color, Blosso
 		tree.grower = new PassthroughTreeGrower(configuredFeatureKey);
 		tree.sapling = new ZetaSaplingBlock(regname, this, tree.grower);
 
-		FuelHandler.addFuel(tree.sapling, 100);
+		Quark.ZETA.fuel.addFuel(tree.sapling, 100);
 
 		event.getVariantRegistry().addFlowerPot(tree.sapling, zeta.registry.getRegistryName(tree.sapling, BuiltInRegistries.BLOCK).getPath(), Functions.identity()); //sure