diff --git a/gradle.properties b/gradle.properties index deefc348..5c0f0b20 100644 --- a/gradle.properties +++ b/gradle.properties @@ -48,7 +48,7 @@ mixinPlugin = # Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail! mixinsPackage = # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin! -# This parameter is for legacy compatability only +# This parameter is for legacy compatibility only # Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin coreModClass = # If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class @@ -58,6 +58,3 @@ containsMixinsAndOrCoreModOnly = false # If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your # responsibility check the licence and request permission for distribution, if required. usesShadowedDependencies = false - -# TODO: Remove when you modify this repository, it's been put in for automatic buildscript updates -disableCheckstyle = true diff --git a/src/main/java/chylex/hee/init/BlockList.java b/src/main/java/chylex/hee/init/BlockList.java index f97f59d1..9ee7754e 100644 --- a/src/main/java/chylex/hee/init/BlockList.java +++ b/src/main/java/chylex/hee/init/BlockList.java @@ -18,7 +18,45 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.oredict.OreDictionary; -import chylex.hee.block.*; +import chylex.hee.block.BlockAccumulationTable; +import chylex.hee.block.BlockBiomeIslandCore; +import chylex.hee.block.BlockCorruptedEnergy; +import chylex.hee.block.BlockCrossedDecoration; +import chylex.hee.block.BlockCustomSpawner; +import chylex.hee.block.BlockDeathFlower; +import chylex.hee.block.BlockDeathFlowerPot; +import chylex.hee.block.BlockDecompositionTable; +import chylex.hee.block.BlockDragonEggCustom; +import chylex.hee.block.BlockDungeonPuzzle; +import chylex.hee.block.BlockEndPowderOre; +import chylex.hee.block.BlockEnderGoo; +import chylex.hee.block.BlockEndermanHead; +import chylex.hee.block.BlockEndiumOre; +import chylex.hee.block.BlockEndstoneTerrain; +import chylex.hee.block.BlockEnergyCluster; +import chylex.hee.block.BlockEnhancedBrewingStand; +import chylex.hee.block.BlockEnhancedTNT; +import chylex.hee.block.BlockEssenceAltar; +import chylex.hee.block.BlockExperienceTable; +import chylex.hee.block.BlockExtractionTable; +import chylex.hee.block.BlockIgneousRockOre; +import chylex.hee.block.BlockInstabilityOrbOre; +import chylex.hee.block.BlockLaboratoryGlass; +import chylex.hee.block.BlockLaserBeam; +import chylex.hee.block.BlockObsidianEnd; +import chylex.hee.block.BlockObsidianSpecial; +import chylex.hee.block.BlockPersegrit; +import chylex.hee.block.BlockRavagedBrick; +import chylex.hee.block.BlockRavagedBrickSmooth; +import chylex.hee.block.BlockReplaceHelper; +import chylex.hee.block.BlockSpecialEffects; +import chylex.hee.block.BlockSphalerite; +import chylex.hee.block.BlockSpookyLeaves; +import chylex.hee.block.BlockSpookyLog; +import chylex.hee.block.BlockStardustOre; +import chylex.hee.block.BlockTempleEndPortal; +import chylex.hee.block.BlockTransportBeacon; +import chylex.hee.block.BlockVoidChest; import chylex.hee.block.vanilla.BlockBasic; import chylex.hee.block.vanilla.BlockBasicSlab; import chylex.hee.block.vanilla.BlockBasicStairs; @@ -31,7 +69,19 @@ import chylex.hee.system.creativetab.ModCreativeTab; import chylex.hee.system.logging.Log; import chylex.hee.system.util.GameRegistryUtil; -import chylex.hee.tileentity.*; +import chylex.hee.tileentity.TileEntityAccumulationTable; +import chylex.hee.tileentity.TileEntityCustomSpawner; +import chylex.hee.tileentity.TileEntityDecompositionTable; +import chylex.hee.tileentity.TileEntityEndermanHead; +import chylex.hee.tileentity.TileEntityEnergyCluster; +import chylex.hee.tileentity.TileEntityEnhancedBrewingStand; +import chylex.hee.tileentity.TileEntityEnhancedTNT; +import chylex.hee.tileentity.TileEntityEssenceAltar; +import chylex.hee.tileentity.TileEntityExperienceTable; +import chylex.hee.tileentity.TileEntityExtractionTable; +import chylex.hee.tileentity.TileEntityLaserBeam; +import chylex.hee.tileentity.TileEntityTransportBeacon; +import chylex.hee.tileentity.TileEntityVoidChest; public final class BlockList { diff --git a/src/main/java/chylex/hee/init/EntityList.java b/src/main/java/chylex/hee/init/EntityList.java index 0d005f35..ea98e1dd 100644 --- a/src/main/java/chylex/hee/init/EntityList.java +++ b/src/main/java/chylex/hee/init/EntityList.java @@ -15,8 +15,32 @@ import chylex.hee.entity.item.EntityItemEndPowder; import chylex.hee.entity.item.EntityItemIgneousRock; import chylex.hee.entity.item.EntityItemInstabilityOrb; -import chylex.hee.entity.mob.*; -import chylex.hee.entity.projectile.*; +import chylex.hee.entity.mob.EntityMobAngryEnderman; +import chylex.hee.entity.mob.EntityMobBabyEnderman; +import chylex.hee.entity.mob.EntityMobEnderGuardian; +import chylex.hee.entity.mob.EntityMobEndermage; +import chylex.hee.entity.mob.EntityMobEnderman; +import chylex.hee.entity.mob.EntityMobFireGolem; +import chylex.hee.entity.mob.EntityMobForestGhost; +import chylex.hee.entity.mob.EntityMobHauntedMiner; +import chylex.hee.entity.mob.EntityMobHomelandEnderman; +import chylex.hee.entity.mob.EntityMobInfestedBat; +import chylex.hee.entity.mob.EntityMobLouse; +import chylex.hee.entity.mob.EntityMobParalyzedEnderman; +import chylex.hee.entity.mob.EntityMobScorchingLens; +import chylex.hee.entity.mob.EntityMobVampiricBat; +import chylex.hee.entity.projectile.EntityProjectileCorruptedEnergy; +import chylex.hee.entity.projectile.EntityProjectileCurse; +import chylex.hee.entity.projectile.EntityProjectileDragonFireball; +import chylex.hee.entity.projectile.EntityProjectileEnhancedEnderPearl; +import chylex.hee.entity.projectile.EntityProjectileExpBottleConsistent; +import chylex.hee.entity.projectile.EntityProjectileFiendFireball; +import chylex.hee.entity.projectile.EntityProjectileFlamingBall; +import chylex.hee.entity.projectile.EntityProjectileGolemFireball; +import chylex.hee.entity.projectile.EntityProjectileMinerShot; +import chylex.hee.entity.projectile.EntityProjectilePotion; +import chylex.hee.entity.projectile.EntityProjectileSacredWand; +import chylex.hee.entity.projectile.EntityProjectileSpatialDash; import chylex.hee.entity.technical.EntityTechnicalBiomeInteraction; import chylex.hee.entity.technical.EntityTechnicalCurseBlock; import chylex.hee.entity.technical.EntityTechnicalCurseEntity; diff --git a/src/main/java/chylex/hee/init/ItemList.java b/src/main/java/chylex/hee/init/ItemList.java index fffdb4b9..abab2de7 100644 --- a/src/main/java/chylex/hee/init/ItemList.java +++ b/src/main/java/chylex/hee/init/ItemList.java @@ -13,7 +13,32 @@ import net.minecraftforge.oredict.OreDictionary; import chylex.hee.block.BlockEnderGoo; -import chylex.hee.item.*; +import chylex.hee.item.ItemAdventurersDiary; +import chylex.hee.item.ItemBiomeCompass; +import chylex.hee.item.ItemCharm; +import chylex.hee.item.ItemCharmPouch; +import chylex.hee.item.ItemCurse; +import chylex.hee.item.ItemEndPowder; +import chylex.hee.item.ItemEndermanHead; +import chylex.hee.item.ItemEnergyWand; +import chylex.hee.item.ItemEnhancedEnderPearl; +import chylex.hee.item.ItemEssence; +import chylex.hee.item.ItemExpBottleConsistent; +import chylex.hee.item.ItemGhostAmulet; +import chylex.hee.item.ItemIgneousRock; +import chylex.hee.item.ItemInfestationRemedy; +import chylex.hee.item.ItemInstabilityOrb; +import chylex.hee.item.ItemKnowledgeNote; +import chylex.hee.item.ItemMusicDisk; +import chylex.hee.item.ItemPotionOfInstability; +import chylex.hee.item.ItemPotionOfPurity; +import chylex.hee.item.ItemRune; +import chylex.hee.item.ItemScorchingPickaxe; +import chylex.hee.item.ItemSpatialDashGem; +import chylex.hee.item.ItemSpawnEggs; +import chylex.hee.item.ItemSpecialEffects; +import chylex.hee.item.ItemTempleCaller; +import chylex.hee.item.ItemTransferenceGem; import chylex.hee.item.block.ItemBlockEnhancedBrewingStand; import chylex.hee.system.creativetab.ModCreativeTab; import chylex.hee.system.util.GameRegistryUtil; diff --git a/src/main/java/chylex/hee/mechanics/compendium/KnowledgeRegistrations.java b/src/main/java/chylex/hee/mechanics/compendium/KnowledgeRegistrations.java index 1840194b..f328ff35 100644 --- a/src/main/java/chylex/hee/mechanics/compendium/KnowledgeRegistrations.java +++ b/src/main/java/chylex/hee/mechanics/compendium/KnowledgeRegistrations.java @@ -14,7 +14,18 @@ import chylex.hee.entity.boss.EntityBossDragon; import chylex.hee.entity.boss.EntityMiniBossEnderEye; import chylex.hee.entity.boss.EntityMiniBossFireFiend; -import chylex.hee.entity.mob.*; +import chylex.hee.entity.mob.EntityMobAngryEnderman; +import chylex.hee.entity.mob.EntityMobBabyEnderman; +import chylex.hee.entity.mob.EntityMobEnderGuardian; +import chylex.hee.entity.mob.EntityMobEndermage; +import chylex.hee.entity.mob.EntityMobEnderman; +import chylex.hee.entity.mob.EntityMobFireGolem; +import chylex.hee.entity.mob.EntityMobHauntedMiner; +import chylex.hee.entity.mob.EntityMobHomelandEnderman; +import chylex.hee.entity.mob.EntityMobInfestedBat; +import chylex.hee.entity.mob.EntityMobLouse; +import chylex.hee.entity.mob.EntityMobScorchingLens; +import chylex.hee.entity.mob.EntityMobVampiricBat; import chylex.hee.init.BlockList; import chylex.hee.init.ItemList; import chylex.hee.mechanics.compendium.content.KnowledgeCategory; diff --git a/src/main/java/chylex/hee/proxy/ModClientProxy.java b/src/main/java/chylex/hee/proxy/ModClientProxy.java index 115396c2..725fda2c 100644 --- a/src/main/java/chylex/hee/proxy/ModClientProxy.java +++ b/src/main/java/chylex/hee/proxy/ModClientProxy.java @@ -34,8 +34,29 @@ import chylex.hee.entity.boss.EntityMiniBossEnderEye; import chylex.hee.entity.boss.EntityMiniBossFireFiend; import chylex.hee.entity.fx.FXEvents; -import chylex.hee.entity.mob.*; -import chylex.hee.entity.projectile.*; +import chylex.hee.entity.mob.EntityMobAngryEnderman; +import chylex.hee.entity.mob.EntityMobBabyEnderman; +import chylex.hee.entity.mob.EntityMobEnderGuardian; +import chylex.hee.entity.mob.EntityMobEndermage; +import chylex.hee.entity.mob.EntityMobEnderman; +import chylex.hee.entity.mob.EntityMobFireGolem; +import chylex.hee.entity.mob.EntityMobHauntedMiner; +import chylex.hee.entity.mob.EntityMobHomelandEnderman; +import chylex.hee.entity.mob.EntityMobInfestedBat; +import chylex.hee.entity.mob.EntityMobLouse; +import chylex.hee.entity.mob.EntityMobParalyzedEnderman; +import chylex.hee.entity.mob.EntityMobScorchingLens; +import chylex.hee.entity.mob.EntityMobVampiricBat; +import chylex.hee.entity.projectile.EntityProjectileCorruptedEnergy; +import chylex.hee.entity.projectile.EntityProjectileCurse; +import chylex.hee.entity.projectile.EntityProjectileDragonFireball; +import chylex.hee.entity.projectile.EntityProjectileExpBottleConsistent; +import chylex.hee.entity.projectile.EntityProjectileFiendFireball; +import chylex.hee.entity.projectile.EntityProjectileFlamingBall; +import chylex.hee.entity.projectile.EntityProjectileGolemFireball; +import chylex.hee.entity.projectile.EntityProjectileMinerShot; +import chylex.hee.entity.projectile.EntityProjectilePotion; +import chylex.hee.entity.projectile.EntityProjectileSpatialDash; import chylex.hee.entity.technical.EntityTechnicalBiomeInteraction; import chylex.hee.entity.technical.EntityTechnicalCurseBlock; import chylex.hee.entity.technical.EntityTechnicalCurseEntity; @@ -63,7 +84,18 @@ import chylex.hee.render.block.RenderBlockSpookyLeaves; import chylex.hee.render.block.RenderBlockTransportBeacon; import chylex.hee.render.block.RenderBlockVoidChest; -import chylex.hee.render.entity.*; +import chylex.hee.render.entity.RenderBossDragon; +import chylex.hee.render.entity.RenderBossEnderDemon; +import chylex.hee.render.entity.RenderMiniBossEnderEye; +import chylex.hee.render.entity.RenderMiniBossFireFiend; +import chylex.hee.render.entity.RenderMobAngryEnderman; +import chylex.hee.render.entity.RenderMobBabyEnderman; +import chylex.hee.render.entity.RenderMobEnderman; +import chylex.hee.render.entity.RenderMobHomelandEnderman; +import chylex.hee.render.entity.RenderMobInfestedBat; +import chylex.hee.render.entity.RenderMobLouse; +import chylex.hee.render.entity.RenderMobParalyzedEnderman; +import chylex.hee.render.entity.RenderTexturedMob; import chylex.hee.render.item.RenderItemVoidChest; import chylex.hee.render.model.ModelEnderGuardian; import chylex.hee.render.model.ModelEndermage; diff --git a/src/main/java/chylex/hee/world/loot/WorldLoot.java b/src/main/java/chylex/hee/world/loot/WorldLoot.java index 2be09fae..5e5ad96a 100644 --- a/src/main/java/chylex/hee/world/loot/WorldLoot.java +++ b/src/main/java/chylex/hee/world/loot/WorldLoot.java @@ -1,6 +1,14 @@ package chylex.hee.world.loot; -import static net.minecraftforge.common.ChestGenHooks.*; +import static net.minecraftforge.common.ChestGenHooks.DUNGEON_CHEST; +import static net.minecraftforge.common.ChestGenHooks.MINESHAFT_CORRIDOR; +import static net.minecraftforge.common.ChestGenHooks.PYRAMID_DESERT_CHEST; +import static net.minecraftforge.common.ChestGenHooks.PYRAMID_JUNGLE_CHEST; +import static net.minecraftforge.common.ChestGenHooks.STRONGHOLD_CORRIDOR; +import static net.minecraftforge.common.ChestGenHooks.STRONGHOLD_CROSSING; +import static net.minecraftforge.common.ChestGenHooks.STRONGHOLD_LIBRARY; +import static net.minecraftforge.common.ChestGenHooks.VILLAGE_BLACKSMITH; +import static net.minecraftforge.common.ChestGenHooks.getInfo; import java.util.Random;