diff --git a/gradle.properties b/gradle.properties index 24607bf..660a7fb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,13 +1,10 @@ org.gradle.jvmargs=-Xmx2G org.gradle.parallel=true - minecraft_version=1.20.1 yarn_mappings=1.20.1+build.10 loader_version=0.15.7 - -mod_version=1.0.0 +mod_version=1.0.0-RC1 maven_group=dev.callmeecho archives_base_name=hollow - fabric_version=0.92.0+1.20.1 owo_version=0.11.2+1.20 diff --git a/src/main/java/dev/callmeecho/hollow/client/HollowClient.java b/src/main/java/dev/callmeecho/hollow/client/HollowClient.java index 4b9b4d1..53a1a18 100644 --- a/src/main/java/dev/callmeecho/hollow/client/HollowClient.java +++ b/src/main/java/dev/callmeecho/hollow/client/HollowClient.java @@ -2,7 +2,6 @@ import dev.callmeecho.cabinetapi.registry.RegistrarHandler; import dev.callmeecho.hollow.client.render.entity.FireflyEntityRenderer; -import dev.callmeecho.hollow.main.Hollow; import dev.callmeecho.hollow.main.block.HollowLogBlock; import dev.callmeecho.hollow.main.registry.HollowBlockRegistry; import dev.callmeecho.hollow.main.registry.HollowEntityTypeRegistry; @@ -11,14 +10,7 @@ import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap; import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry; import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry; -import net.fabricmc.fabric.mixin.client.rendering.BlockColorsMixin; -import net.minecraft.block.BlockState; -import net.minecraft.client.color.block.BlockColors; -import net.minecraft.client.color.item.ItemColorProvider; -import net.minecraft.client.color.item.ItemColors; import net.minecraft.client.render.RenderLayer; -import net.minecraft.item.BlockItem; -import net.minecraft.loot.provider.number.ConstantLootNumberProvider; public class HollowClient implements ClientModInitializer { @Override diff --git a/src/main/java/dev/callmeecho/hollow/client/render/entity/FireflyEntityRenderer.java b/src/main/java/dev/callmeecho/hollow/client/render/entity/FireflyEntityRenderer.java index dd73d8b..d6508ca 100644 --- a/src/main/java/dev/callmeecho/hollow/client/render/entity/FireflyEntityRenderer.java +++ b/src/main/java/dev/callmeecho/hollow/client/render/entity/FireflyEntityRenderer.java @@ -1,6 +1,5 @@ package dev.callmeecho.hollow.client.render.entity; -import dev.callmeecho.hollow.main.Hollow; import dev.callmeecho.hollow.main.entity.FireflyEntity; import net.minecraft.client.render.OverlayTexture; import net.minecraft.client.render.RenderLayer; diff --git a/src/main/java/dev/callmeecho/hollow/datagen/ModelProvider.java b/src/main/java/dev/callmeecho/hollow/datagen/ModelProvider.java index ea7239a..77f6e0b 100644 --- a/src/main/java/dev/callmeecho/hollow/datagen/ModelProvider.java +++ b/src/main/java/dev/callmeecho/hollow/datagen/ModelProvider.java @@ -6,7 +6,6 @@ import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricModelProvider; import net.minecraft.block.Block; -import net.minecraft.block.Blocks; import net.minecraft.data.client.*; import net.minecraft.state.property.Properties; import net.minecraft.util.Identifier; @@ -14,10 +13,6 @@ import java.util.Optional; -import static dev.callmeecho.hollow.main.Hollow.MODID; -import static dev.callmeecho.hollow.main.registry.HollowBlockRegistry.LOTUS_LILYPAD; -import static net.minecraft.data.client.BlockStateModelGenerator.*; - public class ModelProvider extends FabricModelProvider { public static final Model HOLLOW_LOG = new Model(Optional.of(new Identifier("hollow", "block/" + "hollow_log_template")), Optional.empty(), TextureKey.SIDE, TextureKey.INSIDE, TextureKey.END); public static final Model HOLLOW_LOG_HORIZONTAL = new Model(Optional.of(new Identifier("hollow", "block/" + "hollow_log_horizontal_template")), Optional.of("_horizontal"), TextureKey.SIDE, TextureKey.INSIDE, TextureKey.END); diff --git a/src/main/java/dev/callmeecho/hollow/datagen/RecipeProvider.java b/src/main/java/dev/callmeecho/hollow/datagen/RecipeProvider.java index f5b22bd..61f057b 100644 --- a/src/main/java/dev/callmeecho/hollow/datagen/RecipeProvider.java +++ b/src/main/java/dev/callmeecho/hollow/datagen/RecipeProvider.java @@ -1,11 +1,9 @@ package dev.callmeecho.hollow.datagen; -import dev.callmeecho.cabinetapi.registry.RegistrarHandler; import dev.callmeecho.hollow.main.block.HollowLogBlock; import dev.callmeecho.hollow.main.registry.HollowBlockRegistry; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricRecipeProvider; -import net.minecraft.block.Block; import net.minecraft.data.server.recipe.RecipeJsonProvider; import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; import net.minecraft.item.Item; diff --git a/src/main/java/dev/callmeecho/hollow/main/block/PolyporeBlock.java b/src/main/java/dev/callmeecho/hollow/main/block/PolyporeBlock.java index 3ab63e1..29a7558 100644 --- a/src/main/java/dev/callmeecho/hollow/main/block/PolyporeBlock.java +++ b/src/main/java/dev/callmeecho/hollow/main/block/PolyporeBlock.java @@ -16,7 +16,6 @@ import net.minecraft.world.BlockView; import net.minecraft.world.World; import net.minecraft.world.WorldView; -import org.jetbrains.annotations.Nullable; public class PolyporeBlock extends PlantBlock implements Fertilizable { public static final IntProperty POLYPORE_AMOUNT = IntProperty.of("amount", 1, 3); diff --git a/src/main/java/dev/callmeecho/hollow/main/entity/FireflyEntity.java b/src/main/java/dev/callmeecho/hollow/main/entity/FireflyEntity.java index 91b1474..fee1000 100644 --- a/src/main/java/dev/callmeecho/hollow/main/entity/FireflyEntity.java +++ b/src/main/java/dev/callmeecho/hollow/main/entity/FireflyEntity.java @@ -14,7 +14,6 @@ import net.minecraft.entity.data.DataTracker; import net.minecraft.entity.data.TrackedData; import net.minecraft.entity.data.TrackedDataHandlerRegistry; -import net.minecraft.entity.mob.AmbientEntity; import net.minecraft.entity.mob.MobEntity; import net.minecraft.entity.mob.PathAwareEntity; import net.minecraft.entity.player.PlayerEntity; diff --git a/src/main/java/dev/callmeecho/hollow/main/registry/HollowBlockRegistry.java b/src/main/java/dev/callmeecho/hollow/main/registry/HollowBlockRegistry.java index b4ff1d4..1e685f4 100644 --- a/src/main/java/dev/callmeecho/hollow/main/registry/HollowBlockRegistry.java +++ b/src/main/java/dev/callmeecho/hollow/main/registry/HollowBlockRegistry.java @@ -1,7 +1,5 @@ package dev.callmeecho.hollow.main.registry; -import static dev.callmeecho.hollow.main.Hollow.GROUP; - import dev.callmeecho.cabinetapi.block.CabinetBlockSettings; import dev.callmeecho.cabinetapi.item.CabinetItemGroup; import dev.callmeecho.cabinetapi.registry.BlockRegistrar; @@ -26,6 +24,8 @@ import java.lang.reflect.Field; +import static dev.callmeecho.hollow.main.Hollow.GROUP; + @SuppressWarnings("unused") public class HollowBlockRegistry implements BlockRegistrar { @Override diff --git a/src/main/java/dev/callmeecho/hollow/main/registry/HollowEntityTypeRegistry.java b/src/main/java/dev/callmeecho/hollow/main/registry/HollowEntityTypeRegistry.java index 483b6a7..8ab6649 100644 --- a/src/main/java/dev/callmeecho/hollow/main/registry/HollowEntityTypeRegistry.java +++ b/src/main/java/dev/callmeecho/hollow/main/registry/HollowEntityTypeRegistry.java @@ -2,15 +2,11 @@ import dev.callmeecho.cabinetapi.registry.EntityRegistrar; import dev.callmeecho.hollow.main.entity.FireflyEntity; -import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry; import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder; -import net.fabricmc.fabric.impl.object.builder.FabricEntityType; import net.minecraft.entity.EntityDimensions; import net.minecraft.entity.EntityType; import net.minecraft.entity.SpawnGroup; -import java.lang.reflect.Field; - @SuppressWarnings("unused") public class HollowEntityTypeRegistry implements EntityRegistrar { public static EntityType FIREFLY = FabricEntityTypeBuilder.create(SpawnGroup.AMBIENT, FireflyEntity::new).dimensions(new EntityDimensions(0.125F, 0.0625F, true)).trackRangeBlocks(8).build(); diff --git a/src/main/java/dev/callmeecho/hollow/main/worldgen/FallenTreeFeature.java b/src/main/java/dev/callmeecho/hollow/main/worldgen/FallenTreeFeature.java index 98e4056..7941e52 100644 --- a/src/main/java/dev/callmeecho/hollow/main/worldgen/FallenTreeFeature.java +++ b/src/main/java/dev/callmeecho/hollow/main/worldgen/FallenTreeFeature.java @@ -1,13 +1,11 @@ package dev.callmeecho.hollow.main.worldgen; import com.mojang.serialization.Codec; -import dev.callmeecho.hollow.main.Hollow; import dev.callmeecho.hollow.main.block.HollowLogBlock; import dev.callmeecho.hollow.main.block.PolyporeBlock; import dev.callmeecho.hollow.main.registry.HollowBlockRegistry; import net.minecraft.block.BlockState; import net.minecraft.block.Blocks; -import net.minecraft.registry.tag.BlockTags; import net.minecraft.state.property.Properties; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; diff --git a/src/main/java/dev/callmeecho/hollow/main/worldgen/PolyporeTreeDecorator.java b/src/main/java/dev/callmeecho/hollow/main/worldgen/PolyporeTreeDecorator.java index 09a4aab..2271a38 100644 --- a/src/main/java/dev/callmeecho/hollow/main/worldgen/PolyporeTreeDecorator.java +++ b/src/main/java/dev/callmeecho/hollow/main/worldgen/PolyporeTreeDecorator.java @@ -5,11 +5,7 @@ import dev.callmeecho.hollow.main.block.PolyporeBlock; import dev.callmeecho.hollow.main.registry.HollowTreeDecoratorRegistry; import it.unimi.dsi.fastutil.objects.ObjectArrayList; -import net.minecraft.block.BeehiveBlock; import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.nbt.NbtCompound; import net.minecraft.state.property.Properties; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; @@ -41,8 +37,6 @@ public void generate(Generator generator) { ObjectArrayList logs = generator.getLogPositions(); for (BlockPos pos : logs) { -// if (random.nextInt(10) <= 0) continue; - Direction direction = Direction.fromHorizontal(random.nextInt(4)); BlockPos polyporePos = pos.offset(direction);