upstream/Hardcore-Ender-Expansion
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/Hardcore-Ender-Expansion.git synced 2026-10-26 14:24:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tweaks and optimizations

Browse Source
This commit is contained in:
chylex committed 2014-08-12 01:39:36 +02:00
1 parent fcfb831c4a
commit 2aa5d63a5c
8 files changed
+59 -32
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/chylex/hee/HardcoreEnderExpansion.java
+2
View File
@@ -255,8 +255,10 @@ public class HardcoreEnderExpansion{
@EventHandler
public void onPostInit(FMLPostInitializationEvent e){
Stopwatch.time("PostInitEvent");
ModIntegrationManager.integrateMods();
DimensionOverride.postInit();
Stopwatch.finish("PostInitEvent");
}
src/main/java/chylex/hee/mechanics/knowledge/KnowledgeRegistrations.java
+5
View File
@@ -35,6 +35,7 @@ import chylex.hee.mechanics.knowledge.fragment.CraftingKnowledgeFragment;
import chylex.hee.mechanics.knowledge.fragment.IFragmentUnlockAction;
import chylex.hee.mechanics.knowledge.fragment.KnowledgeFragment;
import chylex.hee.mechanics.knowledge.fragment.TextKnowledgeFragment;
import chylex.hee.system.logging.Stopwatch;
public final class KnowledgeRegistrations{
private static final int dist = 28, hdist = dist/2;
@@ -119,6 +120,8 @@ public final class KnowledgeRegistrations{
MUSIC_DISCS = new KnowledgeRegistration(MISCELLANEOUS, "musicDiscs"); //
public static void initialize(){
Stopwatch.time("KnowledgeRegistrations");
HELP
.setFragments(new KnowledgeFragment[]{
new TextKnowledgeFragment(0).setLocalizedText("Ender Compendium is the source of knowledge about the End dimension."),
@@ -882,6 +885,8 @@ public final class KnowledgeRegistrations{
.setFragments(new KnowledgeFragment[]{
new TextKnowledgeFragment(0).setLocalizedText("Discs containing various music that plays in the End, found in various dungeons of the dimension.")
});
Stopwatch.finish("KnowledgeRegistrations");
}
private KnowledgeRegistrations(){}
src/main/java/chylex/hee/mechanics/orb/OrbAcquirableItems.java
+22 -16
View File
@@ -14,13 +14,17 @@ import net.minecraft.item.crafting.ShapelessRecipes;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.fluids.IFluidBlock;
import chylex.hee.item.ItemList;
import chylex.hee.system.logging.Stopwatch;
public final class OrbAcquirableItems{
public static final WeightedItemList idList = new WeightedItemList();
public static void initialize(){
Stopwatch.time("OrbAcquirableItems");
for(BiomeGenBase biome:BiomeGenBase.getBiomeGenArray()){
if (biome == null)continue;
else if (biome.biomeID >= 128)break;
idList.add(new WeightedItem(biome.topBlock,0,34));
idList.add(new WeightedItem(biome.fillerBlock,0,34));
}
@@ -35,7 +39,22 @@ public final class OrbAcquirableItems{
}
for(Object o:CraftingManager.getInstance().getRecipeList()){
if (o instanceof ShapelessRecipes){
if (o instanceof ShapedRecipes){
ShapedRecipes shaped = (ShapedRecipes)o;
ItemStack output = shaped.getRecipeOutput();
if (output == null)continue;
if (output.getItem() == null){
throw new RuntimeException("Hardcore Ender Expansion has found a defective recipe! Another mod is most likely registering a recipe BEFORE registering blocks and items. This is not a fault of Hardcore Ender Expansion, but it will cause a crash when crafting blocks from the defective mod! Please, remove other mods until this message stops appearing to find which mod causes the issue, and then report it to the mod author.");
}
idList.add(new WeightedItem(output.getItem(),output.getItemDamage(),21-shaped.recipeWidth*2-shaped.recipeHeight*2));
for(ItemStack is:shaped.recipeItems){
if (is != null)idList.add(new WeightedItem(is.getItem(),is.getItemDamage(),23-shaped.recipeWidth*2-shaped.recipeHeight*2));
}
}
else if (o instanceof ShapelessRecipes){
ShapelessRecipes shapeless = (ShapelessRecipes)o;
ItemStack output = shapeless.getRecipeOutput();
@@ -51,21 +70,6 @@ public final class OrbAcquirableItems{
idList.add(new WeightedItem(is.getItem(),is.getItemDamage(),25-shapeless.getRecipeSize()*2));
}
}
else if (o instanceof ShapedRecipes){
ShapedRecipes shaped = (ShapedRecipes)o;
ItemStack output = shaped.getRecipeOutput();
if (output == null)continue;
if (output.getItem() == null){
throw new RuntimeException("Hardcore Ender Expansion has found a defective recipe! Another mod is most likely registering a recipe BEFORE registering blocks and items. This is not a fault of Hardcore Ender Expansion, but it will cause a crash when crafting blocks from the defective mod! Please, remove other mods until this message stops appearing to find which mod causes the issue, and then report it to the mod author.");
}
idList.add(new WeightedItem(output.getItem(),output.getItemDamage(),21-shaped.recipeWidth*2-shaped.recipeHeight*2));
for(ItemStack is:shaped.recipeItems){
if (is != null)idList.add(new WeightedItem(is.getItem(),is.getItemDamage(),23-shaped.recipeWidth*2-shaped.recipeHeight*2));
}
}
}
/*
@@ -81,6 +85,8 @@ public final class OrbAcquirableItems{
if (block instanceof IFluidBlock || block instanceof BlockLiquid)iter.remove();
}
}
Stopwatch.finish("OrbAcquirableItems");
}
private OrbAcquirableItems(){}
src/main/java/chylex/hee/mechanics/orb/OrbSpawnableMobs.java
+5
View File
@@ -11,6 +11,7 @@ import net.minecraft.entity.monster.EntityWitch;
import net.minecraft.entity.passive.EntityVillager;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.biome.BiomeGenBase.SpawnListEntry;
import chylex.hee.system.logging.Stopwatch;
import chylex.hee.system.weight.WeightedList;
import chylex.hee.world.structure.island.biome.IslandBiomeBase;
import chylex.hee.world.util.SpawnEntry;
@@ -19,6 +20,8 @@ public final class OrbSpawnableMobs{
public static final Set<Class<?>> classList = new HashSet<>();
public static void initialize(){
Stopwatch.time("OrbSpawnableMobs");
for(BiomeGenBase biome:BiomeGenBase.getBiomeGenArray()){
if (biome == null)continue;
@@ -40,6 +43,8 @@ public final class OrbSpawnableMobs{
EntityCaveSpider.class, EntityWitch.class, EntitySnowman.class,
EntityVillager.class, EntitySilverfish.class, EntityIronGolem.class
})classList.add(cls);
Stopwatch.finish("OrbSpawnableMobs");
}
private OrbSpawnableMobs(){}
src/main/java/chylex/hee/packets/PacketPipeline.java
+12 -10
View File
@@ -12,6 +12,7 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.NetHandlerPlayServer;
import net.minecraft.tileentity.TileEntity;
import chylex.hee.system.logging.Stopwatch;
import com.google.common.reflect.ClassPath;
import com.google.common.reflect.ClassPath.ClassInfo;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
@@ -46,6 +47,8 @@ public class PacketPipeline{
private PacketPipeline(){}
private void load(){
Stopwatch.time("PacketPipeline");
eventDrivenChannel = NetworkRegistry.INSTANCE.newEventDrivenChannel(channelName);
eventDrivenChannel.register(this);
@@ -56,20 +59,19 @@ public class PacketPipeline{
int id = -1;
ClassPath path = ClassPath.from(PacketPipeline.class.getClassLoader());
for(ClassInfo clsInfo:path.getTopLevelClasses("chylex.hee.packets.client")){
Class cls = clsInfo.load();
if (!cls.getName().endsWith("__"))registerPacket(++id,cls);
}
for(ClassInfo clsInfo:path.getTopLevelClasses("chylex.hee.packets.server")){
Class cls = clsInfo.load();
if (!cls.getName().endsWith("__"))registerPacket(++id,cls);
for(ClassInfo clsInfo:ClassPath.from(PacketPipeline.class.getClassLoader()).getTopLevelClassesRecursive("chylex.hee.packets")){
String name = clsInfo.getName();
if (name.startsWith("chylex.hee.packets.client.C") || name.startsWith("chylex.hee.packets.server.S")){
Class cls = clsInfo.load();
registerPacket(++id,cls);
}
}
}catch(NoSuchFieldException | IllegalArgumentException | IllegalAccessException | IOException e){
throw new RuntimeException("Unable to load the Packet system!",e);
}
Stopwatch.finish("PacketPipeline");
}
private void registerPacket(int id, Class<? extends AbstractPacket> cls){
src/main/java/chylex/hee/packets/client/C__.java → src/main/java/chylex/hee/packets/client/__.java
+3 -3
View File
@@ -5,11 +5,11 @@ import chylex.hee.packets.AbstractClientPacket;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
public class C__ extends AbstractClientPacket{
public class __ extends AbstractClientPacket{
public C__(){}
public __(){}
public C__(Object o){
public __(Object o){
}
src/main/java/chylex/hee/packets/server/S__.java → src/main/java/chylex/hee/packets/server/__.java
+3 -3
View File
@@ -3,11 +3,11 @@ import io.netty.buffer.ByteBuf;
import net.minecraft.entity.player.EntityPlayerMP;
import chylex.hee.packets.AbstractServerPacket;
public class S__ extends AbstractServerPacket{
public class __ extends AbstractServerPacket{
public S__(){}
public __(){}
public S__(Object o){
public __(Object o){
}
src/main/java/chylex/hee/world/DimensionOverride.java
+7
View File
@@ -34,6 +34,7 @@ public final class DimensionOverride{
}
private static void overrideBiome(){
Stopwatch.time("DimensionOverride - Biome");
Field modifiersField = null;
try{
@@ -53,10 +54,14 @@ public final class DimensionOverride{
}catch(NoSuchFieldException | IllegalArgumentException | IllegalAccessException e){
throw new RuntimeException("Could not override the End biome!",e);
}
Stopwatch.finish("DimensionOverride - Biome");
}
@SuppressWarnings("unchecked")
private static void overrideWorldGen(){
Stopwatch.time("DimensionOverride - WorldProvider");
try{
Field f = DimensionManager.class.getDeclaredField("providers");
f.setAccessible(true); // let it throw NPE if the field isn't found
@@ -67,5 +72,7 @@ public final class DimensionOverride{
}catch(NoSuchFieldException | IllegalArgumentException | IllegalAccessException e){
throw new RuntimeException("Could not override the DimensionManager providers!",e);
}
Stopwatch.finish("DimensionOverride - WorldProvider");
}
}