mirror of
https://github.com/GTNewHorizons/Hardcore-Ender-Expansion.git
synced 2026-10-25 20:22:31 +00:00
[bs] spotless apply for jenkins (#17)
* spotless apply for jenkins * remove *
This commit is contained in:
1 parent
4bda4415d6
commit
2ec7bed7b6
38 files changed
+231
-104
No files matched your search
+2
-2
@@ -1,4 +1,4 @@
|
||||
//version: 1704650211
|
||||
//version: 1704751096
|
||||
/*
|
||||
DO NOT CHANGE THIS FILE!
|
||||
Also, you may replace this file at any time if there is an update available.
|
||||
@@ -786,7 +786,7 @@ dependencies {
|
||||
java17Dependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}")
|
||||
}
|
||||
if (modId != 'hodgepodge') {
|
||||
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.3.35')
|
||||
java17Dependencies('com.github.GTNewHorizons:Hodgepodge:2.4.4')
|
||||
}
|
||||
|
||||
java17PatchDependencies("com.github.GTNewHorizons:lwjgl3ify:${lwjgl3ifyVersion}:forgePatches") {transitive = false}
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
// Add your dependencies here
|
||||
|
||||
dependencies {
|
||||
implementation('com.github.GTNewHorizons:GTNHLib:0.0.10:dev')
|
||||
implementation('com.github.GTNewHorizons:NotEnoughItems:2.3.20-GTNH:dev')
|
||||
implementation('com.github.GTNewHorizons:GTNHLib:0.0.13:dev')
|
||||
implementation('com.github.GTNewHorizons:NotEnoughItems:2.5.3-GTNH:dev')
|
||||
|
||||
compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')
|
||||
}
|
||||
+1
-4
@@ -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
|
||||
@@ -1,12 +1,4 @@
|
||||
// Add any additional repositiroes for your dependencies here
|
||||
|
||||
repositories {
|
||||
maven {
|
||||
name 'GTNH Maven'
|
||||
url 'http://jenkins.usrv.eu:8081/nexus/content/groups/public/'
|
||||
allowInsecureProtocol
|
||||
}
|
||||
maven {
|
||||
url 'https://jitpack.io'
|
||||
}
|
||||
}
|
||||
@@ -5,12 +5,12 @@ import java.util.Map;
|
||||
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
|
||||
import chylex.hee.api.message.handlers.ImcHandler;
|
||||
import chylex.hee.api.message.utils.MessageLogger;
|
||||
import chylex.hee.api.message.utils.RunEvent;
|
||||
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
|
||||
public final class MessageRegistry {
|
||||
|
||||
private static Map<String, MessagePattern> registry;
|
||||
|
||||
@@ -7,11 +7,11 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
|
||||
import com.google.common.base.Function;
|
||||
|
||||
import chylex.hee.api.message.MessageRunner;
|
||||
import chylex.hee.api.message.element.base.Optional;
|
||||
import chylex.hee.api.message.element.base.PreconditionComposite;
|
||||
|
||||
import com.google.common.base.Function;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
public class ItemStackValue extends PreconditionComposite<ItemStack> {
|
||||
|
||||
@@ -3,12 +3,12 @@ package chylex.hee.api.message.element;
|
||||
import net.minecraft.entity.EntityList;
|
||||
import net.minecraft.entity.EntityLiving;
|
||||
|
||||
import com.google.common.base.Function;
|
||||
|
||||
import chylex.hee.api.message.MessageRunner;
|
||||
import chylex.hee.api.message.element.base.PreconditionComposite;
|
||||
import chylex.hee.world.util.SpawnEntry;
|
||||
|
||||
import com.google.common.base.Function;
|
||||
|
||||
public class SpawnEntryValue extends PreconditionComposite<SpawnEntry> {
|
||||
|
||||
public static SpawnEntryValue any() {
|
||||
|
||||
@@ -8,10 +8,10 @@ import net.minecraftforge.common.util.Constants.NBT;
|
||||
|
||||
import org.apache.commons.lang3.ArrayUtils;
|
||||
|
||||
import chylex.hee.api.message.element.base.Precondition;
|
||||
|
||||
import com.google.common.base.Function;
|
||||
|
||||
import chylex.hee.api.message.element.base.Precondition;
|
||||
|
||||
public abstract class StringValue extends Precondition<String> {
|
||||
|
||||
public static StringValue any() {
|
||||
|
||||
@@ -9,6 +9,8 @@ import net.minecraft.item.ItemStack;
|
||||
import org.apache.commons.lang3.ArrayUtils;
|
||||
import org.apache.commons.lang3.tuple.Pair;
|
||||
|
||||
import com.google.common.base.Function;
|
||||
|
||||
import chylex.hee.api.message.MessageHandler;
|
||||
import chylex.hee.api.message.MessageRunner;
|
||||
import chylex.hee.api.message.element.IntValue;
|
||||
@@ -33,8 +35,6 @@ import chylex.hee.world.structure.island.biome.feature.island.laboratory.Laborat
|
||||
import chylex.hee.world.structure.tower.ComponentTower;
|
||||
import chylex.hee.world.util.SpawnEntry;
|
||||
|
||||
import com.google.common.base.Function;
|
||||
|
||||
public final class ImcWorldHandlers extends ImcHandler {
|
||||
|
||||
private static final Map<String, WeightedLootList> lootNames = new HashMap<>();
|
||||
|
||||
@@ -10,12 +10,11 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.util.ObjectIntIdentityMap;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.reflect.Fields;
|
||||
|
||||
import chylex.hee.system.logging.Log;
|
||||
import chylex.hee.system.logging.Stopwatch;
|
||||
import chylex.hee.system.util.ReflectionUtils;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.reflect.Fields;
|
||||
|
||||
import cpw.mods.fml.common.registry.FMLControlledNamespacedRegistry;
|
||||
import cpw.mods.fml.common.registry.GameData;
|
||||
|
||||
|
||||
@@ -13,12 +13,12 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.google.common.collect.Sets;
|
||||
|
||||
import chylex.hee.HardcoreEnderExpansion;
|
||||
import chylex.hee.block.BlockEnderGoo;
|
||||
import chylex.hee.init.ItemList;
|
||||
|
||||
import com.google.common.collect.Sets;
|
||||
|
||||
public class EntityItemEndPowder extends EntityItem {
|
||||
|
||||
private byte checkTimer = 0;
|
||||
|
||||
@@ -18,7 +18,45 @@ import net.minecraftforge.common.MinecraftForge;
|
||||
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.collections.DefaultingHashMap;
|
||||
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 {
|
||||
|
||||
|
||||
@@ -15,8 +15,32 @@ import chylex.hee.entity.item.EntityItemDragonEgg;
|
||||
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;
|
||||
|
||||
@@ -13,7 +13,32 @@ import net.minecraftforge.fluids.FluidContainerRegistry;
|
||||
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;
|
||||
|
||||
@@ -18,6 +18,8 @@ import net.minecraft.util.EntityDamageSourceIndirect;
|
||||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import com.google.common.collect.Multimap;
|
||||
|
||||
import chylex.hee.entity.GlobalMobData;
|
||||
import chylex.hee.entity.projectile.EntityProjectileSacredWand;
|
||||
import chylex.hee.mechanics.enhancements.EnhancementHandler;
|
||||
@@ -28,9 +30,6 @@ import chylex.hee.system.util.CollectionUtil;
|
||||
import chylex.hee.system.util.DragonUtil;
|
||||
import chylex.hee.system.util.ItemUtil;
|
||||
import chylex.hee.system.util.MathUtil;
|
||||
|
||||
import com.google.common.collect.Multimap;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
|
||||
@@ -18,12 +18,11 @@ import net.minecraft.item.crafting.FurnaceRecipes;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.event.world.BlockEvent.HarvestDropsEvent;
|
||||
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
|
||||
import chylex.hee.init.BlockList;
|
||||
import chylex.hee.system.achievements.AchievementManager;
|
||||
import chylex.hee.system.util.MathUtil;
|
||||
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.EventPriority;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
|
||||
@@ -14,7 +14,18 @@ import chylex.hee.block.BlockSpecialEffects;
|
||||
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;
|
||||
|
||||
@@ -5,10 +5,10 @@ import java.util.List;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import chylex.hee.mechanics.compendium.objects.IKnowledgeObjectInstance;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
|
||||
import chylex.hee.mechanics.compendium.objects.IKnowledgeObjectInstance;
|
||||
|
||||
public class KnowledgeCategory {
|
||||
|
||||
public static final byte iconSize = 44;
|
||||
|
||||
@@ -6,12 +6,11 @@ import java.util.Set;
|
||||
import net.minecraft.client.resources.I18n;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
import chylex.hee.mechanics.compendium.objects.IKnowledgeObjectInstance;
|
||||
import chylex.hee.mechanics.compendium.util.IGuiItemStackRenderer;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableSet;
|
||||
|
||||
import chylex.hee.mechanics.compendium.objects.IKnowledgeObjectInstance;
|
||||
import chylex.hee.mechanics.compendium.util.IGuiItemStackRenderer;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import gnu.trove.map.hash.TIntObjectHashMap;
|
||||
|
||||
+2
-3
@@ -6,6 +6,8 @@ import net.minecraft.item.ItemStack;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.google.common.base.Joiner;
|
||||
|
||||
import chylex.hee.gui.GuiEnderCompendium;
|
||||
import chylex.hee.gui.helpers.GuiItemRenderHelper;
|
||||
import chylex.hee.init.ItemList;
|
||||
@@ -15,9 +17,6 @@ import chylex.hee.mechanics.compendium.content.KnowledgeFragment;
|
||||
import chylex.hee.mechanics.compendium.content.KnowledgeObject;
|
||||
import chylex.hee.mechanics.compendium.objects.IKnowledgeObjectInstance;
|
||||
import chylex.hee.mechanics.compendium.util.KnowledgeUtils;
|
||||
|
||||
import com.google.common.base.Joiner;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
|
||||
+3
-4
@@ -11,6 +11,9 @@ import net.minecraft.item.crafting.IRecipe;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.google.common.base.Joiner;
|
||||
import com.google.common.base.Predicate;
|
||||
|
||||
import chylex.hee.gui.GuiEnderCompendium;
|
||||
import chylex.hee.gui.helpers.GuiItemRenderHelper;
|
||||
import chylex.hee.init.ItemList;
|
||||
@@ -22,10 +25,6 @@ import chylex.hee.system.J8;
|
||||
import chylex.hee.system.logging.Log;
|
||||
import chylex.hee.system.util.RecipeUnifier;
|
||||
import chylex.hee.system.util.RecipeUnifier.Recipe;
|
||||
|
||||
import com.google.common.base.Joiner;
|
||||
import com.google.common.base.Predicate;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
|
||||
+2
-3
@@ -8,6 +8,8 @@ import net.minecraft.item.ItemStack;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.google.common.base.Joiner;
|
||||
|
||||
import chylex.hee.gui.GuiEnderCompendium;
|
||||
import chylex.hee.gui.helpers.GuiItemRenderHelper;
|
||||
import chylex.hee.mechanics.compendium.content.KnowledgeFragment;
|
||||
@@ -16,9 +18,6 @@ import chylex.hee.mechanics.compendium.objects.IKnowledgeObjectInstance;
|
||||
import chylex.hee.mechanics.compendium.util.KnowledgeUtils;
|
||||
import chylex.hee.mechanics.enhancements.IEnhancementEnum;
|
||||
import chylex.hee.system.util.DragonUtil;
|
||||
|
||||
import com.google.common.base.Joiner;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
|
||||
+2
-3
@@ -5,15 +5,14 @@ import net.minecraft.item.ItemStack;
|
||||
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
import com.google.common.base.Joiner;
|
||||
|
||||
import chylex.hee.gui.GuiEnderCompendium;
|
||||
import chylex.hee.gui.helpers.GuiItemRenderHelper;
|
||||
import chylex.hee.mechanics.compendium.content.KnowledgeFragment;
|
||||
import chylex.hee.mechanics.compendium.content.KnowledgeObject;
|
||||
import chylex.hee.mechanics.compendium.objects.IKnowledgeObjectInstance;
|
||||
import chylex.hee.mechanics.compendium.util.KnowledgeUtils;
|
||||
|
||||
import com.google.common.base.Joiner;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
|
||||
@@ -8,13 +8,12 @@ import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.event.entity.item.ItemTossEvent;
|
||||
import net.minecraftforge.event.entity.player.PlayerDropsEvent;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
|
||||
import chylex.hee.entity.technical.EntityTechnicalVoidChest;
|
||||
import chylex.hee.packets.PacketPipeline;
|
||||
import chylex.hee.packets.client.C09SimpleEvent;
|
||||
import chylex.hee.packets.client.C09SimpleEvent.EventType;
|
||||
|
||||
import com.google.common.collect.Lists;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.EventPriority;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
|
||||
|
||||
@@ -34,8 +34,29 @@ import chylex.hee.entity.boss.EntityBossEnderDemon;
|
||||
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.RenderBlockObsidianSpecial;
|
||||
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;
|
||||
|
||||
@@ -19,6 +19,9 @@ import net.minecraftforge.event.entity.living.LivingDeathEvent;
|
||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
|
||||
import net.minecraftforge.event.entity.player.PlayerInteractEvent.Action;
|
||||
|
||||
import com.google.common.base.Joiner;
|
||||
import com.google.common.collect.ArrayListMultimap;
|
||||
|
||||
import chylex.hee.entity.boss.EntityBossDragon;
|
||||
import chylex.hee.init.BlockList;
|
||||
import chylex.hee.init.ItemList;
|
||||
@@ -30,10 +33,6 @@ import chylex.hee.system.savedata.types.DragonSavefile;
|
||||
import chylex.hee.system.savedata.types.QuickSavefile;
|
||||
import chylex.hee.system.savedata.types.QuickSavefile.IQuickSavefile;
|
||||
import chylex.hee.system.util.BlockPosM;
|
||||
|
||||
import com.google.common.base.Joiner;
|
||||
import com.google.common.collect.ArrayListMultimap;
|
||||
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.eventhandler.Event.Result;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
|
||||
@@ -12,6 +12,9 @@ import net.minecraftforge.common.DimensionManager;
|
||||
|
||||
import org.apache.commons.lang3.ArrayUtils;
|
||||
|
||||
import com.google.common.reflect.ClassPath;
|
||||
import com.google.common.reflect.ClassPath.ClassInfo;
|
||||
|
||||
import chylex.hee.HardcoreEnderExpansion;
|
||||
import chylex.hee.entity.boss.EntityBossDragon;
|
||||
import chylex.hee.system.logging.Log;
|
||||
@@ -19,9 +22,6 @@ import chylex.hee.system.logging.Stopwatch;
|
||||
import chylex.hee.system.test.UnitTester;
|
||||
import chylex.hee.system.test.data.RunTime;
|
||||
|
||||
import com.google.common.reflect.ClassPath;
|
||||
import com.google.common.reflect.ClassPath.ClassInfo;
|
||||
|
||||
public class HeeDebugCommand extends BaseCommand {
|
||||
|
||||
public static float overrideWingSpeed = 1F;
|
||||
|
||||
@@ -7,9 +7,6 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
import thaumcraft.api.ThaumcraftApi.EntityTagsNBT;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
import chylex.hee.block.BlockCrossedDecoration;
|
||||
import chylex.hee.block.BlockEndstoneTerrain;
|
||||
import chylex.hee.block.BlockRavagedBrick;
|
||||
@@ -18,6 +15,9 @@ import chylex.hee.init.ItemList;
|
||||
import chylex.hee.mechanics.essence.EssenceType;
|
||||
import chylex.hee.mechanics.misc.HomelandEndermen.HomelandRole;
|
||||
import chylex.hee.system.integration.IIntegrationHandler;
|
||||
import thaumcraft.api.ThaumcraftApi.EntityTagsNBT;
|
||||
import thaumcraft.api.aspects.Aspect;
|
||||
import thaumcraft.api.aspects.AspectList;
|
||||
|
||||
public class ThaumcraftIntegration implements IIntegrationHandler {
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
package chylex.hee.system.test;
|
||||
|
||||
import chylex.hee.system.util.MathUtil;
|
||||
|
||||
import com.google.common.base.Objects;
|
||||
|
||||
import chylex.hee.system.util.MathUtil;
|
||||
|
||||
public final class Assert {
|
||||
|
||||
/**
|
||||
|
||||
@@ -13,12 +13,6 @@ import java.util.Set;
|
||||
|
||||
import net.minecraftforge.common.ForgeVersion;
|
||||
|
||||
import chylex.hee.system.logging.Log;
|
||||
import chylex.hee.system.test.data.MethodType;
|
||||
import chylex.hee.system.test.data.RunTime;
|
||||
import chylex.hee.system.test.data.UnitTest;
|
||||
import chylex.hee.system.util.DragonUtil;
|
||||
|
||||
import com.google.common.collect.HashMultimap;
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableList.Builder;
|
||||
@@ -26,6 +20,12 @@ import com.google.common.collect.Iterables;
|
||||
import com.google.common.collect.Multimap;
|
||||
import com.google.common.reflect.ClassPath;
|
||||
import com.google.common.reflect.ClassPath.ClassInfo;
|
||||
|
||||
import chylex.hee.system.logging.Log;
|
||||
import chylex.hee.system.test.data.MethodType;
|
||||
import chylex.hee.system.test.data.RunTime;
|
||||
import chylex.hee.system.test.data.UnitTest;
|
||||
import chylex.hee.system.util.DragonUtil;
|
||||
import cpw.mods.fml.common.FMLCommonHandler;
|
||||
|
||||
public final class UnitTester {
|
||||
|
||||
@@ -23,6 +23,9 @@ import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.DimensionManager;
|
||||
|
||||
import com.google.common.base.Function;
|
||||
import com.google.common.collect.ArrayListMultimap;
|
||||
|
||||
import chylex.hee.block.BlockDragonEggCustom;
|
||||
import chylex.hee.block.BlockObsidianEnd;
|
||||
import chylex.hee.block.BlockRavagedBrick;
|
||||
@@ -46,10 +49,6 @@ import chylex.hee.tileentity.TileEntityEnhancedBrewingStand;
|
||||
import chylex.hee.tileentity.TileEntityEssenceAltar;
|
||||
import chylex.hee.tileentity.TileEntityExperienceTable;
|
||||
import chylex.hee.tileentity.TileEntityExtractionTable;
|
||||
|
||||
import com.google.common.base.Function;
|
||||
import com.google.common.collect.ArrayListMultimap;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
|
||||
@@ -2,10 +2,10 @@ package chylex.hee.system.update;
|
||||
|
||||
import java.util.Calendar;
|
||||
|
||||
import chylex.hee.system.commands.HeeDebugCommand.HeeTest;
|
||||
|
||||
import com.google.common.base.Joiner;
|
||||
|
||||
import chylex.hee.system.commands.HeeDebugCommand.HeeTest;
|
||||
|
||||
public final class UpdateNotificationManager {
|
||||
|
||||
public static boolean enableNotifications = true;
|
||||
|
||||
@@ -15,14 +15,14 @@ import net.minecraftforge.common.MinecraftForge;
|
||||
import org.apache.commons.codec.Charsets;
|
||||
import org.apache.commons.io.IOUtils;
|
||||
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonParser;
|
||||
|
||||
import chylex.hee.HardcoreEnderExpansion;
|
||||
import chylex.hee.system.logging.Log;
|
||||
import chylex.hee.system.util.DragonUtil;
|
||||
import chylex.hee.system.util.MathUtil;
|
||||
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonParser;
|
||||
|
||||
class UpdateThread extends Thread {
|
||||
|
||||
private static final String defaultUrl = "https://raw.githubusercontent.com/chylex/Hardcore-Ender-Expansion/master/UpdateNotificationDataV2.txt";
|
||||
|
||||
@@ -5,13 +5,13 @@ import java.util.Calendar;
|
||||
import org.apache.commons.lang3.ArrayUtils;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import chylex.hee.system.logging.Log;
|
||||
import chylex.hee.system.util.DragonUtil;
|
||||
|
||||
import com.google.gson.JsonArray;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
|
||||
import chylex.hee.system.logging.Log;
|
||||
import chylex.hee.system.util.DragonUtil;
|
||||
|
||||
final class VersionEntry implements Comparable<VersionEntry> {
|
||||
|
||||
public final String versionIdentifier;
|
||||
|
||||
@@ -11,10 +11,10 @@ import net.minecraft.item.crafting.ShapelessRecipes;
|
||||
import net.minecraftforge.oredict.ShapedOreRecipe;
|
||||
import net.minecraftforge.oredict.ShapelessOreRecipe;
|
||||
|
||||
import chylex.hee.system.J8;
|
||||
|
||||
import com.google.common.base.Function;
|
||||
|
||||
import chylex.hee.system.J8;
|
||||
|
||||
/**
|
||||
* Converts the current IRecipe mess into a unified system.
|
||||
*/
|
||||
|
||||
@@ -8,10 +8,9 @@ import java.util.Map;
|
||||
|
||||
import net.minecraft.launchwrapper.Launch;
|
||||
|
||||
import chylex.hee.system.logging.Log;
|
||||
|
||||
import com.gtnewhorizon.gtnhlib.reflect.Fields;
|
||||
|
||||
import chylex.hee.system.logging.Log;
|
||||
import cpw.mods.fml.relauncher.CoreModManager;
|
||||
import cpw.mods.fml.relauncher.ReflectionHelper;
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
+2
-2
@@ -4,11 +4,11 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
|
||||
import chylex.hee.system.logging.Log;
|
||||
import chylex.hee.world.util.Direction;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
|
||||
public class SanctuaryConquerPointGen {
|
||||
|
||||
private final byte width, depth;
|
||||
|
||||
Reference in new issue
Block a user