refactor

Author: supermassimo

src/main/java/dtteam/dtru/cell/PoplarLeafCell.java

@@ -3,7 +3,6 @@
 
 //import com.ferreusveritas.dynamictrees.cell.MatrixCell;
 
-import com.dtteam.dynamictrees.api.registry.TypedRegistry;
 import com.dtteam.dynamictrees.systems.cell.MatrixCell;
 
 public class PoplarLeafCell extends MatrixCell {

src/main/java/dtteam/dtru/genfeature/GenerateBiomePredicateGenFeature.java

@@ -5,9 +5,10 @@
 //import com.ferreusveritas.dynamictrees.systems.genfeature.GenFeature;
 //import com.ferreusveritas.dynamictrees.systems.genfeature.GenFeatureConfiguration;
 //import com.ferreusveritas.dynamictrees.systems.genfeature.context.FullGenerationContext;
+
+import com.dtteam.dynamictrees.DynamicTrees;
 import com.dtteam.dynamictrees.api.configuration.ConfigurationProperty;
 import com.dtteam.dynamictrees.systems.genfeature.GenFeature;
-import com.dtteam.dynamictrees.DynamicTrees;
 import com.dtteam.dynamictrees.systems.genfeature.GenFeatureConfiguration;
 import com.dtteam.dynamictrees.systems.genfeature.context.FullGenerationContext;
 import net.minecraft.resources.ResourceLocation;

src/main/java/dtteam/dtru/genfeature/MagmaBottomGenFeature.java

@@ -7,14 +7,13 @@
 //import com.ferreusveritas.dynamictrees.systems.genfeature.context.PostGenerationContext;
 //import com.ferreusveritas.dynamictrees.tree.species.Species;
 //import dtteam.dtru.block.TransitionLogBranchBlock;
+
 import com.dtteam.dynamictrees.api.configuration.ConfigurationProperty;
 import com.dtteam.dynamictrees.systems.genfeature.GenFeature;
 import com.dtteam.dynamictrees.systems.genfeature.GenFeatureConfiguration;
 import com.dtteam.dynamictrees.systems.genfeature.context.PostGenerationContext;
 import com.dtteam.dynamictrees.tree.TreeHelper;
 import com.dtteam.dynamictrees.tree.species.Species;
-//import dtteam.dtru.tree.BrimwoodFamily;
-//import dtteam.dtru.tree.TransitionLogFamily;
 import dtteam.dtru.block.TransitionLogBranchBlock;
 import dtteam.dtru.tree.BrimwoodFamily;
 import dtteam.dtru.tree.TransitionLogFamily;

src/main/java/dtteam/dtru/genfeature/ReplaceOnRadiusGenFeature.java

@@ -7,12 +7,13 @@
 //import com.ferreusveritas.dynamictrees.systems.genfeature.context.PostGenerationContext;
 //import com.ferreusveritas.dynamictrees.tree.species.Species;
 //import com.ferreusveritas.dynamictrees.worldgen.GenerationContext;
+
 import com.dtteam.dynamictrees.api.configuration.ConfigurationProperty;
 import com.dtteam.dynamictrees.systems.genfeature.GenFeature;
-import com.dtteam.dynamictrees.worldgen.DynamicTreeGenerationContext;
 import com.dtteam.dynamictrees.systems.genfeature.GenFeatureConfiguration;
 import com.dtteam.dynamictrees.systems.genfeature.context.FullGenerationContext;
 import com.dtteam.dynamictrees.tree.species.Species;
+import com.dtteam.dynamictrees.worldgen.DynamicTreeGenerationContext;
 import net.minecraft.core.Direction;
 import net.minecraft.resources.ResourceLocation;
 

src/main/java/dtteam/dtru/genfeature/StrippedBottomGenFeature.java

@@ -10,12 +10,12 @@
 //import com.ferreusveritas.dynamictrees.tree.family.Family;
 //import com.ferreusveritas.dynamictrees.tree.species.Species;
 //import dtteam.dtru.block.TransitionLogBranchBlock;
+
 import com.dtteam.dynamictrees.api.configuration.ConfigurationProperty;
 import com.dtteam.dynamictrees.systems.genfeature.GenFeature;
 import com.dtteam.dynamictrees.systems.genfeature.GenFeatureConfiguration;
 import com.dtteam.dynamictrees.systems.genfeature.context.PostGenerationContext;
 import com.dtteam.dynamictrees.tree.TreeHelper;
-//import dtteam.dtru.tree.TransitionLogFamily;
 import dtteam.dtru.block.TransitionLogBranchBlock;
 import dtteam.dtru.tree.TransitionLogFamily;
 import net.minecraft.core.BlockPos;

src/main/java/dtteam/dtru/mixins/AshenDirtBlockSafeMixin.java

@@ -1,10 +1,8 @@
 package dtteam.dtru.mixins;
 
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;
-import net.neoforged.neoforge.common.property.Properties;
 import net.regions_unexplored.world.level.block.other_dirt.AshenDirtBlock;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

src/main/java/dtteam/dtru/model/BambooBranchBlockBakedModel.java

@@ -1,13 +1,9 @@
 package dtteam.dtru.model;
 
-//import com.ferreusveritas.dynamictrees.block.branch.BranchBlock;
-//import com.ferreusveritas.dynamictrees.client.ModelUtils;
-//import com.ferreusveritas.dynamictrees.models.modeldata.ModelConnections;
 import com.dtteam.dynamictrees.block.branch.BranchBlock;
 import com.dtteam.dynamictrees.model.ModelHelper;
 import com.dtteam.dynamictrees.model.modeldata.ModelConnections;
 import com.google.common.collect.Maps;
-//import dtteam.dtru.block.BambooBranchBlock;
 import dtteam.dtru.block.BambooBranchBlock;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.block.model.*;
@@ -24,14 +20,6 @@
 import net.minecraft.world.inventory.InventoryMenu;
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.block.state.BlockState;
-//import net.minecraftforge.api.distmarker.Dist;
-//import net.minecraftforge.api.distmarker.OnlyIn;
-//import net.minecraftforge.client.ChunkRenderTypeSet;
-//import net.minecraftforge.client.NamedRenderTypeManager;
-//import net.minecraftforge.client.model.IDynamicBakedModel;
-//import net.minecraftforge.client.model.IModelBuilder;
-//import net.minecraftforge.client.model.data.ModelData;
-//import net.minecraftforge.client.model.geometry.IGeometryBakingContext;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.api.distmarker.OnlyIn;
 import net.neoforged.neoforge.client.ChunkRenderTypeSet;

src/main/java/dtteam/dtru/model/BambooBranchBlockModelGeometry.java

@@ -1,7 +1,5 @@
 package dtteam.dtru.model;
 
-//import com.ferreusveritas.dynamictrees.models.geometry.BranchBlockModelGeometry;
-//import com.ferreusveritas.dynamictreesplus.model.baked.CactusBranchBlockBakedModel;
 import com.dtteam.dynamictrees.model.geometry.BranchBlockModelGeometry;
 import net.minecraft.client.renderer.block.model.ItemOverrides;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -13,9 +11,6 @@
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.api.distmarker.OnlyIn;
 import net.neoforged.neoforge.client.model.geometry.IGeometryBakingContext;
-//import net.minecraftforge.api.distmarker.Dist;
-//import net.minecraftforge.api.distmarker.OnlyIn;
-//import net.minecraftforge.client.model.geometry.IGeometryBakingContext;
 
 import java.util.function.Function;
 
@@ -29,12 +24,6 @@ public BambooBranchBlockModelGeometry(ResourceLocation barkTextureLocation, Reso
         this.leavesTextureLocation = leavesTextureLocation;
     }
 
-//    @Override
-//    public BakedModel bake(IGeometryBakingContext owner, ModelBaker baker, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ItemOverrides overrides, ResourceLocation modelLocation) {
-//        return new BambooBranchBlockBakedModel(owner, modelLocation, this.barkTextureLocation, this.ringsTextureLocation, this.leavesTextureLocation, spriteGetter);
-//    }
-
-
     @Override
     public BakedModel bake(IGeometryBakingContext context, ModelBaker modelBaker, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ItemOverrides itemOverrides) {
         return new BambooBranchBlockBakedModel(context, this.barkTextureLocation, this.ringsTextureLocation, this.leavesTextureLocation, spriteGetter);

src/main/java/dtteam/dtru/model/BambooBranchModelLoader.java

@@ -1,8 +1,5 @@
 package dtteam.dtru.model;
 
-//import com.ferreusveritas.dynamictrees.api.TreeRegistry;
-//import com.ferreusveritas.dynamictrees.models.geometry.BranchBlockModelGeometry;
-//import com.ferreusveritas.dynamictrees.models.loader.BranchBlockModelLoader;
 import com.dtteam.dynamictrees.model.geometry.BranchBlockModelGeometry;
 import com.dtteam.dynamictrees.model.loader.BranchBlockModelLoader;
 import com.dtteam.dynamictrees.utility.ResourceLocationUtils;
@@ -12,8 +9,6 @@
 import net.minecraft.resources.ResourceLocation;
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.api.distmarker.OnlyIn;
-//import net.minecraftforge.api.distmarker.Dist;
-//import net.minecraftforge.api.distmarker.OnlyIn;
 
 import javax.annotation.Nullable;
 

src/main/java/dtteam/dtru/model/EucalyptusBranchBlockModelGeometry.java

@@ -1,7 +1,5 @@
 package dtteam.dtru.model;
 
-//import com.ferreusveritas.dynamictrees.models.geometry.BranchBlockModelGeometry;
-//import com.ferreusveritas.dynamictrees.tree.family.Family;
 import com.dtteam.dynamictrees.model.geometry.BranchBlockModelGeometry;
 import com.dtteam.dynamictrees.tree.family.Family;
 import net.minecraft.client.renderer.block.model.ItemOverrides;
@@ -14,9 +12,6 @@
 import net.neoforged.api.distmarker.Dist;
 import net.neoforged.api.distmarker.OnlyIn;
 import net.neoforged.neoforge.client.model.geometry.IGeometryBakingContext;
-//import net.minecraftforge.api.distmarker.Dist;
-//import net.minecraftforge.api.distmarker.OnlyIn;
-//import net.minecraftforge.client.model.geometry.IGeometryBakingContext;
 
 import javax.annotation.Nullable;
 import java.util.function.Function;