sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

imports, cleanup, fix tallgrass

Browse source
This commit is contained in:
Sen 2025-06-21 20:42:22 +02:00
parent 55aac31bb9
commit 3079a4bb67
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
30 changed files with 8 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

1
common/src/main/java/common/block/foliage/BlockCocoa.java
View file

@ -3,7 +3,6 @@ package common.block.foliage;
import common.block.Block; import common.block.Block;
import common.block.Rotatable; import common.block.Rotatable;
import common.block.Material; import common.block.Material;
import common.color.DyeColor;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Blocks; import common.init.Blocks;
import common.init.Items; import common.init.Items;

4
common/src/main/java/common/block/foliage/BlockDoublePlant.java
View file

@ -1,19 +1,15 @@
package common.block.foliage; package common.block.foliage;
import java.util.List;
import common.block.Block; import common.block.Block;
import common.block.Rotatable; import common.block.Rotatable;
import common.block.Material; import common.block.Material;
import common.block.SoundType; import common.block.SoundType;
import common.collect.Lists;
import common.color.Colorizer; import common.color.Colorizer;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Blocks; import common.init.Blocks;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.init.Items; import common.init.Items;
import common.item.CheatTab;
import common.item.Item; import common.item.Item;
import common.item.ItemShears; import common.item.ItemShears;
import common.item.ItemStack; import common.item.ItemStack;

1
common/src/main/java/common/block/foliage/BlockFarmland.java
View file

@ -5,7 +5,6 @@ import common.block.Material;
import common.entity.Entity; import common.entity.Entity;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Blocks; import common.init.Blocks;
import common.init.ItemRegistry;
import common.init.Items; import common.init.Items;
import common.item.Item; import common.item.Item;
import common.model.Model; import common.model.Model;

11
common/src/main/java/common/block/foliage/BlockFlower.java
View file

@ -1,19 +1,8 @@
package common.block.foliage; 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.init.Blocks;
import common.item.CheatTab;
import common.item.Item;
import common.item.ItemStack;
import common.model.Model; import common.model.Model;
import common.model.ModelProvider; import common.model.ModelProvider;
import common.properties.Property;
import common.properties.PropertyEnum;
import common.rng.Random; import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.Identifyable; import common.util.Identifyable;

1
common/src/main/java/common/block/foliage/BlockLeaves.java
View file

@ -8,7 +8,6 @@ import common.block.SoundType;
import common.collect.Lists; import common.collect.Lists;
import common.color.Colorizer; import common.color.Colorizer;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.init.BlockRegistry;
import common.init.Blocks; import common.init.Blocks;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.init.WoodType; import common.init.WoodType;

6
common/src/main/java/common/block/foliage/BlockTallGrass.java
View file

@ -1,21 +1,15 @@
package common.block.foliage; package common.block.foliage;
import java.util.List;
import common.block.Material; import common.block.Material;
import common.collect.Lists;
import common.color.Colorizer; import common.color.Colorizer;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.init.Blocks; import common.init.Blocks;
import common.init.Items; import common.init.Items;
import common.item.CheatTab;
import common.item.Item; import common.item.Item;
import common.item.ItemShears; import common.item.ItemShears;
import common.item.ItemStack; import common.item.ItemStack;
import common.model.Model; import common.model.Model;
import common.model.ModelProvider; import common.model.ModelProvider;
import common.properties.Property;
import common.properties.PropertyEnum;
import common.rng.Random; import common.rng.Random;
import common.tileentity.TileEntity; import common.tileentity.TileEntity;
import common.util.BlockPos; import common.util.BlockPos;

1
common/src/main/java/common/entity/animal/EntitySheep.java
View file

@ -19,7 +19,6 @@ import common.entity.item.EntityItem;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.entity.types.EntityAnimal; import common.entity.types.EntityAnimal;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.init.Blocks;
import common.init.CraftingRegistry; import common.init.CraftingRegistry;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.init.Items; import common.init.Items;

1
common/src/main/java/common/entity/animal/EntitySquid.java
View file

@ -1,7 +1,6 @@
package common.entity.animal; package common.entity.animal;
import common.ai.EntityAIBase; import common.ai.EntityAIBase;
import common.color.DyeColor;
import common.entity.npc.Alignment; import common.entity.npc.Alignment;
import common.entity.types.EntityWaterMob; import common.entity.types.EntityWaterMob;
import common.init.Items; import common.init.Items;

2
common/src/main/java/common/entity/projectile/EntityDie.java
View file

@ -5,8 +5,6 @@ import common.entity.npc.EntityNPC;
import common.entity.types.EntityLiving; import common.entity.types.EntityLiving;
import common.entity.types.EntityThrowable; import common.entity.types.EntityThrowable;
import common.entity.types.IObjectData; import common.entity.types.IObjectData;
import common.init.ItemRegistry;
import common.init.Items;
import common.init.SoundEvent; import common.init.SoundEvent;
import common.item.ItemDie; import common.item.ItemDie;
import common.item.ItemStack; import common.item.ItemStack;

1
common/src/main/java/common/entity/projectile/EntityDynamite.java
View file

@ -6,7 +6,6 @@ import common.entity.types.EntityLiving;
import common.entity.types.EntityThrowable; import common.entity.types.EntityThrowable;
import common.entity.types.IObjectData; import common.entity.types.IObjectData;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.init.Items;
import common.model.ParticleType; import common.model.ParticleType;
import common.tags.TagObject; import common.tags.TagObject;
import common.util.HitPosition; import common.util.HitPosition;

2
common/src/main/java/common/entity/projectile/FishConstants.java
View file

@ -1,9 +1,7 @@
package common.entity.projectile; package common.entity.projectile;
import common.color.DyeColor;
import common.init.Blocks; import common.init.Blocks;
import common.init.Items; import common.init.Items;
import common.item.ItemFishFood;
import common.item.ItemStack; import common.item.ItemStack;
import common.rng.WeightedList; import common.rng.WeightedList;

5
common/src/main/java/common/init/CraftingRegistry.java
View file

@ -9,15 +9,10 @@ import java.util.Set;
import common.block.Block; import common.block.Block;
import common.block.artificial.BlockBed; import common.block.artificial.BlockBed;
import common.block.artificial.BlockCarpet; import common.block.artificial.BlockCarpet;
import common.block.artificial.BlockQuartz;
import common.block.artificial.BlockStainedGlass; import common.block.artificial.BlockStainedGlass;
import common.block.artificial.BlockStainedGlassPane; import common.block.artificial.BlockStainedGlassPane;
import common.block.artificial.BlockWall;
import common.block.artificial.BlockWool; import common.block.artificial.BlockWool;
import common.block.foliage.BlockDoublePlant;
import common.block.foliage.BlockFlower;
import common.block.natural.BlockColoredClay; import common.block.natural.BlockColoredClay;
import common.block.natural.BlockSandStone;
import common.collect.Lists; import common.collect.Lists;
import common.collect.Maps; import common.collect.Maps;
import common.color.DyeColor; import common.color.DyeColor;

1
common/src/main/java/common/init/DispenserRegistry.java
View file

@ -6,7 +6,6 @@ import common.block.liquid.BlockDynamicLiquid;
import common.block.liquid.BlockLiquid; import common.block.liquid.BlockLiquid;
import common.block.tech.BlockDispenser; import common.block.tech.BlockDispenser;
import common.block.tech.BlockTNT; import common.block.tech.BlockTNT;
import common.color.DyeColor;
import common.dispenser.BehaviorDefaultDispenseItem; import common.dispenser.BehaviorDefaultDispenseItem;
import common.dispenser.BehaviorProjectileDispense; import common.dispenser.BehaviorProjectileDispense;
import common.dispenser.IBehaviorDispenseItem; import common.dispenser.IBehaviorDispenseItem;

12
common/src/main/java/common/init/ItemRegistry.java
View file

@ -232,11 +232,11 @@ public abstract class ItemRegistry {
registerBlock(Blocks.light_weighted_pressure_plate, new ItemPressurePlate(Blocks.light_weighted_pressure_plate)); 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)); registerBlock(Blocks.heavy_weighted_pressure_plate, new ItemPressurePlate(Blocks.heavy_weighted_pressure_plate));
for(BlockTallGrass.EnumType type : BlockTallGrass.EnumType.values()) { for(BlockTallGrass tallgrass : BlockTallGrass.BUSHES) {
registerBlock(BlockTallGrass.getByType(type), (new ItemColored(Blocks.tallgrass, ""))); registerBlock(tallgrass, (new ItemColored(tallgrass, "")));
} }
for(BlockDoublePlant.EnumPlantType type : BlockDoublePlant.EnumPlantType.values()) { for(BlockDoublePlant plant : BlockDoublePlant.PLANTS) {
registerBlock(BlockDoublePlant.getByType(type), new ItemDoublePlant(BlockDoublePlant.getByType(type), type)); registerBlock(plant, new ItemDoublePlant(plant));
} }
for(BlockWall wall : BlockWall.WALLS) { 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)); registerBlock(BlockTNT.getByPower(z), new ItemBlock(BlockTNT.getByPower(z)).setColor(TextColor.RED));
} }
for(BlockFlower.EnumFlowerType type : BlockFlower.EnumFlowerType.values()) { for(BlockFlower flower : BlockFlower.FLOWERS) {
registerFlat(BlockFlower.getByType(type)); registerFlat(flower);
} }
for(BlockStainedGlassPane pane : BlockStainedGlassPane.PANES) { for(BlockStainedGlassPane pane : BlockStainedGlassPane.PANES) {
registerFlat(pane); registerFlat(pane);

1
common/src/main/java/common/init/SmeltingRegistry.java
View file

@ -5,7 +5,6 @@ import java.util.Map.Entry;
import common.block.Block; import common.block.Block;
import common.collect.Maps; import common.collect.Maps;
import common.color.DyeColor;
import common.item.Item; import common.item.Item;
import common.item.ItemFishFood; import common.item.ItemFishFood;
import common.item.ItemStack; import common.item.ItemStack;

1
common/src/main/java/common/init/TradeRegistry.java
View file

@ -1,6 +1,5 @@
package common.init; package common.init;
import common.color.DyeColor;
import common.enchantment.Enchantment; import common.enchantment.Enchantment;
import common.enchantment.EnchantmentHelper; import common.enchantment.EnchantmentHelper;
import common.enchantment.RngEnchantment; import common.enchantment.RngEnchantment;

2
common/src/main/java/common/init/UniverseRegistry.java
View file

@ -5,12 +5,10 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import common.biome.Biome; import common.biome.Biome;
import common.block.artificial.BlockWool;
import common.block.foliage.LeavesType; import common.block.foliage.LeavesType;
import common.collect.Lists; import common.collect.Lists;
import common.collect.Maps; import common.collect.Maps;
import common.collect.Sets; import common.collect.Sets;
import common.color.DyeColor;
import common.dimension.Area; import common.dimension.Area;
import common.dimension.CloudType; import common.dimension.CloudType;
import common.dimension.DimType; import common.dimension.DimType;

1
common/src/main/java/common/inventory/ContainerRepair.java
View file

@ -7,7 +7,6 @@ import common.block.tech.BlockAnvil;
import common.enchantment.Enchantment; import common.enchantment.Enchantment;
import common.enchantment.EnchantmentHelper; import common.enchantment.EnchantmentHelper;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
import common.init.BlockRegistry;
import common.init.Blocks; import common.init.Blocks;
import common.init.Items; import common.init.Items;
import common.item.ItemStack; import common.item.ItemStack;

5
common/src/main/java/common/item/ItemDoublePlant.java
View file

@ -1,6 +1,5 @@
package common.item; package common.item;
import common.block.Block;
import common.block.foliage.BlockDoublePlant; import common.block.foliage.BlockDoublePlant;
import common.block.foliage.BlockDoublePlant.EnumPlantType; import common.block.foliage.BlockDoublePlant.EnumPlantType;
import common.color.Colorizer; import common.color.Colorizer;
@ -11,10 +10,10 @@ public class ItemDoublePlant extends ItemBlock
{ {
private final BlockDoublePlant.EnumPlantType type; private final BlockDoublePlant.EnumPlantType type;
public ItemDoublePlant(Block block, BlockDoublePlant.EnumPlantType type) public ItemDoublePlant(BlockDoublePlant block)
{ {
super(block, ""); super(block, "");
this.type = type; this.type = block.getType();
} }
public int getColorFromItemStack(ItemStack stack, int renderPass) public int getColorFromItemStack(ItemStack stack, int renderPass)

1
common/src/main/java/common/tileentity/TileEntityBanner.java
View file

@ -2,7 +2,6 @@ package common.tileentity;
import java.util.List; import java.util.List;
import common.block.foliage.BlockFlower;
import common.collect.Lists; import common.collect.Lists;
import common.color.DyeColor; import common.color.DyeColor;
import common.init.Blocks; import common.init.Blocks;

1
server/src/main/java/server/biome/BiomeJungle.java
View file

@ -1,7 +1,6 @@
package server.biome; package server.biome;
import common.biome.Biome; import common.biome.Biome;
import common.block.foliage.BlockTallGrass;
import common.entity.animal.EntityChicken; import common.entity.animal.EntityChicken;
import common.entity.animal.EntityOcelot; import common.entity.animal.EntityOcelot;
import common.init.Blocks; import common.init.Blocks;

2
server/src/main/java/server/biome/BiomeMesa.java
View file

@ -4,9 +4,7 @@ import java.util.Arrays;
import common.biome.Biome; import common.biome.Biome;
import common.block.Block; import common.block.Block;
import common.block.artificial.BlockWool;
import common.block.natural.BlockColoredClay; import common.block.natural.BlockColoredClay;
import common.color.DyeColor;
import common.init.Blocks; import common.init.Blocks;
import common.rng.PerlinGen; import common.rng.PerlinGen;
import common.rng.Random; import common.rng.Random;

1
server/src/main/java/server/biome/BiomePlains.java
View file

@ -1,7 +1,6 @@
package server.biome; package server.biome;
import common.biome.Biome; import common.biome.Biome;
import common.block.foliage.BlockDoublePlant;
import common.block.foliage.BlockFlower; import common.block.foliage.BlockFlower;
import common.entity.animal.EntityHorse; import common.entity.animal.EntityHorse;
import common.init.Blocks; import common.init.Blocks;

1
server/src/main/java/server/biome/BiomeSavanna.java
View file

@ -1,7 +1,6 @@
package server.biome; package server.biome;
import common.biome.Biome; import common.biome.Biome;
import common.block.foliage.BlockDoublePlant;
import common.entity.animal.EntityHorse; import common.entity.animal.EntityHorse;
import common.init.Blocks; import common.init.Blocks;
import common.rng.Random; import common.rng.Random;

2
server/src/main/java/server/biome/BiomeTaiga.java
View file

@ -1,8 +1,6 @@
package server.biome; package server.biome;
import common.biome.Biome; import common.biome.Biome;
import common.block.foliage.BlockDoublePlant;
import common.block.foliage.BlockTallGrass;
import common.entity.animal.EntityWolf; import common.entity.animal.EntityWolf;
import common.init.Blocks; import common.init.Blocks;
import common.rng.Random; import common.rng.Random;

3
server/src/main/java/server/biome/GenBiome.java
View file

@ -4,11 +4,8 @@ import common.biome.Biome;
import common.biome.IBiome; import common.biome.IBiome;
import common.block.Block; import common.block.Block;
import common.block.Material; import common.block.Material;
import common.block.artificial.BlockWool;
import common.block.foliage.BlockFlower; import common.block.foliage.BlockFlower;
import common.block.foliage.BlockSapling; import common.block.foliage.BlockSapling;
import common.block.foliage.BlockTallGrass;
import common.color.DyeColor;
import common.entity.animal.EntityBat; import common.entity.animal.EntityBat;
import common.entity.animal.EntityChicken; import common.entity.animal.EntityChicken;
import common.entity.animal.EntityCow; import common.entity.animal.EntityCow;

1
server/src/main/java/server/worldgen/LootConstants.java
View file

@ -1,6 +1,5 @@
package server.worldgen; package server.worldgen;
import common.color.DyeColor;
import common.init.Blocks; import common.init.Blocks;
import common.init.ItemRegistry; import common.init.ItemRegistry;
import common.init.Items; import common.init.Items;

2
server/src/main/java/server/worldgen/caves/MapGenCaves.java
View file

@ -1,9 +1,7 @@
package server.worldgen.caves; package server.worldgen.caves;
import common.block.Block; import common.block.Block;
import common.block.artificial.BlockWool;
import common.block.natural.BlockColoredClay; import common.block.natural.BlockColoredClay;
import common.color.DyeColor;
import common.init.Blocks; import common.init.Blocks;
import common.rng.Random; import common.rng.Random;
import common.util.BlockPos; import common.util.BlockPos;

4
server/src/main/java/server/worldgen/structure/StructureScattered.java
View file

@ -1,12 +1,8 @@
package server.worldgen.structure; 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.BlockLever;
import common.block.tech.BlockTripWire; import common.block.tech.BlockTripWire;
import common.block.tech.BlockTripWireHook; import common.block.tech.BlockTripWireHook;
import common.color.DyeColor;
import common.entity.npc.EntityMage; import common.entity.npc.EntityMage;
import common.init.Blocks; import common.init.Blocks;
import common.init.Items; import common.init.Items;

2
server/src/main/java/server/worldgen/structure/StructureVillage.java
View file

@ -8,10 +8,8 @@ import common.block.Block;
import common.block.artificial.BlockSlab; import common.block.artificial.BlockSlab;
import common.block.artificial.BlockStairs; import common.block.artificial.BlockStairs;
import common.block.foliage.BlockLog; import common.block.foliage.BlockLog;
import common.block.natural.BlockSandStone;
import common.block.tech.BlockTorch; import common.block.tech.BlockTorch;
import common.collect.Lists; import common.collect.Lists;
import common.color.DyeColor;
import common.entity.npc.EntityHuman; import common.entity.npc.EntityHuman;
import common.init.BlockRegistry; import common.init.BlockRegistry;
import common.init.Blocks; import common.init.Blocks;