From 3079a4bb673a004787a71f946588bf73137d874b Mon Sep 17 00:00:00 2001 From: Sen Date: Sat, 21 Jun 2025 20:42:22 +0200 Subject: [PATCH] imports, cleanup, fix tallgrass --- .../main/java/common/block/foliage/BlockCocoa.java | 1 - .../java/common/block/foliage/BlockDoublePlant.java | 4 ---- .../java/common/block/foliage/BlockFarmland.java | 1 - .../main/java/common/block/foliage/BlockFlower.java | 11 ----------- .../main/java/common/block/foliage/BlockLeaves.java | 1 - .../java/common/block/foliage/BlockTallGrass.java | 6 ------ .../main/java/common/entity/animal/EntitySheep.java | 1 - .../main/java/common/entity/animal/EntitySquid.java | 1 - .../java/common/entity/projectile/EntityDie.java | 2 -- .../common/entity/projectile/EntityDynamite.java | 1 - .../java/common/entity/projectile/FishConstants.java | 2 -- .../src/main/java/common/init/CraftingRegistry.java | 5 ----- .../src/main/java/common/init/DispenserRegistry.java | 1 - common/src/main/java/common/init/ItemRegistry.java | 12 ++++++------ .../src/main/java/common/init/SmeltingRegistry.java | 1 - common/src/main/java/common/init/TradeRegistry.java | 1 - .../src/main/java/common/init/UniverseRegistry.java | 2 -- .../main/java/common/inventory/ContainerRepair.java | 1 - .../src/main/java/common/item/ItemDoublePlant.java | 5 ++--- .../java/common/tileentity/TileEntityBanner.java | 1 - server/src/main/java/server/biome/BiomeJungle.java | 1 - server/src/main/java/server/biome/BiomeMesa.java | 2 -- server/src/main/java/server/biome/BiomePlains.java | 1 - server/src/main/java/server/biome/BiomeSavanna.java | 1 - server/src/main/java/server/biome/BiomeTaiga.java | 2 -- server/src/main/java/server/biome/GenBiome.java | 3 --- .../src/main/java/server/worldgen/LootConstants.java | 1 - .../main/java/server/worldgen/caves/MapGenCaves.java | 2 -- .../worldgen/structure/StructureScattered.java | 4 ---- .../server/worldgen/structure/StructureVillage.java | 2 -- 30 files changed, 8 insertions(+), 71 deletions(-) diff --git a/common/src/main/java/common/block/foliage/BlockCocoa.java b/common/src/main/java/common/block/foliage/BlockCocoa.java index d3296a1e..2e14b7aa 100755 --- a/common/src/main/java/common/block/foliage/BlockCocoa.java +++ b/common/src/main/java/common/block/foliage/BlockCocoa.java @@ -3,7 +3,6 @@ package common.block.foliage; import common.block.Block; import common.block.Rotatable; import common.block.Material; -import common.color.DyeColor; import common.entity.types.EntityLiving; import common.init.Blocks; import common.init.Items; diff --git a/common/src/main/java/common/block/foliage/BlockDoublePlant.java b/common/src/main/java/common/block/foliage/BlockDoublePlant.java index feed960a..de91e489 100755 --- a/common/src/main/java/common/block/foliage/BlockDoublePlant.java +++ b/common/src/main/java/common/block/foliage/BlockDoublePlant.java @@ -1,19 +1,15 @@ package common.block.foliage; -import java.util.List; - import common.block.Block; import common.block.Rotatable; import common.block.Material; import common.block.SoundType; -import common.collect.Lists; import common.color.Colorizer; import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.init.Blocks; import common.init.ItemRegistry; import common.init.Items; -import common.item.CheatTab; import common.item.Item; import common.item.ItemShears; import common.item.ItemStack; diff --git a/common/src/main/java/common/block/foliage/BlockFarmland.java b/common/src/main/java/common/block/foliage/BlockFarmland.java index 1a442cca..602d0325 100755 --- a/common/src/main/java/common/block/foliage/BlockFarmland.java +++ b/common/src/main/java/common/block/foliage/BlockFarmland.java @@ -5,7 +5,6 @@ import common.block.Material; import common.entity.Entity; import common.entity.types.EntityLiving; import common.init.Blocks; -import common.init.ItemRegistry; import common.init.Items; import common.item.Item; import common.model.Model; diff --git a/common/src/main/java/common/block/foliage/BlockFlower.java b/common/src/main/java/common/block/foliage/BlockFlower.java index f69ba5e2..53b3bdec 100755 --- a/common/src/main/java/common/block/foliage/BlockFlower.java +++ b/common/src/main/java/common/block/foliage/BlockFlower.java @@ -1,19 +1,8 @@ package common.block.foliage; -import java.util.Collection; -import java.util.List; -import java.util.function.Predicate; - -import common.collect.Filter; -import common.collect.Lists; import common.init.Blocks; -import common.item.CheatTab; -import common.item.Item; -import common.item.ItemStack; import common.model.Model; import common.model.ModelProvider; -import common.properties.Property; -import common.properties.PropertyEnum; import common.rng.Random; import common.util.BlockPos; import common.util.Identifyable; diff --git a/common/src/main/java/common/block/foliage/BlockLeaves.java b/common/src/main/java/common/block/foliage/BlockLeaves.java index 811f1a85..9453faac 100755 --- a/common/src/main/java/common/block/foliage/BlockLeaves.java +++ b/common/src/main/java/common/block/foliage/BlockLeaves.java @@ -8,7 +8,6 @@ import common.block.SoundType; import common.collect.Lists; import common.color.Colorizer; import common.entity.npc.EntityNPC; -import common.init.BlockRegistry; import common.init.Blocks; import common.init.ItemRegistry; import common.init.WoodType; diff --git a/common/src/main/java/common/block/foliage/BlockTallGrass.java b/common/src/main/java/common/block/foliage/BlockTallGrass.java index 3001eea4..e394eed3 100755 --- a/common/src/main/java/common/block/foliage/BlockTallGrass.java +++ b/common/src/main/java/common/block/foliage/BlockTallGrass.java @@ -1,21 +1,15 @@ package common.block.foliage; -import java.util.List; - import common.block.Material; -import common.collect.Lists; import common.color.Colorizer; import common.entity.npc.EntityNPC; import common.init.Blocks; import common.init.Items; -import common.item.CheatTab; import common.item.Item; import common.item.ItemShears; import common.item.ItemStack; import common.model.Model; import common.model.ModelProvider; -import common.properties.Property; -import common.properties.PropertyEnum; import common.rng.Random; import common.tileentity.TileEntity; import common.util.BlockPos; diff --git a/common/src/main/java/common/entity/animal/EntitySheep.java b/common/src/main/java/common/entity/animal/EntitySheep.java index ca5e04f7..44551e3c 100755 --- a/common/src/main/java/common/entity/animal/EntitySheep.java +++ b/common/src/main/java/common/entity/animal/EntitySheep.java @@ -19,7 +19,6 @@ import common.entity.item.EntityItem; import common.entity.npc.EntityNPC; import common.entity.types.EntityAnimal; import common.entity.types.EntityLiving; -import common.init.Blocks; import common.init.CraftingRegistry; import common.init.ItemRegistry; import common.init.Items; diff --git a/common/src/main/java/common/entity/animal/EntitySquid.java b/common/src/main/java/common/entity/animal/EntitySquid.java index 20969ed6..c64ba376 100755 --- a/common/src/main/java/common/entity/animal/EntitySquid.java +++ b/common/src/main/java/common/entity/animal/EntitySquid.java @@ -1,7 +1,6 @@ package common.entity.animal; import common.ai.EntityAIBase; -import common.color.DyeColor; import common.entity.npc.Alignment; import common.entity.types.EntityWaterMob; import common.init.Items; diff --git a/common/src/main/java/common/entity/projectile/EntityDie.java b/common/src/main/java/common/entity/projectile/EntityDie.java index dc484fbb..1d191251 100755 --- a/common/src/main/java/common/entity/projectile/EntityDie.java +++ b/common/src/main/java/common/entity/projectile/EntityDie.java @@ -5,8 +5,6 @@ import common.entity.npc.EntityNPC; import common.entity.types.EntityLiving; import common.entity.types.EntityThrowable; import common.entity.types.IObjectData; -import common.init.ItemRegistry; -import common.init.Items; import common.init.SoundEvent; import common.item.ItemDie; import common.item.ItemStack; diff --git a/common/src/main/java/common/entity/projectile/EntityDynamite.java b/common/src/main/java/common/entity/projectile/EntityDynamite.java index 9024243e..1e4c2980 100755 --- a/common/src/main/java/common/entity/projectile/EntityDynamite.java +++ b/common/src/main/java/common/entity/projectile/EntityDynamite.java @@ -6,7 +6,6 @@ import common.entity.types.EntityLiving; import common.entity.types.EntityThrowable; import common.entity.types.IObjectData; import common.init.ItemRegistry; -import common.init.Items; import common.model.ParticleType; import common.tags.TagObject; import common.util.HitPosition; diff --git a/common/src/main/java/common/entity/projectile/FishConstants.java b/common/src/main/java/common/entity/projectile/FishConstants.java index eb7dfee1..44b8d6c8 100644 --- a/common/src/main/java/common/entity/projectile/FishConstants.java +++ b/common/src/main/java/common/entity/projectile/FishConstants.java @@ -1,9 +1,7 @@ package common.entity.projectile; -import common.color.DyeColor; import common.init.Blocks; import common.init.Items; -import common.item.ItemFishFood; import common.item.ItemStack; import common.rng.WeightedList; diff --git a/common/src/main/java/common/init/CraftingRegistry.java b/common/src/main/java/common/init/CraftingRegistry.java index cbe4afd6..5f4089e1 100755 --- a/common/src/main/java/common/init/CraftingRegistry.java +++ b/common/src/main/java/common/init/CraftingRegistry.java @@ -9,15 +9,10 @@ import java.util.Set; import common.block.Block; import common.block.artificial.BlockBed; import common.block.artificial.BlockCarpet; -import common.block.artificial.BlockQuartz; import common.block.artificial.BlockStainedGlass; import common.block.artificial.BlockStainedGlassPane; -import common.block.artificial.BlockWall; import common.block.artificial.BlockWool; -import common.block.foliage.BlockDoublePlant; -import common.block.foliage.BlockFlower; import common.block.natural.BlockColoredClay; -import common.block.natural.BlockSandStone; import common.collect.Lists; import common.collect.Maps; import common.color.DyeColor; diff --git a/common/src/main/java/common/init/DispenserRegistry.java b/common/src/main/java/common/init/DispenserRegistry.java index 131e42a1..b8765568 100755 --- a/common/src/main/java/common/init/DispenserRegistry.java +++ b/common/src/main/java/common/init/DispenserRegistry.java @@ -6,7 +6,6 @@ import common.block.liquid.BlockDynamicLiquid; import common.block.liquid.BlockLiquid; import common.block.tech.BlockDispenser; import common.block.tech.BlockTNT; -import common.color.DyeColor; import common.dispenser.BehaviorDefaultDispenseItem; import common.dispenser.BehaviorProjectileDispense; import common.dispenser.IBehaviorDispenseItem; diff --git a/common/src/main/java/common/init/ItemRegistry.java b/common/src/main/java/common/init/ItemRegistry.java index 1aded2e9..b3a7eeec 100755 --- a/common/src/main/java/common/init/ItemRegistry.java +++ b/common/src/main/java/common/init/ItemRegistry.java @@ -232,11 +232,11 @@ public abstract class ItemRegistry { registerBlock(Blocks.light_weighted_pressure_plate, new ItemPressurePlate(Blocks.light_weighted_pressure_plate)); registerBlock(Blocks.heavy_weighted_pressure_plate, new ItemPressurePlate(Blocks.heavy_weighted_pressure_plate)); - for(BlockTallGrass.EnumType type : BlockTallGrass.EnumType.values()) { - registerBlock(BlockTallGrass.getByType(type), (new ItemColored(Blocks.tallgrass, ""))); + for(BlockTallGrass tallgrass : BlockTallGrass.BUSHES) { + registerBlock(tallgrass, (new ItemColored(tallgrass, ""))); } - for(BlockDoublePlant.EnumPlantType type : BlockDoublePlant.EnumPlantType.values()) { - registerBlock(BlockDoublePlant.getByType(type), new ItemDoublePlant(BlockDoublePlant.getByType(type), type)); + for(BlockDoublePlant plant : BlockDoublePlant.PLANTS) { + registerBlock(plant, new ItemDoublePlant(plant)); } for(BlockWall wall : BlockWall.WALLS) { @@ -258,8 +258,8 @@ public abstract class ItemRegistry { registerBlock(BlockTNT.getByPower(z), new ItemBlock(BlockTNT.getByPower(z)).setColor(TextColor.RED)); } - for(BlockFlower.EnumFlowerType type : BlockFlower.EnumFlowerType.values()) { - registerFlat(BlockFlower.getByType(type)); + for(BlockFlower flower : BlockFlower.FLOWERS) { + registerFlat(flower); } for(BlockStainedGlassPane pane : BlockStainedGlassPane.PANES) { registerFlat(pane); diff --git a/common/src/main/java/common/init/SmeltingRegistry.java b/common/src/main/java/common/init/SmeltingRegistry.java index 7da3b400..6c3361f9 100755 --- a/common/src/main/java/common/init/SmeltingRegistry.java +++ b/common/src/main/java/common/init/SmeltingRegistry.java @@ -5,7 +5,6 @@ import java.util.Map.Entry; import common.block.Block; import common.collect.Maps; -import common.color.DyeColor; import common.item.Item; import common.item.ItemFishFood; import common.item.ItemStack; diff --git a/common/src/main/java/common/init/TradeRegistry.java b/common/src/main/java/common/init/TradeRegistry.java index 9d1ffefa..6011a108 100755 --- a/common/src/main/java/common/init/TradeRegistry.java +++ b/common/src/main/java/common/init/TradeRegistry.java @@ -1,6 +1,5 @@ package common.init; -import common.color.DyeColor; import common.enchantment.Enchantment; import common.enchantment.EnchantmentHelper; import common.enchantment.RngEnchantment; diff --git a/common/src/main/java/common/init/UniverseRegistry.java b/common/src/main/java/common/init/UniverseRegistry.java index 2d7cff48..625dc0c4 100755 --- a/common/src/main/java/common/init/UniverseRegistry.java +++ b/common/src/main/java/common/init/UniverseRegistry.java @@ -5,12 +5,10 @@ import java.util.Map; import java.util.Map.Entry; import common.biome.Biome; -import common.block.artificial.BlockWool; import common.block.foliage.LeavesType; import common.collect.Lists; import common.collect.Maps; import common.collect.Sets; -import common.color.DyeColor; import common.dimension.Area; import common.dimension.CloudType; import common.dimension.DimType; diff --git a/common/src/main/java/common/inventory/ContainerRepair.java b/common/src/main/java/common/inventory/ContainerRepair.java index 06b6adf2..74d309a2 100755 --- a/common/src/main/java/common/inventory/ContainerRepair.java +++ b/common/src/main/java/common/inventory/ContainerRepair.java @@ -7,7 +7,6 @@ import common.block.tech.BlockAnvil; import common.enchantment.Enchantment; import common.enchantment.EnchantmentHelper; import common.entity.npc.EntityNPC; -import common.init.BlockRegistry; import common.init.Blocks; import common.init.Items; import common.item.ItemStack; diff --git a/common/src/main/java/common/item/ItemDoublePlant.java b/common/src/main/java/common/item/ItemDoublePlant.java index 670e619f..70987b68 100755 --- a/common/src/main/java/common/item/ItemDoublePlant.java +++ b/common/src/main/java/common/item/ItemDoublePlant.java @@ -1,6 +1,5 @@ package common.item; -import common.block.Block; import common.block.foliage.BlockDoublePlant; import common.block.foliage.BlockDoublePlant.EnumPlantType; import common.color.Colorizer; @@ -11,10 +10,10 @@ public class ItemDoublePlant extends ItemBlock { private final BlockDoublePlant.EnumPlantType type; - public ItemDoublePlant(Block block, BlockDoublePlant.EnumPlantType type) + public ItemDoublePlant(BlockDoublePlant block) { super(block, ""); - this.type = type; + this.type = block.getType(); } public int getColorFromItemStack(ItemStack stack, int renderPass) diff --git a/common/src/main/java/common/tileentity/TileEntityBanner.java b/common/src/main/java/common/tileentity/TileEntityBanner.java index be5d13b0..40e42419 100755 --- a/common/src/main/java/common/tileentity/TileEntityBanner.java +++ b/common/src/main/java/common/tileentity/TileEntityBanner.java @@ -2,7 +2,6 @@ package common.tileentity; import java.util.List; -import common.block.foliage.BlockFlower; import common.collect.Lists; import common.color.DyeColor; import common.init.Blocks; diff --git a/server/src/main/java/server/biome/BiomeJungle.java b/server/src/main/java/server/biome/BiomeJungle.java index 8ee66a47..9030120b 100755 --- a/server/src/main/java/server/biome/BiomeJungle.java +++ b/server/src/main/java/server/biome/BiomeJungle.java @@ -1,7 +1,6 @@ package server.biome; import common.biome.Biome; -import common.block.foliage.BlockTallGrass; import common.entity.animal.EntityChicken; import common.entity.animal.EntityOcelot; import common.init.Blocks; diff --git a/server/src/main/java/server/biome/BiomeMesa.java b/server/src/main/java/server/biome/BiomeMesa.java index bb6426ed..9440b4b0 100755 --- a/server/src/main/java/server/biome/BiomeMesa.java +++ b/server/src/main/java/server/biome/BiomeMesa.java @@ -4,9 +4,7 @@ import java.util.Arrays; import common.biome.Biome; import common.block.Block; -import common.block.artificial.BlockWool; import common.block.natural.BlockColoredClay; -import common.color.DyeColor; import common.init.Blocks; import common.rng.PerlinGen; import common.rng.Random; diff --git a/server/src/main/java/server/biome/BiomePlains.java b/server/src/main/java/server/biome/BiomePlains.java index 8b4c1c70..db96fa6c 100755 --- a/server/src/main/java/server/biome/BiomePlains.java +++ b/server/src/main/java/server/biome/BiomePlains.java @@ -1,7 +1,6 @@ package server.biome; import common.biome.Biome; -import common.block.foliage.BlockDoublePlant; import common.block.foliage.BlockFlower; import common.entity.animal.EntityHorse; import common.init.Blocks; diff --git a/server/src/main/java/server/biome/BiomeSavanna.java b/server/src/main/java/server/biome/BiomeSavanna.java index c54f905e..78b6bd2a 100755 --- a/server/src/main/java/server/biome/BiomeSavanna.java +++ b/server/src/main/java/server/biome/BiomeSavanna.java @@ -1,7 +1,6 @@ package server.biome; import common.biome.Biome; -import common.block.foliage.BlockDoublePlant; import common.entity.animal.EntityHorse; import common.init.Blocks; import common.rng.Random; diff --git a/server/src/main/java/server/biome/BiomeTaiga.java b/server/src/main/java/server/biome/BiomeTaiga.java index 6d138fbb..e5167526 100755 --- a/server/src/main/java/server/biome/BiomeTaiga.java +++ b/server/src/main/java/server/biome/BiomeTaiga.java @@ -1,8 +1,6 @@ package server.biome; import common.biome.Biome; -import common.block.foliage.BlockDoublePlant; -import common.block.foliage.BlockTallGrass; import common.entity.animal.EntityWolf; import common.init.Blocks; import common.rng.Random; diff --git a/server/src/main/java/server/biome/GenBiome.java b/server/src/main/java/server/biome/GenBiome.java index b940ae0f..ee4b21cd 100755 --- a/server/src/main/java/server/biome/GenBiome.java +++ b/server/src/main/java/server/biome/GenBiome.java @@ -4,11 +4,8 @@ import common.biome.Biome; import common.biome.IBiome; import common.block.Block; import common.block.Material; -import common.block.artificial.BlockWool; import common.block.foliage.BlockFlower; import common.block.foliage.BlockSapling; -import common.block.foliage.BlockTallGrass; -import common.color.DyeColor; import common.entity.animal.EntityBat; import common.entity.animal.EntityChicken; import common.entity.animal.EntityCow; diff --git a/server/src/main/java/server/worldgen/LootConstants.java b/server/src/main/java/server/worldgen/LootConstants.java index 4d392b22..17f3b5f1 100755 --- a/server/src/main/java/server/worldgen/LootConstants.java +++ b/server/src/main/java/server/worldgen/LootConstants.java @@ -1,6 +1,5 @@ package server.worldgen; -import common.color.DyeColor; import common.init.Blocks; import common.init.ItemRegistry; import common.init.Items; diff --git a/server/src/main/java/server/worldgen/caves/MapGenCaves.java b/server/src/main/java/server/worldgen/caves/MapGenCaves.java index e8684b27..44d44e0e 100755 --- a/server/src/main/java/server/worldgen/caves/MapGenCaves.java +++ b/server/src/main/java/server/worldgen/caves/MapGenCaves.java @@ -1,9 +1,7 @@ package server.worldgen.caves; import common.block.Block; -import common.block.artificial.BlockWool; import common.block.natural.BlockColoredClay; -import common.color.DyeColor; import common.init.Blocks; import common.rng.Random; import common.util.BlockPos; diff --git a/server/src/main/java/server/worldgen/structure/StructureScattered.java b/server/src/main/java/server/worldgen/structure/StructureScattered.java index c6a1fc03..09326a30 100755 --- a/server/src/main/java/server/worldgen/structure/StructureScattered.java +++ b/server/src/main/java/server/worldgen/structure/StructureScattered.java @@ -1,12 +1,8 @@ package server.worldgen.structure; -import common.block.artificial.BlockFlowerPot; -import common.block.foliage.BlockFlower; -import common.block.natural.BlockSandStone; import common.block.tech.BlockLever; import common.block.tech.BlockTripWire; import common.block.tech.BlockTripWireHook; -import common.color.DyeColor; import common.entity.npc.EntityMage; import common.init.Blocks; import common.init.Items; diff --git a/server/src/main/java/server/worldgen/structure/StructureVillage.java b/server/src/main/java/server/worldgen/structure/StructureVillage.java index 0c7f121b..25224a18 100755 --- a/server/src/main/java/server/worldgen/structure/StructureVillage.java +++ b/server/src/main/java/server/worldgen/structure/StructureVillage.java @@ -8,10 +8,8 @@ import common.block.Block; import common.block.artificial.BlockSlab; import common.block.artificial.BlockStairs; import common.block.foliage.BlockLog; -import common.block.natural.BlockSandStone; import common.block.tech.BlockTorch; import common.collect.Lists; -import common.color.DyeColor; import common.entity.npc.EntityHuman; import common.init.BlockRegistry; import common.init.Blocks;