mirror of
https://github.com/GTNewHorizons/Draconic-Evolution.git
synced 2026-11-20 20:22:10 +00:00
1.0.1 release candidate 1 (snapshot 6)
This commit is contained in:
1 parent
2113387202
commit
21e98a5d1a
66 files changed
+2056
-758
No files matched your search
@@ -25,6 +25,7 @@ import com.brandon3055.draconicevolution.common.lib.References;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.*;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyRelay;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyTransceiver;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileWirelessEnergyTransceiver;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyPylon;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyStorageCore;
|
||||
import com.brandon3055.draconicevolution.common.utills.UpdateChecker;
|
||||
@@ -35,6 +36,7 @@ import cpw.mods.fml.common.FMLCommonHandler;
|
||||
import cpw.mods.fml.common.event.FMLInitializationEvent;
|
||||
import cpw.mods.fml.common.event.FMLPostInitializationEvent;
|
||||
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.client.MinecraftForgeClient;
|
||||
@@ -149,6 +151,7 @@ public class ClientProxy extends CommonProxy {
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileDraconiumChest.class, new RenderTileDraconiumChest());
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileEnergyRelay.class, new RenderTileCrystal());
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileEnergyTransceiver.class, new RenderTileCrystal());
|
||||
ClientRegistry.bindTileEntitySpecialRenderer(TileWirelessEnergyTransceiver.class, new RenderTileCrystal());
|
||||
|
||||
//Entitys
|
||||
RenderingRegistry.registerEntityRenderingHandler(EntityCustomDragon.class, new RenderDragon());
|
||||
@@ -217,4 +220,9 @@ public class ClientProxy extends CommonProxy {
|
||||
}
|
||||
return beam;
|
||||
}
|
||||
|
||||
public boolean isOp(String paramString)
|
||||
{
|
||||
return Minecraft.getMinecraft().theWorld.getWorldInfo().getGameType().isCreative();
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,7 @@ import com.brandon3055.draconicevolution.common.ModItems;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
|
||||
@@ -16,7 +17,8 @@ public class DETab extends CreativeTabs {
|
||||
static ItemStack iconStackStaff;
|
||||
|
||||
public static void initialize() {
|
||||
iconStackStaff = ItemNBTHelper.setInteger(new ItemStack(ModItems.draconicDestructionStaff), "Energy", 30000000);
|
||||
if (ModItems.isEnabled(ModItems.draconicDestructionStaff)) iconStackStaff = ItemNBTHelper.setInteger(new ItemStack(ModItems.draconicDestructionStaff), "Energy", 30000000);
|
||||
else iconStackStaff = new ItemStack(Items.stick);
|
||||
}
|
||||
|
||||
public DETab(int id, String modid, String label, int tab) {
|
||||
@@ -30,7 +32,8 @@ public class DETab extends CreativeTabs {
|
||||
public ItemStack getIconItemStack() {
|
||||
|
||||
if (tab == 0) return iconStackStaff;
|
||||
else return new ItemStack(ModBlocks.energyInfuser);
|
||||
else if (ModBlocks.isEnabled(ModBlocks.energyInfuser)) return new ItemStack(ModBlocks.energyInfuser);
|
||||
return new ItemStack(Items.ender_eye);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -5,6 +5,7 @@ import codechicken.nei.api.INEIGuiHandler;
|
||||
import codechicken.nei.api.TaggedInventoryArea;
|
||||
import com.brandon3055.draconicevolution.DraconicEvolution;
|
||||
import com.brandon3055.draconicevolution.client.gui.manual.GuiButtonAHeight;
|
||||
import com.brandon3055.draconicevolution.client.handler.ResourceHandler;
|
||||
import com.brandon3055.draconicevolution.common.container.ContainerDraconiumChest;
|
||||
import com.brandon3055.draconicevolution.common.lib.References;
|
||||
import com.brandon3055.draconicevolution.common.network.ButtonPacket;
|
||||
@@ -60,6 +61,13 @@ public class GUIDraconiumChest extends GuiContainer implements INEIGuiHandler
|
||||
drawTexturedModalRect(guiLeft+387, guiTop+236, 44, 177, 90, 16);
|
||||
drawTexturedModalRect(guiLeft+387, guiTop+180, 44, 177, 90, 16);
|
||||
|
||||
if (tile.lockOutputSlots) {
|
||||
ResourceHandler.bindResource("textures/gui/Widgets.png");
|
||||
GL11.glColor4f(1f, 1f, 1f, 1f);
|
||||
for (int i = 0; i < 5; i++) drawTexturedModalRect(guiLeft + 385 + i * 18, guiTop + 158, 138, 18, 18, 18);
|
||||
Minecraft.getMinecraft().getTextureManager().bindTexture(textureLeft);
|
||||
}
|
||||
|
||||
int arrowHight = (int)(((float)tile.smeltingProgressTime / (float)tile.smeltingCompleateTime) * 22f);
|
||||
drawTexturedModalRect(guiLeft+140, guiTop+192+22-arrowHight, 140, 216+22-arrowHight, 16, arrowHight);
|
||||
|
||||
@@ -101,6 +109,12 @@ public class GUIDraconiumChest extends GuiContainer implements INEIGuiHandler
|
||||
list.add(s.substring(s.indexOf(".")+1));
|
||||
drawHoveringText(list, x-guiLeft, y-guiTop, fontRendererObj);
|
||||
}
|
||||
if (GuiHelper.isInRect(398, 180, 70, 12, x-guiLeft, y-guiTop)){
|
||||
s = StatCollector.translateToLocal("button.de.chestLockOutput.txt");
|
||||
list.add(s.substring(s.indexOf(".")+1));
|
||||
drawHoveringText(list, x-guiLeft, y-guiTop, fontRendererObj);
|
||||
}
|
||||
|
||||
RenderHelper.enableGUIStandardItemLighting();
|
||||
}
|
||||
|
||||
@@ -119,6 +133,8 @@ public class GUIDraconiumChest extends GuiContainer implements INEIGuiHandler
|
||||
buttonList.add(new GuiButtonAHeight(2, posX+4, posY+206, 38, 12, s.substring(0, s.indexOf("."))));
|
||||
s = StatCollector.translateToLocal("button.de.chestAutoFeed3.txt");
|
||||
buttonList.add(new GuiButtonAHeight(3, posX+4, posY+219, 38, 12, s.substring(0, s.indexOf("."))));
|
||||
s = StatCollector.translateToLocal("button.de.chestLockOutput.txt");
|
||||
buttonList.add(new GuiButtonAHeight(4, posX+398, posY+180, 70, 12, s.substring(0, s.indexOf("."))));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -127,6 +143,7 @@ public class GUIDraconiumChest extends GuiContainer implements INEIGuiHandler
|
||||
else if (button.id == 1)DraconicEvolution.network.sendToServer(new ButtonPacket(ButtonPacket.ID_DRACONIUMCHEST1, false));
|
||||
else if (button.id == 2)DraconicEvolution.network.sendToServer(new ButtonPacket(ButtonPacket.ID_DRACONIUMCHEST2, false));
|
||||
else if (button.id == 3)DraconicEvolution.network.sendToServer(new ButtonPacket(ButtonPacket.ID_DRACONIUMCHEST3, false));
|
||||
else if (button.id == 4)DraconicEvolution.network.sendToServer(new ButtonPacket(ButtonPacket.ID_DRACONIUMCHEST4, false));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+2
-2
@@ -680,9 +680,9 @@ public class GUIParticleGenerator extends GuiScreen {
|
||||
fontRendererObj.drawString("Blue:", col1, posY + ln1 + 2 * 22, 0x000000, false);
|
||||
fontRendererObj.drawString(String.valueOf(beam_blue), col1, posY + ln2 + 2 * 22, 0x000000, false);
|
||||
|
||||
fontRendererObj.drawString("Z Rot:", col1, posY + ln1 + 3 * 22, 0x000000, false);
|
||||
fontRendererObj.drawString("Y Rot:", col1, posY + ln1 + 3 * 22, 0x000000, false);
|
||||
fontRendererObj.drawString(pitch, col1, posY + ln2 + 3 * 22, 0x000000, false);
|
||||
fontRendererObj.drawString("X Rot:", col1, posY + ln1 + 4 * 22, 0x000000, false);
|
||||
fontRendererObj.drawString("Z,X Rot:", col1, posY + ln1 + 4 * 22, 0x000000, false);
|
||||
fontRendererObj.drawString(yaw, col1, posY + ln2 + 4 * 22, 0x000000, false);
|
||||
fontRendererObj.drawString("Length:", col1, posY + ln1 + 5 * 22, 0x000000, false);
|
||||
fontRendererObj.drawString(length, col1, posY + ln2 + 5 * 22, 0x000000, false);
|
||||
|
||||
@@ -23,7 +23,7 @@ import net.minecraft.nbt.NBTTagList;
|
||||
import net.minecraft.util.ChatComponentTranslation;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.world.WorldProvider;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
|
||||
@@ -84,14 +84,14 @@ public class GUITeleporter extends GuiScreen
|
||||
String colour = EnumChatFormatting.GREEN + "";
|
||||
if (fuel < 10) colour = EnumChatFormatting.YELLOW + "";
|
||||
if (fuel == 0) colour = EnumChatFormatting.DARK_RED + "";
|
||||
fontRendererObj.drawString(colour+"Fuel: " + fuel, posX + 115, posY + 87, 0x000000);
|
||||
fontRendererObj.drawString(colour+StatCollector.translateToLocal("info.teleporterInfFuel.txt") + " " + fuel, posX + 115, posY + 87, 0x000000);
|
||||
|
||||
super.drawScreen(x, y, f);
|
||||
|
||||
for (int i = 0; i < Math.min(12, locations.size()); i++){
|
||||
if (GuiHelper.isInRect(17, 6+i*11, 80, 10, x - posX, y - posY)) {
|
||||
List l = new ArrayList();
|
||||
l.add("Right click to teleport");
|
||||
l.add(StatCollector.translateToLocal("info.de.rightClickToTeleport.txt"));
|
||||
drawHoveringText(l, x, y, fontRendererObj);
|
||||
}
|
||||
}
|
||||
@@ -165,7 +165,7 @@ public class GUITeleporter extends GuiScreen
|
||||
fontRendererObj.drawString(EnumChatFormatting.GOLD+"X: "+(int)locations.get(selected+selrctionOffset).getXCoord(), posX+114, posY+7, 0x000000);
|
||||
fontRendererObj.drawString(EnumChatFormatting.GOLD + "Y: " + (int) locations.get(selected + selrctionOffset).getYCoord(), posX + 114, posY + 16, 0x000000);
|
||||
fontRendererObj.drawString(EnumChatFormatting.GOLD + "Z: " + (int) locations.get(selected + selrctionOffset).getZCoord(), posX + 114, posY + 25, 0x000000);
|
||||
fontRendererObj.drawString(EnumChatFormatting.GOLD+""+WorldProvider.getProviderForDimension(locations.get(selected + selrctionOffset).getDimension()).getDimensionName(), posX+114, posY+34, 0x000000);
|
||||
fontRendererObj.drawString(EnumChatFormatting.GOLD+""+ locations.get(selected + selrctionOffset).getDimensionName(), posX+114, posY+34, 0x000000);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -214,7 +214,7 @@ public class GUITeleporter extends GuiScreen
|
||||
}
|
||||
|
||||
if (player.capabilities.isCreativeMode || fuel > 0) {
|
||||
fuel--;
|
||||
if (!player.capabilities.isCreativeMode) fuel--;
|
||||
DraconicEvolution.network.sendToServer(new TeleporterPacket(TeleporterPacket.TELEPORT, i+selrctionOffset, false));
|
||||
}
|
||||
}
|
||||
@@ -269,7 +269,7 @@ public class GUITeleporter extends GuiScreen
|
||||
super.handleMouseInput();
|
||||
}
|
||||
|
||||
private void updateButtons(){
|
||||
private void updateButtons(){
|
||||
if (locations.size() > 12) maxOffset = locations.size() - 12;
|
||||
else maxOffset = 0;
|
||||
if (selrctionOffset > maxOffset) selrctionOffset = maxOffset;
|
||||
@@ -291,11 +291,11 @@ public class GUITeleporter extends GuiScreen
|
||||
}
|
||||
if (editingNew){
|
||||
((GuiButton) buttonList.get(4)).enabled = !textBeingEdited.getText().isEmpty();
|
||||
((GuiButton) buttonList.get(4)).displayString = "Commit";
|
||||
((GuiButton) buttonList.get(4)).displayString = StatCollector.translateToLocal("button.de.commit.txt");
|
||||
}
|
||||
if (editingExisting){
|
||||
((GuiButton) buttonList.get(0)).enabled = !textBeingEdited.getText().isEmpty();
|
||||
((GuiButton) buttonList.get(0)).displayString = "Commit";
|
||||
((GuiButton) buttonList.get(0)).displayString = StatCollector.translateToLocal("button.de.commit.txt");
|
||||
}
|
||||
if (locations.size() >= 100) ((GuiButton) buttonList.get(4)).enabled = false;
|
||||
else if (!editingNew) ((GuiButton) buttonList.get(4)).enabled = true;
|
||||
@@ -303,24 +303,24 @@ public class GUITeleporter extends GuiScreen
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public void initGui(){//todo Localization
|
||||
public void initGui(){
|
||||
buttonList.clear();
|
||||
int posX = (this.width - xSize) / 2;
|
||||
int posY = (this.height - ySize) / 2;
|
||||
|
||||
//updateTeleporter();
|
||||
|
||||
buttonList.add(new GuiButtonAHeight(0, posX + 112, posY + 45, 66, 12, "Rename"));
|
||||
buttonList.add(new GuiButtonAHeight(1, posX + 112, posY + 58, 66, 12, "Set Here"));
|
||||
buttonList.add(new GuiButtonAHeight(2, posX + 112, posY + 71, 66, 12, "Remove"));
|
||||
buttonList.add(new GuiButtonAHeight(0, posX + 112, posY + 45, 66, 12, StatCollector.translateToLocal("button.de.rename.txt")));
|
||||
buttonList.add(new GuiButtonAHeight(1, posX + 112, posY + 58, 66, 12, StatCollector.translateToLocal("button.de.setHere.txt")));
|
||||
buttonList.add(new GuiButtonAHeight(2, posX + 112, posY + 71, 66, 12, StatCollector.translateToLocal("button.de.remove.txt")));
|
||||
|
||||
buttonList.add(new GuiButtonAHeight(3, posX + 112, posY + 99, 33, 12, "UP"));
|
||||
buttonList.add(new GuiButtonAHeight(3, posX + 112, posY + 99, 33, 12, StatCollector.translateToLocal("button.de.UP.txt")));
|
||||
|
||||
buttonList.add(new GuiButtonAHeight(4, posX + 112, posY + 112, 66, 12, "Add New"));
|
||||
buttonList.add(new GuiButtonAHeight(5, posX + 112, posY + 125, 66, 12, "Add Fuel"));
|
||||
buttonList.add(new GuiButtonAHeight(6, posX+xSize-63, posY-15, 60, 15, "Cancel"));
|
||||
buttonList.add(new GuiButtonAHeight(4, posX + 112, posY + 112, 66, 12, StatCollector.translateToLocal("button.de.addNew.txt")));
|
||||
buttonList.add(new GuiButtonAHeight(5, posX + 112, posY + 125, 66, 12, StatCollector.translateToLocal("button.de.addFuel.txt")));
|
||||
buttonList.add(new GuiButtonAHeight(6, posX+xSize-63, posY-15, 60, 15, StatCollector.translateToLocal("button.de.cancel.txt")));
|
||||
|
||||
buttonList.add(new GuiButtonAHeight(7, posX + 112 + 34, posY + 99, 33, 12, "DOWN"));
|
||||
buttonList.add(new GuiButtonAHeight(7, posX + 112 + 34, posY + 99, 33, 12, StatCollector.translateToLocal("button.de.DOWN.txt")));
|
||||
((GuiButton) buttonList.get(6)).visible = false;
|
||||
|
||||
textBeingEdited = new GuiTextField(fontRendererObj, posX+3, posY-14, xSize-67, 12);
|
||||
@@ -338,7 +338,7 @@ public class GUITeleporter extends GuiScreen
|
||||
if (button.id == 0 || button.id == 6 && !editingNew){
|
||||
if(button.id == 6){
|
||||
editingExisting = false;
|
||||
((GuiButton) buttonList.get(0)).displayString = "Rename";
|
||||
((GuiButton) buttonList.get(0)).displayString = StatCollector.translateToLocal("button.de.rename.txt");
|
||||
((GuiButton) buttonList.get(6)).visible = false;
|
||||
textBeingEdited.setVisible(false);
|
||||
((GuiButton) buttonList.get(0)).enabled = true;
|
||||
@@ -357,7 +357,7 @@ public class GUITeleporter extends GuiScreen
|
||||
TeleportLocation location = new TeleportLocation();
|
||||
location.setName(textBeingEdited.getText());
|
||||
DraconicEvolution.network.sendToServer(new TeleporterPacket(location, TeleporterPacket.UPDATENAME, selected+selrctionOffset));
|
||||
((GuiButton) buttonList.get(0)).displayString = "Rename";
|
||||
((GuiButton) buttonList.get(0)).displayString = StatCollector.translateToLocal("button.de.rename.txt");
|
||||
editingExisting = false;
|
||||
textBeingEdited.setVisible(false);
|
||||
((GuiButton) buttonList.get(6)).visible = false;
|
||||
@@ -392,7 +392,7 @@ public class GUITeleporter extends GuiScreen
|
||||
}
|
||||
else
|
||||
{
|
||||
if (selected < Math.min(11, locations.size()))
|
||||
if (selected < Math.min(11, locations.size()-1))
|
||||
{
|
||||
TeleportLocation temp = locations.get(selected + selrctionOffset);
|
||||
locations.set(selected + selrctionOffset, locations.get(selected + selrctionOffset + 1));
|
||||
@@ -407,7 +407,7 @@ public class GUITeleporter extends GuiScreen
|
||||
if (button.id == 4 || button.id == 6 && !editingExisting){
|
||||
if(button.id == 6){
|
||||
editingNew = false;
|
||||
((GuiButton) buttonList.get(4)).displayString = "Add New";
|
||||
((GuiButton) buttonList.get(4)).displayString = StatCollector.translateToLocal("button.de.addNew.txt");
|
||||
((GuiButton) buttonList.get(6)).visible = false;
|
||||
((GuiButton) buttonList.get(4)).enabled = true;
|
||||
textBeingEdited.setVisible(false);
|
||||
@@ -423,7 +423,7 @@ public class GUITeleporter extends GuiScreen
|
||||
}else{
|
||||
if (!textBeingEdited.getText().isEmpty()){
|
||||
addCurrentLocationToList(textBeingEdited.getText());
|
||||
((GuiButton) buttonList.get(4)).displayString = "Add New";
|
||||
((GuiButton) buttonList.get(4)).displayString = StatCollector.translateToLocal("button.de.addNew.txt");
|
||||
editingNew = false;
|
||||
textBeingEdited.setVisible(false);
|
||||
((GuiButton) buttonList.get(6)).visible = false;
|
||||
@@ -472,11 +472,11 @@ public class GUITeleporter extends GuiScreen
|
||||
if(this.textBeingEdited.textboxKeyTyped(key, keyN)) {
|
||||
if (editingNew){
|
||||
((GuiButton) buttonList.get(4)).enabled = !textBeingEdited.getText().isEmpty();
|
||||
((GuiButton) buttonList.get(4)).displayString = "Commit";
|
||||
((GuiButton) buttonList.get(4)).displayString = StatCollector.translateToLocal("button.de.commit.txt");
|
||||
}
|
||||
if (editingExisting){
|
||||
((GuiButton) buttonList.get(0)).enabled = !textBeingEdited.getText().isEmpty();
|
||||
((GuiButton) buttonList.get(0)).displayString = "Commit";
|
||||
((GuiButton) buttonList.get(0)).displayString = StatCollector.translateToLocal("button.de.commit.txt");
|
||||
}
|
||||
return;
|
||||
}
|
||||
@@ -499,6 +499,7 @@ public class GUITeleporter extends GuiScreen
|
||||
this.mc.setIngameFocus();
|
||||
}
|
||||
|
||||
if (tick % 5 == 0 && locations.size() > 0 && locations.get(selected + selrctionOffset).getDimensionName().equals("") && player.getHeldItem() != null && player.getHeldItem().getItem() == ModItems.teleporterMKII) readDataFromItem(player.getHeldItem());
|
||||
|
||||
tick++;
|
||||
if (tick >= 10){
|
||||
@@ -527,7 +528,9 @@ public class GUITeleporter extends GuiScreen
|
||||
|
||||
for (int i = 0; i < list.tagCount(); i++){
|
||||
NBTTagCompound tagLocation = list.getCompoundTagAt(i);
|
||||
TeleportLocation location = new TeleportLocation(tagLocation.getDouble("X"), tagLocation.getDouble("Y"), tagLocation.getDouble("Z"), tagLocation.getInteger("Dimension"), tagLocation.getFloat("Pitch"), tagLocation.getFloat("Yaw"), tagLocation.getString("Name"));
|
||||
//TeleportLocation location = new TeleportLocation(tagLocation.getDouble("X"), tagLocation.getDouble("Y"), tagLocation.getDouble("Z"), tagLocation.getInteger("Dimension"), tagLocation.getFloat("Pitch"), tagLocation.getFloat("Yaw"), tagLocation.getString("Name"));
|
||||
TeleportLocation location = new TeleportLocation();
|
||||
location.readFromNBT(tagLocation);
|
||||
location.setWriteProtected(tagLocation.getBoolean("WP"));
|
||||
locations.add(location);
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package com.brandon3055.draconicevolution.client.gui;
|
||||
|
||||
import com.brandon3055.draconicevolution.DraconicEvolution;
|
||||
import com.brandon3055.draconicevolution.client.gui.componentguis.GUIManual;
|
||||
import com.brandon3055.draconicevolution.client.gui.componentguis.GUIToolConfig;
|
||||
import com.brandon3055.draconicevolution.client.gui.manual.GuiManual;
|
||||
import com.brandon3055.draconicevolution.common.container.*;
|
||||
import com.brandon3055.draconicevolution.common.inventory.InventoryTool;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.*;
|
||||
@@ -144,7 +144,7 @@ public class GuiHandler implements IGuiHandler {
|
||||
}
|
||||
break;
|
||||
case GUIID_MANUAL:
|
||||
return new GuiManual();
|
||||
return new GUIManual();
|
||||
case GUIID_DISSENCHANTER:
|
||||
TileEntity dissenchanter = world.getTileEntity(x, y, z);
|
||||
if (dissenchanter != null && dissenchanter instanceof TileDissEnchanter) {
|
||||
|
||||
+15
-15
@@ -3,6 +3,7 @@ package com.brandon3055.draconicevolution.client.gui.componentguis;
|
||||
import com.brandon3055.draconicevolution.client.gui.guicomponents.*;
|
||||
import com.brandon3055.draconicevolution.client.handler.ResourceHandler;
|
||||
import com.brandon3055.draconicevolution.common.container.DummyContainer;
|
||||
import com.brandon3055.draconicevolution.common.handler.ConfigHandler;
|
||||
import com.brandon3055.draconicevolution.common.lib.References;
|
||||
import com.google.gson.stream.JsonReader;
|
||||
import net.minecraft.client.Minecraft;
|
||||
@@ -50,7 +51,6 @@ public class GUIManual extends GUIScrollingBase {
|
||||
|
||||
@Override
|
||||
protected ComponentCollection assembleComponents() {
|
||||
loadPages();//todo remove
|
||||
collection = new ComponentCollection(0, 0, xSize, ySize + 20, this);
|
||||
|
||||
collection.addComponent(new ComponentTexturedRect(0, 0, 255, 255, ResourceHandler.getResource("textures/gui/manualTop.png"))).setGroup(GR_BACKGROUND);
|
||||
@@ -60,14 +60,6 @@ public class GUIManual extends GUIScrollingBase {
|
||||
|
||||
collection.addComponent(new ComponentButton(75, 260, 100, 20, 0, this, StatCollector.translateToLocal("info.de.manual.indexButton.txt"), StatCollector.translateToLocal("info.de.manual.indexButtonTip.txt"))).setGroup(GR_INTRO);
|
||||
|
||||
// ITextureObject iTextureObject = mc.getTextureManager().getTexture(ResourceHandler.getResource("textures/gui/manualBottom.png"));
|
||||
// mc.getResourceManager().getResource(ResourceHandler.getResource("textures/gui/manualBottom.png")).
|
||||
// LogHelper.info(iTextureObject);
|
||||
// if (iTextureObject instanceof TextureMap)
|
||||
// {
|
||||
// LogHelper.info(((TextureMap) iTextureObject).getTextureExtry("textures/gui/manualBottom.png"));
|
||||
// }todo old
|
||||
|
||||
for (int i = 0; i < pageList.size(); i++)
|
||||
{
|
||||
collection.addComponent(new ComponentIndexButton(20, 20 + i * 20, this, pageList.get(i))).setGroup(GR_INDEX);
|
||||
@@ -94,6 +86,12 @@ public class GUIManual extends GUIScrollingBase {
|
||||
int posX = (this.width - xSize) / 2;
|
||||
int posY = (this.height - ySize) / 2;
|
||||
if (collection.getComponent("BANNER") != null && collection.getComponent("BANNER").isEnabled()) fontRendererObj.drawSplitString(StatCollector.translateToLocal("info.de.manual.introTxt.txt"), posX + 20, posY + 190, 150, 0x000000);
|
||||
if (collection.getComponent("BANNER") != null && collection.getComponent("BANNER").isEnabled()) {
|
||||
GL11.glPushMatrix();
|
||||
GL11.glScalef(0.8F, 0.8F, 0.8F);
|
||||
fontRendererObj.drawSplitString("I am still in the process of adding documentation to this manual. There is also some fine tuning that i still need to do.", posX + 110, posY + 380, 280, 0xFF0000);
|
||||
GL11.glPopMatrix();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -132,11 +130,8 @@ public class GUIManual extends GUIScrollingBase {
|
||||
|
||||
public static void loadPages()
|
||||
{
|
||||
//LogHelper.info("loading pages");
|
||||
try
|
||||
{
|
||||
pageList.clear();//todo remove these (only needed for testing)
|
||||
imageURLs.clear();
|
||||
File manualJSON = new File(ResourceHandler.getConfigFolder(), "manual.json");
|
||||
|
||||
InputStream is = Minecraft.getMinecraft().getResourceManager().getResource(new ResourceLocation(References.RESOURCESPREFIX + "manual.json")).getInputStream();
|
||||
@@ -213,7 +208,7 @@ public class GUIManual extends GUIScrollingBase {
|
||||
|
||||
reader.endObject();
|
||||
|
||||
pageList.add(new ManualPage(name, images.toArray(new String[images.size()]), content.toArray(new String[content.size()]), nameL, meta));
|
||||
if (isValidPage(name))pageList.add(new ManualPage(name, images.toArray(new String[images.size()]), content.toArray(new String[content.size()]), nameL, meta));
|
||||
}
|
||||
|
||||
reader.endArray();
|
||||
@@ -227,8 +222,6 @@ public class GUIManual extends GUIScrollingBase {
|
||||
{
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
//for (ManualPage p : pageList) LogHelper.info(p.getLocalizedName());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -250,4 +243,11 @@ public class GUIManual extends GUIScrollingBase {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private static boolean isValidPage(String name)
|
||||
{
|
||||
if (name.contains("info.")) return true;
|
||||
else if (!ConfigHandler.disabledNamesList.contains(name)) return true;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
+9
-11
@@ -4,7 +4,6 @@ import com.brandon3055.draconicevolution.client.gui.componentguis.ManualPage;
|
||||
import com.brandon3055.draconicevolution.client.handler.ResourceHandler;
|
||||
import com.brandon3055.draconicevolution.client.utill.CustomResourceLocation;
|
||||
import com.brandon3055.draconicevolution.common.utills.GuiHelper;
|
||||
import com.brandon3055.draconicevolution.common.utills.LogHelper;
|
||||
import com.brandon3055.draconicevolution.common.utills.Utills;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
@@ -38,26 +37,25 @@ public class ComponentManualPage extends ComponentScrollingBase {
|
||||
pageLength += c.getHeight();
|
||||
contentList.add(c);
|
||||
}
|
||||
pageLength += 100;
|
||||
LogHelper.info(page.scrollOffset);
|
||||
pageLength += 25;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void handleScrollInput(int direction) {
|
||||
page.scrollOffset += direction * 10;
|
||||
if (page.scrollOffset < 0) page.scrollOffset = 0;
|
||||
if (page.scrollOffset > pageLength - getHeight() + 40) page.scrollOffset = pageLength - getHeight() + 40;
|
||||
if (pageLength + 40 <= getHeight()) page.scrollOffset = 0;
|
||||
if (page.scrollOffset > pageLength - getHeight()) page.scrollOffset = pageLength - getHeight();
|
||||
if (pageLength <= getHeight()) page.scrollOffset = 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getWidth() {
|
||||
return gui.width;
|
||||
return gui.getXSize();
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getHeight() {
|
||||
return gui.height;
|
||||
return gui.getYSize();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -109,14 +107,14 @@ public class ComponentManualPage extends ComponentScrollingBase {
|
||||
else if (type == 2)
|
||||
{
|
||||
String s = content.substring(content.indexOf("[c]") + 3);
|
||||
LogHelper.info(content + " " + s);
|
||||
// LogHelper.info(content + " " + s);
|
||||
String name = s.substring(0, s.lastIndexOf(":"));
|
||||
ItemStack stack = Utills.getStackFromName(name, Integer.parseInt(s.substring(s.lastIndexOf(":") + 1)));
|
||||
result = stack;
|
||||
|
||||
if (stack != null)
|
||||
{
|
||||
LogHelper.info(stack);
|
||||
// LogHelper.info(stack);
|
||||
|
||||
for (IRecipe recipe : (List<IRecipe>) CraftingManager.getInstance().getRecipeList())
|
||||
{
|
||||
@@ -143,8 +141,8 @@ public class ComponentManualPage extends ComponentScrollingBase {
|
||||
}
|
||||
}
|
||||
|
||||
LogHelper.info(recipes);
|
||||
LogHelper.info(smeltingRecipes);
|
||||
// LogHelper.info(recipes);
|
||||
// LogHelper.info(smeltingRecipes);
|
||||
}
|
||||
}
|
||||
else textLines = null;
|
||||
|
||||
@@ -1,9 +1,8 @@
|
||||
package com.brandon3055.draconicevolution.client.gui.manual;
|
||||
|
||||
import com.brandon3055.draconicevolution.common.ModBlocks;
|
||||
import com.brandon3055.draconicevolution.common.handler.ConfigHandler;
|
||||
import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper;
|
||||
import com.brandon3055.draconicevolution.common.ModItems;
|
||||
import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.Minecraft;
|
||||
@@ -87,7 +86,7 @@ public class GuiManual extends GuiScreen {
|
||||
pageCollection.addPage(new CraftingInfoPage("ITEM_PAGE."+getNextPageIndex(), pageCollection, mobSoul, ""));
|
||||
|
||||
pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.weatherController), ""));
|
||||
if (ConfigHandler.disableSunDial != 2) pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.sunDial), ""));
|
||||
//if (ConfigHandler.disableSunDial != 2) pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.sunDial), ""));
|
||||
pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.playerDetector), ""));
|
||||
pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.playerDetectorAdvanced), ""));
|
||||
pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.grinder, 1, 3), ""));
|
||||
@@ -99,7 +98,7 @@ public class GuiManual extends GuiScreen {
|
||||
pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.draconiumChest), ""));
|
||||
|
||||
pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.particleGenerator), ""));
|
||||
if (ConfigHandler.disableXrayBlock != 2) pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.xRayBlock), ""));
|
||||
// if (ConfigHandler.disableXrayBlock != 2) pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.xRayBlock), ""));
|
||||
pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.potentiometer), ""));
|
||||
pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.rainSensor), ""));
|
||||
pageCollection.addPage(new CraftingInfoPage("BLOCK_PAGE."+getNextPageIndex(), pageCollection, new ItemStack(ModBlocks.draconiumBlock), ""));
|
||||
|
||||
+6
-1
@@ -2,6 +2,7 @@ package com.brandon3055.draconicevolution.client.render.block;
|
||||
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyRelay;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyTransceiver;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileWirelessEnergyTransceiver;
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.item.ItemStack;
|
||||
@@ -17,12 +18,16 @@ public class RenderCrystal implements IItemRenderer {
|
||||
private TileEnergyRelay relay2;
|
||||
private TileEnergyTransceiver transceiver1;
|
||||
private TileEnergyTransceiver transceiver2;
|
||||
private TileWirelessEnergyTransceiver wirelessTransceiver1;
|
||||
private TileWirelessEnergyTransceiver wirelessTransceiver2;
|
||||
|
||||
public RenderCrystal() {
|
||||
relay1 = new TileEnergyRelay(0);
|
||||
relay2 = new TileEnergyRelay(1);
|
||||
transceiver1 = new TileEnergyTransceiver(0);
|
||||
transceiver2 = new TileEnergyTransceiver(1);
|
||||
wirelessTransceiver1 = new TileWirelessEnergyTransceiver(0);
|
||||
wirelessTransceiver2 = new TileWirelessEnergyTransceiver(1);
|
||||
transceiver1.facing = 1;
|
||||
transceiver2.facing = 1;
|
||||
}
|
||||
@@ -57,7 +62,7 @@ public class RenderCrystal implements IItemRenderer {
|
||||
else GL11.glTranslatef(0.0F, -0.6F, 0.0F);
|
||||
}
|
||||
int meta = item.getItemDamage();
|
||||
TileEntityRendererDispatcher.instance.renderTileEntityAt(meta == 0 ? relay1 : meta == 1 ? relay2 : meta == 2 ? transceiver1 : transceiver2, 0.0D, 0.0D, 0.0D, 0.0F);
|
||||
TileEntityRendererDispatcher.instance.renderTileEntityAt(meta == 0 ? relay1 : meta == 1 ? relay2 : meta == 2 ? transceiver1 : meta == 3 ? transceiver2 : meta == 4 ? wirelessTransceiver1 : wirelessTransceiver2, 0.0D, 0.0D, 0.0D, 0.0F);
|
||||
GL11.glPopMatrix();
|
||||
RenderHelper.enableStandardItemLighting();
|
||||
}
|
||||
|
||||
+7
-2
@@ -64,6 +64,11 @@ public class ParticleEnergyField extends EntityFX {//todo Fancy Animated Particl
|
||||
|
||||
float minU = 0.0F + 0.125F * (advanced ? 4 : 3);
|
||||
float maxU = 0.0F + 0.125F * (advanced ? 5 : 4);//minU + 0.124F;
|
||||
if (type == 2)
|
||||
{
|
||||
minU = 0.0F + 0.125F * 5;
|
||||
maxU = 0.0F + 0.125F * 6;
|
||||
}
|
||||
float minV = 0F;//(float)this.particleTextureIndexY / 32.0F;
|
||||
float maxV = 0.123F;//minV + 0.124F;
|
||||
float drawScale = 0.2f;
|
||||
@@ -81,7 +86,7 @@ public class ParticleEnergyField extends EntityFX {//todo Fancy Animated Particl
|
||||
float drawZ = (float) (this.prevPosZ + (this.posZ - this.prevPosZ) * (double) partialTick - interpPosZ);
|
||||
|
||||
|
||||
if (type == 0)
|
||||
if (type == 0 || type == 2)
|
||||
{
|
||||
tessellator.startDrawingQuads();
|
||||
tessellator.setBrightness(200);
|
||||
@@ -106,7 +111,7 @@ public class ParticleEnergyField extends EntityFX {//todo Fancy Animated Particl
|
||||
|
||||
tessellator.draw();
|
||||
}
|
||||
else
|
||||
else if (type == 1)
|
||||
{
|
||||
|
||||
tessellator.startDrawingQuads();
|
||||
|
||||
+92
-1
@@ -218,8 +218,8 @@ public final class Particles {
|
||||
prevPosY = posY;
|
||||
prevPosZ = posZ;
|
||||
moveEntity(motionX, motionY, motionZ);
|
||||
return;
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void renderParticle(Tessellator tesselator, float par2, float par3, float par4, float par5, float par6, float par7) {//Note U=X V=Y
|
||||
@@ -459,4 +459,95 @@ public final class Particles {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public static class TransceiverParticle extends EntityFX
|
||||
{
|
||||
public double targetX;
|
||||
public double targetY;
|
||||
public double targetZ;
|
||||
private int textureIndex = 0;
|
||||
|
||||
public TransceiverParticle(World world, double x, double y, double z, double tx, double ty, double tz) {
|
||||
super(world, x, y, z, 0.0D, 0.0D, 0.0D);
|
||||
this.targetX = tx;
|
||||
this.targetY = ty;
|
||||
this.targetZ = tz;
|
||||
this.motionX = 0;
|
||||
this.motionY = 0;
|
||||
this.motionZ = 0;
|
||||
this.particleMaxAge = 1000;
|
||||
this.noClip = true;
|
||||
this.particleRed = this.particleGreen = this.particleBlue = 1.0f;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onUpdate() {
|
||||
//super.onUpdate();
|
||||
if (particleAge > particleMaxAge) setDead();
|
||||
if (particleAge > particleMaxAge || this.getDistanceSq(targetX, targetY, targetZ) < 0.05) setDead();
|
||||
particleAge ++;
|
||||
float speed = (float)particleAge * 0.00002F;
|
||||
motionX += (targetX - posX) * speed;
|
||||
motionY += (targetY - posY) * speed;
|
||||
motionZ += (targetZ - posZ) * speed;
|
||||
prevPosX = posX;
|
||||
prevPosY = posY;
|
||||
prevPosZ = posZ;
|
||||
moveEntity(motionX, motionY, motionZ);
|
||||
|
||||
textureIndex = worldObj.rand.nextInt(5);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void renderParticle(Tessellator tesselator, float par2, float par3, float par4, float par5, float par6, float par7) {//Note U=X V=Y
|
||||
|
||||
tesselator.draw();
|
||||
ResourceHandler.bindParticles();
|
||||
tesselator.startDrawingQuads();
|
||||
tesselator.setBrightness(200);
|
||||
|
||||
int uIndex = textureIndex;
|
||||
int vIndex = 1;
|
||||
|
||||
float minU = uIndex * 0.125F;
|
||||
float maxU = (uIndex+1) * 0.125F;
|
||||
float minV = vIndex * 0.125F;
|
||||
float maxV = (vIndex+1) * 0.125F;
|
||||
|
||||
float drawScale = 0.1F * this.particleScale;
|
||||
|
||||
if (this.particleIcon != null) {
|
||||
minU = this.particleIcon.getMinU();
|
||||
maxU = this.particleIcon.getMaxU();
|
||||
minV = this.particleIcon.getMinV();
|
||||
maxV = this.particleIcon.getMaxV();
|
||||
}
|
||||
|
||||
float drawX = (float) (this.prevPosX + (this.posX - this.prevPosX) * (double) par2 - interpPosX);
|
||||
float drawY = (float) (this.prevPosY + (this.posY - this.prevPosY) * (double) par2 - interpPosY);
|
||||
float drawZ = (float) (this.prevPosZ + (this.posZ - this.prevPosZ) * (double) par2 - interpPosZ);
|
||||
|
||||
tesselator.setColorRGBA_F(this.particleRed, this.particleGreen, this.particleBlue, this.particleAlpha);
|
||||
|
||||
//tesselator.setColorRGBA(0, 255, 255, (int) (this.particleAlpha * 255F));
|
||||
|
||||
tesselator.addVertexWithUV((double) (drawX - par3 * drawScale - par6 * drawScale), (double) (drawY - par4 * drawScale), (double) (drawZ - par5 * drawScale - par7 * drawScale), (double) maxU, (double) maxV);
|
||||
tesselator.addVertexWithUV((double) (drawX - par3 * drawScale + par6 * drawScale), (double) (drawY + par4 * drawScale), (double) (drawZ - par5 * drawScale + par7 * drawScale), (double) maxU, (double) minV);
|
||||
tesselator.addVertexWithUV((double) (drawX + par3 * drawScale + par6 * drawScale), (double) (drawY + par4 * drawScale), (double) (drawZ + par5 * drawScale + par7 * drawScale), (double) minU, (double) minV);
|
||||
tesselator.addVertexWithUV((double) (drawX + par3 * drawScale - par6 * drawScale), (double) (drawY - par4 * drawScale), (double) (drawZ + par5 * drawScale - par7 * drawScale), (double) minU, (double) maxV);
|
||||
|
||||
tesselator.draw();
|
||||
ResourceHandler.bindDefaultParticles();
|
||||
tesselator.startDrawingQuads();
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
//int uIndex = 0;
|
||||
//int vIndex = 0;
|
||||
//
|
||||
//float minU = uIndex * 0.125F;
|
||||
//float maxU = (uIndex+1) * 0.125F;
|
||||
//float minV = vIndex * 0.125F;
|
||||
//float maxV = (vIndex+1) * 0.125F;
|
||||
+4
-2
@@ -4,6 +4,8 @@ import com.brandon3055.draconicevolution.client.handler.ClientEventHandler;
|
||||
import com.brandon3055.draconicevolution.common.lib.References;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyRelay;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyTransceiver;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileRemoteEnergyBase;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileWirelessEnergyTransceiver;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
|
||||
@@ -38,12 +40,12 @@ public class RenderTileCrystal extends TileEntitySpecialRenderer {
|
||||
|
||||
@Override
|
||||
public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float partialTick) {
|
||||
if (tileEntity instanceof TileEnergyRelay) renderEnergyRelay((TileEnergyRelay) tileEntity, x, y, z, partialTick);
|
||||
if (tileEntity instanceof TileEnergyRelay || tileEntity instanceof TileWirelessEnergyTransceiver) renderEnergyRelay((TileRemoteEnergyBase) tileEntity, x, y, z, partialTick);
|
||||
else if (tileEntity instanceof TileEnergyTransceiver) renderTransceiver((TileEnergyTransceiver) tileEntity, x, y, z, partialTick);
|
||||
}
|
||||
|
||||
|
||||
public void renderEnergyRelay(TileEnergyRelay tileEntity, double x, double y, double z, float partialTick) {
|
||||
public void renderEnergyRelay(TileRemoteEnergyBase tileEntity, double x, double y, double z, float partialTick) {
|
||||
//--- Pre Render ---//
|
||||
tileEntity.inView = 10;
|
||||
GL11.glPushMatrix();
|
||||
|
||||
+1
-13
@@ -25,14 +25,12 @@ public class RenderTileEnergyPylon extends TileEntitySpecialRenderer {
|
||||
@Override
|
||||
public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float timeSinceLastTick) {
|
||||
|
||||
|
||||
if (tile == null || !(tile instanceof TileEnergyPylon)) return;
|
||||
TileEnergyPylon pylon = (TileEnergyPylon) tile;
|
||||
if (!pylon.active) return;
|
||||
float scale = pylon.modelScale + (timeSinceLastTick *= !pylon.reciveEnergy ? -0.01F : 0.01F);
|
||||
float rotation = pylon.modelRotation + (timeSinceLastTick / 2F);
|
||||
|
||||
|
||||
GL11.glPushMatrix();
|
||||
GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
|
||||
|
||||
@@ -43,14 +41,7 @@ public class RenderTileEnergyPylon extends TileEntitySpecialRenderer {
|
||||
GL11.glTranslated(0, -1, 0);
|
||||
}
|
||||
|
||||
// //GL11.glDepthMask(false);
|
||||
// FMLClientHandler.instance().getClient().getTextureManager().bindTexture(model_texture);
|
||||
// OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 200F, 200F);
|
||||
// GL11.glEnable(GL11.GL_CULL_FACE);
|
||||
// //GL11.glEnable(GL11.GL_BLEND);
|
||||
// //GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
// //GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GL11.glAlphaFunc(GL11.GL_GREATER, 0.1F);
|
||||
GL11.glAlphaFunc(GL11.GL_GREATER, 0.0F);
|
||||
|
||||
bindTexture(model_texture);
|
||||
GL11.glTexParameterf(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_WRAP_S, 10497.0F);
|
||||
@@ -63,8 +54,6 @@ public class RenderTileEnergyPylon extends TileEntitySpecialRenderer {
|
||||
GL11.glDepthMask(false);
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, 200F, 200F);
|
||||
|
||||
|
||||
|
||||
GL11.glPushMatrix();
|
||||
float scale1 = scale % 1F;
|
||||
GL11.glScalef(scale1, scale1, scale1);
|
||||
@@ -97,7 +86,6 @@ public class RenderTileEnergyPylon extends TileEntitySpecialRenderer {
|
||||
model.renderAll();
|
||||
GL11.glPopMatrix();
|
||||
|
||||
|
||||
GL11.glEnable(GL11.GL_LIGHTING);
|
||||
GL11.glEnable(GL11.GL_TEXTURE_2D);
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@ import com.brandon3055.draconicevolution.common.network.*;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.*;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyRelay;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileEnergyTransceiver;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileWirelessEnergyTransceiver;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnderResurrection;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyPylon;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.multiblocktiles.TileEnergyStorageCore;
|
||||
@@ -33,13 +34,10 @@ import cpw.mods.fml.common.network.NetworkRegistry;
|
||||
import cpw.mods.fml.common.registry.EntityRegistry;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Modifier;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
|
||||
public class CommonProxy {
|
||||
//private final static boolean debug = DraconicEvolution.debug;
|
||||
@@ -53,30 +51,35 @@ public class CommonProxy {
|
||||
registerTileEntities();
|
||||
initializeNetwork();
|
||||
|
||||
if (ModBlocks.isEnabled(ModBlocks.draconiumOre)) OreDictionary.registerOre("oreDraconium", ModBlocks.draconiumOre);
|
||||
if (ModItems.isEnabled(ModItems.draconiumIngot)) OreDictionary.registerOre("ingotDraconium", ModItems.draconiumIngot);
|
||||
if (ModItems.isEnabled(ModItems.draconiumDust)) OreDictionary.registerOre("dustDraconium", ModItems.draconiumDust);
|
||||
if (ModItems.isEnabled(ModItems.draconicIngot)) OreDictionary.registerOre("ingotDraconiumAwakened", ModItems.draconicIngot);
|
||||
|
||||
DraconicEvolution.reaperEnchant = new EnchantmentReaper(ConfigHandler.reaperEnchantID);
|
||||
|
||||
Potion[] potionTypes = null;
|
||||
LogHelper.info("Expanding Potion array size to 256");
|
||||
|
||||
for (Field f : Potion.class.getDeclaredFields()) {
|
||||
f.setAccessible(true);
|
||||
|
||||
try {
|
||||
if (f.getName().equals("potionTypes") || f.getName().equals("field_76425_a")) {
|
||||
Field modfield = Field.class.getDeclaredField("modifiers");
|
||||
modfield.setAccessible(true);
|
||||
modfield.setInt(f, f.getModifiers() & ~Modifier.FINAL);
|
||||
potionTypes = (Potion[]) f.get(null);
|
||||
final Potion[] newPotionTypes = new Potion[256];
|
||||
System.arraycopy(potionTypes, 0, newPotionTypes, 0, potionTypes.length);
|
||||
f.set(null, newPotionTypes);
|
||||
}
|
||||
}
|
||||
catch (Exception e) {
|
||||
LogHelper.error("Severe error, please report this to the mod author:");
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
//
|
||||
// Potion[] potionTypes = null;
|
||||
// LogHelper.info("Expanding Potion array size to 256");
|
||||
//
|
||||
// for (Field f : Potion.class.getDeclaredFields()) {
|
||||
// f.setAccessible(true);
|
||||
//
|
||||
// try {
|
||||
// if (f.getName().equals("potionTypes") || f.getName().equals("field_76425_a")) {
|
||||
// Field modfield = Field.class.getDeclaredField("modifiers");
|
||||
// modfield.setAccessible(true);
|
||||
// modfield.setInt(f, f.getModifiers() & ~Modifier.FINAL);
|
||||
// potionTypes = (Potion[]) f.get(null);
|
||||
// final Potion[] newPotionTypes = new Potion[256];
|
||||
// System.arraycopy(potionTypes, 0, newPotionTypes, 0, potionTypes.length);
|
||||
// f.set(null, newPotionTypes);
|
||||
// }
|
||||
// }
|
||||
// catch (Exception e) {
|
||||
// LogHelper.error("Severe error, please report this to the mod author:");
|
||||
// e.printStackTrace();
|
||||
// }
|
||||
// }
|
||||
|
||||
Achievements.addModAchievements();
|
||||
LogHelper.info("Finished PreInitialization");
|
||||
@@ -112,6 +115,9 @@ public class CommonProxy {
|
||||
DraconicEvolution.network.registerMessage(MountUpdatePacket.Handler.class, MountUpdatePacket.class, 8, Side.SERVER);
|
||||
DraconicEvolution.network.registerMessage(ItemConfigPacket.Handler.class, ItemConfigPacket.class, 9, Side.SERVER);
|
||||
DraconicEvolution.network.registerMessage(TileObjectPacket.Handler.class, TileObjectPacket.class, 10, Side.SERVER);
|
||||
DraconicEvolution.network.registerMessage(BlockUpdatePacket.Handler.class, BlockUpdatePacket.class, 11, Side.SERVER);
|
||||
DraconicEvolution.network.registerMessage(SpeedRequestPacket.Handler.class, SpeedRequestPacket.class, 12, Side.SERVER);
|
||||
DraconicEvolution.network.registerMessage(SpeedRequestPacket.Handler.class, SpeedRequestPacket.class, 13, Side.CLIENT);
|
||||
}
|
||||
|
||||
public void registerTileEntities() {
|
||||
@@ -136,6 +142,7 @@ public class CommonProxy {
|
||||
GameRegistry.registerTileEntity(TileDraconiumChest.class, References.RESOURCESPREFIX + "TileDraconiumChest");
|
||||
GameRegistry.registerTileEntity(TileEnergyRelay.class, References.RESOURCESPREFIX + "TileEnergyRelay");
|
||||
GameRegistry.registerTileEntity(TileEnergyTransceiver.class, References.RESOURCESPREFIX + "TileEnergyTransceiver");
|
||||
GameRegistry.registerTileEntity(TileWirelessEnergyTransceiver.class, References.RESOURCESPREFIX + "TileWirelessEnergyTransceiver");
|
||||
if (DraconicEvolution.debug) {
|
||||
GameRegistry.registerTileEntity(TileTestBlock.class, References.RESOURCESPREFIX + "TileTestBlock");
|
||||
GameRegistry.registerTileEntity(TileContainerTemplate.class, References.RESOURCESPREFIX + "TileContainerTemplate");
|
||||
@@ -180,4 +187,16 @@ public class CommonProxy {
|
||||
public ParticleEnergyField energyField(World worldObj, double x, double y, double z, int type, boolean advanced, ParticleEnergyField oldBeam, boolean render) {
|
||||
return null;
|
||||
}
|
||||
|
||||
public boolean isOp(String paramString)
|
||||
{
|
||||
MinecraftServer localMinecraftServer = FMLCommonHandler.instance().getMinecraftServerInstance();
|
||||
paramString = paramString.trim();
|
||||
for (String str : localMinecraftServer.getConfigurationManager().func_152606_n()) {
|
||||
if (paramString.equalsIgnoreCase(str)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -48,9 +48,9 @@ public class ModBlocks {
|
||||
|
||||
public static void init()
|
||||
{
|
||||
if(ConfigHandler.disableXrayBlock < 2) xRayBlock = new XRayBlock();
|
||||
xRayBlock = new XRayBlock();
|
||||
weatherController = new WeatherController();
|
||||
if(ConfigHandler.disableSunDial < 2) sunDial = new SunDial();
|
||||
sunDial = new SunDial();
|
||||
draconiumOre = new DraconiumOre();
|
||||
grinder = new Grinder();
|
||||
potentiometer = new Potentiometer();
|
||||
@@ -74,7 +74,7 @@ public class ModBlocks {
|
||||
draconicBlock = new DraconicBlock();
|
||||
energyCrystal = new EnergyCrystal();
|
||||
|
||||
if(ConfigHandler.disable_LRD < 2) longRangeDislocator = new LongRangeDislocator();
|
||||
longRangeDislocator = new LongRangeDislocator();
|
||||
|
||||
if(DraconicEvolution.debug) {
|
||||
testBlock = new TestBlock();
|
||||
@@ -87,19 +87,23 @@ public class ModBlocks {
|
||||
public static void register(BlockDE block)
|
||||
{
|
||||
String name = block.getUnwrappedUnlocalizedName(block.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(block, name.substring(name.indexOf(":") + 1));
|
||||
//GameRegistry.registerBlock(block, block.getUnwrappedUnlocalizedName(block.getUnlocalizedName()));
|
||||
if (isEnabled(block))GameRegistry.registerBlock(block, name.substring(name.indexOf(":") + 1));
|
||||
}
|
||||
|
||||
public static void register(BlockDE block, Class<? extends ItemBlock> item)
|
||||
{
|
||||
String name = block.getUnwrappedUnlocalizedName(block.getUnlocalizedName());
|
||||
GameRegistry.registerBlock(block, item, name.substring(name.indexOf(":") + 1));
|
||||
if (isEnabled(block))GameRegistry.registerBlock(block, item, name.substring(name.indexOf(":") + 1));
|
||||
}
|
||||
|
||||
public static void registerOther(Block block)
|
||||
{
|
||||
String name = block.getUnlocalizedName().substring(block.getUnlocalizedName().indexOf(".") + 1);
|
||||
GameRegistry.registerBlock(block, name.substring(name.indexOf(":") + 1));
|
||||
if (isEnabled(block)) GameRegistry.registerBlock(block, name.substring(name.indexOf(":") + 1));
|
||||
}
|
||||
|
||||
public static boolean isEnabled(Block block)
|
||||
{
|
||||
return !ConfigHandler.disabledNamesList.contains(block.getUnlocalizedName());
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.brandon3055.draconicevolution.common;
|
||||
|
||||
import com.brandon3055.draconicevolution.common.handler.ConfigHandler;
|
||||
import com.brandon3055.draconicevolution.common.items.*;
|
||||
import com.brandon3055.draconicevolution.common.items.armor.DraconicArmor;
|
||||
import com.brandon3055.draconicevolution.common.items.armor.WyvernArmor;
|
||||
@@ -21,9 +22,9 @@ import net.minecraftforge.common.util.EnumHelper;
|
||||
public class ModItems {
|
||||
public static ArmorMaterial DRACONIUMARMOR_T1 = EnumHelper.addArmorMaterial("DRACONIUMARMOR_T1", -1, new int[] { 3, 8, 6, 3 }, 30);
|
||||
public static ArmorMaterial DRACONIUMARMOR_T2 = EnumHelper.addArmorMaterial("DRACONIUMARMOR_T2", -1, new int[] { 3, 8, 6, 3 }, 30);
|
||||
public static ToolMaterial DRACONIUM_T1 = EnumHelper.addToolMaterial("DRACONIUM_T1", 10, -1, 12.0F, 11.0F, 35);
|
||||
public static ToolMaterial DRACONIUM_T2 = EnumHelper.addToolMaterial("DRACONIUM_T2", 10, -1, 16.0F, 15.0F, 40);
|
||||
public static ToolMaterial DRACONIUM_T3 = EnumHelper.addToolMaterial("DRACONIUM_T3", 10, -1, 400.0F, 20.0F, 45);
|
||||
public static ToolMaterial DRACONIUM_T1 = EnumHelper.addToolMaterial("DRACONIUM_T1", 10, -1, 12.0F, 20.0F, 35);
|
||||
public static ToolMaterial DRACONIUM_T2 = EnumHelper.addToolMaterial("DRACONIUM_T2", 10, -1, 16.0F, 40.0F, 40);
|
||||
public static ToolMaterial DRACONIUM_T3 = EnumHelper.addToolMaterial("DRACONIUM_T3", 10, -1, 400.0F, 60.0F, 45);
|
||||
|
||||
public static Item draconicPickaxe;
|
||||
public static Item draconicShovel;
|
||||
@@ -74,7 +75,6 @@ public class ModItems {
|
||||
public static ItemStack draconicFluxCapacitor;
|
||||
public static ItemStack wyvernEnergyCore;
|
||||
public static ItemStack draconicEnergyCore;
|
||||
|
||||
|
||||
public static void init()
|
||||
{
|
||||
@@ -132,6 +132,11 @@ public class ModItems {
|
||||
public static void register(final ItemDE item)
|
||||
{
|
||||
String name = item.getUnwrappedUnlocalizedName(item.getUnlocalizedName());
|
||||
GameRegistry.registerItem(item, name.substring(name.indexOf(":") + 1));
|
||||
if (isEnabled(item)) GameRegistry.registerItem(item, name.substring(name.indexOf(":") + 1));
|
||||
}
|
||||
|
||||
public static boolean isEnabled(Item item)
|
||||
{
|
||||
return !ConfigHandler.disabledNamesList.contains(item.getUnlocalizedName());
|
||||
}
|
||||
}
|
||||
+2
-2
@@ -2,7 +2,6 @@ package com.brandon3055.draconicevolution.common.achievements;
|
||||
|
||||
import com.brandon3055.draconicevolution.common.ModBlocks;
|
||||
import com.brandon3055.draconicevolution.common.ModItems;
|
||||
import com.brandon3055.draconicevolution.common.handler.ConfigHandler;
|
||||
import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.gameevent.PlayerEvent;
|
||||
@@ -26,6 +25,7 @@ public class Achievements {
|
||||
|
||||
public static void addAchievement (String name, Achievement achievement, ItemStack stack, String triggerCondition)
|
||||
{
|
||||
if (stack == null || stack.getItem() == null) return;
|
||||
achievementsList.put(name, achievement.registerStat());
|
||||
achievementItems.put(stack.getUnlocalizedName(), new AchievementCondition(name, triggerCondition));
|
||||
}
|
||||
@@ -104,7 +104,7 @@ public class Achievements {
|
||||
ItemStack mobSoul = new ItemStack(ModItems.mobSoul);
|
||||
ItemNBTHelper.setString(mobSoul, "Name", "Any");
|
||||
addAchievement("draconicevolution.soul", new Achievement("draconicevolution.soul", "draconicevolution.soul", 0+x, -2, mobSoul, null).initIndependentStat(), "null");
|
||||
if (ConfigHandler.disableSunDial == 0)addAchievement("draconicevolution.sundial", new Achievement("draconicevolution.sundial", "draconicevolution.sundial", 4+x, -4, ModBlocks.sunDial, getAchievement("draconicevolution.core3")).setSpecial(), "craft");
|
||||
//if (ConfigHandler.disableSunDial == 0)addAchievement("draconicevolution.sundial", new Achievement("draconicevolution.sundial", "draconicevolution.sundial", 4+x, -4, ModBlocks.sunDial, getAchievement("draconicevolution.core3")).setSpecial(), "craft");
|
||||
addAchievement("draconicevolution.manual", new Achievement("draconicevolution.manual", "draconicevolution.manual", -8+x, -1, ModItems.infoTablet, getAchievement("draconicevolution.dust")), "craft");
|
||||
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ public class CustomSpawner extends BlockDE implements IHudDisplayBlock {
|
||||
this.setCreativeTab(DraconicEvolution.tabBlocksItems);
|
||||
this.setHardness(10F);
|
||||
this.setResistance(2000F);
|
||||
this.setHarvestLevel("pickaxe", 3);
|
||||
this.setHarvestLevel("pickaxe", 1);
|
||||
ModBlocks.register(this);
|
||||
}
|
||||
|
||||
@@ -81,23 +81,23 @@ public class CustomSpawner extends BlockDE implements IHudDisplayBlock {
|
||||
return true;
|
||||
}else
|
||||
{
|
||||
// if (world.isRemote && !player.isSneaking()) {
|
||||
// player.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + "#################################"));
|
||||
// player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo1.txt").appendText(": " + EnumChatFormatting.DARK_AQUA + spawner.getBaseLogic().entityName));
|
||||
// player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo2.txt").appendText(": " + EnumChatFormatting.DARK_AQUA + spawner.getBaseLogic().requiresPlayer));
|
||||
// player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo3.txt").appendText(": " + EnumChatFormatting.DARK_AQUA + spawner.getBaseLogic().ignoreSpawnRequirements));
|
||||
// player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo4.txt").appendText(": " + EnumChatFormatting.DARK_AQUA + spawner.getBaseLogic().spawnSpeed));
|
||||
// player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo5.txt"));
|
||||
// player.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + "#################################"));
|
||||
// }else if (world.isRemote && player.isSneaking())
|
||||
// {
|
||||
// player.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + "#################################"));
|
||||
// player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo6.txt"));
|
||||
// player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo7.txt"));
|
||||
// player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo8.txt"));
|
||||
// player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo9.txt"));
|
||||
// player.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + "#################################"));
|
||||
// }
|
||||
if (world.isRemote && !player.isSneaking()) {
|
||||
player.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + "#################################"));
|
||||
player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo1.txt").appendText(": " + EnumChatFormatting.DARK_AQUA + spawner.getBaseLogic().entityName));
|
||||
player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo2.txt").appendText(": " + EnumChatFormatting.DARK_AQUA + spawner.getBaseLogic().requiresPlayer));
|
||||
player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo3.txt").appendText(": " + EnumChatFormatting.DARK_AQUA + spawner.getBaseLogic().ignoreSpawnRequirements));
|
||||
player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo4.txt").appendText(": " + EnumChatFormatting.DARK_AQUA + spawner.getBaseLogic().spawnSpeed));
|
||||
player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo5.txt"));
|
||||
player.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + "#################################"));
|
||||
}else if (world.isRemote && player.isSneaking())
|
||||
{
|
||||
player.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + "#################################"));
|
||||
player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo6.txt"));
|
||||
player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo7.txt"));
|
||||
player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo8.txt"));
|
||||
player.addChatMessage(new ChatComponentTranslation("msg.spawnerInfo9.txt"));
|
||||
player.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD + "#################################"));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -164,7 +164,7 @@ public class PlacedItem extends BlockDE {
|
||||
if (tile == null) {
|
||||
world.setBlockToAir(x, y, z);
|
||||
}
|
||||
tile.rotation += 5;
|
||||
tile.rotation += 5.625F;
|
||||
}else {
|
||||
if (!world.isRemote) breakBlock(world, x, y, z, this, world.getBlockMetadata(x, y, z));
|
||||
world.setBlockToAir(x, y, z);
|
||||
@@ -180,13 +180,13 @@ public class PlacedItem extends BlockDE {
|
||||
if (tile == null) {
|
||||
world.setBlockToAir(x, y, z);
|
||||
}
|
||||
tile.rotation += 25;
|
||||
tile.rotation += 22.5F;
|
||||
}else {
|
||||
TilePlacedItem tile = (world.getTileEntity(x, y, z) != null && world.getTileEntity(x, y, z) instanceof TilePlacedItem) ? (TilePlacedItem) world.getTileEntity(x, y, z) : null;
|
||||
if (tile == null) {
|
||||
world.setBlockToAir(x, y, z);
|
||||
}
|
||||
tile.rotation -= 25;
|
||||
tile.rotation -= 22.5F;
|
||||
}
|
||||
world.markBlockForUpdate(x, y, z);
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@ package com.brandon3055.draconicevolution.common.blocks;
|
||||
import com.brandon3055.draconicevolution.DraconicEvolution;
|
||||
import com.brandon3055.draconicevolution.common.ModBlocks;
|
||||
import com.brandon3055.draconicevolution.common.items.tools.TeleporterMKI;
|
||||
import com.brandon3055.draconicevolution.common.items.tools.TeleporterMKII;
|
||||
import com.brandon3055.draconicevolution.common.lib.References;
|
||||
import com.brandon3055.draconicevolution.common.lib.Strings;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.TileTeleporterStand;
|
||||
@@ -19,6 +18,7 @@ import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import java.util.List;
|
||||
@@ -53,10 +53,11 @@ public class TeleporterStand extends BlockCustomDrop {
|
||||
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float prx, float pry, float prz) {
|
||||
TileTeleporterStand tile = world.getTileEntity(x, y, z) instanceof TileTeleporterStand ? (TileTeleporterStand)world.getTileEntity(x, y, z) : null;
|
||||
if (tile == null) return false;
|
||||
if (tile.getStackInSlot(0) == null && player.getHeldItem() != null && (player.getHeldItem().getItem() instanceof TeleporterMKI || player.getHeldItem().getItem() instanceof TeleporterMKII)) {
|
||||
if (tile.getStackInSlot(0) == null && player.getHeldItem() != null && (player.getHeldItem().getItem() instanceof TeleporterMKI)) {
|
||||
ItemStack stack = player.getHeldItem();
|
||||
tile.setInventorySlotContents(0, stack.copy());
|
||||
player.getHeldItem().stackSize--;
|
||||
player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
|
||||
world.markBlockForUpdate(x, y, z);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -124,4 +125,9 @@ public class TeleporterStand extends BlockCustomDrop {
|
||||
if (tile == null) return;
|
||||
tile.rotation = (int)entity.rotationYawHead;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) {
|
||||
return super.getPickBlock(target, world, x, y, z, player);
|
||||
}
|
||||
}
|
||||
+15
-8
@@ -33,10 +33,12 @@ import java.util.List;
|
||||
*/
|
||||
public class EnergyCrystal extends BlockDE implements IHudDisplayBlock
|
||||
{
|
||||
public static final byte RELAY_TIER_1 = 0;
|
||||
public static final byte RELAY_TIER_2 = 1;
|
||||
public static final byte TRANSCEIVER_TIER_1 = 2;
|
||||
public static final byte TRANSCEIVER_TIER_2 = 3;
|
||||
public static final byte RELAY_TIER_1 = 0;
|
||||
public static final byte RELAY_TIER_2 = 1;
|
||||
public static final byte TRANSCEIVER_TIER_1 = 2;
|
||||
public static final byte TRANSCEIVER_TIER_2 = 3;
|
||||
public static final byte WIRELESS_TRANSCEIVER_TIER_1 = 3;
|
||||
public static final byte WIRELESS_TRANSCEIVER_TIER_2 = 4;
|
||||
|
||||
public EnergyCrystal()
|
||||
{
|
||||
@@ -55,12 +57,14 @@ public class EnergyCrystal extends BlockDE implements IHudDisplayBlock
|
||||
list.add(new ItemStack(item, 1, 1));
|
||||
list.add(new ItemStack(item, 1, 2));
|
||||
list.add(new ItemStack(item, 1, 3));
|
||||
list.add(new ItemStack(item, 1, 4));
|
||||
list.add(new ItemStack(item, 1, 5));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) {
|
||||
int meta = world.getBlockMetadata(x, y, z);
|
||||
if (meta == 1 || meta == 0) setBlockBounds(0.37F, 0.135F, 0.37F, 0.63F, 0.865F, 0.63F);
|
||||
if (meta == 1 || meta == 0 || meta == 4 || meta == 5) setBlockBounds(0.37F, 0.135F, 0.37F, 0.63F, 0.865F, 0.63F);
|
||||
else if (meta == 2 || meta == 3)
|
||||
{
|
||||
TileEnergyTransceiver tile = world.getTileEntity(x, y, z) instanceof TileEnergyTransceiver ? (TileEnergyTransceiver) world.getTileEntity(x, y, z) : null;
|
||||
@@ -94,7 +98,7 @@ public class EnergyCrystal extends BlockDE implements IHudDisplayBlock
|
||||
@Override
|
||||
public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
|
||||
int meta = world.getBlockMetadata(x, y, z);
|
||||
if (meta == 1 || meta == 0) return AxisAlignedBB.getBoundingBox(x + 0.37F, y + 0.135F, z + 0.37F, x + 0.63F, y + 0.865F, z + 0.63F);
|
||||
if (meta == 1 || meta == 0 || meta == 4 || meta == 5) return AxisAlignedBB.getBoundingBox(x + 0.37F, y + 0.135F, z + 0.37F, x + 0.63F, y + 0.865F, z + 0.63F);
|
||||
else if (meta == 2 || meta == 3)
|
||||
{
|
||||
TileEnergyTransceiver tile = world.getTileEntity(x, y, z) instanceof TileEnergyTransceiver ? (TileEnergyTransceiver) world.getTileEntity(x, y, z) : null;
|
||||
@@ -158,7 +162,7 @@ public class EnergyCrystal extends BlockDE implements IHudDisplayBlock
|
||||
|
||||
@Override
|
||||
public TileEntity createTileEntity(World world, int metadata) {
|
||||
return metadata == 0 || metadata == 1 ? new TileEnergyRelay(metadata) : metadata == 2 || metadata == 3 ? new TileEnergyTransceiver(metadata - 2) : null;
|
||||
return metadata == 0 || metadata == 1 ? new TileEnergyRelay(metadata) : metadata == 2 || metadata == 3 ? new TileEnergyTransceiver(metadata - 2) : metadata == 4 || metadata == 5 ? new TileWirelessEnergyTransceiver(metadata - 4) : null;
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -198,7 +202,7 @@ public class EnergyCrystal extends BlockDE implements IHudDisplayBlock
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getDisplayData(World world, int x, int y, int z) {//todo Localization
|
||||
public List<String> getDisplayData(World world, int x, int y, int z) {
|
||||
List<String> list = new ArrayList<String>();
|
||||
IRemoteEnergyHandler tile = world.getTileEntity(x, y, z) instanceof IRemoteEnergyHandler ? (IRemoteEnergyHandler) world.getTileEntity(x, y, z) : null;
|
||||
if (tile != null)
|
||||
@@ -213,6 +217,9 @@ public class EnergyCrystal extends BlockDE implements IHudDisplayBlock
|
||||
if (tile instanceof TileRemoteEnergyBase) {
|
||||
list.add(StatCollector.translateToLocal("info.de.connections.txt") + ": " + ((TileRemoteEnergyBase) tile).linkedDevices.size() + "/" + tile.getMaxConnections());
|
||||
}
|
||||
if (tile instanceof TileWirelessEnergyTransceiver){
|
||||
list.add(StatCollector.translateToLocal("info.de.wirelessConnections.txt") + ": " + ((TileWirelessEnergyTransceiver) tile).receiverList.size() + "/" + ((TileWirelessEnergyTransceiver) tile).getmaxWirelessConnections());
|
||||
}
|
||||
|
||||
if (tile instanceof TileRemoteEnergyBase)
|
||||
{
|
||||
|
||||
+14
-13
@@ -18,6 +18,7 @@ import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.ChatComponentText;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
@@ -59,18 +60,18 @@ public class EnergyStorageCore extends BlockDE implements IHudDisplayBlock{
|
||||
|
||||
@Override
|
||||
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_) {
|
||||
// TileEnergyStorageCore tile = (world.getTileEntity(x, y, z) != null && world.getTileEntity(x, y, z) instanceof TileEnergyStorageCore) ? (TileEnergyStorageCore) world.getTileEntity(x, y, z) : null;
|
||||
// if (tile == null)
|
||||
// {
|
||||
// LogHelper.error("Missing Tile Entity (EnergyStorageCore)");
|
||||
// return false;
|
||||
// }
|
||||
//
|
||||
// if (!world.isRemote) {
|
||||
// player.addChatComponentMessage(new ChatComponentText("Tier:" + tile.getTier()));
|
||||
// String BN = String.valueOf(tile.getEnergyStored());
|
||||
// if (BN.substring(BN.length() - 2).contentEquals(".0")) BN = BN.substring(0, BN.length() - 2);
|
||||
// player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("info.de.charge.txt") + ": " + Utills.formatNumber(tile.getEnergyStored()) + " / " + Utills.formatNumber(tile.getMaxEnergyStored()) + " [" + BN + " RF]")); }
|
||||
TileEnergyStorageCore tile = (world.getTileEntity(x, y, z) != null && world.getTileEntity(x, y, z) instanceof TileEnergyStorageCore) ? (TileEnergyStorageCore) world.getTileEntity(x, y, z) : null;
|
||||
if (tile == null)
|
||||
{
|
||||
LogHelper.error("Missing Tile Entity (EnergyStorageCore)");
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!world.isRemote) {
|
||||
player.addChatComponentMessage(new ChatComponentText("Tier:" + (tile.getTier() + 1)));
|
||||
String BN = String.valueOf(tile.getEnergyStored());
|
||||
if (BN.substring(BN.length() - 2).contentEquals(".0")) BN = BN.substring(0, BN.length() - 2);
|
||||
player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("info.de.charge.txt") + ": " + Utills.formatNumber(tile.getEnergyStored()) + " / " + Utills.formatNumber(tile.getMaxEnergyStored()) + " [" + BN + " RF]")); }
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -131,7 +132,7 @@ public class EnergyStorageCore extends BlockDE implements IHudDisplayBlock{
|
||||
}
|
||||
|
||||
list.add(InfoHelper.HITC()+getLocalizedName());
|
||||
list.add("Tier: " + InfoHelper.ITC() + tile.getTier());
|
||||
list.add("Tier: " + InfoHelper.ITC() + (tile.getTier() + 1));
|
||||
String BN = String.valueOf(tile.getEnergyStored());
|
||||
if (BN.substring(BN.length() - 2).contentEquals(".0")) BN = BN.substring(0, BN.length() - 2);
|
||||
list.add(StatCollector.translateToLocal("info.de.charge.txt") + ": " + InfoHelper.ITC() + Utills.formatNumber(tile.getEnergyStored()) + " / " + Utills.formatNumber(tile.getMaxEnergyStored()) + " [" + BN + " RF]");
|
||||
|
||||
+19
-18
@@ -22,6 +22,7 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.ChatComponentText;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
@@ -92,23 +93,23 @@ public class InvisibleMultiblock extends BlockDE implements IHudDisplayBlock {
|
||||
public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int p_149727_6_, float p_149727_7_, float p_149727_8_, float p_149727_9_) {
|
||||
int meta = world.getBlockMetadata(x, y, z);
|
||||
if (meta == 0 || meta == 1) {
|
||||
// TileInvisibleMultiblock thisTile = (world.getTileEntity(x, y, z) != null && world.getTileEntity(x, y, z) instanceof TileInvisibleMultiblock) ? (TileInvisibleMultiblock) world.getTileEntity(x, y, z) : null;
|
||||
// if (thisTile == null) {
|
||||
// LogHelper.error("Missing Tile Entity (TileInvisibleMultiblock)");
|
||||
// return false;
|
||||
// }
|
||||
// TileEnergyStorageCore master = thisTile.getMaster();
|
||||
// if (master == null) {
|
||||
// onNeighborBlockChange(world, x, y, z, this);
|
||||
// return false;
|
||||
// }
|
||||
// if (!world.isRemote) {
|
||||
// world.markBlockForUpdate(master.xCoord, master.yCoord, master.zCoord);
|
||||
// player.addChatComponentMessage(new ChatComponentText("Tier:" + master.getTier()));
|
||||
// String BN = String.valueOf(master.getEnergyStored());
|
||||
// if (BN.substring(BN.length() - 2).contentEquals(".0")) BN = BN.substring(0, BN.length() - 2);
|
||||
// player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("info.de.charge.txt") + ": " + Utills.formatNumber(master.getEnergyStored()) + " / " + Utills.formatNumber(master.getMaxEnergyStored()) + " [" + BN + " RF]"));
|
||||
// }
|
||||
TileInvisibleMultiblock thisTile = (world.getTileEntity(x, y, z) != null && world.getTileEntity(x, y, z) instanceof TileInvisibleMultiblock) ? (TileInvisibleMultiblock) world.getTileEntity(x, y, z) : null;
|
||||
if (thisTile == null) {
|
||||
LogHelper.error("Missing Tile Entity (TileInvisibleMultiblock)");
|
||||
return false;
|
||||
}
|
||||
TileEnergyStorageCore master = thisTile.getMaster();
|
||||
if (master == null) {
|
||||
onNeighborBlockChange(world, x, y, z, this);
|
||||
return false;
|
||||
}
|
||||
if (!world.isRemote) {
|
||||
world.markBlockForUpdate(master.xCoord, master.yCoord, master.zCoord);
|
||||
player.addChatComponentMessage(new ChatComponentText("Tier:" + (master.getTier() + 1)));
|
||||
String BN = String.valueOf(master.getEnergyStored());
|
||||
if (BN.substring(BN.length() - 2).contentEquals(".0")) BN = BN.substring(0, BN.length() - 2);
|
||||
player.addChatComponentMessage(new ChatComponentText(StatCollector.translateToLocal("info.de.charge.txt") + ": " + Utills.formatNumber(master.getEnergyStored()) + " / " + Utills.formatNumber(master.getMaxEnergyStored()) + " [" + BN + " RF]"));
|
||||
}
|
||||
return true;
|
||||
} else if (meta == 2) {
|
||||
TileEnergyPylon pylon = (world.getTileEntity(x, y+1, z) != null && world.getTileEntity(x, y+1, z) instanceof TileEnergyPylon) ? (TileEnergyPylon) world.getTileEntity(x, y+1, z) : (world.getTileEntity(x, y-1, z) != null && world.getTileEntity(x, y-1, z) instanceof TileEnergyPylon) ? (TileEnergyPylon) world.getTileEntity(x, y-1, z) : null;
|
||||
@@ -208,7 +209,7 @@ public class InvisibleMultiblock extends BlockDE implements IHudDisplayBlock {
|
||||
if (master == null) { return list; }
|
||||
|
||||
list.add(InfoHelper.HITC() + ModBlocks.energyStorageCore.getLocalizedName());
|
||||
list.add("Tier: " + InfoHelper.ITC() + master.getTier());
|
||||
list.add("Tier: " + InfoHelper.ITC() + (master.getTier() + 1));
|
||||
String BN = String.valueOf(master.getEnergyStored());
|
||||
if (BN.substring(BN.length() - 2).contentEquals(".0")) BN = BN.substring(0, BN.length() - 2);
|
||||
list.add(StatCollector.translateToLocal("info.de.charge.txt") + ": " + InfoHelper.ITC() + Utills.formatNumber(master.getEnergyStored()) + " / " + Utills.formatNumber(master.getMaxEnergyStored()) + " [" + BN + " RF]");
|
||||
|
||||
+2
-1
@@ -4,6 +4,7 @@ import com.brandon3055.draconicevolution.common.inventory.InventoryTool;
|
||||
import com.brandon3055.draconicevolution.common.utills.IInventoryTool;
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
import net.minecraft.enchantment.EnumEnchantmentType;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.InventoryPlayer;
|
||||
import net.minecraft.init.Items;
|
||||
@@ -185,7 +186,7 @@ public class ContainerAdvTool extends ContainerDataSync {
|
||||
NBTTagList list = stack.getTagCompound().getTagList("StoredEnchantments", 10);
|
||||
if (list.tagCount() != 1) return false;
|
||||
Enchantment enchant = Enchantment.enchantmentsList[list.getCompoundTagAt(0).getInteger("id")];
|
||||
if (inventoryTool.inventoryItem == null || !(inventoryTool.inventoryItem.getItem() instanceof IInventoryTool) || !((IInventoryTool) inventoryTool.inventoryItem.getItem()).isEnchantValid(enchant)) return false;
|
||||
if (inventoryTool.inventoryItem == null || !(inventoryTool.inventoryItem.getItem() instanceof IInventoryTool) || (!((IInventoryTool) inventoryTool.inventoryItem.getItem()).isEnchantValid(enchant) && enchant.type != EnumEnchantmentType.all)) return false;
|
||||
if (EnchantmentHelper.getEnchantments(inventoryTool.inventoryItem).containsKey(list.getCompoundTagAt(0).getInteger("id"))) return false;
|
||||
return super.isItemValid(stack);
|
||||
}
|
||||
|
||||
+22
-3
@@ -33,6 +33,7 @@ public class ContainerDraconiumChest extends Container {
|
||||
private int lastEnergyStored;
|
||||
private int lastBurnSpeed;
|
||||
private int lastTickFeedMode;
|
||||
private boolean lastTickOutputLock;
|
||||
|
||||
public ContainerDraconiumChest(InventoryPlayer invPlayer, TileDraconiumChest tile) {
|
||||
this.tile = tile;
|
||||
@@ -116,15 +117,26 @@ public class ContainerDraconiumChest extends Container {
|
||||
{
|
||||
ItemStack itemstack1 = slot.getStack();
|
||||
itemstack = itemstack1.copy();
|
||||
if (i < tile.getSizeInventory()+10)//Transferring from container
|
||||
if (i < tile.getSizeInventory()+16 && i != 240)//Transferring from container
|
||||
{
|
||||
if (!mergeItemStack(itemstack1, tile.getSizeInventory()+10, inventorySlots.size(), true))
|
||||
if (!mergeItemStack(itemstack1, tile.getSizeInventory()+16, inventorySlots.size(), true))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
slot.onSlotChange(itemstack1, itemstack);
|
||||
}
|
||||
else if (!mergeItemStack(itemstack1, 0, tile.getSizeInventory(), false))//Transferring from player
|
||||
else if (i == 240)
|
||||
{
|
||||
if (!mergeItemStack(itemstack1, tile.getSizeInventory()+16, inventorySlots.size(), true))
|
||||
{
|
||||
if (!mergeItemStack(itemstack1, 0, tile.getSizeInventory(), false))
|
||||
{
|
||||
return null;
|
||||
}
|
||||
}
|
||||
slot.onSlotChange(itemstack1, itemstack);
|
||||
}
|
||||
else if (!DraconiumChest.isStackValid(itemstack1) || !mergeItemStack(itemstack1, 0, tile.getSizeInventory(), false))//Transferring from player
|
||||
{
|
||||
return null;
|
||||
}
|
||||
@@ -196,8 +208,14 @@ public class ContainerDraconiumChest extends Container {
|
||||
{
|
||||
icrafting.sendProgressBarUpdate(this, 3, tile.smeltingAutoFeed);
|
||||
}
|
||||
if (lastTickOutputLock != tile.lockOutputSlots)
|
||||
{
|
||||
icrafting.sendProgressBarUpdate(this, 4, tile.lockOutputSlots ? 1 : 0);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
lastTickOutputLock = tile.lockOutputSlots;
|
||||
lastTickFeedMode = tile.smeltingAutoFeed;
|
||||
lastBurnSpeed = tile.smeltingBurnSpeed;
|
||||
lastProgressTime = tile.smeltingProgressTime;
|
||||
@@ -211,6 +229,7 @@ public class ContainerDraconiumChest extends Container {
|
||||
else if (id == 1) tile.energy.setEnergyStored(value*32);
|
||||
else if (id == 2) tile.smeltingBurnSpeed = value;
|
||||
else if (id == 3) tile.smeltingAutoFeed = value;
|
||||
else if (id == 4) tile.lockOutputSlots = value == 1;
|
||||
}
|
||||
|
||||
public TileDraconiumChest getTile(){return tile;}
|
||||
|
||||
+2
-6
@@ -74,7 +74,7 @@ public class EntityCustomDragon extends EntityDragon {
|
||||
float f;
|
||||
float f1;
|
||||
|
||||
if (!initialized){
|
||||
if (!initialized && !worldObj.isRemote){
|
||||
this.addPotionEffect(new PotionEffect(10, 600, 10, false));
|
||||
initialized = true;
|
||||
}
|
||||
@@ -389,7 +389,7 @@ public class EntityCustomDragon extends EntityDragon {
|
||||
double d2 = entity.posX - d0;
|
||||
double d3 = entity.posZ - d1;
|
||||
double d4 = d2 * d2 + d3 * d3;
|
||||
entity.addVelocity(d2 / d4 * 8.0D, 5.20000000298023224D, d3 / d4 * 8.0D);
|
||||
if (rand.nextInt(isUber ? 3 : 10) == 0) entity.addVelocity(d2 / d4 * 8.0D, 5.20000000298023224D, d3 / d4 * 8.0D);
|
||||
entity.velocityChanged = true;
|
||||
((EntityLivingBase)entity).setLastAttacker(this);
|
||||
}
|
||||
@@ -620,8 +620,6 @@ public class EntityCustomDragon extends EntityDragon {
|
||||
compound.setInteger("PortalY", portalY);
|
||||
compound.setInteger("PortalZ", portalZ);
|
||||
}
|
||||
LogHelper.info(portalY + " write");
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -637,8 +635,6 @@ public class EntityCustomDragon extends EntityDragon {
|
||||
portalY = compound.getInteger("PortalY");
|
||||
portalZ = compound.getInteger("PortalZ");
|
||||
}
|
||||
LogHelper.info(portalY + " read");
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -4,15 +4,15 @@ import com.brandon3055.draconicevolution.common.utills.LogHelper;
|
||||
import net.minecraftforge.common.config.Configuration;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class ConfigHandler {
|
||||
|
||||
public static Configuration config;
|
||||
|
||||
//GENERAL
|
||||
public static int disableSunDial;
|
||||
public static int teleporterUsesPerPearl;
|
||||
public static int disableXrayBlock;
|
||||
public static int soulDropChance;
|
||||
public static int passiveSoulDropChance;
|
||||
public static int cometRarity;
|
||||
@@ -32,6 +32,13 @@ public class ConfigHandler {
|
||||
public static boolean enableVersionChecker;
|
||||
public static boolean dragonBreaksBlocks;
|
||||
public static int[] dragonEggSpawnLocation;
|
||||
public static int[] oreGenDimentionBlacklist;
|
||||
private static String[] disabledBlocksItems;
|
||||
public static List<String> disabledNamesList = new ArrayList<String>();
|
||||
public static double maxPlayerSpeed;
|
||||
private static int[] speedDimBlackList;
|
||||
public static List<Integer> speedLimitDimList = new ArrayList<Integer>();
|
||||
public static boolean speedLimitops;
|
||||
|
||||
//spawner
|
||||
public static String[] spawnerList;
|
||||
@@ -43,7 +50,6 @@ public class ConfigHandler {
|
||||
public static int admin_dislocator_Min_Range;
|
||||
public static int admin_dislocator_Max_Range;
|
||||
public static int admin_dislocator_Detect_Range;
|
||||
public static int disable_LRD;
|
||||
|
||||
//Potion IDs
|
||||
|
||||
@@ -65,8 +71,8 @@ public class ConfigHandler {
|
||||
|
||||
try {
|
||||
//General
|
||||
disableSunDial = config.get(Configuration.CATEGORY_GENERAL, "Disable Sun Dial", 0, "Disable Sun Dial 0:Default, 1:Disable recipe, 2:Disable completely").getInt(0);
|
||||
disableXrayBlock = config.get(Configuration.CATEGORY_GENERAL, "Disable Xray Block", 0, "Disable Distortion Flame 0:Default, 1:Disable recipe, 2:Disable completely").getInt(0);
|
||||
// disableSunDial = config.get(Configuration.CATEGORY_GENERAL, "Disable Sun Dial", 0, "Disable Sun Dial 0:Default, 1:Disable recipe, 2:Disable completely").getInt(0);
|
||||
// disableXrayBlock = config.get(Configuration.CATEGORY_GENERAL, "Disable Xray Block", 0, "Disable Distortion Flame 0:Default, 1:Disable recipe, 2:Disable completely").getInt(0);
|
||||
teleporterUsesPerPearl = config.get(Configuration.CATEGORY_GENERAL, "Teleporter Uses PerPearl", 1, "Charm of Dislocation uses per Ender pearl").getInt(1);
|
||||
bowBlockDamage = config.get(Configuration.CATEGORY_GENERAL, "Bow Block Damage", true, "Dose Draconic bow explosion damage blocks").getBoolean(true);
|
||||
showUnlocalizedNames = config.get(Configuration.CATEGORY_GENERAL, "Show Unlocalized Names", false, "If set to true the unlocalized name of every block and item will be displayed in its tool tip").getBoolean(false);
|
||||
@@ -87,6 +93,11 @@ public class ConfigHandler {
|
||||
enableVersionChecker = config.get(Configuration.CATEGORY_GENERAL, "Enable version checker", true, "Set to false to disable the version checker").getBoolean(true);
|
||||
dragonBreaksBlocks = config.get(Configuration.CATEGORY_GENERAL, "Can dragon break blocks", true, "Set to false to disable the DE dragons ability to break blocks (dose not effect vanilla dragon)").getBoolean(true);
|
||||
dragonEggSpawnLocation = config.get(Configuration.CATEGORY_GENERAL, "Dragon egg spawn location", new int[] {0, 0, 0}, "Sets the exact location to spawn the dragon egg and disables the portal spawn (dose not effect vanilla dragon)").getIntList();
|
||||
oreGenDimentionBlacklist = config.get(Configuration.CATEGORY_GENERAL, "Ore gen dimension blacklist", new int[0], "Add the id's of dimensions you do not want draconium ore to spawn in").getIntList();
|
||||
disabledBlocksItems = config.getStringList("Disabled Blocks & Items", Configuration.CATEGORY_GENERAL, new String[0], "add the unlocalized name of a block or item to this list to disable it");
|
||||
maxPlayerSpeed = config.get(Configuration.CATEGORY_GENERAL, "Player speed cap", 10D, "Limits the max speed of players. Recommend between 0.5 - 1.0 for servers").getDouble(10D);
|
||||
speedDimBlackList = config.get(Configuration.CATEGORY_GENERAL, "Speed limit Dim black lack list", new int[] {1}, "A list of dimensions the speed limit will not effect (speed limit is not so really required in the end)").getIntList();
|
||||
speedLimitops = config.get(Configuration.CATEGORY_GENERAL, "Speed limit effects ops", false, "Dose the speed limit effect ops").getBoolean(false);
|
||||
|
||||
//Spawner
|
||||
spawnerListType = config.get("spawner", "listType", false, "Sets weather the spawner list is a white list or a black list (true = white list false = black list)").getBoolean(false);
|
||||
@@ -96,13 +107,16 @@ public class ConfigHandler {
|
||||
admin_dislocator_Min_Range = config.get("long range dislocator", "Dislocator Min Range", 1000).getInt(1000);
|
||||
admin_dislocator_Max_Range = config.get("long range dislocator", "Dislocator Max Range", 10000).getInt(10000);
|
||||
admin_dislocator_Detect_Range = config.get("long range dislocator", "Admin Dislocator Detect Range", 5).getInt(5);
|
||||
disable_LRD = config.get("long range dislocator", "Disable Dislocator", 0, "Disable Long Range Dislocator 0:Default, 1:Disable recipe, 2:Disable completely (Includes Admin Dislocator)").getInt(0);
|
||||
|
||||
//Potions
|
||||
// potionFlightID = config.get("magic id's", "potionFlightID", 50).getInt(50);
|
||||
|
||||
//Enchantments
|
||||
reaperEnchantID = config.get("magic id's", "Reaper Enchant id", 180).getInt(180);
|
||||
|
||||
|
||||
for (String s : disabledBlocksItems) disabledNamesList.add(s);
|
||||
for (int i : speedDimBlackList) speedLimitDimList.add(i);
|
||||
}
|
||||
catch (Exception e) {
|
||||
LogHelper.error("Unable to load Config");
|
||||
|
||||
+62
-23
@@ -12,7 +12,6 @@ import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.CraftingManager;
|
||||
import net.minecraftforge.oredict.ShapedOreRecipe;
|
||||
import net.minecraftforge.oredict.ShapelessOreRecipe;
|
||||
|
||||
@@ -30,9 +29,9 @@ public class CraftingHandler {
|
||||
add(ModItems.draconicEnergyCore, "CSC", "SMS", "CSC", 'C', ModItems.draconicIngot, 'S', ModItems.wyvernEnergyCore, 'M', ModItems.wyvernCore);
|
||||
addOre(ModItems.draconiumBlend, " D ", "DID", " D ", 'I', "ingotIron", 'D', ModItems.draconiumDust);
|
||||
|
||||
CraftingManager.getInstance().addShapelessRecipe(new ItemStack(ModItems.draconicIngot, 9), Item.getItemFromBlock(ModBlocks.draconicBlock));
|
||||
CraftingManager.getInstance().addShapelessRecipe(new ItemStack(ModItems.draconiumIngot, 9), Item.getItemFromBlock(ModBlocks.draconiumBlock));
|
||||
GameRegistry.addSmelting(ModItems.draconiumBlend, new ItemStack(ModItems.draconiumIngot, 2), 1.0f);
|
||||
addShaplessOre(getStack(ModItems.draconicIngot, 9, 0), Item.getItemFromBlock(ModBlocks.draconicBlock));
|
||||
addShaplessOre(getStack(ModItems.draconiumIngot, 9, 0), Item.getItemFromBlock(ModBlocks.draconiumBlock));
|
||||
if (ModItems.isEnabled(ModItems.draconiumIngot) && ModItems.isEnabled(ModItems.draconiumBlend)) GameRegistry.addSmelting(ModItems.draconiumBlend, getStack(ModItems.draconiumIngot, 2, 0), 1.0f);
|
||||
|
||||
|
||||
//Wyvern tools
|
||||
@@ -82,43 +81,46 @@ public class CraftingHandler {
|
||||
|
||||
|
||||
//machines adv
|
||||
add(ModBlocks.resurrectionStone, "CSC", "SMS", "CSC", 'C', mobSoul, 'S', ModItems.wyvernCore, 'M', new ItemStack(ModBlocks.draconiumBlock, 1, 0));
|
||||
add(ModBlocks.resurrectionStone, "CSC", "SMS", "CSC", 'C', mobSoul, 'S', ModItems.wyvernCore, 'M', ModBlocks.draconiumBlock);
|
||||
add(ModBlocks.energyStorageCore, "CCC", "SMS", "CCC", 'C', ModItems.draconiumIngot, 'S', ModItems.wyvernEnergyCore, 'M', ModItems.wyvernCore);
|
||||
add(ModBlocks.weatherController, "RIR", "TPT", "IEI", 'R', Items.blaze_rod, 'T', Blocks.tnt, 'P', ModItems.draconicCore, 'I', ModItems.draconiumIngot, 'E', Blocks.enchanting_table);
|
||||
add(ModBlocks.playerDetectorAdvanced, "ISI", "EDE", "ICI", 'I', ModItems.draconiumIngot, 'E', Items.ender_eye, 'S', new ItemStack(Items.skull, 1, 1), 'C', Items.compass, 'D', ModBlocks.playerDetector);
|
||||
add(ModBlocks.energyInfuser, "IPI", "CEC", "ICI", 'I', ModItems.draconiumIngot, 'P', ModBlocks.particleGenerator, 'C', ModItems.draconicCore, 'E', Blocks.enchanting_table);
|
||||
add(ModBlocks.draconiumChest, "IFI", "SCS", "IWI", 'I', ModItems.draconiumIngot, 'C', ModItems.draconicCore, 'S', getChest(), 'W', Blocks.crafting_table, 'F', Blocks.furnace);
|
||||
addOre(new ItemStack(ModBlocks.energyPylon, 2), "IEI", "MCM", "IDI", 'I', ModItems.draconiumIngot, 'E', Items.ender_eye, 'C', ModItems.draconicCore, 'D', "gemDiamond", 'M', "gemEmerald");
|
||||
addOre(new ItemStack(ModBlocks.grinder, 1, 3), "IXI", "DCD", "IFI", 'I', "ingotIron", 'X', ModItems.draconiumIngot, 'D', Items.diamond_sword, 'C', ModItems.draconicCore, 'F', Blocks.furnace);
|
||||
addOre(getStack(ModBlocks.energyPylon, 2, 0), "IEI", "MCM", "IDI", 'I', ModItems.draconiumIngot, 'E', Items.ender_eye, 'C', ModItems.draconicCore, 'D', "gemDiamond", 'M', "gemEmerald");
|
||||
addOre(getStack(ModBlocks.grinder, 1, 3), "IXI", "DCD", "IFI", 'I', "ingotIron", 'X', ModItems.draconiumIngot, 'D', Items.diamond_sword, 'C', ModItems.draconicCore, 'F', Blocks.furnace);
|
||||
addOre(ModBlocks.playerDetector, "ITI", "CEC", "IDI", 'I', "ingotIron", 'E', Items.ender_eye, 'T', Blocks.redstone_torch, 'C', Items.comparator, 'D', ModItems.draconicCore);
|
||||
addOre(new ItemStack(ModBlocks.generator, 1, 3), "NIN", "IFI", "NCN", 'N', Items.netherbrick, 'I', "ingotIron", 'F', Blocks.furnace, 'C', ModItems.draconicCore);
|
||||
addOre(getStack(ModBlocks.generator, 1, 3), "NIN", "IFI", "NCN", 'N', Items.netherbrick, 'I', "ingotIron", 'F', Blocks.furnace, 'C', ModItems.draconicCore);
|
||||
addOre(ModBlocks.dissEnchanter, "PIP", "ETE", "CBC", 'P', Items.ender_eye, 'I', Items.enchanted_book, 'E', "gemEmerald", 'T', Blocks.enchanting_table, 'C', ModItems.draconicCore, 'B', Items.book);
|
||||
addOre(new ItemStack(ModBlocks.energyCrystal, 4, 0), "IDI", "DCD", "IDI", 'I' , ModItems.draconiumIngot, 'D', "gemDiamond", 'C', ModItems.draconicCore);
|
||||
addOre(new ItemStack(ModBlocks.energyCrystal, 4, 1), "CRC", "RWR", "CRC", 'R' , new ItemStack(ModBlocks.energyCrystal, 1), 'W', ModItems.wyvernCore, 'C', ModItems.draconicCore);
|
||||
addShaplessOre(new ItemStack(ModBlocks.energyCrystal, 1, 0), new ItemStack(ModBlocks.energyCrystal, 1, 2), new ItemStack(ModBlocks.energyCrystal, 1, 2));
|
||||
addShaplessOre(new ItemStack(ModBlocks.energyCrystal, 2, 2), new ItemStack(ModBlocks.energyCrystal, 1, 0));
|
||||
addShaplessOre(new ItemStack(ModBlocks.energyCrystal, 1, 1), new ItemStack(ModBlocks.energyCrystal, 1, 3), new ItemStack(ModBlocks.energyCrystal, 1, 3));
|
||||
addShaplessOre(new ItemStack(ModBlocks.energyCrystal, 2, 3), new ItemStack(ModBlocks.energyCrystal, 1, 1));
|
||||
addOre(getStack(ModBlocks.energyCrystal, 4, 0), "IDI", "DCD", "IDI", 'I' , ModItems.draconiumIngot, 'D', "gemDiamond", 'C', ModItems.draconicCore);
|
||||
addOre(getStack(ModBlocks.energyCrystal, 4, 1), "CRC", "RWR", "CRC", 'R' , ModBlocks.energyCrystal, 'W', ModItems.wyvernCore, 'C', ModItems.draconicCore);
|
||||
addShaplessOre(getStack(ModBlocks.energyCrystal, 1, 0), getStack(ModBlocks.energyCrystal, 1, 2), getStack(ModBlocks.energyCrystal, 1, 2));
|
||||
addShaplessOre(getStack(ModBlocks.energyCrystal, 2, 2), getStack(ModBlocks.energyCrystal, 1, 0));
|
||||
addShaplessOre(getStack(ModBlocks.energyCrystal, 1, 1), getStack(ModBlocks.energyCrystal, 1, 3), getStack(ModBlocks.energyCrystal, 1, 3));
|
||||
addShaplessOre(getStack(ModBlocks.energyCrystal, 2, 3), getStack(ModBlocks.energyCrystal, 1, 1));
|
||||
addOre(getStack(ModBlocks.energyCrystal, 1, 4), "PGP", "ECE", "PGP", 'P', Items.ender_pearl, 'G', ModBlocks.particleGenerator, 'E', Items.ender_eye, 'C', getStack(ModBlocks.energyCrystal, 1, 0));
|
||||
addOre(getStack(ModBlocks.energyCrystal, 1, 5), "PGP", "ECE", "PGP", 'P', Items.ender_pearl, 'G', ModBlocks.particleGenerator, 'E', Items.ender_eye, 'C', getStack(ModBlocks.energyCrystal, 1, 1));
|
||||
|
||||
|
||||
//Tools
|
||||
add(ModItems.teleporterMKII, "IEI", "ETE", "IWI", 'I', ModItems.draconiumIngot, 'E', Items.ender_pearl, 'T', ModItems.teleporterMKI, 'W', ModItems.wyvernCore);
|
||||
add(ModItems.teleporterMKI, "CSC", "SMS", "CSC", 'C', Items.blaze_powder, 'S', ModItems.draconiumDust, 'M', Items.ender_eye);
|
||||
addOre(new ItemStack(ModItems.safetyMatch, 1, 1000), " O ", " S ", " ", 'O', "dyeOrange", 'S', "stickWood");
|
||||
add(ModItems.safetyMatch, "MMM", "MMM", "MMM", 'M', new ItemStack(ModItems.safetyMatch, 1, 1000));
|
||||
addOre(getStack(ModItems.safetyMatch, 1, 1000), " O ", " S ", " ", 'O', "dyeOrange", 'S', "stickWood");
|
||||
add(ModItems.safetyMatch, "MMM", "MMM", "MMM", 'M', getStack(ModItems.safetyMatch, 1, 1000));
|
||||
addOre(ModItems.wrench, " ID", " RI", "C ", 'I' , ModItems.draconiumIngot, 'D', "gemDiamond", 'R', Items.blaze_rod, 'C', ModItems.draconicCore);
|
||||
|
||||
//Other
|
||||
addOre(ModItems.infoTablet, "SSS", "SDS", "SSS", 'S', "stone", 'D', ModItems.draconiumDust);
|
||||
CraftingManager.getInstance().addShapelessRecipe(new ItemStack(ModItems.enderArrow), Items.arrow, Items.ender_pearl);
|
||||
addShaplessOre(getStack(ModItems.enderArrow, 1, 0), Items.arrow, Items.ender_pearl);
|
||||
addShaplessOre(new ItemStack(Blocks.dirt), Item.getItemFromBlock(Blocks.sand), Items.rotten_flesh, "treeSapling", "treeSapling", "treeSapling");
|
||||
addShaplessOre(new ItemStack(Blocks.dirt), Item.getItemFromBlock(Blocks.sand), Items.rotten_flesh, "treeLeaves", "treeLeaves", "treeLeaves");
|
||||
|
||||
|
||||
//Disable able
|
||||
if(ConfigHandler.disableSunDial == 0)
|
||||
add(ModBlocks.sunDial, "IAI", "CDC", "IEI", 'I', ModItems.draconiumIngot, 'A', ModItems.awakenedCore, 'C', ModItems.draconicCore, 'E', Blocks.enchanting_table, 'D', Blocks.dragon_egg);
|
||||
if(ConfigHandler.disableXrayBlock == 0)
|
||||
addOre(new ItemStack(ModBlocks.xRayBlock, 4), "SGS", "GDG", "SGS", 'S', Items.nether_star, 'G', "blockGlassColorless", 'D', "gemDiamond");
|
||||
//if(ConfigHandler.disableSunDial == 0)
|
||||
add(ModBlocks.sunDial, "IAI", "CDC", "IEI", 'I', ModItems.draconiumIngot, 'A', ModItems.awakenedCore, 'C', ModItems.draconicCore, 'E', Blocks.enchanting_table, 'D', Blocks.dragon_egg);
|
||||
//if(ConfigHandler.disableXrayBlock == 0)
|
||||
addOre(getStack(ModBlocks.xRayBlock, 4, 0), "SGS", "GDG", "SGS", 'S', Items.nether_star, 'G', "blockGlassColorless", 'D', "gemDiamond");
|
||||
|
||||
}
|
||||
|
||||
@@ -135,23 +137,60 @@ public class CraftingHandler {
|
||||
private static void addOre(Block result, Object... recipe){ addOre(new ItemStack(result), recipe); }
|
||||
private static void addOre(Item result, Object... recipe){ addOre(new ItemStack(result), recipe); }
|
||||
private static void addOre(ItemStack result, Object... recipe){
|
||||
if (result == null) return;
|
||||
for (Object o : recipe) {
|
||||
if (o == null) return;
|
||||
String s = o instanceof Item ? ((Item) o).getUnlocalizedName() : o instanceof Block ? ((Block) o).getUnlocalizedName() : null;
|
||||
if (s != null && ConfigHandler.disabledNamesList.contains(s)) return;
|
||||
}
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreRecipe(result, recipe));
|
||||
}
|
||||
|
||||
private static void addShaplessOre(ItemStack result, Object... recipe){
|
||||
if (result == null) return;
|
||||
for (Object o : recipe) {
|
||||
if (o == null) return;
|
||||
String s = o instanceof Item ? ((Item) o).getUnlocalizedName() : o instanceof Block ? ((Block) o).getUnlocalizedName() : null;
|
||||
if (s != null && ConfigHandler.disabledNamesList.contains(s)) return;
|
||||
}
|
||||
|
||||
GameRegistry.addRecipe(new ShapelessOreRecipe(result, recipe));
|
||||
}
|
||||
|
||||
|
||||
|
||||
private static void add(Block result, Object... recipe){ add(new ItemStack(result), recipe); }
|
||||
private static void add(Item result, Object... recipe){ add(new ItemStack(result), recipe); }
|
||||
private static void add(ItemStack result, Object... recipe){
|
||||
if (result == null) return;
|
||||
for (Object o : recipe) {
|
||||
if (o == null) return;
|
||||
String s = o instanceof Item ? ((Item) o).getUnlocalizedName() : o instanceof Block ? ((Block) o).getUnlocalizedName() : null;
|
||||
if (s != null && ConfigHandler.disabledNamesList.contains(s)) return;
|
||||
}
|
||||
|
||||
GameRegistry.addRecipe(result, recipe);
|
||||
}
|
||||
|
||||
private static void addEnergy(Block result, Object... recipe){ addEnergy(new ItemStack(result), recipe); }
|
||||
private static void addEnergy(Item result, Object... recipe){ addEnergy(new ItemStack(result), recipe); }
|
||||
private static void addEnergy(ItemStack result, Object... recipe){
|
||||
if (result == null) return;
|
||||
for (Object o : recipe) {
|
||||
if (o == null) return;
|
||||
String s = o instanceof Item ? ((Item) o).getUnlocalizedName() : o instanceof Block ? ((Block) o).getUnlocalizedName() : null;
|
||||
if (s != null && ConfigHandler.disabledNamesList.contains(s)) return;
|
||||
}
|
||||
|
||||
GameRegistry.addRecipe(new ShapedOreEnergyRecipe(result, recipe));
|
||||
}
|
||||
|
||||
private static ItemStack getStack(Block block, int count, int meta)
|
||||
{
|
||||
return ModBlocks.isEnabled(block) ? new ItemStack(block, count, meta) : null;
|
||||
}
|
||||
|
||||
private static ItemStack getStack(Item item, int count, int meta)
|
||||
{
|
||||
return ModItems.isEnabled(item) ? new ItemStack(item, count, meta) : null;
|
||||
}
|
||||
}
|
||||
@@ -32,7 +32,6 @@ public class FMLEventHandler {
|
||||
public void onEntityUpdate(TickEvent.PlayerTickEvent event) {
|
||||
if (event.phase != TickEvent.Phase.START) return;
|
||||
EntityPlayer player = event.player;
|
||||
|
||||
//Reset Walk Speed----------------------------------------------------------------------------------------------
|
||||
|
||||
if (walkSpeed == null){
|
||||
|
||||
+34
@@ -10,6 +10,7 @@ import com.brandon3055.draconicevolution.common.entity.EntityDragonHeart;
|
||||
import com.brandon3055.draconicevolution.common.entity.ExtendedPlayer;
|
||||
import com.brandon3055.draconicevolution.common.items.armor.ArmorEffectHandler;
|
||||
import com.brandon3055.draconicevolution.common.network.MountUpdatePacket;
|
||||
import com.brandon3055.draconicevolution.common.network.SpeedRequestPacket;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.TileGrinder;
|
||||
import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper;
|
||||
import com.brandon3055.draconicevolution.common.utills.LogHelper;
|
||||
@@ -63,6 +64,38 @@ public class MinecraftForgeEventHandler {
|
||||
Random random = new Random();
|
||||
private static Method becomeAngryAt;
|
||||
|
||||
public static double maxSpeed = 10F;
|
||||
public static int ticksSinceRequest = 0;
|
||||
public static boolean speedNeedsUpdating = true;
|
||||
|
||||
@SubscribeEvent
|
||||
public void onLivingUpdate(LivingEvent.LivingUpdateEvent event)
|
||||
{
|
||||
if (!event.entityLiving.worldObj.isRemote || !(event.entityLiving instanceof EntityPlayerSP)) return;
|
||||
EntityPlayerSP player = (EntityPlayerSP) event.entityLiving;
|
||||
|
||||
double motionX = player.motionX;
|
||||
double motionZ = player.motionZ;
|
||||
double motion = Math.sqrt((motionX*motionX + motionZ*motionZ));
|
||||
double reduction = motion - maxSpeed;
|
||||
|
||||
if (motion > maxSpeed && (player.onGround || player.capabilities.isFlying))
|
||||
{
|
||||
player.motionX -= motionX * reduction;
|
||||
player.motionZ -= motionZ * reduction;
|
||||
}
|
||||
|
||||
if (speedNeedsUpdating)
|
||||
{
|
||||
if (ticksSinceRequest == 0) {
|
||||
DraconicEvolution.network.sendToServer(new SpeedRequestPacket());
|
||||
LogHelper.info("Requesting speed packet from server");
|
||||
}
|
||||
ticksSinceRequest++;
|
||||
if (ticksSinceRequest > 500) ticksSinceRequest = 0;
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onLivingJumpEvent(LivingEvent.LivingJumpEvent event) {
|
||||
if (!(event.entityLiving instanceof EntityPlayer)) return;
|
||||
@@ -303,6 +336,7 @@ public class MinecraftForgeEventHandler {
|
||||
public void joinWorld(EntityJoinWorldEvent event) {
|
||||
if (event.entity instanceof EntityPlayerSP)
|
||||
{
|
||||
speedNeedsUpdating = true;
|
||||
DraconicEvolution.network.sendToServer(new MountUpdatePacket(0));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,6 +21,7 @@ public class InfoTablet extends ItemDE {
|
||||
this.setCreativeTab(DraconicEvolution.tabBlocksItems);
|
||||
this.setMaxStackSize(1);
|
||||
ModItems.register(this);
|
||||
//GameRegistry.registerItem(this, Strings.infoTabletName);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+7
-1
@@ -51,7 +51,7 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IEnergyCo
|
||||
super(material, 0, armorType);
|
||||
this.setUnlocalizedName(name);
|
||||
this.setCreativeTab(DraconicEvolution.tabToolsWeapons);
|
||||
GameRegistry.registerItem(this, name);
|
||||
if (ModItems.isEnabled(this)) GameRegistry.registerItem(this, name);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -169,7 +169,10 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IEnergyCo
|
||||
if (world.isRemote) return;
|
||||
if (this.getEnergyStored(stack) >= 5000 && clearNegativeEffects(player)) this.extractEnergy(stack, 5000, false);
|
||||
if (player.worldObj.getBlockLightValue((int)Math.floor(player.posX), (int) player.posY, (int)Math.floor(player.posZ)) < 5 && ItemNBTHelper.getBoolean(stack, "ArmorNVActive", false))
|
||||
{
|
||||
player.addPotionEffect(new PotionEffect(16, 419, 0, true));
|
||||
}
|
||||
else if ( ItemNBTHelper.getBoolean(stack, "ArmorNVActive", false) && ItemNBTHelper.getBoolean(stack, "ArmorNVLock", false)) player.addPotionEffect(new PotionEffect(16, 419, 0, true));
|
||||
else if (player.isPotionActive(16)) player.removePotionEffect(16);
|
||||
|
||||
}
|
||||
@@ -264,7 +267,10 @@ public class DraconicArmor extends ItemArmor implements ISpecialArmor, IEnergyCo
|
||||
public List<ItemConfigField> getFields(ItemStack stack, int slot) {
|
||||
List<ItemConfigField> list = new ArrayList<ItemConfigField>();
|
||||
if (armorType == 0)
|
||||
{
|
||||
list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorNVActive").readFromItem(stack, false));
|
||||
list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorNVLock").readFromItem(stack, false));
|
||||
}
|
||||
else if (armorType == 1)
|
||||
{
|
||||
list.add(new ItemConfigField(References.BOOLEAN_ID, slot, "ArmorFlightLock").readFromItem(stack, false));
|
||||
|
||||
@@ -47,7 +47,7 @@ public class WyvernArmor extends ItemArmor implements ISpecialArmor, IEnergyCont
|
||||
super(material, 0, armorType);
|
||||
this.setUnlocalizedName(name);
|
||||
this.setCreativeTab(DraconicEvolution.tabToolsWeapons);
|
||||
GameRegistry.registerItem(this, name);
|
||||
if (ModItems.isEnabled(this)) GameRegistry.registerItem(this, name);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+22
-3
@@ -8,13 +8,17 @@ import com.brandon3055.draconicevolution.common.lib.Strings;
|
||||
import com.brandon3055.draconicevolution.common.utills.IInventoryTool;
|
||||
import com.brandon3055.draconicevolution.common.utills.ItemConfigField;
|
||||
import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.EnumEnchantmentType;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -67,9 +71,24 @@ public class DraconicDistructionStaff extends MiningTool implements IInventoryTo
|
||||
|
||||
@Override
|
||||
public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity) {
|
||||
//todo Make this awesome
|
||||
ToolHandler.AOEAttack(player, entity, stack, 25, ItemNBTHelper.getInteger(stack, References.ATTACK_AOE, 0));
|
||||
ToolHandler.damageEntityBasedOnHealth(entity, player, 0.5F);
|
||||
ToolHandler.damageEntityBasedOnHealth(entity, player, 0.3F);
|
||||
ToolHandler.AOEAttack(player, entity, stack, ItemNBTHelper.getInteger(stack, References.ATTACK_AOE, 0));
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
|
||||
return super.onItemRightClick(stack, world, player);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean extended) {
|
||||
super.addInformation(stack, player, list, extended);
|
||||
|
||||
list.add("");
|
||||
list.add(EnumChatFormatting.BLUE + "+" + ToolHandler.getBaseAttackDamage(stack) + " " + StatCollector.translateToLocal("info.de.attackDamage.txt"));
|
||||
list.add(EnumChatFormatting.BLUE + "+30%" + " " + StatCollector.translateToLocal("info.de.bonusHealthDamage.txt"));
|
||||
}
|
||||
}
|
||||
@@ -40,7 +40,7 @@ public class DraconicHoe extends ItemHoe implements IEnergyContainerItem{
|
||||
super(ModItems.DRACONIUM_T1);
|
||||
this.setUnlocalizedName(Strings.draconicHoeName);
|
||||
this.setCreativeTab(DraconicEvolution.tabToolsWeapons);
|
||||
GameRegistry.registerItem(this, Strings.draconicHoeName);
|
||||
if (ModItems.isEnabled(this)) GameRegistry.registerItem(this, Strings.draconicHoeName);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
+6
-10
@@ -22,7 +22,6 @@ import net.minecraft.util.ChatComponentTranslation;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.WorldProvider;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@@ -88,6 +87,7 @@ public class TeleporterMKI extends ItemDE {
|
||||
ItemNBTHelper.setFloat(stack, "Pitch", player.rotationPitch);
|
||||
ItemNBTHelper.setInteger(stack, "Dimension", player.dimension);
|
||||
ItemNBTHelper.setBoolean(stack, "IsSet", true);
|
||||
ItemNBTHelper.setString(stack, "DimentionName", DraconicEvolution.proxy.getMCServer().worldServerForDimension(player.dimension).provider.getDimensionName());
|
||||
if (world.isRemote)
|
||||
player.addChatMessage(new ChatComponentText(new ChatComponentTranslation("msg.teleporterBound.txt").getFormattedText() + "{X:" + (int) player.posX + " Y:" + (int) player.posY + " Z:" + (int) player.posZ + " Dim:" + player.worldObj.provider.getDimensionName() + "}"));
|
||||
return stack;
|
||||
@@ -128,7 +128,7 @@ public class TeleporterMKI extends ItemDE {
|
||||
} else
|
||||
{
|
||||
list.add(EnumChatFormatting.GREEN + StatCollector.translateToLocal("info.teleporterInfSet1.txt"));
|
||||
list.add(EnumChatFormatting.WHITE + "{x:" + (int) ItemNBTHelper.getDouble(stack, "X", 0) + " y:" + (int) ItemNBTHelper.getDouble(stack, "Y", 0) + " z:" + (int) ItemNBTHelper.getDouble(stack, "Z", 0) + " Dim:" + WorldProvider.getProviderForDimension(ItemNBTHelper.getInteger(stack, "Dimension", 0)).getDimensionName() + "}");
|
||||
list.add(EnumChatFormatting.WHITE + "{x:" + (int) ItemNBTHelper.getDouble(stack, "X", 0) + " y:" + (int) ItemNBTHelper.getDouble(stack, "Y", 0) + " z:" + (int) ItemNBTHelper.getDouble(stack, "Z", 0) + " Dim:" + getLocation(stack).getDimensionName() + "}");
|
||||
list.add(EnumChatFormatting.BLUE + String.valueOf(stack.getMaxDamage() - stack.getItemDamage() + 1) + " " + StatCollector.translateToLocal("info.teleporterInfSet2.txt"));
|
||||
}
|
||||
}
|
||||
@@ -149,15 +149,11 @@ public class TeleporterMKI extends ItemDE {
|
||||
}
|
||||
|
||||
public TeleportLocation getLocation(ItemStack stack) {
|
||||
double x = ItemNBTHelper.getDouble(stack, "X", 0);
|
||||
double y = ItemNBTHelper.getDouble(stack, "Y", 0);
|
||||
double z = ItemNBTHelper.getDouble(stack, "Z", 0);
|
||||
float yaw = ItemNBTHelper.getFloat(stack, "Yaw", 0);
|
||||
float pitch = ItemNBTHelper.getFloat(stack, "Pitch", 0);
|
||||
int dim = ItemNBTHelper.getInteger(stack, "Dimension", 0);
|
||||
|
||||
if (!ItemNBTHelper.getBoolean(stack, "IsSet", false)) return null;
|
||||
|
||||
return new TeleportLocation(x, y, z, dim, pitch, yaw);
|
||||
TeleportLocation location = new TeleportLocation();
|
||||
location.readFromNBT(stack.getTagCompound());
|
||||
|
||||
return location;
|
||||
}
|
||||
}
|
||||
@@ -1,16 +1,21 @@
|
||||
package com.brandon3055.draconicevolution.common.items.tools;
|
||||
|
||||
import cofh.api.energy.IEnergyReceiver;
|
||||
import com.brandon3055.draconicevolution.DraconicEvolution;
|
||||
import com.brandon3055.draconicevolution.common.ModItems;
|
||||
import com.brandon3055.draconicevolution.common.items.ItemDE;
|
||||
import com.brandon3055.draconicevolution.common.lib.Strings;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileRemoteEnergyBase;
|
||||
import com.brandon3055.draconicevolution.common.tileentities.energynet.TileWirelessEnergyTransceiver;
|
||||
import com.brandon3055.draconicevolution.common.utills.IHudDisplayItem;
|
||||
import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper;
|
||||
import com.brandon3055.draconicevolution.common.utills.LogHelper;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ChatComponentTranslation;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
@@ -21,15 +26,14 @@ import java.util.List;
|
||||
/**
|
||||
* Created by Brandon on 23/08/2014.
|
||||
*/
|
||||
public class Wrench extends ItemDE implements IHudDisplayItem{
|
||||
public class Wrench extends ItemDE implements IHudDisplayItem {
|
||||
|
||||
public static final String BIND_MODE = "bind";
|
||||
public static final String UNBIND_MODE = "unBind";
|
||||
public static final String CLEAR_BINDINGS = "unBindAll";
|
||||
public static final String MODE_SWITCH = "modeSwitch";
|
||||
|
||||
public Wrench()
|
||||
{
|
||||
public Wrench() {
|
||||
this.setUnlocalizedName(Strings.wrenchName);
|
||||
this.setCreativeTab(DraconicEvolution.tabToolsWeapons);
|
||||
this.setMaxStackSize(1);
|
||||
@@ -43,14 +47,14 @@ public class Wrench extends ItemDE implements IHudDisplayItem{
|
||||
//player.addChatComponentMessage(new ChatComponentText(EnumChatFormatting.BLUE + "[Draconic Evolution]" + EnumChatFormatting.RESET + " New version available:"));
|
||||
|
||||
if (player.isSneaking()) cycleMode(stack, world, player);
|
||||
else if (ItemNBTHelper.getCompound(stack).hasKey("LinkData") && ItemNBTHelper.getCompound(stack).getCompoundTag("LinkData").getBoolean("Bound")) ItemNBTHelper.getCompound(stack).getCompoundTag("LinkData").setBoolean("Bound", false);
|
||||
else if (ItemNBTHelper.getCompound(stack).hasKey("LinkData") && ItemNBTHelper.getCompound(stack).getCompoundTag("LinkData").getBoolean("Bound"))
|
||||
ItemNBTHelper.getCompound(stack).getCompoundTag("LinkData").setBoolean("Bound", false);
|
||||
return super.onItemRightClick(stack, world, player);
|
||||
}
|
||||
|
||||
static final String[] modes = new String[] {BIND_MODE, UNBIND_MODE, CLEAR_BINDINGS, MODE_SWITCH};
|
||||
static final String[] modes = new String[]{BIND_MODE, UNBIND_MODE, CLEAR_BINDINGS, MODE_SWITCH};
|
||||
|
||||
private static void cycleMode(ItemStack stack, World world, EntityPlayer player)
|
||||
{
|
||||
private static void cycleMode(ItemStack stack, World world, EntityPlayer player) {
|
||||
String currentMode = ItemNBTHelper.getString(stack, "Mode", "bind");
|
||||
int mode = 0;
|
||||
for (String s : modes)
|
||||
@@ -95,8 +99,35 @@ public class Wrench extends ItemDE implements IHudDisplayItem{
|
||||
return list;
|
||||
}
|
||||
|
||||
public static String getMode(ItemStack stack)
|
||||
{
|
||||
public static String getMode(ItemStack stack) {
|
||||
return ItemNBTHelper.getString(stack, "Mode", "bind");
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) {
|
||||
if (world.isRemote) return false;
|
||||
DraconicEvolution.debug = true;
|
||||
TileEntity tileClicked = world.getTileEntity(x, y, z);
|
||||
if (tileClicked instanceof TileRemoteEnergyBase) return false;
|
||||
else if (!(tileClicked instanceof IEnergyReceiver)) return false;
|
||||
if (stack.hasTagCompound() && stack.getTagCompound().hasKey("LinkData"))
|
||||
{
|
||||
NBTTagCompound linkData = stack.getTagCompound().getCompoundTag("LinkData");
|
||||
if (!linkData.getBoolean("Bound")) return false;
|
||||
int xCoord = linkData.getInteger("XCoord");
|
||||
int yCoord = linkData.getInteger("YCoord");
|
||||
int zCoord = linkData.getInteger("ZCoord");
|
||||
LogHelper.info("side");
|
||||
if (world.getTileEntity(xCoord, yCoord, zCoord) instanceof TileWirelessEnergyTransceiver)
|
||||
{
|
||||
((TileWirelessEnergyTransceiver)world.getTileEntity(xCoord, yCoord, zCoord)).linkDevice(x, y, z, side, player, ItemNBTHelper.getString(stack, "Mode", "bind"));
|
||||
|
||||
linkData.setBoolean("Bound", false);
|
||||
return true;
|
||||
}
|
||||
else return false;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
+97
-34
@@ -1,14 +1,15 @@
|
||||
package com.brandon3055.draconicevolution.common.items.tools.baseclasses;
|
||||
|
||||
import com.brandon3055.draconicevolution.common.lib.References;
|
||||
import com.brandon3055.draconicevolution.common.utills.DataUtills;
|
||||
import com.brandon3055.draconicevolution.common.utills.ItemConfigField;
|
||||
import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper;
|
||||
import com.brandon3055.draconicevolution.common.utills.*;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.MaterialLiquid;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
@@ -16,6 +17,7 @@ import net.minecraft.network.play.client.C07PacketPlayerDigging;
|
||||
import net.minecraft.network.play.server.S18PacketEntityTeleport;
|
||||
import net.minecraft.network.play.server.S23PacketBlockChange;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.ChatComponentTranslation;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeHooks;
|
||||
@@ -61,24 +63,43 @@ public abstract class MiningTool extends ToolBase {//todo add custom information
|
||||
public boolean onBlockStartBreak(ItemStack stack, int x, int y, int z, EntityPlayer player) {
|
||||
int radius = ItemNBTHelper.getInteger(stack, References.DIG_AOE, 0);
|
||||
int depth = ItemNBTHelper.getInteger(stack, References.DIG_DEPTH, 1) - 1;
|
||||
|
||||
return getEnergyStored(stack) >= energyPerOperation && (radius > 0) ? breakAOEBlocks(stack, x, y, z, radius, depth, player) : super.onBlockStartBreak(stack, x, y, z, player);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onBlockDestroyed(ItemStack stack, World p_150894_2_, Block p_150894_3_, int p_150894_4_, int p_150894_5_, int p_150894_6_, EntityLivingBase p_150894_7_) {
|
||||
if (ItemNBTHelper.getInteger(stack, References.DIG_AOE, 0) == 0) extractEnergy(stack, References.ENERGYPERBLOCK, false);
|
||||
return super.onBlockDestroyed(stack, p_150894_2_, p_150894_3_, p_150894_4_, p_150894_5_, p_150894_6_, p_150894_7_);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
|
||||
ToolHandler.updateGhostBlocks(player, world);
|
||||
if (player.isSneaking())
|
||||
if (InfoHelper.isShiftKeyDown() && !InfoHelper.isCtrlKeyDown())
|
||||
{
|
||||
List<ItemConfigField> fields = getFields(stack, player.inventory.currentItem);
|
||||
for (ItemConfigField field : fields)
|
||||
{
|
||||
if (field.name.equals(References.DIG_AOE)) {
|
||||
if (field.name.equals(References.DIG_AOE))
|
||||
{
|
||||
int aoe = (Integer) field.value;
|
||||
aoe++;
|
||||
if (aoe > (Integer) field.max) aoe = (Integer) field.min;
|
||||
field.value = aoe;
|
||||
DataUtills.writeObjectToItem(stack, field.value, field.datatype, field.name);
|
||||
}
|
||||
}
|
||||
}
|
||||
else if (InfoHelper.isCtrlKeyDown() && !InfoHelper.isShiftKeyDown())
|
||||
{
|
||||
List<ItemConfigField> fields = getFields(stack, player.inventory.currentItem);
|
||||
for (ItemConfigField field : fields)
|
||||
{
|
||||
if (field.name.equals(References.DIG_DEPTH)) {
|
||||
int aoe = (Integer) field.value;
|
||||
aoe++;
|
||||
if (aoe > (Integer) field.max) aoe = (Integer) field.min;
|
||||
field.value = aoe;
|
||||
//field.sendChanges();
|
||||
DataUtills.writeObjectToItem(stack, field.value, field.datatype, field.name);
|
||||
}
|
||||
}
|
||||
@@ -88,7 +109,6 @@ public abstract class MiningTool extends ToolBase {//todo add custom information
|
||||
}
|
||||
|
||||
//todo attack, hoe, textures
|
||||
//This method is basses on tinkerers construct
|
||||
public boolean breakAOEBlocks(ItemStack stack, int x, int y, int z, int breakRadius, int breakDepth, EntityPlayer player)
|
||||
{
|
||||
Map<Block, Integer> blockMap = ItemNBTHelper.getBoolean(stack, References.OBLITERATE, false) ? getObliterationList(stack) : new HashMap<Block, Integer>();
|
||||
@@ -115,43 +135,84 @@ public abstract class MiningTool extends ToolBase {//todo add custom information
|
||||
}
|
||||
int sideHit = mop.sideHit;
|
||||
|
||||
int xRange = breakRadius;
|
||||
int yRange = breakRadius;
|
||||
int zRange = breakDepth;
|
||||
int xMax = breakRadius;
|
||||
int xMin = breakRadius;
|
||||
int yMax = breakRadius;
|
||||
int yMin = breakRadius;
|
||||
int zMax = breakRadius;
|
||||
int zMin = breakRadius;
|
||||
int yOffset = 0;
|
||||
|
||||
switch (sideHit) {
|
||||
case 0:
|
||||
yMax = breakDepth;
|
||||
yMin = 0;
|
||||
zMax = breakRadius;
|
||||
break;
|
||||
case 1:
|
||||
yRange = breakDepth;
|
||||
zRange = breakRadius;
|
||||
yMin = breakDepth;
|
||||
yMax = 0;
|
||||
zMax = breakRadius;
|
||||
break;
|
||||
case 2:
|
||||
xMax = breakRadius;
|
||||
zMin = 0;
|
||||
zMax = breakDepth;
|
||||
yOffset = breakRadius - 1;
|
||||
break;
|
||||
case 3:
|
||||
xRange = breakRadius;
|
||||
zRange = breakDepth;
|
||||
xMax = breakRadius;
|
||||
zMax = 0;
|
||||
zMin = breakDepth;
|
||||
yOffset = breakRadius - 1;
|
||||
break;
|
||||
case 4:
|
||||
xMax = breakDepth;
|
||||
xMin = 0;
|
||||
zMax = breakRadius;
|
||||
yOffset = breakRadius - 1;
|
||||
break;
|
||||
case 5:
|
||||
xRange = breakDepth;
|
||||
zRange = breakRadius;
|
||||
xMin = breakDepth;
|
||||
xMax = 0;
|
||||
zMax = breakRadius;
|
||||
yOffset = breakRadius - 1;
|
||||
break;
|
||||
}
|
||||
|
||||
for (int xPos = x - xRange; xPos <= x + xRange; xPos++)
|
||||
if (ItemNBTHelper.getBoolean(stack, References.BASE_SAFE_AOE, false))
|
||||
{
|
||||
for (int yPos = y + yOffset - yRange; yPos <= y + yOffset + yRange; yPos++)
|
||||
for (int xPos = x - xMin; xPos <= x + xMax; xPos++)
|
||||
{
|
||||
for (int zPos = z - zRange; zPos <= z + zRange; zPos++)
|
||||
for (int yPos = y + yOffset - yMin; yPos <= y + yOffset + yMax; yPos++)
|
||||
{
|
||||
breakExtraBlock(stack, player.worldObj, xPos, yPos, zPos, sideHit, player, refStrength, Math.abs(x - xPos) <= 1 && Math.abs(y - yPos) <= 1 && Math.abs(z - zPos) <= 1, blockMap);
|
||||
for (int zPos = z - zMin; zPos <= z + zMax; zPos++)
|
||||
{
|
||||
if (player.worldObj.getTileEntity(xPos, yPos, zPos) != null) {
|
||||
if (player.worldObj.isRemote) {
|
||||
player.addChatComponentMessage(new ChatComponentTranslation("msg.de.baseSafeAOW.txt"));
|
||||
}
|
||||
else ((EntityPlayerMP)player).playerNetServerHandler.sendPacket(new S23PacketBlockChange(x, y, z, ((EntityPlayerMP)player).worldObj));
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (int xPos = x - xMin; xPos <= x + xMax; xPos++)
|
||||
{
|
||||
for (int yPos = y + yOffset - yMin; yPos <= y + yOffset + yMax; yPos++)
|
||||
{
|
||||
for (int zPos = z - zMin; zPos <= z + zMax; zPos++)
|
||||
{
|
||||
breakExtraBlock(stack, player.worldObj, xPos, yPos, zPos, breakRadius * ((breakDepth / 2) + 1) , player, refStrength, Math.abs(x - xPos) <= 1 && Math.abs(y - yPos) <= 1 && Math.abs(z - zPos) <= 1, blockMap);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
List<EntityItem> items = player.worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(x - xRange, y + yOffset - yRange, z - zRange, x + xRange + 1, y + yOffset + yRange + 1, z + zRange + 1));
|
||||
List<EntityItem> items = player.worldObj.getEntitiesWithinAABB(EntityItem.class, AxisAlignedBB.getBoundingBox(x - xMin, y + yOffset - yMin, z - zMin, x + xMax + 1, y + yOffset + yMax + 1, z + zMax + 1));
|
||||
for (EntityItem item : items){
|
||||
if (!player.worldObj.isRemote)
|
||||
{
|
||||
@@ -164,23 +225,22 @@ public abstract class MiningTool extends ToolBase {//todo add custom information
|
||||
return true;
|
||||
}
|
||||
|
||||
//This method is basses on tinkerers construct
|
||||
protected void breakExtraBlock(ItemStack stack, World world, int x, int y, int z, int sidehit, EntityPlayer player, float refStrength, boolean breakSound, Map<Block, Integer> blockMap)
|
||||
protected void breakExtraBlock(ItemStack stack, World world, int x, int y, int z, int totalSize, EntityPlayer player, float refStrength, boolean breakSound, Map<Block, Integer> blockMap)
|
||||
{
|
||||
if (world.isAirBlock(x, y, z))
|
||||
return;
|
||||
if (world.isAirBlock(x, y, z)) return;
|
||||
|
||||
Block block = world.getBlock(x, y, z);
|
||||
if (block == Blocks.bedrock || block.getMaterial() instanceof MaterialLiquid) return;
|
||||
|
||||
int meta = world.getBlockMetadata(x, y, z);
|
||||
|
||||
boolean effective = false;
|
||||
if(block != null)
|
||||
|
||||
for (String s : getToolClasses(stack))
|
||||
{
|
||||
for (String s : getToolClasses(stack))
|
||||
{
|
||||
if (block.isToolEffective(s, meta) || func_150893_a(stack, block) > 1F) effective = true;
|
||||
}
|
||||
if (block.isToolEffective(s, meta) || func_150893_a(stack, block) > 1F) effective = true;
|
||||
}
|
||||
|
||||
if (!effective) return;
|
||||
|
||||
float strength = ForgeHooks.blockStrength(block, player, world, x,y,z);
|
||||
@@ -193,9 +253,12 @@ public abstract class MiningTool extends ToolBase {//todo add custom information
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (!player.canHarvestBlock(block) || !ForgeHooks.canHarvestBlock(block, player, meta) || refStrength/strength > 10f)
|
||||
return;
|
||||
|
||||
int scaledPower = energyPerOperation + (totalSize * (energyPerOperation / 10));
|
||||
|
||||
if (player.capabilities.isCreativeMode || (blockMap.containsKey(block) && blockMap.get(block) == meta)) {
|
||||
block.onBlockHarvested(world, x, y, z, meta, player);
|
||||
if (block.removedByPlayer(world, player, x, y, z, false))
|
||||
@@ -205,18 +268,18 @@ public abstract class MiningTool extends ToolBase {//todo add custom information
|
||||
((EntityPlayerMP)player).playerNetServerHandler.sendPacket(new S23PacketBlockChange(x, y, z, world));
|
||||
}
|
||||
|
||||
if ((blockMap.containsKey(block) && blockMap.get(block) == meta)) extractEnergy(stack, energyPerOperation, false);
|
||||
if ((blockMap.containsKey(block) && blockMap.get(block) == meta)) extractEnergy(stack, scaledPower, false);
|
||||
if (breakSound) world.playAuxSFX(2001, x, y, z, Block.getIdFromBlock(block) + (meta << 12));
|
||||
return;
|
||||
}
|
||||
|
||||
extractEnergy(stack, energyPerOperation, false);
|
||||
extractEnergy(stack, scaledPower, false);
|
||||
|
||||
if (!world.isRemote) {
|
||||
|
||||
block.onBlockHarvested(world, x, y, z, meta, player);
|
||||
|
||||
if(block.removedByPlayer(world, player, x,y,z, true)) // boolean is if block can be harvested, checked above
|
||||
if(block.removedByPlayer(world, player, x,y,z, true))
|
||||
{
|
||||
block.onBlockDestroyedByPlayer( world, x,y,z, meta);
|
||||
block.harvestBlock(world, player, x,y,z, meta);
|
||||
|
||||
+32
-4
@@ -3,9 +3,7 @@ package com.brandon3055.draconicevolution.common.items.tools.baseclasses;
|
||||
import com.brandon3055.draconicevolution.DraconicEvolution;
|
||||
import com.brandon3055.draconicevolution.client.keybinding.KeyBindings;
|
||||
import com.brandon3055.draconicevolution.common.lib.References;
|
||||
import com.brandon3055.draconicevolution.common.utills.InfoHelper;
|
||||
import com.brandon3055.draconicevolution.common.utills.ItemConfigField;
|
||||
import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper;
|
||||
import com.brandon3055.draconicevolution.common.utills.*;
|
||||
import com.google.common.collect.Sets;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -16,6 +14,8 @@ import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.ForgeHooks;
|
||||
import org.lwjgl.input.Keyboard;
|
||||
|
||||
@@ -125,6 +125,7 @@ public class ToolBase extends RFItemBase {
|
||||
public List<ItemConfigField> getFields(ItemStack stack, int slot) {
|
||||
List<ItemConfigField> list = super.getFields(stack, slot);
|
||||
if (!getToolClasses(stack).isEmpty()) list.add(new ItemConfigField(References.FLOAT_ID, slot, References.DIG_SPEED_MULTIPLIER).setMinMaxAndIncromente(0f, 1f, 0.01f).readFromItem(stack, 1f));
|
||||
if (!getToolClasses(stack).isEmpty()) list.add(new ItemConfigField(References.BOOLEAN_ID, slot, References.BASE_SAFE_AOE).readFromItem(stack, false));
|
||||
return list;
|
||||
}
|
||||
|
||||
@@ -135,15 +136,17 @@ public class ToolBase extends RFItemBase {
|
||||
if (show){
|
||||
List<ItemConfigField> l = getFields(stack, 0);
|
||||
for (ItemConfigField f : l) list.add(f.getTooltipInfo());
|
||||
if (getCapacity(stack) > 0) list.add(InfoHelper.ITC() + StatCollector.translateToLocal("info.de.charge.txt") + ": " + InfoHelper.HITC() + Utills.formatNumber(getEnergyStored(stack)) + " / " + Utills.formatNumber(getCapacity(stack)));
|
||||
}
|
||||
|
||||
addAditionalInformation(stack, player, list, extended);
|
||||
if (show) InfoHelper.addLore(stack, list, true);
|
||||
InfoHelper.addEnergyInfo(stack, list);
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void addAditionalInformation(ItemStack stack, EntityPlayer player, List list, boolean extended) {
|
||||
list.add("Press " + Keyboard.getKeyName(KeyBindings.toolConfig.getKeyCode()) + " to open config gui");
|
||||
list.add(StatCollector.translateToLocal("info.de.press.txt") + " " + Keyboard.getKeyName(KeyBindings.toolConfig.getKeyCode()) + " " + StatCollector.translateToLocal("info.de.toOpenConfigGUI.txt"));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -152,4 +155,29 @@ public class ToolBase extends RFItemBase {
|
||||
if (stack.getUnlocalizedName().contains(":draconic")) return EnumRarity.epic;
|
||||
return EnumRarity.uncommon;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack onItemRightClick(ItemStack stack, World p_77659_2_, EntityPlayer player) {
|
||||
|
||||
if (InfoHelper.isCtrlKeyDown() && InfoHelper.isShiftKeyDown())
|
||||
{
|
||||
List<ItemConfigField> fields = getFields(stack, player.inventory.currentItem);
|
||||
for (ItemConfigField field : fields)
|
||||
{
|
||||
if (field.name.equals(References.ATTACK_AOE)) {
|
||||
int aoe = (Integer) field.value;
|
||||
aoe++;
|
||||
if (aoe > (Integer) field.max) aoe = (Integer) field.min;
|
||||
field.value = aoe;
|
||||
DataUtills.writeObjectToItem(stack, field.value, field.datatype, field.name);
|
||||
}
|
||||
}
|
||||
}
|
||||
return super.onItemRightClick(stack, p_77659_2_, player);
|
||||
}
|
||||
|
||||
public ToolMaterial getToolMaterial()
|
||||
{
|
||||
return toolMaterial;
|
||||
}
|
||||
}
|
||||
+50
-75
@@ -1,29 +1,30 @@
|
||||
package com.brandon3055.draconicevolution.common.items.tools.baseclasses;
|
||||
|
||||
import cofh.api.energy.IEnergyContainerItem;
|
||||
import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper;
|
||||
import com.brandon3055.draconicevolution.common.ModItems;
|
||||
import com.brandon3055.draconicevolution.common.lib.References;
|
||||
import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.SharedMonsterAttributes;
|
||||
import net.minecraft.entity.boss.EntityDragonPart;
|
||||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.monster.EntitySpider;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.ItemSword;
|
||||
import net.minecraft.network.play.server.S23PacketBlockChange;
|
||||
import net.minecraft.util.*;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class ToolHandler {
|
||||
public static Block[] destroyList = {Blocks.cobblestone, Blocks.stone, Blocks.dirt, Blocks.gravel, Blocks.sand, Blocks.grass, Blocks.netherrack};
|
||||
@@ -137,64 +138,25 @@ public class ToolHandler {
|
||||
}
|
||||
}
|
||||
|
||||
public static ItemStack changeMode(ItemStack stack, EntityPlayer player, boolean hasOblit, int maxSize) {
|
||||
if (player.isSneaking()) {
|
||||
if (ItemNBTHelper.getShort(stack, "size", (short) 0) < maxSize)
|
||||
ItemNBTHelper.setShort(stack, "size", (short) (ItemNBTHelper.getShort(stack, "size", (short) 0) + 1));
|
||||
else ItemNBTHelper.setShort(stack, "size", (short) 0);
|
||||
if (!player.worldObj.isRemote)
|
||||
player.addChatMessage(new ChatComponentTranslation("msg.size" + ItemNBTHelper.getShort(stack, "size", (short) 0) + ".txt"));
|
||||
|
||||
} else {
|
||||
updateGhostBlocks(player, player.worldObj);
|
||||
if (hasOblit) {
|
||||
ItemNBTHelper.setBoolean(stack, "obliterate", !ItemNBTHelper.getBoolean(stack, "obliterate", false));
|
||||
if (player.worldObj.isRemote)
|
||||
player.addChatMessage(new ChatComponentTranslation("msg.oblit" + ItemNBTHelper.getBoolean(stack, "obliterate", false) + ".txt"));
|
||||
}
|
||||
}
|
||||
return stack;
|
||||
}
|
||||
|
||||
public static void damageEntityBasedOnHealth(Entity entity, EntityPlayer player, float dmg) {
|
||||
World world = player.worldObj;
|
||||
public static void damageEntityBasedOnHealth(Entity entity, EntityPlayer player, float dmgMult) {
|
||||
ItemStack stack = player.getCurrentEquippedItem();
|
||||
if (entity instanceof EntityLivingBase) {
|
||||
float baseAttack = getDamageAgainstEntity(stack, entity);
|
||||
|
||||
if (entity instanceof EntityLivingBase)
|
||||
{
|
||||
float entHealth = ((EntityLivingBase) entity).getHealth();
|
||||
if (!world.isRemote) {
|
||||
if (entHealth > 20) {
|
||||
if (stack == null || !(stack.getItem() instanceof IEnergyContainerItem) || ((IEnergyContainerItem) stack.getItem()).getEnergyStored(stack) < References.ENERGYPERBLOCK) {
|
||||
if (!player.capabilities.isCreativeMode) return;
|
||||
} else {
|
||||
if (!player.capabilities.isCreativeMode)
|
||||
((IEnergyContainerItem) stack.getItem()).extractEnergy(stack, References.ENERGYPERATTACK + (int) ((entHealth) * 100), false);
|
||||
}
|
||||
entity.attackEntityFrom(DamageSource.causePlayerDamage(player), (entHealth) * dmg);
|
||||
}
|
||||
}
|
||||
((EntityLivingBase) entity).attackTime = 0;
|
||||
} else if (entity instanceof EntityDragonPart) {
|
||||
if (!world.isRemote) {
|
||||
if (stack == null || !(stack.getItem() instanceof IEnergyContainerItem) || ((IEnergyContainerItem) stack.getItem()).getEnergyStored(stack) < References.ENERGYPERBLOCK) {
|
||||
if (!player.capabilities.isCreativeMode) return;
|
||||
} else {
|
||||
if (!player.capabilities.isCreativeMode)
|
||||
((IEnergyContainerItem) stack.getItem()).extractEnergy(stack, References.ENERGYPERATTACK + (int) ((200F) * 100), false);
|
||||
}
|
||||
entity.attackEntityFrom(DamageSource.causePlayerDamage(player), 200F * dmg);
|
||||
}
|
||||
} else {
|
||||
if (!world.isRemote) {
|
||||
if (stack == null || !(stack.getItem() instanceof IEnergyContainerItem) || ((IEnergyContainerItem) stack.getItem()).getEnergyStored(stack) < References.ENERGYPERBLOCK) {
|
||||
if (!player.capabilities.isCreativeMode) return;
|
||||
} else {
|
||||
if (!player.capabilities.isCreativeMode)
|
||||
((IEnergyContainerItem) stack.getItem()).extractEnergy(stack, References.ENERGYPERATTACK + (int) ((100F) * 100), false);
|
||||
}
|
||||
entity.attackEntityFrom(DamageSource.causePlayerDamage(player), 100F * dmg);
|
||||
}
|
||||
baseAttack += (entHealth * dmgMult);
|
||||
}
|
||||
|
||||
if (!player.capabilities.isCreativeMode && ((IEnergyContainerItem) stack.getItem()).getEnergyStored(stack) < (int)(baseAttack / 2) * References.ENERGYPERATTACK) return;
|
||||
|
||||
entity.attackEntityFrom(DamageSource.causePlayerDamage(player), baseAttack);
|
||||
if (EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, stack) > 0) entity.setFire(EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, stack) * 15);
|
||||
|
||||
|
||||
if (!player.capabilities.isCreativeMode) ((IEnergyContainerItem) stack.getItem()).extractEnergy(stack, (int)(baseAttack / 2) * References.ENERGYPERATTACK, false);
|
||||
|
||||
|
||||
if (entity instanceof EntityLivingBase) {
|
||||
EntityLivingBase entityLivingBase = (EntityLivingBase)entity;
|
||||
double d1 = player.posX - entityLivingBase.posX;
|
||||
@@ -210,7 +172,7 @@ public class ToolHandler {
|
||||
{
|
||||
entityLivingBase.isAirBorne = true;
|
||||
float f1 = MathHelper.sqrt_double(d1 * d1 + d0 * d0);
|
||||
float f2 = 0.4F + EnchantmentHelper.getKnockbackModifier(player, entityLivingBase) * 0.4F;
|
||||
float f2 = 0.1F + EnchantmentHelper.getKnockbackModifier(player, entityLivingBase) * 0.4F;
|
||||
entityLivingBase.motionX /= 2.0D;
|
||||
entityLivingBase.motionY /= 2.0D;
|
||||
entityLivingBase.motionZ /= 2.0D;
|
||||
@@ -227,29 +189,21 @@ public class ToolHandler {
|
||||
}
|
||||
|
||||
@SuppressWarnings({"rawtypes", "unused"})
|
||||
public static void AOEAttack(EntityPlayer player, Entity entity, ItemStack stack, int dmg, int range) {
|
||||
Map enchants = EnchantmentHelper.getEnchantments(stack);
|
||||
int sharp = 0;
|
||||
if (enchants.get(16) != null) sharp = (Integer) enchants.get(16);
|
||||
public static void AOEAttack(EntityPlayer player, Entity entity, ItemStack stack, int range) {
|
||||
World world = player.worldObj;
|
||||
AxisAlignedBB box = AxisAlignedBB.getBoundingBox(entity.posX - range, entity.posY - range, entity.posZ - range, entity.posX + range, entity.posY + range, entity.posZ + range).expand(1.0D, 1.0D, 1.0D);
|
||||
List list = world.getEntitiesWithinAABBExcludingEntity(player, box);
|
||||
if (range == 0){
|
||||
if (stack == null || !(stack.getItem() instanceof IEnergyContainerItem) || ((IEnergyContainerItem) stack.getItem()).getEnergyStored(stack) < References.ENERGYPERATTACK) {
|
||||
if (!player.capabilities.isCreativeMode) return;
|
||||
} else {
|
||||
if (!player.capabilities.isCreativeMode)
|
||||
((IEnergyContainerItem) stack.getItem()).extractEnergy(stack, References.ENERGYPERATTACK, false);
|
||||
}
|
||||
entity.attackEntityFrom(DamageSource.causePlayerDamage(player), dmg + sharp);
|
||||
return;
|
||||
}
|
||||
if (range == 0) return;
|
||||
|
||||
for (Object entityObject : list) {
|
||||
if (entityObject instanceof EntityLivingBase) {
|
||||
((Entity) entityObject).attackEntityFrom(DamageSource.causePlayerDamage(player), dmg + sharp);
|
||||
|
||||
EntityLivingBase entityLivingBase = (EntityLivingBase) entityObject;
|
||||
if (entityLivingBase.getEntityId() == entity.getEntityId()) continue;
|
||||
|
||||
entityLivingBase.attackEntityFrom(DamageSource.causePlayerDamage(player), getDamageAgainstEntity(stack, entityLivingBase));
|
||||
if (EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, stack) > 0) entityLivingBase.setFire(EnchantmentHelper.getEnchantmentLevel(Enchantment.fireAspect.effectId, stack) * 15);
|
||||
|
||||
|
||||
double d1 = player.posX - entityLivingBase.posX;
|
||||
double d0;
|
||||
|
||||
@@ -260,7 +214,7 @@ public class ToolHandler {
|
||||
if (entityLivingBase.worldObj.rand.nextDouble() >= entityLivingBase.getEntityAttribute(SharedMonsterAttributes.knockbackResistance).getAttributeValue()) {
|
||||
entityLivingBase.isAirBorne = true;
|
||||
float f1 = MathHelper.sqrt_double(d1 * d1 + d0 * d0);
|
||||
float f2 = 0.4F + EnchantmentHelper.getKnockbackModifier(player, entityLivingBase) * 0.4F;
|
||||
float f2 = 0.1F + (EnchantmentHelper.getKnockbackModifier(player, entityLivingBase) * 0.4F);
|
||||
entityLivingBase.motionX /= 2.0D;
|
||||
entityLivingBase.motionY /= 2.0D;
|
||||
entityLivingBase.motionZ /= 2.0D;
|
||||
@@ -316,4 +270,25 @@ public class ToolHandler {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static float getBaseAttackDamage(ItemStack stack)
|
||||
{
|
||||
if (stack == null) return 0;
|
||||
float sharpMod = (float)EnchantmentHelper.getEnchantmentLevel(Enchantment.sharpness.effectId, stack) * 4F;
|
||||
if (stack.getItem() == ModItems.draconicDestructionStaff) return (ModItems.DRACONIUM_T3.getDamageVsEntity()) + sharpMod;
|
||||
else if (stack.getItem() instanceof ItemSword) return (((ItemSword)stack.getItem()).func_150931_i()) + sharpMod;
|
||||
return 0;
|
||||
}
|
||||
|
||||
public static float getDamageAgainstEntity(ItemStack stack, Entity entity)
|
||||
{
|
||||
float baseAttack = getBaseAttackDamage(stack);
|
||||
float smiteMod = EnchantmentHelper.getEnchantmentLevel(Enchantment.smite.effectId ,stack) * 6F;
|
||||
float athropodsMod = EnchantmentHelper.getEnchantmentLevel(Enchantment.baneOfArthropods.effectId ,stack) * 6F;
|
||||
|
||||
if (entity instanceof EntityLivingBase && ((EntityLivingBase)entity).isEntityUndead()) baseAttack += smiteMod;
|
||||
if (entity instanceof EntitySpider) baseAttack += athropodsMod;
|
||||
|
||||
return baseAttack;
|
||||
}
|
||||
}
|
||||
+3
-2
@@ -14,6 +14,7 @@ import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
import net.minecraft.enchantment.EnumEnchantmentType;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -41,7 +42,7 @@ public class DraconicBow extends ItemBow implements IInventoryTool
|
||||
this.setMaxDamage(-1);
|
||||
this.setCreativeTab(DraconicEvolution.tabToolsWeapons);
|
||||
this.setUnlocalizedName(Strings.draconicBowName);
|
||||
GameRegistry.registerItem(this, Strings.draconicBowName);
|
||||
if (ModItems.isEnabled(this)) GameRegistry.registerItem(this, Strings.draconicBowName);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -73,7 +74,7 @@ public class DraconicBow extends ItemBow implements IInventoryTool
|
||||
return event.result;
|
||||
}
|
||||
|
||||
if (player.capabilities.isCreativeMode || player.inventory.hasItem(Items.arrow) || player.inventory.hasItem(ModItems.enderArrow))
|
||||
if (player.capabilities.isCreativeMode || player.inventory.hasItem(Items.arrow) || player.inventory.hasItem(ModItems.enderArrow) || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0)
|
||||
{
|
||||
player.setItemInUse(stack, this.getMaxItemUseDuration(stack));
|
||||
}
|
||||
|
||||
+15
-3
@@ -11,6 +11,7 @@ import com.brandon3055.draconicevolution.common.utills.IInventoryTool;
|
||||
import com.brandon3055.draconicevolution.common.utills.InfoHelper;
|
||||
import com.brandon3055.draconicevolution.common.utills.ItemConfigField;
|
||||
import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper;
|
||||
import com.google.common.collect.Multimap;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -25,6 +26,7 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.ItemSword;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
@@ -40,7 +42,7 @@ public class DraconicSword extends ItemSword implements IEnergyContainerItem, II
|
||||
super(ModItems.DRACONIUM_T2);
|
||||
this.setUnlocalizedName(Strings.draconicSwordName);
|
||||
this.setCreativeTab(DraconicEvolution.tabToolsWeapons);
|
||||
GameRegistry.registerItem(this, Strings.draconicSwordName);
|
||||
if (ModItems.isEnabled(this)) GameRegistry.registerItem(this, Strings.draconicSwordName);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -76,8 +78,8 @@ public class DraconicSword extends ItemSword implements IEnergyContainerItem, II
|
||||
@Override
|
||||
public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity)
|
||||
{
|
||||
ToolHandler.AOEAttack(player, entity, stack, 15, 3);
|
||||
ToolHandler.damageEntityBasedOnHealth(entity, player, 0.3F);
|
||||
ToolHandler.AOEAttack(player, entity, stack, 3);
|
||||
ToolHandler.damageEntityBasedOnHealth(entity, player, 0.2F);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -90,6 +92,9 @@ public class DraconicSword extends ItemSword implements IEnergyContainerItem, II
|
||||
list.add(InfoHelper.ITC() + StatCollector.translateToLocal("info.de.sword.txt"));
|
||||
InfoHelper.addLore(stack, list);
|
||||
}
|
||||
list.add("");
|
||||
list.add(EnumChatFormatting.BLUE + "+" + ToolHandler.getBaseAttackDamage(stack) + " " + StatCollector.translateToLocal("info.de.attackDamage.txt"));
|
||||
list.add(EnumChatFormatting.BLUE + "+20%" + " " + StatCollector.translateToLocal("info.de.bonusHealthDamage.txt"));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -182,4 +187,11 @@ public class DraconicSword extends ItemSword implements IEnergyContainerItem, II
|
||||
public List<ItemConfigField> getFields(ItemStack stack, int slot) {
|
||||
return new ArrayList<ItemConfigField>();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Multimap getAttributeModifiers(ItemStack stack) {
|
||||
Multimap map = super.getAttributeModifiers(stack);
|
||||
map.clear();
|
||||
return map;
|
||||
}
|
||||
}
|
||||
@@ -14,6 +14,7 @@ import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.enchantment.EnchantmentHelper;
|
||||
import net.minecraft.enchantment.EnumEnchantmentType;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -41,7 +42,7 @@ public class WyvernBow extends ItemBow implements IInventoryTool {
|
||||
this.setMaxDamage(-1);
|
||||
this.setCreativeTab(DraconicEvolution.tabToolsWeapons);
|
||||
this.setUnlocalizedName(Strings.wyvernBowName);
|
||||
GameRegistry.registerItem(this, Strings.wyvernBowName);
|
||||
if (ModItems.isEnabled(this)) GameRegistry.registerItem(this, Strings.wyvernBowName);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -60,7 +61,7 @@ public class WyvernBow extends ItemBow implements IInventoryTool {
|
||||
return getUnlocalizedName();
|
||||
}
|
||||
|
||||
/* ======================================== CUSTOMEBOW START =====================================*/
|
||||
/* ======================================== CUSTOMEBOW START ===================================== */
|
||||
@Override
|
||||
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
|
||||
{
|
||||
@@ -71,7 +72,7 @@ public class WyvernBow extends ItemBow implements IInventoryTool {
|
||||
return event.result;
|
||||
}
|
||||
|
||||
if (player.capabilities.isCreativeMode || player.inventory.hasItem(Items.arrow) || player.inventory.hasItem(ModItems.enderArrow)) {
|
||||
if (player.capabilities.isCreativeMode || player.inventory.hasItem(Items.arrow) || player.inventory.hasItem(ModItems.enderArrow) || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0) {
|
||||
player.setItemInUse(stack, this.getMaxItemUseDuration(stack));
|
||||
}
|
||||
} else
|
||||
|
||||
+15
-3
@@ -11,6 +11,7 @@ import com.brandon3055.draconicevolution.common.utills.IInventoryTool;
|
||||
import com.brandon3055.draconicevolution.common.utills.InfoHelper;
|
||||
import com.brandon3055.draconicevolution.common.utills.ItemConfigField;
|
||||
import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper;
|
||||
import com.google.common.collect.Multimap;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
@@ -26,6 +27,7 @@ import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.ItemSword;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.util.EnumChatFormatting;
|
||||
import net.minecraft.util.StatCollector;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
@@ -42,7 +44,7 @@ public class WyvernSword extends ItemSword implements IEnergyContainerItem, IInv
|
||||
super(ModItems.DRACONIUM_T1);
|
||||
this.setUnlocalizedName(Strings.wyvernSwordName);
|
||||
this.setCreativeTab(DraconicEvolution.tabToolsWeapons);
|
||||
GameRegistry.registerItem(this, Strings.wyvernSwordName);
|
||||
if (ModItems.isEnabled(this)) GameRegistry.registerItem(this, Strings.wyvernSwordName);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -81,8 +83,8 @@ public class WyvernSword extends ItemSword implements IEnergyContainerItem, IInv
|
||||
@Override
|
||||
public boolean onLeftClickEntity(ItemStack stack, EntityPlayer player, Entity entity)
|
||||
{
|
||||
ToolHandler.AOEAttack(player, entity, stack, 8, 1);
|
||||
ToolHandler.damageEntityBasedOnHealth(entity, player, 0.2F);
|
||||
ToolHandler.AOEAttack(player, entity, stack, 1);
|
||||
ToolHandler.damageEntityBasedOnHealth(entity, player, 0.1F);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -95,6 +97,9 @@ public class WyvernSword extends ItemSword implements IEnergyContainerItem, IInv
|
||||
list.add(InfoHelper.ITC() + StatCollector.translateToLocal("info.de.sword.txt"));
|
||||
InfoHelper.addLore(stack, list);
|
||||
}
|
||||
list.add("");
|
||||
list.add(EnumChatFormatting.BLUE + "+" + ToolHandler.getBaseAttackDamage(stack) + " " + StatCollector.translateToLocal("info.de.attackDamage.txt"));
|
||||
list.add(EnumChatFormatting.BLUE + "+10%" + " " + StatCollector.translateToLocal("info.de.bonusHealthDamage.txt"));
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -195,5 +200,12 @@ public class WyvernSword extends ItemSword implements IEnergyContainerItem, IInv
|
||||
public List<ItemConfigField> getFields(ItemStack stack, int slot) {
|
||||
return new ArrayList<ItemConfigField>();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Multimap getAttributeModifiers(ItemStack stack) {
|
||||
Multimap map = super.getAttributeModifiers(stack);
|
||||
map.clear();
|
||||
return map;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -44,4 +44,6 @@ public final class References {
|
||||
public static final String ATTACK_AOE = "WeaponAttackAOE";
|
||||
public static final String OBLITERATE = "ToolVoidJunk";
|
||||
public static final String TREE_MODE = "AxeTreeMode";
|
||||
public static final String BASE_SAFE_AOE = "BaseSafeAOE";
|
||||
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
package com.brandon3055.draconicevolution.common.network;
|
||||
|
||||
import com.brandon3055.draconicevolution.common.utills.LogHelper;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
||||
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import net.minecraft.network.play.server.S23PacketBlockChange;
|
||||
|
||||
public class BlockUpdatePacket implements IMessage
|
||||
{
|
||||
int x, y, z;
|
||||
|
||||
public BlockUpdatePacket() {}
|
||||
|
||||
public BlockUpdatePacket(int x, int y, int z) {
|
||||
this.x = x;
|
||||
this.y = y;
|
||||
this.z = z;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fromBytes(ByteBuf bytes) {
|
||||
this.x = bytes.readInt();
|
||||
this.y = bytes.readInt();
|
||||
this.z = bytes.readInt();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void toBytes(ByteBuf bytes){
|
||||
bytes.writeInt(x);
|
||||
bytes.writeInt(y);
|
||||
bytes.writeInt(z);
|
||||
}
|
||||
|
||||
public static class Handler implements IMessageHandler<BlockUpdatePacket, IMessage> {
|
||||
|
||||
@Override
|
||||
public IMessage onMessage(BlockUpdatePacket message, MessageContext ctx) {
|
||||
LogHelper.info("update " + message.x + " " + message.y + " " + message.z);
|
||||
ctx.getServerHandler().playerEntity.playerNetServerHandler.sendPacket(new S23PacketBlockChange(message.x, message.y, message.z, ctx.getServerHandler().playerEntity.worldObj));
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -23,6 +23,7 @@ public class ButtonPacket implements IMessage
|
||||
public static final byte ID_DRACONIUMCHEST2 = 4;
|
||||
public static final byte ID_DRACONIUMCHEST3 = 5;
|
||||
public static final byte ID_TOOLCONFIG = 7;
|
||||
public static final byte ID_DRACONIUMCHEST4 = 8;
|
||||
byte buttonId = 0;
|
||||
boolean state = false;
|
||||
|
||||
@@ -104,6 +105,15 @@ public class ButtonPacket implements IMessage
|
||||
}
|
||||
break;
|
||||
}
|
||||
case ID_DRACONIUMCHEST4:
|
||||
{
|
||||
Container container = ctx.getServerHandler().playerEntity.openContainer;
|
||||
if (container != null && container instanceof ContainerDraconiumChest){
|
||||
TileDraconiumChest tile = ((ContainerDraconiumChest) container).getTile();
|
||||
tile.lockOutputSlots = ! tile.lockOutputSlots;
|
||||
}
|
||||
break;
|
||||
}
|
||||
case ID_TOOLCONFIG:
|
||||
{
|
||||
ctx.getServerHandler().playerEntity.openGui(DraconicEvolution.instance, GuiHandler.GUIID_TOOL_CONFIG, ctx.getServerHandler().playerEntity.worldObj, (int)ctx.getServerHandler().playerEntity.posX, (int)ctx.getServerHandler().playerEntity.posY, (int)ctx.getServerHandler().playerEntity.posZ);
|
||||
|
||||
+54
@@ -0,0 +1,54 @@
|
||||
package com.brandon3055.draconicevolution.common.network;
|
||||
|
||||
import com.brandon3055.draconicevolution.DraconicEvolution;
|
||||
import com.brandon3055.draconicevolution.common.handler.ConfigHandler;
|
||||
import com.brandon3055.draconicevolution.common.handler.MinecraftForgeEventHandler;
|
||||
import com.brandon3055.draconicevolution.common.utills.LogHelper;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
|
||||
import cpw.mods.fml.common.network.simpleimpl.MessageContext;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
|
||||
/**
|
||||
* Created by Brandon on 26/03/2015.
|
||||
*/
|
||||
public class SpeedRequestPacket implements IMessage
|
||||
{
|
||||
double speed = 0F;
|
||||
|
||||
public SpeedRequestPacket() {}
|
||||
|
||||
public SpeedRequestPacket(double speed) {
|
||||
this.speed = speed;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void toBytes(ByteBuf bytes){
|
||||
bytes.writeDouble(speed);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fromBytes(ByteBuf bytes){
|
||||
this.speed = bytes.readDouble();
|
||||
}
|
||||
|
||||
public static class Handler implements IMessageHandler<SpeedRequestPacket, IMessage> {
|
||||
|
||||
@Override
|
||||
public IMessage onMessage(SpeedRequestPacket message, MessageContext ctx) {
|
||||
if (ctx.side == Side.SERVER)
|
||||
{
|
||||
if (ConfigHandler.speedLimitDimList.contains(ctx.getServerHandler().playerEntity.dimension) || (DraconicEvolution.proxy.isOp(ctx.getServerHandler().playerEntity.getCommandSenderName()) && !ConfigHandler.speedLimitops)) return new SpeedRequestPacket(20F);
|
||||
return new SpeedRequestPacket(ConfigHandler.maxPlayerSpeed);
|
||||
}
|
||||
else {
|
||||
MinecraftForgeEventHandler.maxSpeed = message.speed;
|
||||
MinecraftForgeEventHandler.ticksSinceRequest = 0;
|
||||
MinecraftForgeEventHandler.speedNeedsUpdating = false;
|
||||
LogHelper.info("Server speed is set to " + message.speed);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.brandon3055.draconicevolution.common.network;
|
||||
|
||||
import com.brandon3055.draconicevolution.DraconicEvolution;
|
||||
import com.brandon3055.draconicevolution.common.ModItems;
|
||||
import com.brandon3055.draconicevolution.common.handler.ConfigHandler;
|
||||
import com.brandon3055.draconicevolution.common.utills.ItemNBTHelper;
|
||||
@@ -64,6 +65,7 @@ public class TeleporterPacket implements IMessage
|
||||
bytes.writeFloat(location.getPitch());
|
||||
bytes.writeFloat(location.getYaw());
|
||||
ByteBufUtils.writeUTF8String(bytes, location.getName());
|
||||
//ByteBufUtils.writeUTF8String(bytes, location.getDimensionName());
|
||||
if (function == UPDATEDESTINATION) bytes.writeInt(data);
|
||||
}
|
||||
|
||||
@@ -98,6 +100,7 @@ public class TeleporterPacket implements IMessage
|
||||
location.setPitch(bytes.readFloat());
|
||||
location.setYaw(bytes.readFloat());
|
||||
location.setName(ByteBufUtils.readUTF8String(bytes));
|
||||
//location.setDimentionName(ByteBufUtils.readUTF8String(bytes));
|
||||
if (function == UPDATEDESTINATION) data = bytes.readInt();
|
||||
}
|
||||
|
||||
@@ -135,6 +138,7 @@ public class TeleporterPacket implements IMessage
|
||||
|
||||
if (message.function == ADDDESTINATION){
|
||||
NBTTagCompound tag = new NBTTagCompound();
|
||||
message.location.setDimentionName(DraconicEvolution.proxy.getMCServer().worldServerForDimension(message.location.getDimension()).provider.getDimensionName());
|
||||
message.location.writeToNBT(tag);
|
||||
list.appendTag(tag);
|
||||
compound.setTag("Locations", list);
|
||||
@@ -168,6 +172,7 @@ public class TeleporterPacket implements IMessage
|
||||
|
||||
if (message.function == UPDATEDESTINATION){
|
||||
NBTTagCompound tag = list.getCompoundTagAt(message.data);
|
||||
message.location.setDimentionName(DraconicEvolution.proxy.getMCServer().worldServerForDimension(message.location.getDimension()).provider.getDimensionName());
|
||||
message.location.writeToNBT(tag);
|
||||
list.func_150304_a(message.data, tag);
|
||||
compound.setTag("Locations", list);
|
||||
|
||||
+1
-1
@@ -165,7 +165,7 @@ public abstract class CustomSpawnerBaseLogic {
|
||||
}
|
||||
} else ((EntityLiving) par1Entity).onSpawnWithEgg(null);
|
||||
|
||||
((EntityLiving)par1Entity).func_110163_bv();
|
||||
if (!requiresPlayer)((EntityLiving)par1Entity).func_110163_bv();
|
||||
this.getSpawnerWorld().spawnEntityInWorld(par1Entity);
|
||||
}
|
||||
|
||||
|
||||
+27
-60
@@ -10,7 +10,7 @@ import com.brandon3055.draconicevolution.common.utills.EnergyStorage;
|
||||
import com.brandon3055.draconicevolution.common.utills.ICustomItemData;
|
||||
import com.brandon3055.draconicevolution.common.utills.InventoryUtils;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.inventory.ISidedInventory;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.crafting.FurnaceRecipes;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
@@ -28,7 +28,7 @@ import java.util.List;
|
||||
/**
|
||||
* Created by Brandon on 27/06/2014.
|
||||
*/
|
||||
public class TileDraconiumChest extends TileEntity implements IInventory, IEnergyReceiver, ICustomItemData {
|
||||
public class TileDraconiumChest extends TileEntity implements ISidedInventory, IEnergyReceiver, ICustomItemData {
|
||||
ItemStack[] items = new ItemStack[240];
|
||||
ItemStack[] itemsCrafting = new ItemStack[10];
|
||||
private int ticksSinceSync = -1;
|
||||
@@ -40,6 +40,7 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg
|
||||
public int green = 0;
|
||||
public int blue = 150;
|
||||
public boolean editMode = false;
|
||||
public boolean lockOutputSlots = false;
|
||||
private String customName;
|
||||
public EnergyStorage energy = new EnergyStorage(1000000, 10000, 0);
|
||||
|
||||
@@ -55,6 +56,7 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg
|
||||
public final int smeltingCompleateTime = 1600;
|
||||
public int smeltingAutoFeed = 0;
|
||||
public int tick;
|
||||
private boolean inTick = false;
|
||||
|
||||
@Override
|
||||
public void updateEntity() {
|
||||
@@ -108,7 +110,7 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg
|
||||
updateEnergy();
|
||||
}
|
||||
|
||||
public void updateEnergy() {
|
||||
public void updateEnergy() {//todo if no charging item wait a sec before checking again
|
||||
if (energy.getEnergyStored() < energy.getMaxEnergyStored() && getStackInSlot(239) != null && getStackInSlot(239).getItem() instanceof IEnergyContainerItem) {
|
||||
IEnergyContainerItem item = (IEnergyContainerItem) getStackInSlot(239).getItem();
|
||||
item.extractEnergy(getStackInSlot(239), receiveEnergy(ForgeDirection.DOWN, item.extractEnergy(getStackInSlot(239), energy.getMaxReceive(), true), false), false);
|
||||
@@ -117,6 +119,7 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg
|
||||
|
||||
public void updateFurnace() {
|
||||
if (worldObj.isRemote) return;
|
||||
inTick = true;
|
||||
tick++;
|
||||
boolean canSmelt = false;
|
||||
boolean flag = true;
|
||||
@@ -196,7 +199,7 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg
|
||||
} while (itemsToProccess > 0 && proccessAttempts < 5);
|
||||
}
|
||||
|
||||
if ((flag && (getFill() || getLock() || getAll())) || (!canSmelt && (getLock() || getAll()) && tick % 60 == 0)) feedNextItem();
|
||||
if ((flag && (getFill() || getLock() || getAll())) || (!canSmelt && (getLock() || getAll()) && (tick + xCoord + yCoord + zCoord) % 60 == 0)) feedNextItem();
|
||||
|
||||
if (canSmelt) {
|
||||
smeltingBurnSpeed = Math.min(energy.getEnergyStored() / 1000, smeltingMaxBurnSpeed);
|
||||
@@ -206,7 +209,7 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg
|
||||
smeltingProgressTime += smeltingBurnSpeed;
|
||||
energy.modifyEnergyStored(-smeltingBurnSpeed * 5);
|
||||
} else smeltingProgressTime = 0;
|
||||
|
||||
inTick = false;
|
||||
}
|
||||
|
||||
public void feedNextItem() {
|
||||
@@ -445,6 +448,7 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg
|
||||
compound.setInteger("Green", green);
|
||||
compound.setInteger("Blue", blue);
|
||||
compound.setBoolean("Edit", editMode);
|
||||
compound.setBoolean("LockOutputSlots", lockOutputSlots);
|
||||
compound.setByte("AutoFeed", (byte) smeltingAutoFeed);
|
||||
if (customName != null && customName.length() > 0)compound.setString("CustomName", customName);
|
||||
energy.writeToNBT(compound);
|
||||
@@ -470,6 +474,7 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg
|
||||
green = compound.getInteger("Green");
|
||||
blue = compound.getInteger("Blue");
|
||||
editMode = compound.getBoolean("Edit");
|
||||
lockOutputSlots = compound.getBoolean("LockOutputSlots");
|
||||
smeltingAutoFeed = compound.getByte("AutoFeed");
|
||||
customName = compound.getString("CustomName");
|
||||
energy.readFromNBT(compound);
|
||||
@@ -539,61 +544,6 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg
|
||||
energy.readFromNBT(compound);
|
||||
}
|
||||
|
||||
// @Override
|
||||
// public void writeDataToItem(NBTTagCompound compound, ItemStack stack) {
|
||||
// NBTTagCompound[] tag = new NBTTagCompound[items.length];
|
||||
//
|
||||
// for (int i = 0; i < items.length; i++) {
|
||||
// tag[i] = new NBTTagCompound();
|
||||
//
|
||||
// if (items[i] != null) {
|
||||
// tag[i] = items[i].writeToNBT(tag[i]);
|
||||
// }
|
||||
//
|
||||
// compound.setTag("Item" + i, tag[i]);
|
||||
// }
|
||||
//
|
||||
// for (int i = 0; i < itemsCrafting.length; i++) {
|
||||
// tag[i] = new NBTTagCompound();
|
||||
//
|
||||
// if (itemsCrafting[i] != null) {
|
||||
// tag[i] = itemsCrafting[i].writeToNBT(tag[i]);
|
||||
// }
|
||||
//
|
||||
// compound.setTag("CraftingItem" + i, tag[i]);
|
||||
// }
|
||||
//
|
||||
// compound.setInteger("Red", red);
|
||||
// compound.setInteger("Green", green);
|
||||
// compound.setInteger("Blue", blue);
|
||||
// compound.setBoolean("Edit", editMode);
|
||||
// compound.setByte("AutoFeed", (byte) smeltingAutoFeed);
|
||||
// if (hasCustomInventoryName()) stack.setStackDisplayName(customName);
|
||||
// energy.writeToNBT(compound);
|
||||
// }
|
||||
|
||||
// @Override
|
||||
// public void readDataFromItem(NBTTagCompound compound, ItemStack stack) {
|
||||
// NBTTagCompound[] tag = new NBTTagCompound[items.length];
|
||||
//
|
||||
// for (int i = 0; i < items.length; i++) {
|
||||
// tag[i] = compound.getCompoundTag("Item" + i);
|
||||
// items[i] = ItemStack.loadItemStackFromNBT(tag[i]);
|
||||
// }
|
||||
//
|
||||
// for (int i = 0; i < itemsCrafting.length; i++) {
|
||||
// tag[i] = compound.getCompoundTag("CraftingItem" + i);
|
||||
// itemsCrafting[i] = ItemStack.loadItemStackFromNBT(tag[i]);
|
||||
// }
|
||||
//
|
||||
// red = compound.getInteger("Red");
|
||||
// green = compound.getInteger("Green");
|
||||
// blue = compound.getInteger("Blue");
|
||||
// editMode = compound.getBoolean("Edit");
|
||||
// smeltingAutoFeed = compound.getByte("AutoFeed");
|
||||
// energy.readFromNBT(compound);
|
||||
// }
|
||||
|
||||
@Override
|
||||
public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) {
|
||||
return this.energy.receiveEnergy(maxReceive, simulate);
|
||||
@@ -613,4 +563,21 @@ public class TileDraconiumChest extends TileEntity implements IInventory, IEnerg
|
||||
public boolean canConnectEnergy(ForgeDirection from) {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int[] getAccessibleSlotsFromSide(int side) {
|
||||
int[] i = new int[getSizeInventory()];
|
||||
for (int i1 = 0; i1 < i.length; i1++) i[i1] = i1;
|
||||
return i;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canInsertItem(int slot, ItemStack stack, int side) {
|
||||
return !lockOutputSlots || inTick || slot < getSizeInventory() - 5;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canExtractItem(int slot, ItemStack stack, int side) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
+89
@@ -0,0 +1,89 @@
|
||||
package com.brandon3055.draconicevolution.common.tileentities.energynet;
|
||||
|
||||
import cofh.api.energy.IEnergyReceiver;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
/**
|
||||
* Created by Brandon on 26/03/2015.
|
||||
*/
|
||||
public class LinkedReceiver {
|
||||
|
||||
public int xCoord;
|
||||
public int yCoord;
|
||||
public int zCoord;
|
||||
public int connectionSide;
|
||||
public int particleEnergyCounter = 0;
|
||||
public Block target = null;
|
||||
private double tBBXMin = -1;
|
||||
private double tBBXMax = -1;
|
||||
private double tBBYMin = -1;
|
||||
private double tBBYMax = -1;
|
||||
private double tBBZMin = -1;
|
||||
private double tBBZMax = -1;
|
||||
|
||||
public LinkedReceiver(){}
|
||||
|
||||
public LinkedReceiver(int xCoord, int yCoord, int zCoord, int connectionSide)
|
||||
{
|
||||
this.xCoord = xCoord;
|
||||
this.yCoord = yCoord;
|
||||
this.zCoord = zCoord;
|
||||
this.connectionSide = connectionSide;
|
||||
}
|
||||
|
||||
public boolean isStillValid(World world)
|
||||
{
|
||||
TileEntity tile = world.getTileEntity(xCoord, yCoord, zCoord);
|
||||
return tile instanceof IEnergyReceiver && ((IEnergyReceiver) tile).canConnectEnergy(ForgeDirection.getOrientation(connectionSide));
|
||||
}
|
||||
|
||||
public IEnergyReceiver getReceiver(World world)
|
||||
{
|
||||
return isStillValid(world) ? (IEnergyReceiver) world.getTileEntity(xCoord, yCoord, zCoord) : null;
|
||||
}
|
||||
|
||||
public int receiveEnergy(World world, int maxReceive, boolean simulate) {
|
||||
if (isStillValid(world)) return getReceiver(world).receiveEnergy(ForgeDirection.getOrientation(connectionSide), maxReceive, simulate);
|
||||
else return 0;
|
||||
}
|
||||
|
||||
public int getEnergyStored(World world) {
|
||||
if (isStillValid(world)) return getReceiver(world).getEnergyStored(ForgeDirection.getOrientation(connectionSide));
|
||||
else return 0;
|
||||
}
|
||||
|
||||
public int getMaxEnergyStored(World world) {
|
||||
if (isStillValid(world)) return getReceiver(world).getMaxEnergyStored(ForgeDirection.getOrientation(connectionSide));
|
||||
else return 0;
|
||||
}
|
||||
|
||||
public void updateTarget(World world) {
|
||||
target = world.getBlock(xCoord, yCoord, zCoord);
|
||||
tBBXMin = target.getBlockBoundsMinX();
|
||||
tBBXMax = target.getBlockBoundsMinX();
|
||||
tBBYMin = target.getBlockBoundsMinX();
|
||||
tBBYMax = target.getBlockBoundsMinX();
|
||||
tBBZMin = target.getBlockBoundsMinX();
|
||||
tBBZMax = target.getBlockBoundsMinX();
|
||||
}
|
||||
|
||||
public void writeToNBT(NBTTagCompound compound, String tag)
|
||||
{
|
||||
compound.setInteger(tag + "_XCoord", xCoord);
|
||||
compound.setInteger(tag + "_YCoord", yCoord);
|
||||
compound.setInteger(tag + "_ZCoord", zCoord);
|
||||
compound.setInteger(tag + "_Side", connectionSide);
|
||||
}
|
||||
|
||||
public void readFromNBT(NBTTagCompound compound, String tag)
|
||||
{
|
||||
xCoord = compound.getInteger(tag + "_XCoord");
|
||||
yCoord = compound.getInteger(tag + "_YCoord");
|
||||
zCoord = compound.getInteger(tag + "_ZCoord");
|
||||
connectionSide = compound.getInteger(tag + "_Side");
|
||||
}
|
||||
}
|
||||
+6
-2
@@ -94,14 +94,14 @@ public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRe
|
||||
if (worldObj.isRemote)
|
||||
{
|
||||
int rType = 0;
|
||||
if (this instanceof TileEnergyRelay)
|
||||
if (this instanceof TileEnergyRelay || this instanceof TileWirelessEnergyTransceiver)
|
||||
{
|
||||
if (remoteTile instanceof TileEnergyTransceiver) rType = 2;
|
||||
else rType = 3;
|
||||
}
|
||||
else if (this instanceof TileEnergyTransceiver)
|
||||
{
|
||||
if (remoteTile instanceof TileEnergyRelay) rType = 1;
|
||||
if (remoteTile instanceof TileEnergyRelay || remoteTile instanceof TileWirelessEnergyTransceiver) rType = 1;
|
||||
else rType = 0;
|
||||
}
|
||||
if (inView) LogHelper.info(device.energyFlow);
|
||||
@@ -199,11 +199,13 @@ public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRe
|
||||
{
|
||||
if (linkDat != null && linkDat.hasKey("Bound") && linkDat.getBoolean("Bound"))
|
||||
{
|
||||
LogHelper.info("Bind");
|
||||
handleBinding(player, linkDat.getInteger("XCoord"), linkDat.getInteger("YCoord"), linkDat.getInteger("ZCoord"), true);
|
||||
linkDat.setBoolean("Bound", false);
|
||||
}
|
||||
else
|
||||
{
|
||||
LogHelper.info("Bind2");
|
||||
linkDat = new NBTTagCompound();
|
||||
linkDat.setInteger("XCoord", xCoord);
|
||||
linkDat.setInteger("YCoord", yCoord);
|
||||
@@ -257,6 +259,8 @@ public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRe
|
||||
}
|
||||
else if (mode.equals(Wrench.CLEAR_BINDINGS))
|
||||
{
|
||||
if (this instanceof TileWirelessEnergyTransceiver) ((TileWirelessEnergyTransceiver)this).receiverList.clear();
|
||||
|
||||
for (LinkedEnergyDevice ld : linkedDevices)
|
||||
{
|
||||
if (!(ld.getTile(worldObj) instanceof TileRemoteEnergyBase))
|
||||
|
||||
+224
@@ -0,0 +1,224 @@
|
||||
package com.brandon3055.draconicevolution.common.tileentities.energynet;
|
||||
|
||||
import cofh.api.energy.IEnergyReceiver;
|
||||
import com.brandon3055.draconicevolution.DraconicEvolution;
|
||||
import com.brandon3055.draconicevolution.client.handler.ParticleHandler;
|
||||
import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyField;
|
||||
import com.brandon3055.draconicevolution.client.render.particle.Particles;
|
||||
import com.brandon3055.draconicevolution.common.items.tools.Wrench;
|
||||
import com.brandon3055.draconicevolution.common.lib.References;
|
||||
import com.brandon3055.draconicevolution.common.utills.Utills;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ChatComponentText;
|
||||
import net.minecraft.util.ChatComponentTranslation;
|
||||
import net.minecraftforge.common.util.ForgeDirection;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* Created by Brandon on 10/02/2015.
|
||||
*/
|
||||
public class TileWirelessEnergyTransceiver extends TileRemoteEnergyBase {
|
||||
private ParticleEnergyField ring;
|
||||
|
||||
public List<LinkedReceiver> receiverList = new ArrayList<LinkedReceiver>();
|
||||
|
||||
public TileWirelessEnergyTransceiver(){}
|
||||
|
||||
public TileWirelessEnergyTransceiver(int powerTier){
|
||||
this.powerTier = powerTier;
|
||||
this.updateStorage();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public int getCap() {
|
||||
return 50000 + (powerTier * 4500000);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getRec() {
|
||||
return 50000 + (powerTier * 4500000);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getExt() {
|
||||
return 50000 + (powerTier * 4500000);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updateEntity() {
|
||||
super.updateEntity();
|
||||
|
||||
if (worldObj.isRemote)
|
||||
{
|
||||
ring = DraconicEvolution.proxy.energyField(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 2, powerTier == 1, ring, inView > 0);
|
||||
|
||||
for (LinkedReceiver receiver : receiverList)
|
||||
{
|
||||
int particleValue = 200;
|
||||
if (receiver.particleEnergyCounter > particleValue)
|
||||
{
|
||||
receiver.particleEnergyCounter -= particleValue;
|
||||
|
||||
//todo detect box size
|
||||
ParticleHandler.spawnCustomParticle(new Particles.TransceiverParticle(worldObj, xCoord + 0.5, yCoord + 0.3 + (worldObj.rand.nextDouble() * 0.4), zCoord + 0.5, receiver.xCoord + worldObj.rand.nextDouble(), receiver.yCoord + worldObj.rand.nextDouble(), receiver.zCoord + worldObj.rand.nextDouble()));
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
for (LinkedReceiver receiver : receiverList)
|
||||
{
|
||||
if (!receiver.isStillValid(worldObj) && worldObj.getChunkFromBlockCoords(receiver.xCoord, receiver.zCoord).isChunkLoaded)
|
||||
{
|
||||
receiverList.remove(receiver);
|
||||
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
|
||||
break;
|
||||
}
|
||||
|
||||
int sent = receiver.receiveEnergy(worldObj, storage.extractEnergy(receiver.receiveEnergy(worldObj, powerTier == 0 ? 5000 : 50000, true), false), false);
|
||||
|
||||
sent = (sent / 20);
|
||||
|
||||
if (sent > Short.MAX_VALUE) sent = Short.MAX_VALUE;
|
||||
|
||||
if (sent > 0) sendObject(References.SHORT_ID, 10 + receiverList.indexOf(receiver), (short)sent);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void receiveObject(int index, Object object) {
|
||||
super.receiveObject(index, object);
|
||||
if (index >= 10)
|
||||
{
|
||||
|
||||
if (receiverList.size() > index - 10 && receiverList.get(index - 10).particleEnergyCounter < 10000) receiverList.get(index - 10).particleEnergyCounter += (Short)object;
|
||||
}
|
||||
}
|
||||
|
||||
public void linkDevice(int x, int y, int z, int side, EntityPlayer player, String mode)
|
||||
{
|
||||
TileEntity target = worldObj.getTileEntity(x, y, z);
|
||||
if (!(target instanceof IEnergyReceiver))
|
||||
{
|
||||
player.addChatComponentMessage(new ChatComponentText("Unknown Error occurred [Invalid Tile]"));
|
||||
return;
|
||||
}
|
||||
|
||||
IEnergyReceiver receiver = (IEnergyReceiver) target;
|
||||
|
||||
if (!receiver.canConnectEnergy(ForgeDirection.getOrientation(side)))
|
||||
{
|
||||
player.addChatComponentMessage(new ChatComponentTranslation("msg.de.wrongSide.txt"));
|
||||
return;
|
||||
}
|
||||
|
||||
if (receiverList.size() >= getmaxWirelessConnections())
|
||||
{
|
||||
player.addChatComponentMessage(new ChatComponentTranslation("msg.de.maxConnections.txt"));
|
||||
return;
|
||||
}
|
||||
|
||||
if (Utills.getDistanceAtoB(xCoord, yCoord, zCoord, x, y, z) > (powerTier == 0 ? 15 : 30))
|
||||
{
|
||||
player.addChatComponentMessage(new ChatComponentTranslation("msg.de.outOfRange.txt"));
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
if (mode.equals(Wrench.BIND_MODE))
|
||||
{
|
||||
LinkedReceiver r = new LinkedReceiver(x, y, z, side);
|
||||
|
||||
for (LinkedReceiver r2 : receiverList)
|
||||
{
|
||||
if (r.xCoord == r2.xCoord && r.yCoord == r2.yCoord && r.zCoord == r2.zCoord && r.connectionSide == r2.connectionSide)
|
||||
{
|
||||
player.addChatComponentMessage(new ChatComponentTranslation("msg.de.linked.txt"));
|
||||
return;
|
||||
}
|
||||
}
|
||||
receiverList.add(r);
|
||||
player.addChatComponentMessage(new ChatComponentTranslation("msg.de.linked.txt"));
|
||||
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
|
||||
}
|
||||
else if (mode.equals(Wrench.UNBIND_MODE))
|
||||
{
|
||||
for (LinkedReceiver r2 : receiverList)
|
||||
{
|
||||
if (x == r2.xCoord && y == r2.yCoord && z == r2.zCoord && side == r2.connectionSide)
|
||||
{
|
||||
player.addChatComponentMessage(new ChatComponentTranslation("msg.de.unLinked.txt"));
|
||||
receiverList.remove(r2);
|
||||
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeToNBT(NBTTagCompound compound) {
|
||||
super.writeToNBT(compound);
|
||||
compound.setInteger("Receiver_Count", receiverList.size());
|
||||
for (int i = 0; i < receiverList.size(); i++) receiverList.get(i).writeToNBT(compound, String.valueOf(i));
|
||||
}
|
||||
|
||||
@Override
|
||||
public void readFromNBT(NBTTagCompound compound) {
|
||||
super.readFromNBT(compound);
|
||||
int count = compound.getInteger("Receiver_Count");
|
||||
receiverList.clear();
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
LinkedReceiver r = new LinkedReceiver();
|
||||
r.readFromNBT(compound, String.valueOf(i));
|
||||
receiverList.add(r);
|
||||
}
|
||||
}
|
||||
|
||||
// @Override
|
||||
// public double getCapacity() {
|
||||
// return ((double) getEnergyStored(ForgeDirection.UNKNOWN) / (double) getMaxEnergyStored(ForgeDirection.UNKNOWN)) * 100D;
|
||||
// }
|
||||
|
||||
/**Calculates the energy flow based on the local buffer
|
||||
* and the remote buffer
|
||||
*return double between 0 to 100*/
|
||||
public double getFlow(double localCap, double remoteCap)
|
||||
{
|
||||
return Math.max(0, Math.min(100, (localCap - remoteCap) * 100D/*Flow Multiplier*/));
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getBeamX() {
|
||||
return xCoord + 0.5D;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getBeamY() {
|
||||
return yCoord + 0.5D;
|
||||
}
|
||||
|
||||
@Override
|
||||
public double getBeamZ() {
|
||||
return zCoord + 0.5D;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMaxConnections() {
|
||||
return powerTier == 0 ? 3 : 6;
|
||||
}
|
||||
|
||||
public int getmaxWirelessConnections() {
|
||||
return powerTier == 0 ? 8 : 16;
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -275,7 +275,7 @@ public class TileEnergyPylon extends TileObjectSync implements IEnergyHandler, I
|
||||
|
||||
@Override
|
||||
public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) {
|
||||
if (getMaster() == null) return 0;
|
||||
if (getMaster() == null || !getMaster().isOnline()) return 0;
|
||||
int extracted = reciveEnergy ? 0 : getMaster().extractEnergy(maxExtract, simulate);
|
||||
if (!simulate && extracted > 0) particleRate = (byte)Math.min(20, extracted < 500 && extracted > 0 ? 1 : extracted/500);
|
||||
return extracted;
|
||||
|
||||
@@ -98,6 +98,10 @@ public class InfoHelper {
|
||||
return Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT);
|
||||
}
|
||||
|
||||
public static boolean isCtrlKeyDown() {
|
||||
return Keyboard.isKeyDown(Keyboard.KEY_LCONTROL) || Keyboard.isKeyDown(Keyboard.KEY_RCONTROL);
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
public static boolean holdShiftForDetails(List list, boolean inverted){
|
||||
if (isShiftKeyDown() == inverted) list.add(StatCollector.translateToLocal("info.de.hold.txt")+" "+EnumChatFormatting.AQUA + "" + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("info.de.shift.txt") + EnumChatFormatting.RESET + " " + EnumChatFormatting.GRAY + StatCollector.translateToLocal("info.de.forDetails.txt"));
|
||||
|
||||
@@ -11,7 +11,6 @@ import net.minecraft.network.play.server.S07PacketRespawn;
|
||||
import net.minecraft.network.play.server.S1DPacketEntityEffect;
|
||||
import net.minecraft.network.play.server.S1FPacketSetExperience;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.WorldServer;
|
||||
|
||||
@@ -26,6 +25,7 @@ public class Teleporter
|
||||
protected float pitch;
|
||||
protected float yaw;
|
||||
protected String name;
|
||||
protected String dimentionName = "";
|
||||
protected boolean writeProtected = false;
|
||||
|
||||
public TeleportLocation(){
|
||||
@@ -75,8 +75,7 @@ public class Teleporter
|
||||
public int getDimension() {return dimension;}
|
||||
|
||||
public String getDimensionName() {
|
||||
if (DraconicEvolution.proxy.getMCServer() == null) return String.valueOf(dimension);
|
||||
return MinecraftServer.getServer().worldServerForDimension(dimension).provider.getDimensionName();
|
||||
return dimentionName;
|
||||
}
|
||||
|
||||
public float getPitch() {return pitch;}
|
||||
@@ -117,6 +116,7 @@ public class Teleporter
|
||||
compound.setFloat("Pitch", pitch);
|
||||
compound.setFloat("Yaw", yaw);
|
||||
compound.setString("Name", name);
|
||||
compound.setString("DimentionName", dimentionName);
|
||||
compound.setBoolean("WP", writeProtected);
|
||||
}
|
||||
|
||||
@@ -128,6 +128,7 @@ public class Teleporter
|
||||
pitch = compound.getFloat("Pitch");
|
||||
yaw = compound.getFloat("Yaw");
|
||||
name = compound.getString("Name");
|
||||
dimentionName = compound.getString("DimentionName");
|
||||
writeProtected = compound.getBoolean("WP");
|
||||
}
|
||||
|
||||
@@ -165,6 +166,10 @@ public class Teleporter
|
||||
// entity.fallDistance = 0;
|
||||
entity.worldObj.playSoundEffect(entity.posX, entity.posY, entity.posZ, "portal.travel", 0.1F, entity.worldObj.rand.nextFloat() * 0.1F + 0.9F);
|
||||
}
|
||||
|
||||
public void setDimentionName(String dimentionName) {
|
||||
this.dimentionName = dimentionName;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
+5
@@ -25,6 +25,11 @@ public class DraconicWorldGenerator implements IWorldGenerator {
|
||||
generateNether(random, chunkX * 16, chunkZ * 16, world);
|
||||
break;
|
||||
default:
|
||||
for (Integer i : ConfigHandler.oreGenDimentionBlacklist)
|
||||
{
|
||||
if (i == world.provider.dimensionId) return;
|
||||
}
|
||||
addOreSpawn(ModBlocks.draconiumOre, world, random, chunkX * 16, chunkZ * 16, 3, 4, 2, 2, 8);
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user