Removed Steam piston gui since it had no use, if you need Force output
use the pipe guage. Also fixed a bug where pipes would output 2 per
update from every produce whether or not there it could actual produce
anything.
This commit is contained in:
Rseifert 2012-11-02 14:04:10 -04:00
parent a9fe90b3ca
commit 97113441eb
50 changed files with 621 additions and 1204 deletions

View file

Binary file not shown.

View file

@ -1,2 +0,0 @@
eclipse.preferences.version=1
jd.ide.eclipse.prefs.Setup=true

View file

@ -1,2 +0,0 @@
eclipse.preferences.version=1
version=1

View file

@ -1,2 +0,0 @@
eclipse.preferences.version=1
org.eclipse.epp.usagedata.recording.last-upload=1351461895073

View file

@ -1,13 +0,0 @@
content_assist_proposals_background=255,255,255
content_assist_proposals_foreground=0,0,0
eclipse.preferences.version=1
fontPropagated=true
org.eclipse.jdt.ui.editor.tab.width=
org.eclipse.jdt.ui.formatterprofiles.version=12
org.eclipse.jdt.ui.javadoclocations.migrated=true
org.eclipse.jface.textfont=1|Consolas|10.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Consolas;
proposalOrderMigrated=true
spelling_locale_initialized=true
tabWidthPropagated=true
useAnnotationsPrefPage=true
useQuickDiffPrefPage=true

View file

@ -1,2 +0,0 @@
eclipse.preferences.version=1
org.eclipse.m2e.discovery.pref.projects=

View file

@ -1,2 +0,0 @@
eclipse.preferences.version=1
mylyn.attention.migrated=true

View file

@ -1,2 +0,0 @@
eclipse.preferences.version=1
org.eclipse.mylyn.monitor.activity.tracking.enabled.checked=true

View file

@ -1,2 +0,0 @@
eclipse.preferences.version=1
pref_first_startup=false

View file

@ -1,2 +0,0 @@
eclipse.preferences.version=1
org.eclipse.team.ui.first_time=false

View file

@ -1,5 +0,0 @@
PROBLEMS_FILTERS_MIGRATE=true
eclipse.preferences.version=1
platformState=1341384697020
quickStart=false
tipsAndTricks=true

View file

@ -1,2 +0,0 @@
eclipse.preferences.version=1
showIntro=false

View file

@ -1,5 +0,0 @@
ENABLED_DECORATORS=org.eclipse.m2e.core.mavenVersionDecorator\:false,org.eclipse.egit.ui.internal.decorators.GitLightweightDecorator\:true,org.eclipse.jdt.ui.override.decorator\:true,org.eclipse.jdt.ui.interface.decorator\:false,org.eclipse.jdt.ui.buildpath.decorator\:true,org.eclipse.m2e.core.maven2decorator\:true,org.eclipse.mylyn.context.ui.decorator.interest\:true,org.eclipse.mylyn.tasks.ui.decorators.task\:true,org.eclipse.mylyn.team.ui.changeset.decorator\:true,org.eclipse.team.cvs.ui.decorator\:true,org.eclipse.ui.LinkedResourceDecorator\:true,org.eclipse.ui.VirtualResourceDecorator\:true,org.eclipse.ui.ContentTypeDecorator\:true,org.eclipse.ui.ResourceFilterDecorator\:false,
PLUGINS_NOT_ACTIVATED_ON_STARTUP=org.eclipse.m2e.discovery;
eclipse.preferences.version=1
editors=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<editors>\r\n<descriptor class\="org.eclipse.wb.internal.core.editor.multi.DesignerEditor" id\="org.eclipse.wb.core.guiEditor" image\="icons/gui_editor.gif" internal\="true" label\="WindowBuilder Editor" openMode\="1" open_in_place\="false" plugin\="org.eclipse.wb.core.ui"/>\r\n<descriptor id\="org.eclipse.ui.browser.editorSupport" image\="$nl$/icons/obj16/internal_browser.gif" internal\="false" label\="Web Browser" launcher\="org.eclipse.ui.internal.browser.BrowserLauncher" openMode\="4" open_in_place\="false" plugin\="org.eclipse.ui.browser"/>\r\n<descriptor id\="org.eclipse.jdt.ui.JARDescEditor" image\="$nl$/icons/full/obj16/jar_desc_obj.gif" internal\="false" label\="JAR Export Wizard" launcher\="org.eclipse.jdt.internal.ui.jarpackager.OpenJarExportWizardEditorLauncher" openMode\="4" open_in_place\="false" plugin\="org.eclipse.jdt.ui"/>\r\n<descriptor class\="org.eclipse.jdt.internal.debug.ui.snippeteditor.JavaSnippetEditor" id\="org.eclipse.jdt.debug.ui.SnippetEditor" image\="$nl$/icons/full/obj16/jsbook_obj.gif" internal\="true" label\="Scrapbook" openMode\="1" open_in_place\="false" plugin\="org.eclipse.jdt.debug.ui"/>\r\n<descriptor class\="jd.ide.eclipse.editors.JDClassFileEditorWin32X86" id\="jd.ide.eclipse.editors.JDClassFileEditor.win32.x86" image\="icons/jd_16.png" internal\="true" label\="Class File Editor" openMode\="1" open_in_place\="false" plugin\="jd.ide.eclipse"/>\r\n</editors>
resourcetypes=<?xml version\="1.0" encoding\="UTF-8"?>\r\n<editors version\="3.1">\r\n<info extension\="java" name\="*">\r\n<editor id\="org.eclipse.wb.core.guiEditor"/>\r\n</info>\r\n<info extension\="html" name\="*">\r\n<editor id\="org.eclipse.ui.browser.editorSupport"/>\r\n</info>\r\n<info extension\="htm" name\="*">\r\n<editor id\="org.eclipse.ui.browser.editorSupport"/>\r\n</info>\r\n<info extension\="jardesc" name\="*">\r\n<editor id\="org.eclipse.jdt.ui.JARDescEditor"/>\r\n<defaultEditor id\="org.eclipse.jdt.ui.JARDescEditor"/>\r\n</info>\r\n<info extension\="jpage" name\="*">\r\n<editor id\="org.eclipse.jdt.debug.ui.SnippetEditor"/>\r\n</info>\r\n<info extension\="shtml" name\="*">\r\n<editor id\="org.eclipse.ui.browser.editorSupport"/>\r\n</info>\r\n<info extension\="class" name\="*">\r\n<editor id\="jd.ide.eclipse.editors.JDClassFileEditor.win32.x86"/>\r\n<defaultEditor id\="jd.ide.eclipse.editors.JDClassFileEditor.win32.x86"/>\r\n</info>\r\n</editors>

View file

@ -1,119 +0,0 @@
what,kind,bundleId,bundleVersion,description,time
activated,perspective,org.eclipse.jdt.ui,,"org.eclipse.jdt.ui.JavaPerspective",1351461893792
started,bundle,org.eclipse.osgi,3.7.2.v20120110-1415,"org.eclipse.osgi",1351461893793
started,bundle,org.eclipse.core.contenttype,3.4.100.v20110423-0524,"org.eclipse.core.contenttype",1351461893794
started,bundle,org.eclipse.core.databinding.observable,1.4.0.I20110222-0800,"org.eclipse.core.databinding.observable",1351461893795
started,bundle,org.eclipse.core.expressions,3.4.300.v20110228,"org.eclipse.core.expressions",1351461893795
started,bundle,org.eclipse.core.net,1.2.100.I20110511-0800,"org.eclipse.core.net",1351461893796
started,bundle,org.eclipse.core.runtime,3.7.0.v20110110,"org.eclipse.core.runtime",1351461893797
started,bundle,org.eclipse.core.runtime.compatibility,3.2.100.v20100505,"org.eclipse.core.runtime.compatibility",1351461893797
started,bundle,org.eclipse.core.runtime.compatibility.auth,3.2.200.v20110110,"org.eclipse.core.runtime.compatibility.auth",1351461893798
started,bundle,org.eclipse.epp.usagedata.gathering,1.3.1.R201106061540,"org.eclipse.epp.usagedata.gathering",1351461893798
started,bundle,org.eclipse.epp.usagedata.recording,1.3.1.R201106061540,"org.eclipse.epp.usagedata.recording",1351461893799
started,bundle,org.eclipse.equinox.app,1.3.100.v20110321,"org.eclipse.equinox.app",1351461893799
started,bundle,org.eclipse.equinox.common,3.6.0.v20110523,"org.eclipse.equinox.common",1351461893800
started,bundle,org.eclipse.equinox.event,1.2.100.v20110502,"org.eclipse.equinox.event",1351461893800
started,bundle,org.eclipse.equinox.util,1.0.300.v20110502,"org.eclipse.equinox.util",1351461893801
started,bundle,org.eclipse.help,3.5.100.v20110426,"org.eclipse.help",1351461893813
started,bundle,org.eclipse.team.core,3.6.0.I20110525-0800,"org.eclipse.team.core",1351461893814
started,bundle,org.eclipse.ui.intro,3.4.100.v20110425,"org.eclipse.ui.intro",1351461893815
started,bundle,org.eclipse.ui.intro.universal,3.2.500.v20110510,"org.eclipse.ui.intro.universal",1351461893815
started,bundle,org.eclipse.update.configurator,3.3.100.v20100512,"org.eclipse.update.configurator",1351461893816
started,bundle,org.eclipse.update.core,3.2.500.v20110330,"org.eclipse.update.core",1351461893854
started,bundle,org.eclipse.update.scheduler,3.2.300.v20100512,"org.eclipse.update.scheduler",1351461893855
started,bundle,jd.ide.eclipse,0.1.3,"jd.ide.eclipse",1351461893856
started,bundle,org.eclipse.equinox.simpleconfigurator,1.0.200.v20110815-1438,"org.eclipse.equinox.simpleconfigurator",1351461893857
started,bundle,com.ibm.icu,4.4.2.v20110823,"com.ibm.icu",1351461893857
started,bundle,org.eclipse.core.filebuffers,3.5.200.v20110928-1504,"org.eclipse.core.filebuffers",1351461893858
started,bundle,org.eclipse.core.jobs,3.5.101.v20120113-1953,"org.eclipse.core.jobs",1351461893859
started,bundle,org.eclipse.core.resources,3.7.101.v20120125-1505,"org.eclipse.core.resources",1351461893860
started,bundle,org.eclipse.epp.mpc.ui,1.1.1.I20110907-0947,"org.eclipse.epp.mpc.ui",1351461893860
started,bundle,org.eclipse.equinox.ds,1.3.1.R37x_v20110701,"org.eclipse.equinox.ds",1351461893861
started,bundle,org.eclipse.equinox.p2.core,2.1.1.v20120113-1346,"org.eclipse.equinox.p2.core",1351461893862
started,bundle,org.eclipse.equinox.p2.directorywatcher,1.0.300.v20110815-1419,"org.eclipse.equinox.p2.directorywatcher",1351461893862
started,bundle,org.eclipse.equinox.p2.operations,2.1.1.R37x_v20111111,"org.eclipse.equinox.p2.operations",1351461893863
started,bundle,org.eclipse.equinox.p2.reconciler.dropins,1.1.100.v20110815-1419,"org.eclipse.equinox.p2.reconciler.dropins",1351461893864
started,bundle,org.eclipse.equinox.preferences,3.4.2.v20120111-2020,"org.eclipse.equinox.preferences",1351461893865
started,bundle,org.eclipse.equinox.registry,3.5.101.R37x_v20110810-1611,"org.eclipse.equinox.registry",1351461893865
started,bundle,org.eclipse.equinox.security,1.1.1.R37x_v20110822-1018,"org.eclipse.equinox.security",1351461893882
started,bundle,org.eclipse.jdt.core,3.7.3.v20120119-1537,"org.eclipse.jdt.core",1351461893883
started,bundle,org.eclipse.jdt.core.manipulation,1.4.0.v20110928-1453,"org.eclipse.jdt.core.manipulation",1351461893883
started,bundle,org.eclipse.jdt.ui,3.7.2.v20120109-1427,"org.eclipse.jdt.ui",1351461893888
started,bundle,org.eclipse.jface,3.7.0.v20110928-1505,"org.eclipse.jface",1351461893889
started,bundle,org.eclipse.m2e.logback.configuration,1.0.200.20111228-1245,"org.eclipse.m2e.logback.configuration",1351461893889
started,bundle,org.eclipse.mylyn.bugzilla.core,3.7.1.v20120425-0100,"org.eclipse.mylyn.bugzilla.core",1351461893901
started,bundle,org.eclipse.mylyn.bugzilla.ui,3.7.1.v20120425-0100,"org.eclipse.mylyn.bugzilla.ui",1351461893902
started,bundle,org.eclipse.mylyn.commons.core,3.7.1.v20120425-0100,"org.eclipse.mylyn.commons.core",1351461893902
started,bundle,org.eclipse.mylyn.commons.net,3.7.1.v20120425-0100,"org.eclipse.mylyn.commons.net",1351461893902
started,bundle,org.eclipse.mylyn.commons.notifications.core,0.9.1.v20120425-0100,"org.eclipse.mylyn.commons.notifications.core",1351461893902
started,bundle,org.eclipse.mylyn.commons.notifications.feed,0.9.1.v20120425-0100,"org.eclipse.mylyn.commons.notifications.feed",1351461893903
started,bundle,org.eclipse.mylyn.commons.notifications.ui,0.9.1.v20120425-0100,"org.eclipse.mylyn.commons.notifications.ui",1351461893903
started,bundle,org.eclipse.mylyn.commons.ui,3.7.1.v20120425-0100,"org.eclipse.mylyn.commons.ui",1351461893904
started,bundle,org.eclipse.mylyn.commons.workbench,3.7.1.v20120425-0100,"org.eclipse.mylyn.commons.workbench",1351461893904
started,bundle,org.eclipse.mylyn.context.core,3.7.1.v20120425-0100,"org.eclipse.mylyn.context.core",1351461893904
started,bundle,org.eclipse.mylyn.context.tasks.ui,3.7.1.v20120425-0100,"org.eclipse.mylyn.context.tasks.ui",1351461893905
started,bundle,org.eclipse.mylyn.monitor.ui,3.7.1.v20120425-0100,"org.eclipse.mylyn.monitor.ui",1351461893905
started,bundle,org.eclipse.mylyn.tasks.index.core,3.7.1.v20120425-0100,"org.eclipse.mylyn.tasks.index.core",1351461893906
started,bundle,org.eclipse.mylyn.tasks.ui,3.7.1.v20120425-0100,"org.eclipse.mylyn.tasks.ui",1351461893907
started,bundle,org.eclipse.search,3.7.0.v20110928-1504,"org.eclipse.search",1351461893927
started,bundle,org.eclipse.ui,3.7.0.v20110928-1505,"org.eclipse.ui",1351461893943
started,bundle,org.eclipse.ui.editors,3.7.0.v20110928-1504,"org.eclipse.ui.editors",1351461893944
started,bundle,org.eclipse.ui.forms,3.5.101.v20111011-1919,"org.eclipse.ui.forms",1351461893944
started,bundle,org.eclipse.ui.ide,3.7.0.v20110928-1505,"org.eclipse.ui.ide",1351461893945
started,bundle,org.eclipse.ui.net,1.2.100.v20111208-1155,"org.eclipse.ui.net",1351461893946
started,bundle,org.eclipse.ui.views,3.6.0.v20110928-1505,"org.eclipse.ui.views",1351461893946
started,bundle,org.eclipse.ui.workbench,3.7.1.v20120104-1859,"org.eclipse.ui.workbench",1351461893947
started,bundle,org.eclipse.ui.workbench.texteditor,3.7.0.v20110928-1504,"org.eclipse.ui.workbench.texteditor",1351461893965
os,sysinfo,,,"win32",1351461893968
arch,sysinfo,,,"x86",1351461893968
ws,sysinfo,,,"win32",1351461893968
locale,sysinfo,,,"en_US",1351461893968
processors,sysinfo,,,"4",1351461893968
java.runtime.name,sysinfo,,,"Java(TM) SE Runtime Environment",1351461893968
java.runtime.version,sysinfo,,,"1.7.0_07-b10",1351461893969
java.specification.name,sysinfo,,,"Java Platform API Specification",1351461893969
java.specification.vendor,sysinfo,,,"Oracle Corporation",1351461893969
java.specification.version,sysinfo,,,"1.7",1351461893969
java.vendor,sysinfo,,,"Oracle Corporation",1351461893969
java.version,sysinfo,,,"1.7.0_07",1351461893969
java.vm.info,sysinfo,,,"mixed mode, sharing",1351461893969
java.vm.name,sysinfo,,,"Java HotSpot(TM) Client VM",1351461893969
java.vm.specification.name,sysinfo,,,"Java Virtual Machine Specification",1351461893969
java.vm.specification.vendor,sysinfo,,,"Oracle Corporation",1351461893969
java.vm.specification.version,sysinfo,,,"1.7",1351461893969
java.vm.vendor,sysinfo,,,"Oracle Corporation",1351461893969
java.vm.version,sysinfo,,,"23.3-b01",1351461893969
started,bundle,org.eclipse.equinox.p2.repository,2.1.1.v20120113-1346,"org.eclipse.equinox.p2.repository",1351461893994
started,bundle,org.eclipse.m2e.usagedata,1.0.200.20111228-1245,"org.eclipse.m2e.usagedata",1351461893996
started,bundle,org.eclipse.equinox.p2.metadata.repository,1.2.0.v20110815-1419,"org.eclipse.equinox.p2.metadata.repository",1351461894009
started,bundle,org.eclipse.equinox.p2.ui.sdk.scheduler,1.0.100.v20110815-1419,"org.eclipse.equinox.p2.ui.sdk.scheduler",1351461894041
started,bundle,org.eclipse.equinox.p2.updatechecker,1.1.200.v20110815-1419,"org.eclipse.equinox.p2.updatechecker",1351461894059
started,bundle,org.eclipse.m2e.discovery,1.0.200.20111228-1245,"org.eclipse.m2e.discovery",1351461894081
started,bundle,org.eclipse.mylyn.team.ui,3.7.1.v20120425-0100,"org.eclipse.mylyn.team.ui",1351461894094
started,bundle,org.eclipse.wb.discovery.core,1.3.0.r37x201202052340,"org.eclipse.wb.discovery.core",1351461894163
started,bundle,org.eclipse.jsch.core,1.1.300.I20110514-0800,"org.eclipse.jsch.core",1351461894266
started,bundle,org.eclipse.team.cvs.core,3.3.400.I20110510-0800,"org.eclipse.team.cvs.core",1351461894280
started,bundle,org.eclipse.team.ui,3.6.101.R37x_v20111109-0800,"org.eclipse.team.ui",1351461894298
started,bundle,org.eclipse.ui.console,3.5.100.v20111007_r372,"org.eclipse.ui.console",1351461894313
started,bundle,org.eclipse.team.cvs.ui,3.3.401.v20120126-1227,"org.eclipse.team.cvs.ui",1351461894437
activated,view,org.eclipse.jdt.ui,3.7.2.v20120109-1427,"org.eclipse.jdt.ui.PackageExplorer",1351461894607
activated,view,org.eclipse.jdt.ui,3.7.2.v20120109-1427,"org.eclipse.jdt.ui.PackageExplorer",1351461894647
closed,view,org.eclipse.ui,3.7.0.v20110928-1505,"org.eclipse.ui.internal.introview",1351461894690
started,bundle,org.eclipse.wb.discovery.ui,1.3.0.r37x201202052340,"org.eclipse.wb.discovery.ui",1351461895209
deactivated,workbench,org.eclipse.ui.workbench,3.7.1.v20120104-1859,"",1351461904591
activated,workbench,org.eclipse.ui.workbench,3.7.1.v20120104-1859,"",1351461924702
closed,workbench,org.eclipse.ui.workbench,3.7.1.v20120104-1859,"",1351461924783
started,bundle,org.eclipse.core.filesystem,1.3.100.v20110423-0524,"org.eclipse.core.filesystem",1351461925042
started,bundle,org.eclipse.compare.core,3.5.200.I20110208-0800,"org.eclipse.compare.core",1351461925263
started,bundle,org.eclipse.compare,3.5.202.R37x_v20111109-0800,"org.eclipse.compare",1351461925294
stopped,bundle,org.eclipse.ui.cheatsheets,3.4.100.v20110425,"org.eclipse.ui.cheatsheets",1351461925606
stopped,bundle,org.eclipse.epp.usagedata.ui,1.3.1.R201106061540,"org.eclipse.epp.usagedata.ui",1351461925607
stopped,bundle,org.eclipse.epp.mpc.ui,1.1.1.I20110907-0947,"org.eclipse.epp.mpc.ui",1351461925607
stopped,bundle,org.eclipse.ui.intro.universal,3.2.500.v20110510,"org.eclipse.ui.intro.universal",1351461925607
stopped,bundle,org.eclipse.ui.intro,3.4.100.v20110425,"org.eclipse.ui.intro",1351461925607
stopped,bundle,jd.ide.eclipse,0.1.3,"jd.ide.eclipse",1351461925607
stopped,bundle,org.eclipse.help.ui,3.5.101.r37_20110819,"org.eclipse.help.ui",1351461925610
stopped,bundle,org.eclipse.help.webapp,3.6.1.r37_20110929,"org.eclipse.help.webapp",1351461925640
stopped,bundle,org.eclipse.help.base,3.6.2.v201202080800,"org.eclipse.help.base",1351461925640
stopped,bundle,org.eclipse.equinox.http.jetty,2.0.100.v20110502,"org.eclipse.equinox.http.jetty",1351461925662
stopped,bundle,org.eclipse.m2e.discovery,1.0.200.20111228-1245,"org.eclipse.m2e.discovery",1351461925662
1 what kind bundleId bundleVersion description time
2 activated perspective org.eclipse.jdt.ui org.eclipse.jdt.ui.JavaPerspective 1351461893792
3 started bundle org.eclipse.osgi 3.7.2.v20120110-1415 org.eclipse.osgi 1351461893793
4 started bundle org.eclipse.core.contenttype 3.4.100.v20110423-0524 org.eclipse.core.contenttype 1351461893794
5 started bundle org.eclipse.core.databinding.observable 1.4.0.I20110222-0800 org.eclipse.core.databinding.observable 1351461893795
6 started bundle org.eclipse.core.expressions 3.4.300.v20110228 org.eclipse.core.expressions 1351461893795
7 started bundle org.eclipse.core.net 1.2.100.I20110511-0800 org.eclipse.core.net 1351461893796
8 started bundle org.eclipse.core.runtime 3.7.0.v20110110 org.eclipse.core.runtime 1351461893797
9 started bundle org.eclipse.core.runtime.compatibility 3.2.100.v20100505 org.eclipse.core.runtime.compatibility 1351461893797
10 started bundle org.eclipse.core.runtime.compatibility.auth 3.2.200.v20110110 org.eclipse.core.runtime.compatibility.auth 1351461893798
11 started bundle org.eclipse.epp.usagedata.gathering 1.3.1.R201106061540 org.eclipse.epp.usagedata.gathering 1351461893798
12 started bundle org.eclipse.epp.usagedata.recording 1.3.1.R201106061540 org.eclipse.epp.usagedata.recording 1351461893799
13 started bundle org.eclipse.equinox.app 1.3.100.v20110321 org.eclipse.equinox.app 1351461893799
14 started bundle org.eclipse.equinox.common 3.6.0.v20110523 org.eclipse.equinox.common 1351461893800
15 started bundle org.eclipse.equinox.event 1.2.100.v20110502 org.eclipse.equinox.event 1351461893800
16 started bundle org.eclipse.equinox.util 1.0.300.v20110502 org.eclipse.equinox.util 1351461893801
17 started bundle org.eclipse.help 3.5.100.v20110426 org.eclipse.help 1351461893813
18 started bundle org.eclipse.team.core 3.6.0.I20110525-0800 org.eclipse.team.core 1351461893814
19 started bundle org.eclipse.ui.intro 3.4.100.v20110425 org.eclipse.ui.intro 1351461893815
20 started bundle org.eclipse.ui.intro.universal 3.2.500.v20110510 org.eclipse.ui.intro.universal 1351461893815
21 started bundle org.eclipse.update.configurator 3.3.100.v20100512 org.eclipse.update.configurator 1351461893816
22 started bundle org.eclipse.update.core 3.2.500.v20110330 org.eclipse.update.core 1351461893854
23 started bundle org.eclipse.update.scheduler 3.2.300.v20100512 org.eclipse.update.scheduler 1351461893855
24 started bundle jd.ide.eclipse 0.1.3 jd.ide.eclipse 1351461893856
25 started bundle org.eclipse.equinox.simpleconfigurator 1.0.200.v20110815-1438 org.eclipse.equinox.simpleconfigurator 1351461893857
26 started bundle com.ibm.icu 4.4.2.v20110823 com.ibm.icu 1351461893857
27 started bundle org.eclipse.core.filebuffers 3.5.200.v20110928-1504 org.eclipse.core.filebuffers 1351461893858
28 started bundle org.eclipse.core.jobs 3.5.101.v20120113-1953 org.eclipse.core.jobs 1351461893859
29 started bundle org.eclipse.core.resources 3.7.101.v20120125-1505 org.eclipse.core.resources 1351461893860
30 started bundle org.eclipse.epp.mpc.ui 1.1.1.I20110907-0947 org.eclipse.epp.mpc.ui 1351461893860
31 started bundle org.eclipse.equinox.ds 1.3.1.R37x_v20110701 org.eclipse.equinox.ds 1351461893861
32 started bundle org.eclipse.equinox.p2.core 2.1.1.v20120113-1346 org.eclipse.equinox.p2.core 1351461893862
33 started bundle org.eclipse.equinox.p2.directorywatcher 1.0.300.v20110815-1419 org.eclipse.equinox.p2.directorywatcher 1351461893862
34 started bundle org.eclipse.equinox.p2.operations 2.1.1.R37x_v20111111 org.eclipse.equinox.p2.operations 1351461893863
35 started bundle org.eclipse.equinox.p2.reconciler.dropins 1.1.100.v20110815-1419 org.eclipse.equinox.p2.reconciler.dropins 1351461893864
36 started bundle org.eclipse.equinox.preferences 3.4.2.v20120111-2020 org.eclipse.equinox.preferences 1351461893865
37 started bundle org.eclipse.equinox.registry 3.5.101.R37x_v20110810-1611 org.eclipse.equinox.registry 1351461893865
38 started bundle org.eclipse.equinox.security 1.1.1.R37x_v20110822-1018 org.eclipse.equinox.security 1351461893882
39 started bundle org.eclipse.jdt.core 3.7.3.v20120119-1537 org.eclipse.jdt.core 1351461893883
40 started bundle org.eclipse.jdt.core.manipulation 1.4.0.v20110928-1453 org.eclipse.jdt.core.manipulation 1351461893883
41 started bundle org.eclipse.jdt.ui 3.7.2.v20120109-1427 org.eclipse.jdt.ui 1351461893888
42 started bundle org.eclipse.jface 3.7.0.v20110928-1505 org.eclipse.jface 1351461893889
43 started bundle org.eclipse.m2e.logback.configuration 1.0.200.20111228-1245 org.eclipse.m2e.logback.configuration 1351461893889
44 started bundle org.eclipse.mylyn.bugzilla.core 3.7.1.v20120425-0100 org.eclipse.mylyn.bugzilla.core 1351461893901
45 started bundle org.eclipse.mylyn.bugzilla.ui 3.7.1.v20120425-0100 org.eclipse.mylyn.bugzilla.ui 1351461893902
46 started bundle org.eclipse.mylyn.commons.core 3.7.1.v20120425-0100 org.eclipse.mylyn.commons.core 1351461893902
47 started bundle org.eclipse.mylyn.commons.net 3.7.1.v20120425-0100 org.eclipse.mylyn.commons.net 1351461893902
48 started bundle org.eclipse.mylyn.commons.notifications.core 0.9.1.v20120425-0100 org.eclipse.mylyn.commons.notifications.core 1351461893902
49 started bundle org.eclipse.mylyn.commons.notifications.feed 0.9.1.v20120425-0100 org.eclipse.mylyn.commons.notifications.feed 1351461893903
50 started bundle org.eclipse.mylyn.commons.notifications.ui 0.9.1.v20120425-0100 org.eclipse.mylyn.commons.notifications.ui 1351461893903
51 started bundle org.eclipse.mylyn.commons.ui 3.7.1.v20120425-0100 org.eclipse.mylyn.commons.ui 1351461893904
52 started bundle org.eclipse.mylyn.commons.workbench 3.7.1.v20120425-0100 org.eclipse.mylyn.commons.workbench 1351461893904
53 started bundle org.eclipse.mylyn.context.core 3.7.1.v20120425-0100 org.eclipse.mylyn.context.core 1351461893904
54 started bundle org.eclipse.mylyn.context.tasks.ui 3.7.1.v20120425-0100 org.eclipse.mylyn.context.tasks.ui 1351461893905
55 started bundle org.eclipse.mylyn.monitor.ui 3.7.1.v20120425-0100 org.eclipse.mylyn.monitor.ui 1351461893905
56 started bundle org.eclipse.mylyn.tasks.index.core 3.7.1.v20120425-0100 org.eclipse.mylyn.tasks.index.core 1351461893906
57 started bundle org.eclipse.mylyn.tasks.ui 3.7.1.v20120425-0100 org.eclipse.mylyn.tasks.ui 1351461893907
58 started bundle org.eclipse.search 3.7.0.v20110928-1504 org.eclipse.search 1351461893927
59 started bundle org.eclipse.ui 3.7.0.v20110928-1505 org.eclipse.ui 1351461893943
60 started bundle org.eclipse.ui.editors 3.7.0.v20110928-1504 org.eclipse.ui.editors 1351461893944
61 started bundle org.eclipse.ui.forms 3.5.101.v20111011-1919 org.eclipse.ui.forms 1351461893944
62 started bundle org.eclipse.ui.ide 3.7.0.v20110928-1505 org.eclipse.ui.ide 1351461893945
63 started bundle org.eclipse.ui.net 1.2.100.v20111208-1155 org.eclipse.ui.net 1351461893946
64 started bundle org.eclipse.ui.views 3.6.0.v20110928-1505 org.eclipse.ui.views 1351461893946
65 started bundle org.eclipse.ui.workbench 3.7.1.v20120104-1859 org.eclipse.ui.workbench 1351461893947
66 started bundle org.eclipse.ui.workbench.texteditor 3.7.0.v20110928-1504 org.eclipse.ui.workbench.texteditor 1351461893965
67 os sysinfo win32 1351461893968
68 arch sysinfo x86 1351461893968
69 ws sysinfo win32 1351461893968
70 locale sysinfo en_US 1351461893968
71 processors sysinfo 4 1351461893968
72 java.runtime.name sysinfo Java(TM) SE Runtime Environment 1351461893968
73 java.runtime.version sysinfo 1.7.0_07-b10 1351461893969
74 java.specification.name sysinfo Java Platform API Specification 1351461893969
75 java.specification.vendor sysinfo Oracle Corporation 1351461893969
76 java.specification.version sysinfo 1.7 1351461893969
77 java.vendor sysinfo Oracle Corporation 1351461893969
78 java.version sysinfo 1.7.0_07 1351461893969
79 java.vm.info sysinfo mixed mode, sharing 1351461893969
80 java.vm.name sysinfo Java HotSpot(TM) Client VM 1351461893969
81 java.vm.specification.name sysinfo Java Virtual Machine Specification 1351461893969
82 java.vm.specification.vendor sysinfo Oracle Corporation 1351461893969
83 java.vm.specification.version sysinfo 1.7 1351461893969
84 java.vm.vendor sysinfo Oracle Corporation 1351461893969
85 java.vm.version sysinfo 23.3-b01 1351461893969
86 started bundle org.eclipse.equinox.p2.repository 2.1.1.v20120113-1346 org.eclipse.equinox.p2.repository 1351461893994
87 started bundle org.eclipse.m2e.usagedata 1.0.200.20111228-1245 org.eclipse.m2e.usagedata 1351461893996
88 started bundle org.eclipse.equinox.p2.metadata.repository 1.2.0.v20110815-1419 org.eclipse.equinox.p2.metadata.repository 1351461894009
89 started bundle org.eclipse.equinox.p2.ui.sdk.scheduler 1.0.100.v20110815-1419 org.eclipse.equinox.p2.ui.sdk.scheduler 1351461894041
90 started bundle org.eclipse.equinox.p2.updatechecker 1.1.200.v20110815-1419 org.eclipse.equinox.p2.updatechecker 1351461894059
91 started bundle org.eclipse.m2e.discovery 1.0.200.20111228-1245 org.eclipse.m2e.discovery 1351461894081
92 started bundle org.eclipse.mylyn.team.ui 3.7.1.v20120425-0100 org.eclipse.mylyn.team.ui 1351461894094
93 started bundle org.eclipse.wb.discovery.core 1.3.0.r37x201202052340 org.eclipse.wb.discovery.core 1351461894163
94 started bundle org.eclipse.jsch.core 1.1.300.I20110514-0800 org.eclipse.jsch.core 1351461894266
95 started bundle org.eclipse.team.cvs.core 3.3.400.I20110510-0800 org.eclipse.team.cvs.core 1351461894280
96 started bundle org.eclipse.team.ui 3.6.101.R37x_v20111109-0800 org.eclipse.team.ui 1351461894298
97 started bundle org.eclipse.ui.console 3.5.100.v20111007_r372 org.eclipse.ui.console 1351461894313
98 started bundle org.eclipse.team.cvs.ui 3.3.401.v20120126-1227 org.eclipse.team.cvs.ui 1351461894437
99 activated view org.eclipse.jdt.ui 3.7.2.v20120109-1427 org.eclipse.jdt.ui.PackageExplorer 1351461894607
100 activated view org.eclipse.jdt.ui 3.7.2.v20120109-1427 org.eclipse.jdt.ui.PackageExplorer 1351461894647
101 closed view org.eclipse.ui 3.7.0.v20110928-1505 org.eclipse.ui.internal.introview 1351461894690
102 started bundle org.eclipse.wb.discovery.ui 1.3.0.r37x201202052340 org.eclipse.wb.discovery.ui 1351461895209
103 deactivated workbench org.eclipse.ui.workbench 3.7.1.v20120104-1859 1351461904591
104 activated workbench org.eclipse.ui.workbench 3.7.1.v20120104-1859 1351461924702
105 closed workbench org.eclipse.ui.workbench 3.7.1.v20120104-1859 1351461924783
106 started bundle org.eclipse.core.filesystem 1.3.100.v20110423-0524 org.eclipse.core.filesystem 1351461925042
107 started bundle org.eclipse.compare.core 3.5.200.I20110208-0800 org.eclipse.compare.core 1351461925263
108 started bundle org.eclipse.compare 3.5.202.R37x_v20111109-0800 org.eclipse.compare 1351461925294
109 stopped bundle org.eclipse.ui.cheatsheets 3.4.100.v20110425 org.eclipse.ui.cheatsheets 1351461925606
110 stopped bundle org.eclipse.epp.usagedata.ui 1.3.1.R201106061540 org.eclipse.epp.usagedata.ui 1351461925607
111 stopped bundle org.eclipse.epp.mpc.ui 1.1.1.I20110907-0947 org.eclipse.epp.mpc.ui 1351461925607
112 stopped bundle org.eclipse.ui.intro.universal 3.2.500.v20110510 org.eclipse.ui.intro.universal 1351461925607
113 stopped bundle org.eclipse.ui.intro 3.4.100.v20110425 org.eclipse.ui.intro 1351461925607
114 stopped bundle jd.ide.eclipse 0.1.3 jd.ide.eclipse 1351461925607
115 stopped bundle org.eclipse.help.ui 3.5.101.r37_20110819 org.eclipse.help.ui 1351461925610
116 stopped bundle org.eclipse.help.webapp 3.6.1.r37_20110929 org.eclipse.help.webapp 1351461925640
117 stopped bundle org.eclipse.help.base 3.6.2.v201202080800 org.eclipse.help.base 1351461925640
118 stopped bundle org.eclipse.equinox.http.jetty 2.0.100.v20110502 org.eclipse.equinox.http.jetty 1351461925662
119 stopped bundle org.eclipse.m2e.discovery 1.0.200.20111228-1245 org.eclipse.m2e.discovery 1351461925662

View file

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<typeInfoHistroy/>

View file

@ -1,2 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<qualifiedTypeNameHistroy/>

View file

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
<section name="org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart">
<item value="true" key="group_libraries"/>
<item value="false" key="linkWithEditor"/>
<item value="2" key="layout"/>
<item value="1" key="rootMode"/>
<item value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#x0D;&#x0A;&lt;packageExplorer group_libraries=&quot;1&quot; layout=&quot;2&quot; linkWithEditor=&quot;0&quot; rootMode=&quot;1&quot; workingSetName=&quot;&quot;&gt;&#x0D;&#x0A;&lt;customFilters userDefinedPatternsEnabled=&quot;false&quot;&gt;&#x0D;&#x0A;&lt;xmlDefinedFilters&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.LibraryFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.LocalTypesFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.StaticsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ClosedProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonSharedProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonJavaElementFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ContainedLibraryFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.CuAndClassFileFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonJavaProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.EmptyInnerPackageFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.PackageDeclarationFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.EmptyPackageFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ImportDeclarationFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.FieldsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.HideInnerClassFilesFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonPublicFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer_patternFilterId_.*&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.EmptyLibraryContainerFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.SyntheticMembersFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.mylyn.java.ui.MembersFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.m2e.MavenModuleFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;/xmlDefinedFilters&gt;&#x0D;&#x0A;&lt;/customFilters&gt;&#x0D;&#x0A;&lt;/packageExplorer&gt;" key="memento"/>
</section>
</section>

View file

@ -1,41 +0,0 @@
<configuration scan="true">
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern>
</encoder>
<filter class="org.eclipse.m2e.logback.appender.ConsoleAppenderFilter"/>
</appender>
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<File>${org.eclipse.m2e.log.dir}/0.log</File>
<rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
<FileNamePattern>${org.eclipse.m2e.log.dir}/%i.log</FileNamePattern>
<MinIndex>1</MinIndex>
<MaxIndex>10</MaxIndex>
</rollingPolicy>
<triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
<MaxFileSize>100MB</MaxFileSize>
</triggeringPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%date [%thread] %-5level %logger{35} - %msg%n</pattern>
</encoder>
</appender>
<appender name="EclipseLog" class="org.eclipse.m2e.logback.appender.EclipseLogAppender">
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>WARN</level>
</filter>
</appender>
<appender name="MavenConsoleLog" class="org.eclipse.m2e.logback.appender.MavenConsoleAppender">
</appender>
<root level="INFO">
<appender-ref ref="FILE" />
<appender-ref ref="STDOUT" />
<appender-ref ref="EclipseLog" />
<appender-ref ref="MavenConsoleLog" />
</root>
<logger name="com.ning.http.client" level="INFO" />
</configuration>

View file

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
<section name="ChooseWorkspaceDialogSettings">
<item value="197" key="DIALOG_Y_ORIGIN"/>
<item value="202" key="DIALOG_X_ORIGIN"/>
</section>
<section name="WORKBENCH_SETTINGS">
<list key="ENABLED_TRANSFERS">
</list>
</section>
</section>

View file

@ -1,3 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<section name="Workbench">
</section>

View file

@ -1,245 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<workbench progressCount="30" version="2.0">
<workbenchAdvisor/>
<window height="768" width="1024" x="150" y="0">
<fastViewData fastViewLocation="1024"/>
<perspectiveBar>
<itemSize x="160"/>
</perspectiveBar>
<coolbarLayout>
<coolItem id="group.file" itemType="typeGroupMarker"/>
<coolItem id="org.eclipse.ui.workbench.file" itemType="typeToolBarContribution" x="160" y="22"/>
<coolItem id="additions" itemType="typeGroupMarker"/>
<coolItem id="org.eclipse.debug.ui.launchActionSet" itemType="typeToolBarContribution" x="129" y="22"/>
<coolItem id="org.eclipse.jdt.ui.JavaElementCreationActionSet" itemType="typeToolBarContribution" x="76" y="22"/>
<coolItem id="org.eclipse.search.searchActionSet" itemType="typeToolBarContribution" x="99" y="22"/>
<coolItem id="org.eclipse.wst.xml.ui.perspective.NewFileToolBar" itemType="typeToolBarContribution" x="-1" y="-1"/>
<coolItem id="org.eclipse.wst.xml.ui.design.DesignToolBar" itemType="typeToolBarContribution" x="-1" y="-1"/>
<coolItem id="group.nav" itemType="typeGroupMarker"/>
<coolItem id="org.eclipse.ui.workbench.navigate" itemType="typeToolBarContribution" x="190" y="22"/>
<coolItem id="group.editor" itemType="typeGroupMarker"/>
<coolItem id="group.help" itemType="typeGroupMarker"/>
<coolItem id="org.eclipse.ui.workbench.help" itemType="typeToolBarContribution" x="-1" y="-1"/>
</coolbarLayout>
<page aggregateWorkingSetId="Aggregate for window 1351461887120" focus="true" label="Workspace - Java">
<editors>
<editorArea activeWorkbook="DefaultEditorWorkbook">
<info part="DefaultEditorWorkbook">
<folder appearance="1" expanded="2">
<presentation id="org.eclipse.ui.presentations.WorkbenchPresentationFactory"/>
</folder>
</info>
</editorArea>
</editors>
<views>
<view id="org.eclipse.ui.views.ProblemView" partName="Problems">
<viewState PRIMARY_SORT_FIELD="org.eclipse.ui.ide.severityAndDescriptionField" categoryGroup="org.eclipse.ui.ide.severity" markerContentGenerator="org.eclipse.ui.ide.problemsGenerator" partName="Problems">
<columnWidths org.eclipse.ui.ide.locationField="90" org.eclipse.ui.ide.markerType="90" org.eclipse.ui.ide.pathField="120" org.eclipse.ui.ide.resourceField="90" org.eclipse.ui.ide.severityAndDescriptionField="300"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.severityAndDescriptionField"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.resourceField"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.pathField"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.locationField"/>
<visible IMemento.internal.id="org.eclipse.ui.ide.markerType"/>
</viewState>
</view>
<view id="org.eclipse.jdt.ui.PackageExplorer" partName="Package Explorer">
<viewState group_libraries="1" layout="2" linkWithEditor="0" rootMode="1" workingSetName="">
<customFilters userDefinedPatternsEnabled="false">
<xmlDefinedFilters>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.LibraryFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.LocalTypesFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.StaticsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.ClosedProjectsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonSharedProjectsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonJavaElementFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.ContainedLibraryFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.CuAndClassFileFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonJavaProjectsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.internal.ui.PackageExplorer.EmptyInnerPackageFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.PackageDeclarationFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.internal.ui.PackageExplorer.EmptyPackageFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.ImportDeclarationFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.FieldsFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.internal.ui.PackageExplorer.HideInnerClassFilesFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.NonPublicFilter" isEnabled="false"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer_patternFilterId_.*" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.EmptyLibraryContainerFilter" isEnabled="true"/>
<child filterId="org.eclipse.jdt.ui.PackageExplorer.SyntheticMembersFilter" isEnabled="true"/>
<child filterId="org.eclipse.mylyn.java.ui.MembersFilter" isEnabled="false"/>
<child filterId="org.eclipse.m2e.MavenModuleFilter" isEnabled="false"/>
</xmlDefinedFilters>
</customFilters>
</viewState>
</view>
<view id="org.eclipse.mylyn.tasks.ui.views.tasks" partName="Task List">
<viewState linkWithEditor="true" presentation="org.eclipse.mylyn.tasks.ui.categorized">
<sorter groupBy="CATEGORY_QUERY">
<sorter>
<sort0 sortDirection="1" sortKey="PRIORITY"/>
<sort1 sortDirection="1" sortKey="RANK"/>
<sort2 sortDirection="1" sortKey="DATE_CREATED"/>
<sort3 sortDirection="1" sortKey="NONE"/>
<sort4 sortDirection="1" sortKey="NONE"/>
<sort5 sortDirection="1" sortKey="NONE"/>
<sort6 sortDirection="1" sortKey="NONE"/>
<sort7 sortDirection="1" sortKey="NONE"/>
</sorter>
</sorter>
<filteredTreeFindHistory/>
</viewState>
</view>
<view id="org.eclipse.ui.views.ContentOutline" partName="Outline">
<viewState/>
</view>
<view id="org.eclipse.jdt.ui.SourceView" partName="Declaration"/>
<view id="org.eclipse.jdt.ui.JavadocView" partName="Javadoc"/>
</views>
<perspectives activePart="org.eclipse.jdt.ui.PackageExplorer" activePerspective="org.eclipse.jdt.ui.JavaPerspective">
<perspective editorAreaTrimState="2" editorAreaVisible="1" fixed="0" version="0.016">
<descriptor class="org.eclipse.jdt.internal.ui.JavaPerspectiveFactory" id="org.eclipse.jdt.ui.JavaPerspective" label="Java"/>
<alwaysOnActionSet id="org.eclipse.mylyn.context.ui.actionSet"/>
<alwaysOnActionSet id="org.eclipse.mylyn.doc.actionSet"/>
<alwaysOnActionSet id="org.eclipse.mylyn.tasks.ui.navigation"/>
<alwaysOnActionSet id="org.eclipse.ui.cheatsheets.actionSet"/>
<alwaysOnActionSet id="org.eclipse.search.searchActionSet"/>
<alwaysOnActionSet id="org.eclipse.ui.edit.text.actionSet.annotationNavigation"/>
<alwaysOnActionSet id="org.eclipse.ui.edit.text.actionSet.navigation"/>
<alwaysOnActionSet id="org.eclipse.ui.edit.text.actionSet.convertLineDelimitersTo"/>
<alwaysOnActionSet id="org.eclipse.ui.externaltools.ExternalToolsSet"/>
<alwaysOnActionSet id="org.eclipse.ui.actionSet.keyBindings"/>
<alwaysOnActionSet id="org.eclipse.ui.actionSet.openFiles"/>
<alwaysOnActionSet id="org.eclipse.wb.core.ui.actionset"/>
<alwaysOnActionSet id="org.eclipse.debug.ui.launchActionSet"/>
<alwaysOnActionSet id="org.eclipse.jdt.ui.JavaActionSet"/>
<alwaysOnActionSet id="org.eclipse.jdt.ui.JavaElementCreationActionSet"/>
<alwaysOnActionSet id="org.eclipse.ui.NavigateActionSet"/>
<alwaysOnActionSet id="org.eclipse.debug.ui.breakpointActionSet"/>
<alwaysOnActionSet id="org.eclipse.jdt.debug.ui.JDTDebugActionSet"/>
<alwaysOnActionSet id="org.eclipse.jdt.junit.JUnitActionSet"/>
<show_view_action id="org.eclipse.jdt.ui.PackageExplorer"/>
<show_view_action id="org.eclipse.jdt.ui.TypeHierarchy"/>
<show_view_action id="org.eclipse.jdt.ui.SourceView"/>
<show_view_action id="org.eclipse.jdt.ui.JavadocView"/>
<show_view_action id="org.eclipse.search.ui.views.SearchView"/>
<show_view_action id="org.eclipse.ui.console.ConsoleView"/>
<show_view_action id="org.eclipse.ui.views.ContentOutline"/>
<show_view_action id="org.eclipse.ui.views.ProblemView"/>
<show_view_action id="org.eclipse.ui.views.ResourceNavigator"/>
<show_view_action id="org.eclipse.ui.views.TaskList"/>
<show_view_action id="org.eclipse.ui.views.ProgressView"/>
<show_view_action id="org.eclipse.ui.navigator.ProjectExplorer"/>
<show_view_action id="org.eclipse.ui.texteditor.TemplatesView"/>
<show_view_action id="org.eclipse.pde.runtime.LogView"/>
<show_view_action id="org.eclipse.ant.ui.views.AntView"/>
<show_view_action id="org.eclipse.mylyn.tasks.ui.views.tasks"/>
<show_view_action id="org.eclipse.wb.core.StructureView"/>
<show_view_action id="org.eclipse.wb.core.PaletteView"/>
<new_wizard_action id="org.eclipse.jdt.ui.wizards.JavaProjectWizard"/>
<new_wizard_action id="org.eclipse.jdt.ui.wizards.NewPackageCreationWizard"/>
<new_wizard_action id="org.eclipse.jdt.ui.wizards.NewClassCreationWizard"/>
<new_wizard_action id="org.eclipse.jdt.ui.wizards.NewInterfaceCreationWizard"/>
<new_wizard_action id="org.eclipse.jdt.ui.wizards.NewEnumCreationWizard"/>
<new_wizard_action id="org.eclipse.jdt.ui.wizards.NewAnnotationCreationWizard"/>
<new_wizard_action id="org.eclipse.jdt.ui.wizards.NewSourceFolderCreationWizard"/>
<new_wizard_action id="org.eclipse.jdt.ui.wizards.NewSnippetFileCreationWizard"/>
<new_wizard_action id="org.eclipse.jdt.ui.wizards.NewJavaWorkingSetWizard"/>
<new_wizard_action id="org.eclipse.ui.wizards.new.folder"/>
<new_wizard_action id="org.eclipse.ui.wizards.new.file"/>
<new_wizard_action id="org.eclipse.ui.editors.wizards.UntitledTextFileWizard"/>
<new_wizard_action id="org.eclipse.jdt.junit.wizards.NewTestCaseCreationWizard"/>
<new_wizard_action id="org.eclipse.mylyn.tasks.ui.wizards.new.repository.task"/>
<perspective_action id="org.eclipse.jdt.ui.JavaBrowsingPerspective"/>
<perspective_action id="org.eclipse.debug.ui.DebugPerspective"/>
<hide_toolbar_item_id id="org.eclipse.jdt.ui.actions.OpenProjectWizard"/>
<hide_toolbar_item_id id="org.eclipse.ui.edit.text.toggleShowSelectedElementOnly"/>
<view id="org.eclipse.jdt.ui.PackageExplorer"/>
<view id="org.eclipse.ui.views.ProblemView"/>
<view id="org.eclipse.jdt.ui.JavadocView"/>
<view id="org.eclipse.jdt.ui.SourceView"/>
<view id="org.eclipse.ui.views.ContentOutline"/>
<view id="org.eclipse.mylyn.tasks.ui.views.tasks"/>
<fastViewBars/>
<layout>
<mainWindow>
<info folder="true" part="left">
<folder activePageID="org.eclipse.jdt.ui.PackageExplorer" appearance="2" expanded="2">
<page content="org.eclipse.jdt.ui.PackageExplorer" label="Package Explorer"/>
<page content="org.eclipse.jdt.ui.TypeHierarchy" label="LabelNotFound"/>
<page content="org.eclipse.ui.views.ResourceNavigator" label="LabelNotFound"/>
<page content="org.eclipse.ui.navigator.ProjectExplorer" label="LabelNotFound"/>
<page content="org.eclipse.jdt.junit.ResultView" label="LabelNotFound"/>
<page content="org.eclipse.wb.core.StructureView" label="LabelNotFound"/>
<page content="org.eclipse.wb.core.PaletteView" label="LabelNotFound"/>
<presentation id="org.eclipse.ui.presentations.WorkbenchPresentationFactory">
<part id="0"/>
</presentation>
</folder>
</info>
<info folder="true" part="org.eclipse.ui.internal.ViewStack@1e84841" ratio="0.75" ratioLeft="750" ratioRight="250" relationship="2" relative="left">
<folder appearance="2" expanded="2">
<page content="org.eclipse.help.ui.HelpView" label="LabelNotFound"/>
<page content="org.eclipse.ui.internal.introview" label="LabelNotFound"/>
<page content="org.eclipse.ui.cheatsheets.views.CheatSheetView" label="LabelNotFound"/>
<presentation id="org.eclipse.ui.presentations.WorkbenchPresentationFactory"/>
</folder>
</info>
<info part="org.eclipse.ui.editorss" ratio="0.25" ratioLeft="250" ratioRight="750" relationship="2" relative="left"/>
<info folder="true" part="bottom" ratio="0.7496136" ratioLeft="485" ratioRight="162" relationship="4" relative="org.eclipse.ui.editorss">
<folder activePageID="org.eclipse.ui.views.ProblemView" appearance="2" expanded="2">
<page content="org.eclipse.ui.views.ProblemView" label="Problems"/>
<page content="org.eclipse.jdt.ui.JavadocView" label="Javadoc"/>
<page content="org.eclipse.jdt.ui.SourceView" label="Declaration"/>
<page content="org.eclipse.search.ui.views.SearchView" label="LabelNotFound"/>
<page content="org.eclipse.ui.console.ConsoleView" label="LabelNotFound"/>
<page content="org.eclipse.ui.views.BookmarkView" label="LabelNotFound"/>
<page content="org.eclipse.ui.views.ProgressView" label="LabelNotFound"/>
<presentation id="org.eclipse.ui.presentations.WorkbenchPresentationFactory">
<part id="0"/>
<part id="1"/>
<part id="2"/>
</presentation>
</folder>
</info>
<info folder="true" part="org.eclipse.ui.internal.ViewStack@108b201" ratio="0.7493333" ratioLeft="562" ratioRight="188" relationship="2" relative="org.eclipse.ui.editorss">
<folder activePageID="org.eclipse.mylyn.tasks.ui.views.tasks" appearance="2" expanded="2">
<page content="org.eclipse.mylyn.tasks.ui.views.tasks" label="Task List"/>
<presentation id="org.eclipse.ui.presentations.WorkbenchPresentationFactory">
<part id="0"/>
</presentation>
</folder>
</info>
<info folder="true" part="right" ratio="0.49896908" ratioLeft="242" ratioRight="243" relationship="4" relative="org.eclipse.ui.internal.ViewStack@108b201">
<folder activePageID="org.eclipse.ui.views.ContentOutline" appearance="2" expanded="2">
<page content="org.eclipse.ui.views.ContentOutline" label="Outline"/>
<page content="org.eclipse.ui.texteditor.TemplatesView" label="LabelNotFound"/>
<page content="org.eclipse.ant.ui.views.AntView" label="LabelNotFound"/>
<presentation id="org.eclipse.ui.presentations.WorkbenchPresentationFactory">
<part id="0"/>
</presentation>
</folder>
</info>
<info part="org.eclipse.egit.ui.RepositoriesView" ratio="0.59969085" ratioLeft="388" ratioRight="259" relationship="4" relative="left"/>
</mainWindow>
</layout>
</perspective>
</perspectives>
<workingSets/>
<navigationHistory/>
<input factoryID="org.eclipse.ui.internal.model.ResourceFactory" path="/" type="8"/>
</page>
<workbenchWindowAdvisor/>
<actionBarAdvisor/>
<trimLayout>
<trimArea IMemento.internal.id="128">
<trimItem IMemento.internal.id="org.eclipse.ui.internal.WorkbenchWindow.topBar"/>
<trimItem IMemento.internal.id="org.eclipse.mylyn.tasks.ui.trim.container"/>
</trimArea>
<trimArea IMemento.internal.id="1024">
<trimItem IMemento.internal.id="org.eclise.ui.internal.FastViewBar"/>
<trimItem IMemento.internal.id="org.eclipse.jface.action.StatusLineManager"/>
<trimItem IMemento.internal.id="org.eclipse.ui.internal.progress.ProgressRegion"/>
</trimArea>
</trimLayout>
</window>
<mruList/>
</workbench>

View file

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<workingSetManager>
<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1351461887122_0" label="Window Working Set" name="Aggregate for window 1351461887120"/>
</workingSetManager>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.9 KiB

View file

@ -1,145 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<toolkits>
<!-- SWT -->
<toolkit
name="SWT"
id="org.eclipse.swt"
icon="toolkit_swt.png"
providerName="Eclipse.org"
licenseDescription="EPL"
moreInfoURL="http://www.eclipse.org/swt/">
<description>This WindowBuilder toolkit allows you to build user interfaces with the Standard Widget Toolkit (SWT) from Eclipse.</description>
<updateSite
version="[3.6,3.7)"
url="http://download.eclipse.org/windowbuilder/WB/integration/3.6"
auxurl="http://download.eclipse.org/releases/helios">
<feature id="org.eclipse.wb.rcp.feature"/>
</updateSite>
<updateSite
version="[3.7,5.0)"
url="http://download.eclipse.org/windowbuilder/WB/integration/3.7"
auxurl="http://download.eclipse.org/releases/indigo">
<feature id="org.eclipse.wb.rcp.feature"/>
</updateSite>
</toolkit>
<!-- Swing -->
<toolkit
name="Swing"
id="org.eclipse.swing"
icon="toolkit_swing.png"
providerName="Eclipse.org"
licenseDescription="EPL">
<description>This WindowBuilder toolkit allows you to build user interfaces with Java's Swing GUI framework.</description>
<updateSite
version="[3.6,3.7)"
url="http://download.eclipse.org/windowbuilder/WB/integration/3.6">
<feature id="org.eclipse.wb.swing.feature"/>
</updateSite>
<updateSite
version="[3.7,5.0)"
url="http://download.eclipse.org/windowbuilder/WB/integration/3.7">
<feature id="org.eclipse.wb.swing.feature"/>
</updateSite>
</toolkit>
<!-- eRCP -->
<toolkit
name="eRCP"
id="org.eclipse.ercp"
icon="toolkit_ercp.png"
providerName="Eclipse.org"
licenseDescription="EPL"
os="win32"
moreInfoURL="http://www.eclipse.org/ercp/">
<description>This WindowBuilder toolkit allows you to build user interfaces with Eclipse's embedded Rich Client Platform (eRCP) framework. eRCP targets embedded devices.</description>
<updateSite
version="[3.6,3.7)"
url="http://download.eclipse.org/windowbuilder/WB/integration/3.6"
auxurl="http://download.eclipse.org/releases/helios">
<feature id="org.eclipse.wb.ercp.feature"/>
</updateSite>
<updateSite
version="[3.7,5.0)"
url="http://download.eclipse.org/windowbuilder/WB/integration/3.7"
auxurl="http://download.eclipse.org/releases/indigo">
<feature id="org.eclipse.wb.ercp.feature"/>
</updateSite>
</toolkit>
<!-- XWT -->
<toolkit
name="XWT"
id="org.eclipse.xwt"
icon="toolkit_xwt.png"
providerName="Eclipse.org"
licenseDescription="EPL"
moreInfoURL="http://wiki.eclipse.org/E4/XWT">
<description>This WindowBuilder toolkit allows you to build user interfaces with the XML Windowing Toolkit (XWT) UI framework.</description>
<updateSite
version="[3.6,3.7)"
url="http://download.eclipse.org/windowbuilder/WB/integration/3.6"
auxurl="http://download.eclipse.org/releases/helios">
<feature id="org.eclipse.wb.xwt.feature"/>
</updateSite>
<updateSite
version="[3.7,5.0)"
url="http://download.eclipse.org/windowbuilder/WB/integration/3.7"
auxurl="http://download.eclipse.org/releases/indigo">
<feature id="org.eclipse.wb.xwt.feature"/>
</updateSite>
</toolkit>
<!-- GWT -->
<toolkit
name="GWT"
title="GWT / Google Plugin for Eclipse"
id="com.google.gwt"
icon="toolkit_gwt.png"
providerName="Google, Inc."
moreInfoURL="http://code.google.com/eclipse/index.html">
<description>The Google Plugin for Eclipse provides support for building projects with the Google Web Toolkit and Google APIs, as well as integration with Google Project Hosting and App Engine.</description>
<updateSite version="[3.6,3.7)" url="http://dl.google.com/eclipse/plugin/3.6"
auxurl="http://download.eclipse.org/releases/helios">
<feature id="com.google.gdt.eclipse.suite.e36.feature"/>
<feature id="com.google.gwt.eclipse.sdkbundle.e36.feature" optional="true"/>
<feature id="com.google.appengine.eclipse.sdkbundle.e36.feature" optional="true"/>
<feature id="org.eclipse.wb.core.feature" optional="true"/>
<feature id="org.eclipse.wb.core.xml.feature" optional="true"/>
<feature id="org.eclipse.wb.css.feature" optional="true"/>
<feature id="com.google.gdt.eclipse.designer.hosted.feature" optional="true"/>
<feature id="com.google.gdt.eclipse.designer.editor.feature" optional="true"/>
<feature id="com.google.gdt.eclipse.designer.gpe.feature" optional="true"/>
</updateSite>
<updateSite version="[3.7,3.8)" url="http://dl.google.com/eclipse/plugin/3.7"
auxurl="http://download.eclipse.org/releases/indigo">
<feature id="com.google.gdt.eclipse.suite.e37.feature"/>
<feature id="com.google.gwt.eclipse.sdkbundle.e37.feature" optional="true"/>
<feature id="com.google.appengine.eclipse.sdkbundle.e37.feature" optional="true"/>
<feature id="org.eclipse.wb.core.feature" optional="true"/>
<feature id="org.eclipse.wb.core.xml.feature" optional="true"/>
<feature id="org.eclipse.wb.css.feature" optional="true"/>
<feature id="com.google.gdt.eclipse.designer.hosted.feature" optional="true"/>
<feature id="com.google.gdt.eclipse.designer.editor.feature" optional="true"/>
<feature id="com.google.gdt.eclipse.designer.gpe.feature" optional="true"/>
</updateSite>
</toolkit>
</toolkits>

View file

@ -1 +0,0 @@
org.eclipse.core.runtime=1

View file

@ -1,4 +1,5 @@
package basicpipes;
import java.io.File;
import net.minecraft.src.Block;
@ -30,16 +31,18 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
@Mod(modid = "basicPipes", name = "Basic Pipes", version = "1.9",dependencies = "after:UniversalElectricity")
@NetworkMod(channels = { "Pipes" }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class)
public class BasicPipesMain{
@Mod(modid = "basicPipes", name = "Basic Pipes", version = "1.9", dependencies = "after:UniversalElectricity")
@NetworkMod(channels = { "Pipes" }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class)
public class BasicPipesMain {
public BasicPipesMain instance;
@SidedProxy(clientSide = "basicpipes.PipeClientProxy", serverSide = "basicpipes.PipeProxy")
public static PipeProxy proxy;
static Configuration config = new Configuration((new File(cpw.mods.fml.common.Loader.instance().getConfigDir(), "/UniversalElectricity/BasicPipes.cfg")));
static Configuration config = new Configuration((new File(
cpw.mods.fml.common.Loader.instance().getConfigDir(),
"/UniversalElectricity/BasicPipes.cfg")));
public static int pipeID = configurationProperties();
private static int partID;
private static int ppipeID;
@ -49,7 +52,8 @@ public class BasicPipesMain{
public static int valveID;
public static int rodID;
public static Block pipe = new BlockPipe(pipeID).setBlockName("pipe");
public static Block machine = new BlockMachine(machineID).setBlockName("pump");
public static Block machine = new BlockMachine(machineID)
.setBlockName("pump");
public static Block valve = new BlockValve(valveID).setBlockName("valve");
public static Block rod = new BlockRod(rodID);
public static Item parts = new ItemParts(partID);
@ -61,55 +65,63 @@ public class BasicPipesMain{
public static String textureFile = "/textures";
public static boolean ueLoaded = false;
public static int configurationProperties()
{
public static int configurationProperties() {
config.load();
pipeID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"PipeBlock", 155).value);
machineID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"machineBlock", 156).value);
valveID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"ValveBlock", 157).value);
rodID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"gearBlock", 158).value);
partID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,"parts", 23022).value);
ppipeID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,"pipes", 23023).value);
toolID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,"ToolID", 23024).value);
tankID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,"tankID", 23025).value);
pipeID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,
"PipeBlock", 155).value);
machineID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,
"machineBlock", 156).value);
valveID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,
"ValveBlock", 157).value);
rodID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,
"gearBlock", 158).value);
partID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,
"parts", 23022).value);
ppipeID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,
"pipes", 23023).value);
toolID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,
"ToolID", 23024).value);
tankID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,
"tankID", 23025).value);
config.save();
return pipeID;
}
@PreInit
public void preInit(FMLPreInitializationEvent event)
{
public void preInit(FMLPreInitializationEvent event) {
proxy.preInit();
GameRegistry.registerBlock(pipe);
GameRegistry.registerBlock(rod);
GameRegistry.registerBlock(machine,basicpipes.machines.ItemMachine.class);
GameRegistry.registerBlock(machine,
basicpipes.machines.ItemMachine.class);
}
@Init
public void load(FMLInitializationEvent evt)
{
//register
public void load(FMLInitializationEvent evt) {
// register
proxy.init();
GameRegistry.registerTileEntity(TileEntityPipe.class, "pipe");
GameRegistry.registerTileEntity(TileEntityPump.class, "pump");
GameRegistry.registerTileEntity(TileEntityRod.class, "rod");
GameRegistry.registerTileEntity(TileEntityLTank.class, "ltank");
//Names and lang stuff
//Pipe Names
for(int i =0; i < Liquid.values().length;i++)
{
LanguageRegistry.addName((new ItemStack(itemPipes, 1, i)), Liquid.getLiquid(i).lName+" Pipe");
// Names and lang stuff
// Pipe Names
for (int i = 0; i < Liquid.values().length; i++) {
LanguageRegistry.addName((new ItemStack(itemPipes, 1, i)),
Liquid.getLiquid(i).lName + " Pipe");
}
for(int i =0; i < Liquid.values().length;i++)
{
LanguageRegistry.addName((new ItemStack(itemTank, 1, i)), Liquid.getLiquid(i).lName+" Tank");
for (int i = 0; i < Liquid.values().length; i++) {
LanguageRegistry.addName((new ItemStack(itemTank, 1, i)),
Liquid.getLiquid(i).lName + " Tank");
}
//Pump
// Pump
LanguageRegistry.addName((new ItemStack(machine, 1, 0)), "WaterPump");
LanguageRegistry.addName((new ItemStack(machine, 1, 4)), "WaterCondensor");
LanguageRegistry.addName((new ItemStack(machine, 1, 4)),
"WaterCondensor");
LanguageRegistry.addName((new ItemStack(rod, 1)), "MechRod");
//Tools
// Tools
LanguageRegistry.addName((new ItemStack(gauge, 1, 0)), "PipeGuage");
//Parts
// Parts
LanguageRegistry.addName((new ItemStack(parts, 1, 0)), "BronzeTube");
LanguageRegistry.addName((new ItemStack(parts, 1, 1)), "IronTube");
LanguageRegistry.addName((new ItemStack(parts, 1, 2)), "ObsidianTube");
@ -119,45 +131,90 @@ public class BasicPipesMain{
LanguageRegistry.addName((new ItemStack(parts, 1, 6)), "BronzeTank");
LanguageRegistry.addName((new ItemStack(parts, 1, 7)), "Valve");
}
@PostInit
public void postInit(FMLPostInitializationEvent event)
{
proxy.postInit();
GameRegistry.addRecipe(new ItemStack(parts, 2,1), new Object[] { "@@@", '@',Item.ingotIron});//iron tube
GameRegistry.addRecipe(new ItemStack(parts, 2,2), new Object[] { "@@@", '@',Block.obsidian});//obby Tube
GameRegistry.addRecipe(new ItemStack(parts, 2,3), new Object[] { "N@N", 'N',Block.netherrack,'@',new ItemStack(parts, 2,2)});//nether tube
GameRegistry.addRecipe(new ItemStack(parts, 2,4), new Object[] { "@@","@@", '@',Item.leather});//seal
GameRegistry.addShapelessRecipe(new ItemStack(parts, 1,5), new Object[] { new ItemStack(parts, 1,4),new ItemStack(Item.slimeBall, 1)});//stick seal
//crafting pipes
//{"black", "red", "green", "brown", "blue", "purple", "cyan",
//"silver", "gray", "pink", "lime", "yellow", "lightBlue", "magenta", "orange", "white"};
GameRegistry.addRecipe(new ItemStack(rod, 1), new Object[] { "I@I", 'I',Item.ingotIron,'@',new ItemStack(parts, 1,1)});
//water
GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1,1), new Object[] { new ItemStack(parts, 1,1),new ItemStack(parts, 1,4),new ItemStack(Item.dyePowder, 1,4)});
//lava TODO change to use obby pipe and nether items
GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1,2), new Object[] { new ItemStack(parts, 1,2),new ItemStack(Item.dyePowder, 1,1)});
//oil
GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1,3), new Object[] { new ItemStack(parts, 1,1),new ItemStack(parts, 1,4),new ItemStack(Item.dyePowder, 1,0)});
//fuel
GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1,4), new Object[] { new ItemStack(parts, 1,1),new ItemStack(parts, 1,4),new ItemStack(Item.dyePowder, 1,11)});
GameRegistry.addRecipe(new ItemStack(parts, 1,7), new Object[] { "T@T", 'T',new ItemStack(parts,1,1),'@',Block.lever});//valve
GameRegistry.addRecipe(new ItemStack(parts, 1,6), new Object[] { " @ ","@ @"," @ ", '@',Item.ingotIron});//tank
GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1,0), new Object[] { new ItemStack(parts, 1,6),new ItemStack(parts, 1,4),new ItemStack(Item.dyePowder, 1,15)});
GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1,1), new Object[] { new ItemStack(parts, 1,6),new ItemStack(parts, 1,4),new ItemStack(Item.dyePowder, 1,4)});
//lava TODO change to use obby pipe and nether items
GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1,2), new Object[] { new ItemStack(parts, 1,6),Block.obsidian,Block.obsidian,Block.obsidian,Block.obsidian});
//oil
GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1,3), new Object[] { new ItemStack(parts, 1,6),new ItemStack(parts, 1,4),new ItemStack(Item.dyePowder, 1,0)});
//fuel
GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1,4), new Object[] { new ItemStack(parts, 1,6),new ItemStack(parts, 1,4),new ItemStack(Item.dyePowder, 1,11)});
GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1,0), new Object[] { new ItemStack(parts, 1,1),new ItemStack(parts, 1,4)});
GameRegistry.addRecipe(new ItemStack(machine, 1,0), new Object[] { "@T@","BPB","@P@"
, '@',new ItemStack(Item.ingotIron,2)
, 'B',new ItemStack(parts, 1,7)
, 'P',new ItemStack(Block.pistonBase)
, 'T',new ItemStack(parts, 1,6)
});
@PostInit
public void postInit(FMLPostInitializationEvent event) {
proxy.postInit();
GameRegistry.addRecipe(new ItemStack(this.gauge, 1, 0), new Object[] {
"TVT"," T ", 'V', new ItemStack(parts,1,7), 'T',new ItemStack(parts,1,1) });
//iron tube
GameRegistry.addRecipe(new ItemStack(parts, 2, 1), new Object[] {
"@@@", '@', Item.ingotIron });
//obby tube
GameRegistry.addRecipe(new ItemStack(parts, 2, 2), new Object[] {
"@@@", '@', Block.obsidian });
//nether tube
GameRegistry
.addRecipe(new ItemStack(parts, 2, 3),
new Object[] { "N@N", 'N', Block.netherrack, '@',
new ItemStack(parts, 2, 2) });
//seal
GameRegistry.addRecipe(new ItemStack(parts, 2, 4), new Object[] { "@@",
"@@", '@', Item.leather });
//slime steal
GameRegistry.addShapelessRecipe(new ItemStack(parts, 1, 5),
new Object[] { new ItemStack(parts, 1, 4),
new ItemStack(Item.slimeBall, 1) });// stick seal
// crafting pipes
// {"black", "red", "green", "brown", "blue", "purple", "cyan",
// "silver", "gray", "pink", "lime", "yellow", "lightBlue", "magenta",
// "orange", "white"};
GameRegistry.addRecipe(new ItemStack(rod, 1), new Object[] { "I@I",
'I', Item.ingotIron, '@', new ItemStack(parts, 1, 1) });
// water
GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1, 1),
new Object[] { new ItemStack(parts, 1, 1),
new ItemStack(parts, 1, 4),
new ItemStack(Item.dyePowder, 1, 4) });
// lava TODO change to use obby pipe and nether items
GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1, 2),
new Object[] { new ItemStack(parts, 1, 2),
new ItemStack(Item.dyePowder, 1, 1) });
// oil
GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1, 3),
new Object[] { new ItemStack(parts, 1, 1),
new ItemStack(parts, 1, 4),
new ItemStack(Item.dyePowder, 1, 0) });
// fuel
GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1, 4),
new Object[] { new ItemStack(parts, 1, 1),
new ItemStack(parts, 1, 4),
new ItemStack(Item.dyePowder, 1, 11) });
GameRegistry.addRecipe(new ItemStack(parts, 1, 7), new Object[] {
"T@T", 'T', new ItemStack(parts, 1, 1), '@', Block.lever });// valve
GameRegistry.addRecipe(new ItemStack(parts, 1, 6), new Object[] {
" @ ", "@ @", " @ ", '@', Item.ingotIron });// tank
GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1, 0),
new Object[] { new ItemStack(parts, 1, 6),
new ItemStack(parts, 1, 4),
new ItemStack(Item.dyePowder, 1, 15) });
GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1, 1),
new Object[] { new ItemStack(parts, 1, 6),
new ItemStack(parts, 1, 4),
new ItemStack(Item.dyePowder, 1, 4) });
// lava TODO change to use obby pipe and nether items
GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1, 2),
new Object[] { new ItemStack(parts, 1, 6), Block.obsidian,
Block.obsidian, Block.obsidian, Block.obsidian });
// oil
GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1, 3),
new Object[] { new ItemStack(parts, 1, 6),
new ItemStack(parts, 1, 4),
new ItemStack(Item.dyePowder, 1, 0) });
// fuel
GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1, 4),
new Object[] { new ItemStack(parts, 1, 6),
new ItemStack(parts, 1, 4),
new ItemStack(Item.dyePowder, 1, 11) });
GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1, 0),
new Object[] { new ItemStack(parts, 1, 1),
new ItemStack(parts, 1, 4) });
GameRegistry.addRecipe(new ItemStack(machine, 1, 0), new Object[] {
"@T@", "BPB", "@P@", '@', new ItemStack(Item.ingotIron, 2),
'B', new ItemStack(parts, 1, 7), 'P',
new ItemStack(Block.pistonBase), 'T',
new ItemStack(parts, 1, 6) });
}

View file

@ -25,6 +25,7 @@ public class ItemGuage extends Item
this.setIconIndex(10);
this.setItemName("guage");
this.setCreativeTab(CreativeTabs.tabTools);
this.setMaxStackSize(1);
}
@Override
public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List)

View file

@ -1,4 +1,5 @@
package basicpipes.conductors;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.INetworkManager;
import net.minecraft.src.NBTTagCompound;
@ -15,8 +16,9 @@ import basicpipes.pipes.api.Liquid;
import basicpipes.pipes.api.MHelper;
import com.google.common.io.ByteArrayDataInput;
public class TileEntityPipe extends TileEntity implements ILiquidConsumer,IPacketReceiver
{
public class TileEntityPipe extends TileEntity implements ILiquidConsumer,
IPacketReceiver {
protected Liquid type = Liquid.DEFUALT;
public int capacity = 2;
@ -24,78 +26,89 @@ public class TileEntityPipe extends TileEntity implements ILiquidConsumer,IPacke
public int connectedUnits = 0;
public int liquidStored = 0;
private int count = 0;
private int count2 =0;
private int count2 = 0;
protected boolean firstUpdate = true;
public TileEntity[] connectedBlocks = {null, null, null, null, null, null};
public int getPressure()
{
public TileEntity[] connectedBlocks = { null, null, null, null, null, null };
public int getPressure() {
return this.presure;
}
@Override
public void updateEntity()
{
public void updateEntity() {
int highestPressure = 0;
if(++count >= 5)
{
this.connectedBlocks = MHelper.getSourounding(worldObj,xCoord, yCoord, zCoord);
for(int i =0; i < 6; i++)
{
if (++count >= 5) {
this.connectedBlocks = MHelper.getSourounding(worldObj, xCoord,
yCoord, zCoord);
for (int i = 0; i < 6; i++) {
if(connectedBlocks[i] instanceof ILiquidConsumer && ((ILiquidConsumer) connectedBlocks[i]).canRecieveLiquid(this.type, ForgeDirection.getOrientation(i).getOpposite()))
{
if (connectedBlocks[i] instanceof ILiquidConsumer
&& ((ILiquidConsumer) connectedBlocks[i])
.canRecieveLiquid(this.type, ForgeDirection
.getOrientation(i).getOpposite())) {
this.connectedUnits++;
if(connectedBlocks[i] instanceof TileEntityPipe)
{
if(((TileEntityPipe) connectedBlocks[i]).getPressure() > highestPressure)
{
highestPressure = ((TileEntityPipe) connectedBlocks[i]).getPressure();
if (connectedBlocks[i] instanceof TileEntityPipe) {
if (((TileEntityPipe) connectedBlocks[i]).getPressure() > highestPressure) {
highestPressure = ((TileEntityPipe) connectedBlocks[i])
.getPressure();
}
}
}
else
if(connectedBlocks[i] instanceof ILiquidProducer && ((ILiquidProducer) connectedBlocks[i]).canProduceLiquid(this.type, ForgeDirection.getOrientation(i).getOpposite()))
{
} else if (connectedBlocks[i] instanceof ILiquidProducer
&& ((ILiquidProducer) connectedBlocks[i])
.canProduceLiquid(this.type, ForgeDirection
.getOrientation(i).getOpposite())) {
this.connectedUnits++;
if(((ILiquidProducer) connectedBlocks[i]).canProducePresure(this.type, ForgeDirection.getOrientation(i)) && ((ILiquidProducer) connectedBlocks[i]).presureOutput(this.type,ForgeDirection.getOrientation(i).getOpposite()) > highestPressure)
{
highestPressure = ((ILiquidProducer) connectedBlocks[i]).presureOutput(this.type,ForgeDirection.getOrientation(i));
if (((ILiquidProducer) connectedBlocks[i])
.canProducePresure(this.type,
ForgeDirection.getOrientation(i))
&& ((ILiquidProducer) connectedBlocks[i])
.presureOutput(this.type, ForgeDirection
.getOrientation(i).getOpposite()) > highestPressure) {
highestPressure = ((ILiquidProducer) connectedBlocks[i])
.presureOutput(this.type,
ForgeDirection.getOrientation(i));
}
}
else
{
} else {
connectedBlocks[i] = null;
}
}
if(!worldObj.isRemote)
{
if(firstUpdate || count2++ >= 10)
{ count2= 0;
if (!worldObj.isRemote) {
if (firstUpdate || count2++ >= 10) {
count2 = 0;
firstUpdate = false;
Packet packet = PacketManager.getPacket("Pipes",this, new Object[]{this.type.ordinal()});
PacketManager.sendPacketToClients(packet, worldObj, Vector3.get(this), 60);
Packet packet = PacketManager.getPacket("Pipes", this,
new Object[] { this.type.ordinal() });
PacketManager.sendPacketToClients(packet, worldObj,
Vector3.get(this), 60);
}
this.presure = highestPressure -1;
for(int i =0; i < 6; i++)
{
if(connectedBlocks[i] instanceof ILiquidProducer)
{
int vol = ((ILiquidProducer)connectedBlocks[i]).onProduceLiquid(this.type, this.capacity - this.liquidStored, ForgeDirection.getOrientation(i).getOpposite());
this.liquidStored = Math.max(this.liquidStored + vol,this.capacity);
this.presure = highestPressure - 1;
for (int i = 0; i < 6; i++) {
if (connectedBlocks[i] instanceof ILiquidProducer) {
int vol = ((ILiquidProducer) connectedBlocks[i])
.onProduceLiquid(this.type, this.capacity
- this.liquidStored, ForgeDirection
.getOrientation(i).getOpposite());
this.liquidStored = Math.min(this.liquidStored + vol,
this.capacity);
}
if(connectedBlocks[i] instanceof ILiquidConsumer && this.liquidStored > 0 && this.presure > 0)
{
if(connectedBlocks[i] instanceof TileEntityPipe)
{
if (connectedBlocks[i] instanceof ILiquidConsumer
&& this.liquidStored > 0 && this.presure > 0) {
if (connectedBlocks[i] instanceof TileEntityPipe) {
this.liquidStored--;
int vol = ((ILiquidConsumer)connectedBlocks[i]).onReceiveLiquid(this.type, Math.max(this.liquidStored,1), ForgeDirection.getOrientation(i).getOpposite());
int vol = ((ILiquidConsumer) connectedBlocks[i])
.onReceiveLiquid(this.type, Math.max(
this.liquidStored, 1),
ForgeDirection.getOrientation(i)
.getOpposite());
this.liquidStored += vol;
}else
{
this.liquidStored = ((ILiquidConsumer)connectedBlocks[i]).onReceiveLiquid(this.type, this.liquidStored, ForgeDirection.getOrientation(i).getOpposite());
} else {
this.liquidStored = ((ILiquidConsumer) connectedBlocks[i])
.onReceiveLiquid(this.type,
this.liquidStored, ForgeDirection
.getOrientation(i)
.getOpposite());
}
}
}
@ -103,92 +116,84 @@ public class TileEntityPipe extends TileEntity implements ILiquidConsumer,IPacke
}
}
//---------------
//liquid stuff
//---------------
// ---------------
// liquid stuff
// ---------------
@Override
public int onReceiveLiquid(Liquid type,int vol, ForgeDirection side)
{
if(type == this.type)
{
int rejectedVolume = Math.max((this.getStoredLiquid(type) + vol) - this.capacity, 0);
this.liquidStored = Math.min(Math.max((liquidStored + vol - rejectedVolume),0),this.capacity);
public int onReceiveLiquid(Liquid type, int vol, ForgeDirection side) {
if (type == this.type) {
int rejectedVolume = Math.max((this.getStoredLiquid(type) + vol)
- this.capacity, 0);
this.liquidStored = Math.min(
Math.max((liquidStored + vol - rejectedVolume), 0),
this.capacity);
return rejectedVolume;
}
return vol;
}
/**
* @return Return the stored volume in this pipe.
*/
@Override
public int getStoredLiquid(Liquid type)
{
if(type == this.type)
{
public int getStoredLiquid(Liquid type) {
if (type == this.type) {
return this.liquidStored;
}
return 0;
}
@Override
public int getLiquidCapacity(Liquid type)
{
if(type == this.type)
{
public int getLiquidCapacity(Liquid type) {
if (type == this.type) {
return this.capacity;
}
return 0;
}
//find wether or not this side of X block can recieve X liquid type. Also use to determine connection of a pipe
// find wether or not this side of X block can recieve X liquid type. Also
// use to determine connection of a pipe
@Override
public boolean canRecieveLiquid(Liquid type, ForgeDirection side) {
if(type == this.type)
{
if (type == this.type) {
return true;
}
return false;
}
//returns liquid type
// returns liquid type
public Liquid getType() {
return this.type;
}
//used by the item to set the liquid type on spawn
// used by the item to set the liquid type on spawn
public void setType(Liquid rType) {
this.type = rType;
}
//---------------------
//data
//--------------------
// ---------------------
// data
// --------------------
@Override
public void handlePacketData(INetworkManager network, int packetType,
Packet250CustomPayload packet, EntityPlayer player,
ByteArrayDataInput data) {
try
{
try {
int type = data.readInt();
if(worldObj.isRemote)
{
if (worldObj.isRemote) {
this.type = Liquid.getLiquid(type);
}
}
catch(Exception e)
{
} catch (Exception e) {
e.printStackTrace();
}
}
/**
* Reads a tile entity from NBT.
*/
public void readFromNBT(NBTTagCompound par1NBTTagCompound)
{
public void readFromNBT(NBTTagCompound par1NBTTagCompound) {
super.readFromNBT(par1NBTTagCompound);
this.liquidStored = par1NBTTagCompound.getInteger("liquid");
this.type = Liquid.getLiquid(par1NBTTagCompound.getInteger("type"));
@ -197,11 +202,9 @@ public class TileEntityPipe extends TileEntity implements ILiquidConsumer,IPacke
/**
* Writes a tile entity to NBT.
*/
public void writeToNBT(NBTTagCompound par1NBTTagCompound)
{
public void writeToNBT(NBTTagCompound par1NBTTagCompound) {
super.writeToNBT(par1NBTTagCompound);
par1NBTTagCompound.setInteger("liquid", this.liquidStored);
par1NBTTagCompound.setInteger("type", this.type.ordinal());
}
}

View file

@ -48,7 +48,7 @@ public class TileEntityPump extends TileEntityElectricityReceiver implements ILi
if(!worldObj.isRemote)
{
if(bBlock == type.Still && this.eStored > 200 && this.lStored < this.wMax)
if(bBlock == type.Still && this.eStored >= 200 && this.lStored < this.wMax)
{
eStored -= 200;
lStored += 1;
@ -71,9 +71,8 @@ public class TileEntityPump extends TileEntityElectricityReceiver implements ILi
public int onProduceLiquid(Liquid type, int maxVol, ForgeDirection side) {
if(type == this.type && lStored > 0)
{
int tradeW = Math.min(maxVol, lStored);
lStored -= tradeW;
return tradeW;
lStored -= 1;
return 1;
}
return 0;
}

View file

@ -1,4 +1,5 @@
package steampower;
import java.io.File;
import net.minecraft.src.Block;
@ -25,12 +26,14 @@ import cpw.mods.fml.common.network.NetworkMod;
import cpw.mods.fml.common.network.NetworkRegistry;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.LanguageRegistry;
@Mod(modid = "SteamPower", name = "Steam Power", version = "1.9",dependencies = "after:basicPipes")
@NetworkMod(channels = { "SPpack" }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class)
public class SteamPowerMain{
static Configuration config = new Configuration((new File(cpw.mods.fml.common.Loader.instance().getConfigDir(), "/UniversalElectricity/SteamPower.cfg")));
private static int BlockID= configurationProperties();
@Mod(modid = "SteamPower", name = "Steam Power", version = "1.9", dependencies = "after:basicPipes")
@NetworkMod(channels = { "SPpack" }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class)
public class SteamPowerMain {
static Configuration config = new Configuration((new File(
cpw.mods.fml.common.Loader.instance().getConfigDir(),
"/UniversalElectricity/SteamPower.cfg")));
private static int BlockID = configurationProperties();
public static int EngineItemID;
public static int EngineID;
public static int genID;
@ -40,33 +43,44 @@ public class SteamPowerMain{
public static int boilerHeat;
public static int fireOutput;
public static final String channel = "SPpack";
public static Block machine = new BlockMachine(BlockID).setBlockName("machine");
public static Block engine = new BlockSteamPiston(EngineID).setBlockName("SteamEngien");
public static Block machine = new BlockMachine(BlockID)
.setBlockName("machine");
public static Block engine = new BlockSteamPiston(EngineID)
.setBlockName("SteamEngien");
public static Block gen = new BlockGenerator(genID).setBlockName("ElecGen");
public static Item itemEngine = new ItemEngine(EngineItemID).setItemName("SteamEngine");
public static Item itemEngine = new ItemEngine(EngineItemID)
.setItemName("SteamEngine");
public static SteamPowerMain instance;
@SidedProxy(clientSide = "steampower.SteamClientProxy", serverSide = "steampower.SteamProxy")
public static SteamProxy proxy;
public static String textureFile = "/textures/";
public static int configurationProperties()
{
public static int configurationProperties() {
config.load();
BlockID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"MachinesID", 3030).value);
EngineItemID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,"EngineItem", 30308).value);
EngineID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"SteamEngineID", 3031).value);
genID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"ElecGenID", 3032).value);
genOutput = Integer.parseInt(config.get(Configuration.CATEGORY_GENERAL,"genOutputWattsmax", 1000).value);
steamOutBoiler = Integer.parseInt(config.get(Configuration.CATEGORY_GENERAL,"steamOutPerCycle", 10).value);
boilerHeat = Integer.parseInt(config.get(Configuration.CATEGORY_GENERAL,"boilerInKJNeed", 4500).value);
fireOutput = Integer.parseInt(config.get(Configuration.CATEGORY_GENERAL,"fireBoxOutKJMax", 250).value);
BlockID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,
"MachinesID", 3030).value);
EngineItemID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,
"EngineItem", 30308).value);
EngineID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,
"SteamEngineID", 3031).value);
genID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,
"ElecGenID", 3032).value);
genOutput = Integer.parseInt(config.get(Configuration.CATEGORY_GENERAL,
"genOutputWattsmax", 1000).value);
steamOutBoiler = Integer.parseInt(config.get(
Configuration.CATEGORY_GENERAL, "steamOutPerCycle", 10).value);
boilerHeat = Integer.parseInt(config.get(
Configuration.CATEGORY_GENERAL, "boilerInKJNeed", 4500).value);
fireOutput = Integer.parseInt(config.get(
Configuration.CATEGORY_GENERAL, "fireBoxOutKJMax", 250).value);
config.save();
return BlockID;
}
@PreInit
public void preInit(FMLPreInitializationEvent event)
{
public void preInit(FMLPreInitializationEvent event) {
instance = this;
NetworkRegistry.instance().registerGuiHandler(this, this.proxy);
proxy.preInit();
@ -74,54 +88,63 @@ public class SteamPowerMain{
GameRegistry.registerBlock(engine);
GameRegistry.registerBlock(gen);
}
@Init
public void load(FMLInitializationEvent evt)
{
public void load(FMLInitializationEvent evt) {
proxy.init();
GameRegistry.registerTileEntity(TileEntitytopGen.class, "gentop");
//Names...............
// Names...............
LanguageRegistry.addName((new ItemStack(machine, 1, 1)), "Boiler");
LanguageRegistry.addName((new ItemStack(gen, 1, 0)), "Generator");
LanguageRegistry.addName((new ItemStack(machine, 1, 2)), "FireBox");
LanguageRegistry.addName((new ItemStack(itemEngine, 1, 0)), "SteamPiston");
LanguageRegistry.addName((new ItemStack(itemEngine, 1, 0)),
"SteamPiston");
}
@PostInit
public void postInit(FMLPostInitializationEvent event)
{
public void postInit(FMLPostInitializationEvent event) {
proxy.postInit();
//Crafting
try{
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(gen, 1), new Object [] {"@T@", "OVO", "@T@",
'T',new ItemStack(BasicPipesMain.rod, 1),
'@',"plateSteel",
'O',"basicCircuit",
'V',"motor"}));
// Crafting
try {
CraftingManager
.getInstance()
.getRecipeList()
.add(new ShapedOreRecipe(new ItemStack(gen, 1),
new Object[] { "@T@", "OVO", "@T@", 'T',
new ItemStack(BasicPipesMain.rod, 1), '@',
"plateSteel", 'O', "basicCircuit", 'V',
"motor" }));
/**
TileEntityBoiler();<- metadata 1
TileEntityFireBox();<-metadata 2-5
* TileEntityBoiler();<- metadata 1 TileEntityFireBox();<-metadata
* 2-5
*/
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(
new ItemStack(machine, 1, 1), new Object [] {"TT", "VV", "TT",
'T',new ItemStack(BasicPipesMain.parts, 1,6),
'V',new ItemStack(BasicPipesMain.parts, 1,7)}));
CraftingManager.getInstance().getRecipeList().add(
new ShapedOreRecipe(new ItemStack(machine, 1, 2), new Object [] { "@", "F",
'F',Block.stoneOvenIdle,
'@',"plateSteel"}));
CraftingManager.getInstance().getRecipeList().add(
new ShapedOreRecipe(new ItemStack(itemEngine, 1,0), new Object [] {"GGG", "VPV", "@T@",
'T',new ItemStack(BasicPipesMain.parts, 1,1),
'G',BasicPipesMain.rod,
'@',"plateSteel",
'P',Block.pistonBase,
'V',new ItemStack(BasicPipesMain.parts, 1,7),
'M',"motor"}));
}
catch(Exception e)
{
CraftingManager
.getInstance()
.getRecipeList()
.add(new ShapedOreRecipe(new ItemStack(machine, 1, 1),
new Object[] { "TT", "VV", "TT", 'T',
new ItemStack(BasicPipesMain.parts, 1, 6),
'V',
new ItemStack(BasicPipesMain.parts, 1, 7) }));
CraftingManager
.getInstance()
.getRecipeList()
.add(new ShapedOreRecipe(new ItemStack(machine, 1, 2),
new Object[] { "@", "F", 'F', Block.stoneOvenIdle,
'@', "plateSteel" }));
CraftingManager
.getInstance()
.getRecipeList()
.add(new ShapedOreRecipe(new ItemStack(itemEngine, 1, 0),
new Object[] { "GGG", "VPV", "@T@", 'T',
new ItemStack(BasicPipesMain.parts, 1, 1),
'G', BasicPipesMain.rod, '@', "plateSteel",
'P', Block.pistonBase, 'V',
new ItemStack(BasicPipesMain.parts, 1, 7),
'M', "motor" }));
} catch (Exception e) {
e.printStackTrace();
System.out.print("UE based recipes not loaded");
}

View file

@ -2,9 +2,6 @@ package steampower.turbine;
import java.util.ArrayList;
import steampower.ItemRenderHelperS;
import steampower.TileEntityMachine;
import net.minecraft.src.CreativeTabs;
import net.minecraft.src.EntityLiving;
import net.minecraft.src.EntityPlayer;
@ -13,6 +10,7 @@ import net.minecraft.src.Material;
import net.minecraft.src.MathHelper;
import net.minecraft.src.TileEntity;
import net.minecraft.src.World;
import steampower.ItemRenderHelperS;
public class BlockGenerator extends universalelectricity.prefab.BlockMachine {
@ -20,50 +18,51 @@ public class BlockGenerator extends universalelectricity.prefab.BlockMachine {
super("Generator", id, Material.iron);
this.setCreativeTab(CreativeTabs.tabBlock);
}
@Override
public void addCreativeItems(ArrayList itemList)
{
itemList.add(new ItemStack(this, 1,0));
public void addCreativeItems(ArrayList itemList) {
itemList.add(new ItemStack(this, 1, 0));
}
@Override
public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving par5EntityLiving)
{
int angle = MathHelper.floor_double((par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
public void onBlockPlacedBy(World world, int x, int y, int z,
EntityLiving par5EntityLiving) {
int angle = MathHelper
.floor_double((par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
world.setBlockAndMetadataWithUpdate(x, y, z, blockID, angle, true);
}
@Override
public boolean onUseWrench(World par1World, int x, int y, int z, EntityPlayer par5EntityPlayer)
{
int angle = MathHelper.floor_double((par5EntityPlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
public boolean onUseWrench(World par1World, int x, int y, int z,
EntityPlayer par5EntityPlayer) {
int angle = MathHelper
.floor_double((par5EntityPlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
int metadata = par1World.getBlockMetadata(x, y, z);
if(metadata < 3)
{
par1World.setBlockAndMetadata(x, y, z, blockID, metadata+angle);
}
else
{
if (metadata < 3) {
par1World.setBlockAndMetadata(x, y, z, blockID, metadata + angle);
} else {
par1World.setBlockAndMetadata(x, y, z, blockID, 0);
}
return true;
}
@Override
public boolean isOpaqueCube()
{
public boolean isOpaqueCube() {
return false;
}
@Override
public boolean renderAsNormalBlock()
{
public boolean renderAsNormalBlock() {
return false;
}
@Override
public int getRenderType()
{
public int getRenderType() {
return ItemRenderHelperS.renderID;
}
@Override
public TileEntity createNewTileEntity(World world)
{
public TileEntity createNewTileEntity(World world) {
return new TileEntityGen();
}
}

View file

@ -2,148 +2,113 @@ package steampower.turbine;
import java.util.Random;
import net.minecraft.src.EntityLiving;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.Material;
import net.minecraft.src.MathHelper;
import net.minecraft.src.TileEntity;
import net.minecraft.src.World;
import steampower.SteamPowerMain;
import steampower.TileEntityMachine;
public class BlockSteamPiston extends universalelectricity.prefab.BlockMachine{
public class BlockSteamPiston extends universalelectricity.prefab.BlockMachine {
public BlockSteamPiston(int par1) {
super("SteamEngine", par1, Material.iron);
}
@Override
public boolean onMachineActivated(World par1World, int x, int y, int z, EntityPlayer par5EntityPlayer)
{
if (par1World.isRemote)
{
return true;
}
else
{
TileEntity blockEntity = (TileEntity)par1World.getBlockTileEntity(x, y, z);
if (blockEntity != null)
{
if(blockEntity instanceof TileEntitySteamPiston)
{
par5EntityPlayer.openGui(SteamPowerMain.instance, 2, par1World, x, y, z);
}
if(blockEntity instanceof TileEntitytopGen)
{
par5EntityPlayer.openGui(SteamPowerMain.instance, 2, par1World, x, y-1, z);
}
}
return true;
}
}
@Override
public boolean onUseWrench(World par1World, int x, int y, int z, EntityPlayer par5EntityPlayer)
{
int angle = MathHelper.floor_double((par5EntityPlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
public boolean onMachineActivated(World par1World, int x, int y, int z,
EntityPlayer par5EntityPlayer) {
return false;
}
@Override
public boolean onUseWrench(World par1World, int x, int y, int z,
EntityPlayer par5EntityPlayer) {
int angle = MathHelper
.floor_double((par5EntityPlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
int metadata = par1World.getBlockMetadata(x, y, z);
if(metadata < 3)
{
par1World.setBlockAndMetadata(x, y, z, blockID, metadata+angle);
}
else
{
if (metadata < 3) {
par1World.setBlockAndMetadata(x, y, z, blockID, metadata + angle);
} else {
par1World.setBlockAndMetadata(x, y, z, blockID, 0);
}
return true;
}
public TileEntity createNewTileEntity(World var1)
{
public TileEntity createNewTileEntity(World var1) {
return null;
}
public void breakBlock(World world, int x, int y, int z,int par5, int par6)
{
public void breakBlock(World world, int x, int y, int z, int par5, int par6) {
super.breakBlock(world, x, y, z, par5, par6);
int meta = world.getBlockMetadata(x, y, z);
if(meta < 4)
{
if(world.getBlockId(x, y+1, z) == this.blockID)
{
if(world.getBlockMetadata(x, y, z)> 4)
{
if (meta < 4) {
if (world.getBlockId(x, y + 1, z) == this.blockID) {
if (world.getBlockMetadata(x, y, z) > 4) {
world.setBlockAndMetadataWithUpdate(x, y, z, 0, 0, true);
}
}
}
else
if(meta > 4)
{
if(world.getBlockId(x, y-1, z) == this.blockID)
{
if(world.getBlockMetadata(x, y, z)< 4)
{
} else if (meta > 4) {
if (world.getBlockId(x, y - 1, z) == this.blockID) {
if (world.getBlockMetadata(x, y, z) < 4) {
world.setBlockAndMetadataWithUpdate(x, y, z, 0, 0, true);
}
}
}
}
@Override
public boolean isOpaqueCube()
{
public boolean isOpaqueCube() {
return false;
}
@Override
public boolean renderAsNormalBlock()
{
public boolean renderAsNormalBlock() {
return false;
}
@Override
public int getRenderType()
{
public int getRenderType() {
return -1;
}
@Override
public TileEntity createNewTileEntity(World world, int metadata)
{
if(metadata >= 0 && metadata < 4)
{
public TileEntity createNewTileEntity(World world, int metadata) {
if (metadata >= 0 && metadata < 4) {
return new TileEntitySteamPiston();
}
if(metadata == 14)
{
if (metadata == 14) {
return new TileEntitytopGen();
}
return null;
}
public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, int par5)
{
public void onNeighborBlockChange(World par1World, int par2, int par3,
int par4, int par5) {
int meta = par1World.getBlockMetadata(par2, par3, par4);
if (meta < 4)
{
if (par1World.getBlockId(par2, par3 + 1, par4) != this.blockID)
{
if (meta < 4) {
if (par1World.getBlockId(par2, par3 + 1, par4) != this.blockID) {
par1World.setBlockWithNotify(par2, par3, par4, 0);
}
}
else
{
if (par1World.getBlockId(par2, par3 - 1, par4) != this.blockID)
{
} else {
if (par1World.getBlockId(par2, par3 - 1, par4) != this.blockID) {
par1World.setBlockWithNotify(par2, par3, par4, 0);
}
}
}
@Override
public int idDropped(int par1, Random par2Random, int par3)
{
public int idDropped(int par1, Random par2Random, int par3) {
return SteamPowerMain.itemEngine.shiftedIndex;
}
@Override
public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4)
{
public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) {
int var5 = par1World.getBlockId(par2, par3, par4);
int var6 = par1World.getBlockId(par2, par3+1, par4);
return (var5 == 0 || blocksList[var5].blockMaterial.isGroundCover()) && (var6 == 0 || blocksList[var6].blockMaterial.isGroundCover());
int var6 = par1World.getBlockId(par2, par3 + 1, par4);
return (var5 == 0 || blocksList[var5].blockMaterial.isGroundCover())
&& (var6 == 0 || blocksList[var6].blockMaterial.isGroundCover());
}
}

View file

@ -1,4 +1,5 @@
package steampower.turbine;
import java.util.List;
import net.minecraft.src.Block;
@ -11,105 +12,100 @@ import net.minecraft.src.World;
import steampower.SteamPowerMain;
import steampower.TileEntityMachine;
public class ItemEngine extends Item
{
public ItemEngine(int par1)
{
public class ItemEngine extends Item {
public ItemEngine(int par1) {
super(par1);
this.maxStackSize = 5;
this.setCreativeTab(CreativeTabs.tabBlock);
this.setIconIndex(21);
}
@Override
public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List)
{
public void getSubItems(int par1, CreativeTabs par2CreativeTabs,
List par3List) {
par3List.add(new ItemStack(this, 1, 0));
}
@Override
public String getTextureFile() {
// TODO Auto-generated method stub
return SteamPowerMain.textureFile+"Items.png";
return SteamPowerMain.textureFile + "Items.png";
}
public boolean onItemUse(ItemStack itemStack, EntityPlayer ePlayer,
World world, int x, int y, int z, int par7, float par8, float par9, float par10)
{
World world, int x, int y, int z, int par7, float par8, float par9,
float par10) {
int var11 = world.getBlockId(x, y, z);
int BlockID = SteamPowerMain.EngineID;
if (var11 == Block.snow.blockID)
{
if (var11 == Block.snow.blockID) {
par7 = 1;
}
else if (var11 != Block.vine.blockID && var11 != Block.tallGrass.blockID && var11 != Block.deadBush.blockID
&& (Block.blocksList[var11] == null || !Block.blocksList[var11].isBlockReplaceable(world, x, y, z)))
{
if (par7 == 0)
{
} else if (var11 != Block.vine.blockID
&& var11 != Block.tallGrass.blockID
&& var11 != Block.deadBush.blockID
&& (Block.blocksList[var11] == null || !Block.blocksList[var11]
.isBlockReplaceable(world, x, y, z))) {
if (par7 == 0) {
--y;
}
if (par7 == 1)
{
if (par7 == 1) {
++y;
}
if (par7 == 2)
{
if (par7 == 2) {
--z;
}
if (par7 == 3)
{
if (par7 == 3) {
++z;
}
if (par7 == 4)
{
if (par7 == 4) {
--x;
}
if (par7 == 5)
{
if (par7 == 5) {
++x;
}
}
if (itemStack.stackSize == 0)
{
if (itemStack.stackSize == 0) {
return false;
}
else if (!ePlayer.func_82247_a(x, y, z, par7, itemStack))
{
} else if (!ePlayer.func_82247_a(x, y, z, par7, itemStack)) {
return false;
}
else if (y == 255 && Block.blocksList[BlockID].blockMaterial.isSolid())
{
} else if (y == 255
&& Block.blocksList[BlockID].blockMaterial.isSolid()) {
return false;
}
else if (world.canPlaceEntityOnSide(BlockID, x, y, z, false, par7, ePlayer))
{
} else if (world.canPlaceEntityOnSide(BlockID, x, y, z, false, par7,
ePlayer)) {
Block var12 = Block.blocksList[BlockID];
int angle = MathHelper.floor_double((ePlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
switch (angle)
{
case 0: world.setBlockAndMetadata(x, y, z, var12.blockID, 0); break;
case 1: world.setBlockAndMetadata(x, y, z, var12.blockID, 1); break;
case 2: world.setBlockAndMetadata(x, y, z, var12.blockID, 2); break;
case 3: world.setBlockAndMetadata(x, y, z, var12.blockID, 3); break;
int angle = MathHelper
.floor_double((ePlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
switch (angle) {
case 0:
world.setBlockAndMetadata(x, y, z, var12.blockID, 0);
break;
case 1:
world.setBlockAndMetadata(x, y, z, var12.blockID, 1);
break;
case 2:
world.setBlockAndMetadata(x, y, z, var12.blockID, 2);
break;
case 3:
world.setBlockAndMetadata(x, y, z, var12.blockID, 3);
break;
}
int meta = world.getBlockMetadata(x, y, z);
//ePlayer.sendChatToPlayer("A:"+angle+" M:"+meta);
// ePlayer.sendChatToPlayer("A:"+angle+" M:"+meta);
world.notifyBlocksOfNeighborChange(x, y, z, var12.blockID);
world.setBlockAndMetadataWithNotify(x, y+1, z, var12.blockID, 14);
world.setBlockAndMetadataWithNotify(x, y + 1, z, var12.blockID, 14);
world.notifyBlocksOfNeighborChange(x, y, z, var12.blockID);
world.editingBlocks = false;
--itemStack.stackSize;
return true;
}
else
{
} else {
return false;
}
}