fixed a few bugs, removed unused variables & imports

+added a ingame book containing the fuelmap
This commit is contained in:
bartimaeusnek committed 2018-09-04 08:00:47 +02:00
1 parent 805553e04e
commit 028f5ef031
25 files changed
+92 -77

No files matched your search

@@ -1,8 +1,5 @@
package emt.block;
import java.util.List;
import java.util.Random;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import emt.EMT;
@@ -17,9 +14,11 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import java.util.List;
import java.util.Random;
public class BlockReflectedGen
extends BlockBaseContainer
{
+1 -4
View File
@@ -1,16 +1,13 @@
package emt.client.gui;
import org.lwjgl.opengl.GL11;
import emt.EMT;
import emt.client.gui.container.ConainerGenerator;
import emt.client.gui.container.ContainerSolars;
import emt.tile.generator.TileEntityBaseGenerator;
import emt.tile.solar.TileEntitySolarBase;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.ResourceLocation;
import org.lwjgl.opengl.GL11;
public class GuiSolar extends GuiContainer {
+63 -33
View File
@@ -1,5 +1,7 @@
package emt.command;
import emt.util.EMTEssentiasOutputs;
import emt.util.EMTTextHelper;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommand;
import net.minecraft.command.ICommandSender;
@@ -10,16 +12,11 @@ import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTTagString;
import thaumcraft.api.aspects.Aspect;
import java.util.Collection;
import java.util.ArrayList;
import java.util.List;
import emt.util.EMTEssentiasOutputs;
import emt.util.EMTTextHelper;
public class CommandOutputs extends CommandBase {
public String text;
@Override
public String getCommandName() {
return "emt_outputs";
@@ -51,37 +48,70 @@ public class CommandOutputs extends CommandBase {
@Override
public void processCommand(ICommandSender command, String[] astring) {
text = EMTTextHelper.localize("gui.EMT.book.aspect.output.essentia.eu") + ": ";
Collection<Aspect> aspectCollection = Aspect.aspects.values();
for (Aspect aspect : aspectCollection) {
String text2 = addStrings(text, (aspect.getTag() + ": " + String.valueOf(EMTEssentiasOutputs.outputs.get(aspect.getTag())) + "\n"));
text = text2;
}
addOutputsBook(EMTTextHelper.localize("gui.EMT.book.aspect.output.eu.title"), text, command, astring);
}
public void addOutputsBook(String title, String text, ICommandSender command, String[] astring) {
ItemStack book = new ItemStack(Items.written_book);
book.setTagInfo("author", new NBTTagString("Tombenpotter"));
book.setTagInfo("title", new NBTTagString(title));
NBTTagCompound nbttagcompound = book.getTagCompound();
NBTTagList bookPages = new NBTTagList();
bookPages.appendTag(new NBTTagString(text.substring(0, 237)));
bookPages.appendTag(new NBTTagString(text.substring(237, 476)));
bookPages.appendTag(new NBTTagString(text.substring(476, 709)));
bookPages.appendTag(new NBTTagString(text.substring(709)));
nbttagcompound.setTag("pages", bookPages);
System.out.println(text.length());
ItemStack book = mkbook();
if (!command.getEntityWorld().getPlayerEntityByName(command.getCommandSenderName()).inventory.addItemStackToInventory(book))
command.getEntityWorld().getPlayerEntityByName(command.getCommandSenderName()).entityDropItem(book, 0);
}
public String addStrings(String string1, String string2) {
String result = string1 + string2;
return result;
public static ItemStack mkbook(){
String text = EMTTextHelper.localize("gui.EMT.book.aspect.output.essentia.eu") + ": \n";
String text2 = EMTTextHelper.localize("gui.EMT.book.aspect.output.essentia.eu") + " /t: \n";
String text3 = EMTTextHelper.localize("gui.EMT.book.aspect.output.essentia.eu") + " /t singleblock: \n";
final String title = EMTTextHelper.localize("gui.EMT.book.aspect.output.eu.title");
final ArrayList<String> singleblock = new ArrayList<String>();
final ArrayList<String> bookL = new ArrayList<String>();
final ArrayList<String> bookL2 = new ArrayList<String>();
byte counter = 0;
for (final Aspect aspect : Aspect.aspects.values()) {
++counter;
if (aspect.equals(Aspect.ENERGY)||aspect.equals(Aspect.TREE)||aspect.equals(Aspect.FIRE)||aspect.equals(Aspect.AURA)||aspect.equals(Aspect.GREED)||aspect.equals(Aspect.AIR))
text3 = text3 + aspect.getTag() + ": " + String.valueOf(EMTEssentiasOutputs.outputs.get(aspect.getTag())/20D/20D) + "EU\n";
if (counter < 12){
text2 = text2 + aspect.getTag() + ": " + String.valueOf(EMTEssentiasOutputs.outputs.get(aspect.getTag())/20D) + "EU/t\n";
text = text + aspect.getTag() + ": " + String.valueOf(EMTEssentiasOutputs.outputs.get(aspect.getTag())) + "EU\n";
}
else {
text2 = text2+ aspect.getTag() + ": " + String.valueOf(EMTEssentiasOutputs.outputs.get(aspect.getTag())/20D) + "EU\n";
text = text + aspect.getTag() + ": " + String.valueOf(EMTEssentiasOutputs.outputs.get(aspect.getTag())) + "EU\n";
bookL.add(text);
bookL2.add(text2);
text2 = new String("");
text = new String("");
counter = 0;
}
}
singleblock.add(text3);
if (counter != 0){
bookL.add(text);
bookL2.add(text2);
}
final ItemStack book = new ItemStack(Items.written_book);
book.setTagInfo("author", new NBTTagString("Tombenpotter, bartimaeusnek"));
book.setTagInfo("title", new NBTTagString(title));
final NBTTagCompound nbttagcompound = book.getTagCompound();
final NBTTagList bookPages = new NBTTagList();
for (int i = 0; i < singleblock.size(); i++) {
bookPages.appendTag(new NBTTagString(singleblock.get(i)));
}
for (int i = 0; i < bookL.size(); i++) {
bookPages.appendTag(new NBTTagString(bookL.get(i)));
}
for (int i = 0; i < bookL2.size(); i++) {
bookPages.appendTag(new NBTTagString(bookL2.get(i)));
}
nbttagcompound.setTag("pages", bookPages);
return book;
}
}
@@ -1,7 +1,5 @@
package emt.entity;
import java.util.ArrayList;
import cpw.mods.fml.common.registry.IEntityAdditionalSpawnData;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@@ -19,6 +17,8 @@ import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import thaumcraft.common.Thaumcraft;
import java.util.ArrayList;
public class EntityEnergyBall extends Entity implements IProjectile, IEntityAdditionalSpawnData {
public static final int RADIUS = 8;
public static final int MAX_TICKS_IN_TILE = 60;
@@ -25,7 +25,7 @@ public class EMT_GT_Block extends Block {
}
@SideOnly(Side.CLIENT)
private static IIcon[] texture;
private IIcon[] texture;
@SideOnly(Side.CLIENT)
private String[] textureNames;
private String name;
@@ -1,13 +1,10 @@
package emt.gthandler.common.implementations;
import gregtech.api.enums.GT_Values;
import gregtech.api.gui.GT_Container;
import gregtech.api.gui.GT_GUIContainer;
import gregtech.api.interfaces.ITexture;
import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
import gregtech.api.metatileentity.MetaTileEntity;
import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input;
import gregtech.api.util.GT_Utility;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@@ -11,8 +11,13 @@ import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import thaumcraft.common.config.ConfigBlocks;
import thaumcraft.common.config.ConfigItems;
import static emt.command.CommandOutputs.mkbook;
public class EMT_GT_Loader implements Runnable {
@@ -40,4 +45,8 @@ public class EMT_GT_Loader implements Runnable {
for (int i = 0; i < ItemList.HATCHES_INPUT.length; i++)
GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.HATCHES_INPUT[i].get(1L), new ItemStack(ConfigBlocks.blockTube,1,4)},Materials.Thaumium.getMolten(288L),EHatch[i],100,(int)(GT_Values.V[i]-(GT_Values.V[i]/10)));
}
public void runlate(){
GT_Values.RA.addAssemblerRecipe(new ItemStack[]{new ItemStack(Items.book), GT_OreDictUnificator.get(OrePrefixes.circuit,Materials.Basic,1L), new ItemStack(ConfigItems.itemShard,1, OreDictionary.WILDCARD_VALUE)},GT_Values.NF,mkbook(),128,64);
}
}
@@ -237,6 +237,7 @@ public class EMT_Large_Essentia_Gen extends GT_MetaTileEntity_MultiBlockBase {
if (this.mMaintenanceHatches.size() != 1)
return false;
/*
//repair shit debug shit
this.mWrench = true;
this.mScrewdriver = true;
@@ -244,7 +245,7 @@ public class EMT_Large_Essentia_Gen extends GT_MetaTileEntity_MultiBlockBase {
this.mHardHammer = true;
this.mSolderingTool = true;
this.mCrowbar = true;
*/
return true;
}
@@ -296,7 +297,7 @@ public class EMT_Large_Essentia_Gen extends GT_MetaTileEntity_MultiBlockBase {
}
//transfer energy into mEU
this.mEUt = (int) cached;
this.mEUt = (int) Math.ceil(cached);
}
@Override
@@ -4,7 +4,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
import emt.block.BlockReflectedGen;
import emt.tile.generator.TileEntityBaseGenerator;
import emt.tile.generator.TileEntityReflexionGen;
import java.util.List;
public class EMTAutogeneratedGens
implements Runnable
+4 -2
View File
@@ -1,10 +1,10 @@
package emt.init;
import emt.gthandler.common.items.EMT_CasingBlock;
import emt.gthandler.common.loader.EMT_GT_Loader;
public class Registry
{
private static final EMT_GT_Loader gtloader = new EMT_GT_Loader();
public static void registerPreInit() {
}
@@ -13,15 +13,17 @@ public class Registry
EMTBlocks.registerBlocks();
EMTItems.registerItems();
EMTTiles.registerTileEntities();
new EMT_GT_Loader().run();
gtloader.run();
EMTRecipes.registerEarlyRecipes();
}
public static void registerLate()
{
EMTBlocks.addAspects();
gtloader.runlate();
EMTRecipes.registerLateRecipes();
EMTRecipes.registerUUMInfusionRecipes();
// new EMTAutogeneratedGens().run();
}
}
@@ -9,7 +9,6 @@ import emt.util.EMTTextHelper;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
import ic2.api.item.IMetalArmor;
import ic2.core.item.ElectricItemManager;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.Entity;
@@ -3,7 +3,6 @@ package emt.item.armor.wings;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import emt.EMT;
import emt.item.armor.wings.ItemThaumiumReinforcedWing;
import emt.util.EMTConfigHandler;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
@@ -1,8 +1,5 @@
package emt.item.focus;
import java.util.Map.Entry;
import emt.item.focus.ItemBaseFocus;
import emt.util.EMTConfigHandler;
import ic2.api.item.ElectricItem;
import net.minecraft.entity.player.EntityPlayer;
@@ -12,6 +9,8 @@ import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.wands.FocusUpgradeType;
import thaumcraft.common.items.wands.ItemWandCasting;
import java.util.Map.Entry;
public class ItemWandChargingFocus extends ItemBaseFocus {
AspectList visCost = new AspectList().add(Aspect.FIRE, 10).add(Aspect.WATER, 10).add(Aspect.AIR, 10).add(Aspect.EARTH, 10).add(Aspect.ORDER, 10).add(Aspect.ENTROPY, 10);
@@ -8,13 +8,10 @@ import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Item.ToolMaterial;
import net.minecraft.item.ItemSword;
import net.minecraft.util.DamageSource;
import net.minecraft.world.World;
import org.lwjgl.input.Keyboard;
import thaumcraft.api.IRepairable;
import thaumcraft.common.entities.projectile.EntityAlumentum;
@@ -27,7 +27,6 @@ import thaumcraft.common.Thaumcraft;
import thaumcraft.common.entities.EntityFollowingItem;
import thaumcraft.common.lib.utils.BlockUtils;
import javax.swing.*;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.Locale;
@@ -36,7 +35,6 @@ public class ItemRockbreakerDrill extends ItemThaumiumDrill {
private static final Block[] isEffective = { Blocks.nether_brick, Blocks.netherrack, Blocks.glowstone, Blocks.iron_block, Blocks.gold_block, Blocks.diamond_block, Blocks.lapis_block, Blocks.redstone_block, Blocks.redstone_ore, Blocks.emerald_ore, Blocks.emerald_block, Blocks.stonebrick, Blocks.glass, Blocks.stone, Blocks.gold_ore, Blocks.iron_ore, Blocks.coal_ore, Blocks.cobblestone,
Blocks.diamond_ore, Blocks.lapis_ore, Blocks.dirt, Blocks.gravel, Blocks.sand, Blocks.sandstone, Blocks.soul_sand, Blocks.clay, Blocks.grass, Blocks.snow_layer, Blocks.snow, Blocks.farmland, Blocks.hardened_clay, Blocks.stained_hardened_clay, Blocks.mossy_cobblestone };
public Icon icon;
int side;
public int searchCost = 1000;
public int hitCost = 400;
@@ -5,7 +5,6 @@ import net.minecraft.network.NetworkManager;
import net.minecraft.network.Packet;
import net.minecraft.network.play.server.S35PacketUpdateTileEntity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class TileEntityEMT
extends TileEntity
@@ -1,7 +1,6 @@
package emt.tile;
import emt.init.EMTBlocks;
import emt.tile.TileEntityEMT;
import emt.util.EMTConfigHandler;
import ic2.api.item.IC2Items;
import ic2.api.tile.IWrenchable;
@@ -379,7 +379,6 @@ public class TileEntityBaseGenerator
for (byte i = 0; i < 6; i = (byte)(i + 1)) {
if (getIGregTechTileEntityAtSide(i) != null)
{
IGregTechTileEntity aBaseMetaTileEntity = getIGregTechTileEntityAtSide(i);
if (isUniversalEnergyStored(getOutputVoltage() * getOutputAmperage()))
{
long tEU = IEnergyConnected.Util.emitEnergyToNetwork(getOutputVoltage(), getOutputAmperage(), this);
@@ -1,7 +1,5 @@
package emt.tile.solar;
import java.util.Random;
import cpw.mods.fml.common.FMLCommonHandler;
import emt.tile.TileEntityEMT;
import gregtech.api.enums.GT_Values;
@@ -29,11 +27,9 @@ import net.minecraftforge.fluids.IFluidHandler;
public abstract class TileEntitySolarBase extends TileEntityEMT implements IInventory, IWrenchable, IHasWorldObjectAndCoords, IEnergyConnected, IBasicEnergyContainer {
public BasicSource energySource;
public static Random random = new Random();
public boolean initialized;
public boolean theSunIsVisible;
public boolean canRain;
public boolean noSunlight;
public int tick;
public double output = 0;
public long timer = 0L;
@@ -192,7 +188,6 @@ public abstract class TileEntitySolarBase extends TileEntityEMT implements IInve
for (byte i = 0; i < 6; i = (byte)(i + 1)) {
if (getIGregTechTileEntityAtSide(i) != null)
{
IGregTechTileEntity aBaseMetaTileEntity = getIGregTechTileEntityAtSide(i);
if (isUniversalEnergyStored(getOutputVoltage() * getOutputAmperage()))
{
long tEU = IEnergyConnected.Util.emitEnergyToNetwork(getOutputVoltage(), getOutputAmperage(), this);
@@ -1,6 +1,5 @@
package emt.tile.solar.dark;
import cpw.mods.fml.common.FMLCommonHandler;
import emt.init.EMTBlocks;
import emt.tile.solar.TileEntitySolarBase;
import emt.util.EMTConfigHandler;
@@ -1,6 +1,5 @@
package emt.tile.solar.fire;
import cpw.mods.fml.common.FMLCommonHandler;
import emt.init.EMTBlocks;
import emt.tile.solar.TileEntitySolarBase;
import emt.util.EMTConfigHandler;
@@ -1,6 +1,5 @@
package emt.tile.solar.order;
import cpw.mods.fml.common.FMLCommonHandler;
import emt.init.EMTBlocks;
import emt.tile.solar.TileEntitySolarBase;
import emt.util.EMTConfigHandler;
@@ -1,6 +1,5 @@
package emt.tile.solar.water;
import cpw.mods.fml.common.FMLCommonHandler;
import emt.init.EMTBlocks;
import emt.tile.solar.TileEntitySolarBase;
import emt.util.EMTConfigHandler;
+1 -1
View File
@@ -150,7 +150,7 @@ public class EMTConfigHandler {
outputCap = config.get(OUTPUTS, "Output Cap", -1).getDouble(outputCap);
EssentiaGeneratorStorage=config.get(VALUES,"Essentia Generator Storage",1000000,"This is the number you have to modify if you want to change the size of the "+"internal buffer of the Essentia Generator").getDouble(EssentiaGeneratorStorage);
EMT_GT_Loader.aIDoffset=config.get(VALUES,"aID for Gregetch Machinery",(13000-GT_Values.VN.length-1),"This Mod will use "+Integer.toString(GT_Values.VN.length+1)+"IDs, do not change if you dont know what you are doing!").getInt(13000-GT_Values.VN.length-1);
EMT_GT_Loader.aIDoffset=config.get(VALUES,"aID offset for Gregetch Machinery",(13000-GT_Values.VN.length-1),"This Mod will use "+Integer.toString(GT_Values.VN.length+1)+" IDs, do not change if you dont know what you are doing!").getInt(13000-GT_Values.VN.length-1);
wandChargerConsumption = config.get(VALUES, "Wand Charging Station Consumption", 50000, "This is the number you have to modify if you want to make the Industrial Wand Charging " + "Station use more or less EU to charge 1 unit of Vis on your wand.").getDouble(wandChargerConsumption);
compressedSolarOutput = config.get(VALUES, "Compressed Solar Panel Output", 10, "This is the number you have to modify if you want to make the Compressed Solar Panel yield " + "more or less EU per tick. Really, you shouldn't touch that, " + "since it's pretty balanced as it is.").getDouble(compressedSolarOutput);
+3 -2
View File
@@ -8,7 +8,7 @@ public class EMTCreativeTab extends CreativeTabs {
public EMTCreativeTab(String tabLabel) {
super(tabLabel);
setBackgroundImageName("emt.png");
//setBackgroundImageName("emt.png");
}
@@ -17,6 +17,7 @@ public class EMTCreativeTab extends CreativeTabs {
return EMTItems.electricThorHammer;
}
/*
@Override
public boolean hasSearchBar() {
return true;
@@ -25,5 +26,5 @@ public class EMTCreativeTab extends CreativeTabs {
@Override
public int getSearchbarWidth() {
return 60;
}
}*/
}