Updated to 1.4.2 and UE 1.0.0
I baddly need to clean this mod up but for now it should be fully updated. The recipes are not tested yet with the ore Directory changes i made to them but i'll test shortly.
This commit is contained in:
parent
168cf1f049
commit
a9fe90b3ca
71 changed files with 816 additions and 247 deletions
0
.metadata/.lock
Normal file
0
.metadata/.lock
Normal file
BIN
.metadata/.mylyn/.taskListIndex/segments.gen
Normal file
BIN
.metadata/.mylyn/.taskListIndex/segments.gen
Normal file
Binary file not shown.
BIN
.metadata/.mylyn/.taskListIndex/segments_1
Normal file
BIN
.metadata/.mylyn/.taskListIndex/segments_1
Normal file
Binary file not shown.
BIN
.metadata/.mylyn/repositories.xml.zip
Normal file
BIN
.metadata/.mylyn/repositories.xml.zip
Normal file
Binary file not shown.
BIN
.metadata/.mylyn/tasks.xml.zip
Normal file
BIN
.metadata/.mylyn/tasks.xml.zip
Normal file
Binary file not shown.
|
@ -0,0 +1 @@
|
||||||
|
|
Binary file not shown.
|
@ -0,0 +1 @@
|
||||||
|
|
BIN
.metadata/.plugins/org.eclipse.core.resources/.root/1.tree
Normal file
BIN
.metadata/.plugins/org.eclipse.core.resources/.root/1.tree
Normal file
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,2 @@
|
||||||
|
eclipse.preferences.version=1
|
||||||
|
jd.ide.eclipse.prefs.Setup=true
|
|
@ -0,0 +1,2 @@
|
||||||
|
eclipse.preferences.version=1
|
||||||
|
version=1
|
|
@ -0,0 +1,2 @@
|
||||||
|
eclipse.preferences.version=1
|
||||||
|
org.eclipse.epp.usagedata.recording.last-upload=1351461895073
|
|
@ -0,0 +1,13 @@
|
||||||
|
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
|
|
@ -0,0 +1,2 @@
|
||||||
|
eclipse.preferences.version=1
|
||||||
|
org.eclipse.m2e.discovery.pref.projects=
|
|
@ -0,0 +1,2 @@
|
||||||
|
eclipse.preferences.version=1
|
||||||
|
mylyn.attention.migrated=true
|
|
@ -0,0 +1,2 @@
|
||||||
|
eclipse.preferences.version=1
|
||||||
|
org.eclipse.mylyn.monitor.activity.tracking.enabled.checked=true
|
|
@ -0,0 +1,2 @@
|
||||||
|
eclipse.preferences.version=1
|
||||||
|
pref_first_startup=false
|
|
@ -0,0 +1,2 @@
|
||||||
|
eclipse.preferences.version=1
|
||||||
|
org.eclipse.team.ui.first_time=false
|
|
@ -0,0 +1,5 @@
|
||||||
|
PROBLEMS_FILTERS_MIGRATE=true
|
||||||
|
eclipse.preferences.version=1
|
||||||
|
platformState=1341384697020
|
||||||
|
quickStart=false
|
||||||
|
tipsAndTricks=true
|
|
@ -0,0 +1,2 @@
|
||||||
|
eclipse.preferences.version=1
|
||||||
|
showIntro=false
|
|
@ -0,0 +1,5 @@
|
||||||
|
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>
|
|
@ -0,0 +1,119 @@
|
||||||
|
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
|
|
BIN
.metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache
Normal file
BIN
.metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache
Normal file
Binary file not shown.
BIN
.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
Normal file
BIN
.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
Normal file
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,2 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<typeInfoHistroy/>
|
|
@ -0,0 +1,2 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<qualifiedTypeNameHistroy/>
|
10
.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
Normal file
10
.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
Normal file
|
@ -0,0 +1,10 @@
|
||||||
|
<?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="<?xml version="1.0" encoding="UTF-8"?>
<packageExplorer 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>
</packageExplorer>" key="memento"/>
|
||||||
|
</section>
|
||||||
|
</section>
|
|
@ -0,0 +1,41 @@
|
||||||
|
<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>
|
11
.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
Normal file
11
.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
<?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>
|
|
@ -0,0 +1,3 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<section name="Workbench">
|
||||||
|
</section>
|
245
.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
Normal file
245
.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
Normal file
|
@ -0,0 +1,245 @@
|
||||||
|
<?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>
|
|
@ -0,0 +1,4 @@
|
||||||
|
<?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.
After Width: | Height: | Size: 4 KiB |
BIN
.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_gwt.png
Normal file
BIN
.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_gwt.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.8 KiB |
Binary file not shown.
After Width: | Height: | Size: 3.6 KiB |
BIN
.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_swt.png
Normal file
BIN
.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_swt.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.8 KiB |
BIN
.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_xwt.png
Normal file
BIN
.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_xwt.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.9 KiB |
145
.metadata/.plugins/org.eclipse.wb.discovery.core/toolkits.xml
Normal file
145
.metadata/.plugins/org.eclipse.wb.discovery.core/toolkits.xml
Normal file
|
@ -0,0 +1,145 @@
|
||||||
|
<?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>
|
1
.metadata/version.ini
Normal file
1
.metadata/version.ini
Normal file
|
@ -0,0 +1 @@
|
||||||
|
org.eclipse.core.runtime=1
|
|
@ -5,8 +5,7 @@ import net.minecraft.src.Block;
|
||||||
import net.minecraft.src.Item;
|
import net.minecraft.src.Item;
|
||||||
import net.minecraft.src.ItemStack;
|
import net.minecraft.src.ItemStack;
|
||||||
import net.minecraftforge.common.Configuration;
|
import net.minecraftforge.common.Configuration;
|
||||||
import universalelectricity.BasicComponents;
|
import universalelectricity.prefab.network.PacketManager;
|
||||||
import universalelectricity.network.PacketManager;
|
|
||||||
import basicpipes.LTanks.ItemTank;
|
import basicpipes.LTanks.ItemTank;
|
||||||
import basicpipes.LTanks.TileEntityLTank;
|
import basicpipes.LTanks.TileEntityLTank;
|
||||||
import basicpipes.conductors.BlockPipe;
|
import basicpipes.conductors.BlockPipe;
|
||||||
|
@ -66,14 +65,14 @@ public class BasicPipesMain{
|
||||||
public static int configurationProperties()
|
public static int configurationProperties()
|
||||||
{
|
{
|
||||||
config.load();
|
config.load();
|
||||||
pipeID = Integer.parseInt(config.getOrCreateIntProperty("PipeBlock", Configuration.CATEGORY_BLOCK, 155).value);
|
pipeID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"PipeBlock", 155).value);
|
||||||
machineID = Integer.parseInt(config.getOrCreateIntProperty("machineBlock", Configuration.CATEGORY_BLOCK, 156).value);
|
machineID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"machineBlock", 156).value);
|
||||||
valveID = Integer.parseInt(config.getOrCreateIntProperty("ValveBlock", Configuration.CATEGORY_BLOCK, 157).value);
|
valveID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"ValveBlock", 157).value);
|
||||||
rodID = Integer.parseInt(config.getOrCreateIntProperty("gearBlock", Configuration.CATEGORY_BLOCK, 158).value);
|
rodID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"gearBlock", 158).value);
|
||||||
partID = Integer.parseInt(config.getOrCreateIntProperty("parts", Configuration.CATEGORY_ITEM, 23022).value);
|
partID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,"parts", 23022).value);
|
||||||
ppipeID = Integer.parseInt(config.getOrCreateIntProperty("pipes", Configuration.CATEGORY_ITEM, 23023).value);
|
ppipeID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,"pipes", 23023).value);
|
||||||
toolID = Integer.parseInt(config.getOrCreateIntProperty("ToolID", Configuration.CATEGORY_ITEM, 23024).value);
|
toolID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,"ToolID", 23024).value);
|
||||||
tankID = Integer.parseInt(config.getOrCreateIntProperty("tankID", Configuration.CATEGORY_ITEM, 23025).value);
|
tankID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,"tankID", 23025).value);
|
||||||
config.save();
|
config.save();
|
||||||
return pipeID;
|
return pipeID;
|
||||||
}
|
}
|
||||||
|
@ -152,32 +151,14 @@ public class BasicPipesMain{
|
||||||
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)});
|
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
|
//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(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)});
|
||||||
try{
|
GameRegistry.addRecipe(new ItemStack(machine, 1,0), new Object[] { "@T@","BPB","@P@"
|
||||||
GameRegistry.addRecipe(new ItemStack(parts, 2,0), new Object[] { "@@@", '@',BasicComponents.itemBronzeIngot});//bronze tube
|
, '@',new ItemStack(Item.ingotIron,2)
|
||||||
//steam
|
|
||||||
GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1,0), new Object[] { new ItemStack(parts, 1,0),new ItemStack(parts, 1,4)});
|
|
||||||
GameRegistry.addRecipe(new ItemStack(parts, 1,6), new Object[] { " @ ","@ @"," @ ", '@',BasicComponents.itemBronzeIngot});//tank
|
|
||||||
|
|
||||||
//pump
|
|
||||||
GameRegistry.addRecipe(new ItemStack(machine, 1,0), new Object[] { "@T@","BPB","@M@"
|
|
||||||
, '@',BasicComponents.itemSteelPlate
|
|
||||||
, 'M',BasicComponents.itemMotor
|
|
||||||
, 'B',new ItemStack(parts, 1,7)
|
, 'B',new ItemStack(parts, 1,7)
|
||||||
, 'P',new ItemStack(Block.pistonBase)
|
, 'P',new ItemStack(Block.pistonBase)
|
||||||
, 'C',BasicComponents.blockCopperWire
|
|
||||||
, 'T',new ItemStack(parts, 1,6)
|
, 'T',new ItemStack(parts, 1,6)
|
||||||
});
|
});
|
||||||
this.ueLoaded = true;
|
|
||||||
}
|
|
||||||
catch(Exception e)
|
|
||||||
{
|
|
||||||
System.out.print("UE based recipes not loaded");
|
|
||||||
//secondary boiler tank
|
|
||||||
|
|
||||||
//steam
|
|
||||||
GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1,0), new Object[] { new ItemStack(parts, 1,1),new ItemStack(parts, 1,4)});
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,26 +1,22 @@
|
||||||
package basicpipes.LTanks;
|
package basicpipes.LTanks;
|
||||||
|
|
||||||
import com.google.common.io.ByteArrayDataInput;
|
|
||||||
|
|
||||||
import universalelectricity.network.IPacketReceiver;
|
|
||||||
import universalelectricity.network.PacketManager;
|
|
||||||
import universalelectricity.prefab.Vector3;
|
|
||||||
import basicpipes.BasicPipesMain;
|
|
||||||
import basicpipes.conductors.TileEntityPipe;
|
|
||||||
import basicpipes.pipes.api.ILiquidConsumer;
|
|
||||||
import basicpipes.pipes.api.ILiquidProducer;
|
|
||||||
import basicpipes.pipes.api.IStorageTank;
|
|
||||||
import basicpipes.pipes.api.Liquid;
|
|
||||||
import basicpipes.pipes.api.MHelper;
|
|
||||||
import net.minecraft.src.EntityPlayer;
|
import net.minecraft.src.EntityPlayer;
|
||||||
import net.minecraft.src.ItemStack;
|
import net.minecraft.src.INetworkManager;
|
||||||
import net.minecraft.src.NBTTagCompound;
|
import net.minecraft.src.NBTTagCompound;
|
||||||
import net.minecraft.src.NBTTagList;
|
|
||||||
import net.minecraft.src.NetworkManager;
|
|
||||||
import net.minecraft.src.Packet;
|
import net.minecraft.src.Packet;
|
||||||
import net.minecraft.src.Packet250CustomPayload;
|
import net.minecraft.src.Packet250CustomPayload;
|
||||||
import net.minecraft.src.TileEntity;
|
import net.minecraft.src.TileEntity;
|
||||||
import net.minecraftforge.common.ForgeDirection;
|
import net.minecraftforge.common.ForgeDirection;
|
||||||
|
import universalelectricity.core.Vector3;
|
||||||
|
import universalelectricity.prefab.network.IPacketReceiver;
|
||||||
|
import universalelectricity.prefab.network.PacketManager;
|
||||||
|
import basicpipes.BasicPipesMain;
|
||||||
|
import basicpipes.pipes.api.ILiquidProducer;
|
||||||
|
import basicpipes.pipes.api.IStorageTank;
|
||||||
|
import basicpipes.pipes.api.Liquid;
|
||||||
|
import basicpipes.pipes.api.MHelper;
|
||||||
|
|
||||||
|
import com.google.common.io.ByteArrayDataInput;
|
||||||
|
|
||||||
public class TileEntityLTank extends TileEntity implements IStorageTank,ILiquidProducer,IPacketReceiver{
|
public class TileEntityLTank extends TileEntity implements IStorageTank,ILiquidProducer,IPacketReceiver{
|
||||||
public TileEntity[] cc = {null,null,null,null,null,null};
|
public TileEntity[] cc = {null,null,null,null,null,null};
|
||||||
|
@ -193,7 +189,7 @@ public int presureOutput(Liquid type, ForgeDirection side) {
|
||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void handlePacketData(NetworkManager network, int packetType,
|
public void handlePacketData(INetworkManager network, int packetType,
|
||||||
Packet250CustomPayload packet, EntityPlayer player,
|
Packet250CustomPayload packet, EntityPlayer player,
|
||||||
ByteArrayDataInput data) {
|
ByteArrayDataInput data) {
|
||||||
try
|
try
|
||||||
|
|
|
@ -19,7 +19,7 @@ public class BlockRod extends universalelectricity.prefab.BlockMachine {
|
||||||
this.setCreativeTab(CreativeTabs.tabRedstone);
|
this.setCreativeTab(CreativeTabs.tabRedstone);
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected int damageDropped(int metadata)
|
public int damageDropped(int metadata)
|
||||||
{
|
{
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
package basicpipes.conductors;
|
package basicpipes.conductors;
|
||||||
import net.minecraft.src.EntityPlayer;
|
import net.minecraft.src.EntityPlayer;
|
||||||
|
import net.minecraft.src.INetworkManager;
|
||||||
import net.minecraft.src.NBTTagCompound;
|
import net.minecraft.src.NBTTagCompound;
|
||||||
import net.minecraft.src.NetworkManager;
|
|
||||||
import net.minecraft.src.Packet;
|
import net.minecraft.src.Packet;
|
||||||
import net.minecraft.src.Packet250CustomPayload;
|
import net.minecraft.src.Packet250CustomPayload;
|
||||||
import net.minecraft.src.TileEntity;
|
import net.minecraft.src.TileEntity;
|
||||||
import net.minecraftforge.common.ForgeDirection;
|
import net.minecraftforge.common.ForgeDirection;
|
||||||
import universalelectricity.network.IPacketReceiver;
|
import universalelectricity.core.Vector3;
|
||||||
import universalelectricity.network.PacketManager;
|
import universalelectricity.prefab.network.IPacketReceiver;
|
||||||
import universalelectricity.prefab.Vector3;
|
import universalelectricity.prefab.network.PacketManager;
|
||||||
import basicpipes.pipes.api.ILiquidConsumer;
|
import basicpipes.pipes.api.ILiquidConsumer;
|
||||||
import basicpipes.pipes.api.ILiquidProducer;
|
import basicpipes.pipes.api.ILiquidProducer;
|
||||||
import basicpipes.pipes.api.Liquid;
|
import basicpipes.pipes.api.Liquid;
|
||||||
|
@ -166,7 +166,7 @@ public class TileEntityPipe extends TileEntity implements ILiquidConsumer,IPacke
|
||||||
//data
|
//data
|
||||||
//--------------------
|
//--------------------
|
||||||
@Override
|
@Override
|
||||||
public void handlePacketData(NetworkManager network, int packetType,
|
public void handlePacketData(INetworkManager network, int packetType,
|
||||||
Packet250CustomPayload packet, EntityPlayer player,
|
Packet250CustomPayload packet, EntityPlayer player,
|
||||||
ByteArrayDataInput data) {
|
ByteArrayDataInput data) {
|
||||||
try
|
try
|
||||||
|
|
|
@ -1,15 +1,15 @@
|
||||||
package basicpipes.conductors;
|
package basicpipes.conductors;
|
||||||
|
|
||||||
import net.minecraft.src.EntityPlayer;
|
import net.minecraft.src.EntityPlayer;
|
||||||
import net.minecraft.src.NetworkManager;
|
import net.minecraft.src.INetworkManager;
|
||||||
import net.minecraft.src.Packet;
|
import net.minecraft.src.Packet;
|
||||||
import net.minecraft.src.Packet250CustomPayload;
|
import net.minecraft.src.Packet250CustomPayload;
|
||||||
import net.minecraft.src.TileEntity;
|
import net.minecraft.src.TileEntity;
|
||||||
import net.minecraftforge.common.ForgeDirection;
|
import net.minecraftforge.common.ForgeDirection;
|
||||||
import steampower.SteamPowerMain;
|
import steampower.SteamPowerMain;
|
||||||
import universalelectricity.network.IPacketReceiver;
|
import universalelectricity.core.Vector3;
|
||||||
import universalelectricity.network.PacketManager;
|
import universalelectricity.prefab.network.IPacketReceiver;
|
||||||
import universalelectricity.prefab.Vector3;
|
import universalelectricity.prefab.network.PacketManager;
|
||||||
import basicpipes.pipes.api.IMechanical;
|
import basicpipes.pipes.api.IMechanical;
|
||||||
|
|
||||||
import com.google.common.io.ByteArrayDataInput;
|
import com.google.common.io.ByteArrayDataInput;
|
||||||
|
@ -112,7 +112,7 @@ public class TileEntityRod extends TileEntity implements IPacketReceiver,IMechan
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void handlePacketData(NetworkManager network, int packetType,
|
public void handlePacketData(INetworkManager network, int packetType,
|
||||||
Packet250CustomPayload packet, EntityPlayer player,
|
Packet250CustomPayload packet, EntityPlayer player,
|
||||||
ByteArrayDataInput data) {
|
ByteArrayDataInput data) {
|
||||||
try
|
try
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
package basicpipes.machines;
|
package basicpipes.machines;
|
||||||
|
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
import net.minecraft.src.BlockContainer;
|
import net.minecraft.src.BlockContainer;
|
||||||
import net.minecraft.src.CreativeTabs;
|
import net.minecraft.src.CreativeTabs;
|
||||||
import net.minecraft.src.Material;
|
import net.minecraft.src.Material;
|
||||||
|
@ -41,7 +39,7 @@ public class BlockMachine extends BlockContainer
|
||||||
{
|
{
|
||||||
return ItemRenderHelper.renderID;
|
return ItemRenderHelper.renderID;
|
||||||
}
|
}
|
||||||
protected int damageDropped(int meta)
|
public int damageDropped(int meta)
|
||||||
{
|
{
|
||||||
if(meta < 4)
|
if(meta < 4)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
package basicpipes.machines;
|
package basicpipes.machines;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import net.minecraft.src.*;
|
|
||||||
|
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
|
|
||||||
import universalelectricity.UniversalElectricity;
|
import net.minecraft.src.CreativeTabs;
|
||||||
|
import net.minecraft.src.EntityPlayer;
|
||||||
|
import net.minecraft.src.Material;
|
||||||
|
import net.minecraft.src.TileEntity;
|
||||||
|
import net.minecraft.src.World;
|
||||||
import basicpipes.BasicPipesMain;
|
import basicpipes.BasicPipesMain;
|
||||||
|
|
||||||
public class BlockValve extends universalelectricity.prefab.BlockMachine
|
public class BlockValve extends universalelectricity.prefab.BlockMachine
|
||||||
|
@ -148,7 +148,7 @@ public class BlockValve extends universalelectricity.prefab.BlockMachine
|
||||||
{
|
{
|
||||||
return this.blockID;
|
return this.blockID;
|
||||||
}
|
}
|
||||||
protected int damageDropped(int meta)
|
public int damageDropped(int meta)
|
||||||
{
|
{
|
||||||
if(meta < 8)
|
if(meta < 8)
|
||||||
{
|
{
|
||||||
|
|
17
src/common/mcpmod.info
Normal file
17
src/common/mcpmod.info
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"modid": "mcp",
|
||||||
|
"name": "Minecraft Coder Pack",
|
||||||
|
"description": "Modding toolkit to decompile and deobfuscate the Minecraft client and server files.",
|
||||||
|
"version": "7.19",
|
||||||
|
"mcversion": "1.4.2",
|
||||||
|
"logoFile": "/mcp.png",
|
||||||
|
"url": "http://mcp.ocean-labs.de/",
|
||||||
|
"updateUrl": "",
|
||||||
|
"authors": ["Searge", "ProfMobius", "IngisKahn", "Fesh0r", "ZeuX", "R4wk", "Others"],
|
||||||
|
"credits": "Made by the MCP team",
|
||||||
|
"parent": "",
|
||||||
|
"screenshots": [],
|
||||||
|
"dependencies": []
|
||||||
|
}
|
||||||
|
]
|
|
@ -30,7 +30,7 @@ public class BlockMachine extends universalelectricity.prefab.BlockMachine
|
||||||
this.setResistance(3f);
|
this.setResistance(3f);
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
protected int damageDropped(int metadata)
|
public int damageDropped(int metadata)
|
||||||
{
|
{
|
||||||
return metadata;
|
return metadata;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,15 +2,16 @@ package steampower;
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
import net.minecraft.src.Block;
|
import net.minecraft.src.Block;
|
||||||
|
import net.minecraft.src.CraftingManager;
|
||||||
import net.minecraft.src.Item;
|
import net.minecraft.src.Item;
|
||||||
import net.minecraft.src.ItemStack;
|
import net.minecraft.src.ItemStack;
|
||||||
import net.minecraftforge.common.Configuration;
|
import net.minecraftforge.common.Configuration;
|
||||||
|
import net.minecraftforge.oredict.ShapedOreRecipe;
|
||||||
import steampower.turbine.BlockGenerator;
|
import steampower.turbine.BlockGenerator;
|
||||||
import steampower.turbine.BlockSteamPiston;
|
import steampower.turbine.BlockSteamPiston;
|
||||||
import steampower.turbine.ItemEngine;
|
import steampower.turbine.ItemEngine;
|
||||||
import steampower.turbine.TileEntitytopGen;
|
import steampower.turbine.TileEntitytopGen;
|
||||||
import universalelectricity.BasicComponents;
|
import universalelectricity.prefab.network.PacketManager;
|
||||||
import universalelectricity.network.PacketManager;
|
|
||||||
import basicpipes.BasicPipesMain;
|
import basicpipes.BasicPipesMain;
|
||||||
import cpw.mods.fml.common.Mod;
|
import cpw.mods.fml.common.Mod;
|
||||||
import cpw.mods.fml.common.Mod.Init;
|
import cpw.mods.fml.common.Mod.Init;
|
||||||
|
@ -52,14 +53,14 @@ public class SteamPowerMain{
|
||||||
public static int configurationProperties()
|
public static int configurationProperties()
|
||||||
{
|
{
|
||||||
config.load();
|
config.load();
|
||||||
BlockID = Integer.parseInt(config.getOrCreateIntProperty("MachinesID", Configuration.CATEGORY_BLOCK, 3030).value);
|
BlockID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"MachinesID", 3030).value);
|
||||||
EngineItemID = Integer.parseInt(config.getOrCreateIntProperty("EngineItem", Configuration.CATEGORY_ITEM, 30308).value);
|
EngineItemID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,"EngineItem", 30308).value);
|
||||||
EngineID = Integer.parseInt(config.getOrCreateIntProperty("SteamEngineID", Configuration.CATEGORY_BLOCK, 3031).value);
|
EngineID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"SteamEngineID", 3031).value);
|
||||||
genID = Integer.parseInt(config.getOrCreateIntProperty("ElecGenID", Configuration.CATEGORY_BLOCK, 3032).value);
|
genID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"ElecGenID", 3032).value);
|
||||||
genOutput = Integer.parseInt(config.getOrCreateIntProperty("genOutputWattsmax", Configuration.CATEGORY_GENERAL, 1000).value);
|
genOutput = Integer.parseInt(config.get(Configuration.CATEGORY_GENERAL,"genOutputWattsmax", 1000).value);
|
||||||
steamOutBoiler = Integer.parseInt(config.getOrCreateIntProperty("steamOutPerCycle", Configuration.CATEGORY_GENERAL, 10).value);
|
steamOutBoiler = Integer.parseInt(config.get(Configuration.CATEGORY_GENERAL,"steamOutPerCycle", 10).value);
|
||||||
boilerHeat = Integer.parseInt(config.getOrCreateIntProperty("boilerInKJNeed", Configuration.CATEGORY_GENERAL, 4500).value);
|
boilerHeat = Integer.parseInt(config.get(Configuration.CATEGORY_GENERAL,"boilerInKJNeed", 4500).value);
|
||||||
fireOutput = Integer.parseInt(config.getOrCreateIntProperty("fireBoxOutKJMax", Configuration.CATEGORY_GENERAL,250).value);
|
fireOutput = Integer.parseInt(config.get(Configuration.CATEGORY_GENERAL,"fireBoxOutKJMax", 250).value);
|
||||||
config.save();
|
config.save();
|
||||||
return BlockID;
|
return BlockID;
|
||||||
}
|
}
|
||||||
|
@ -93,28 +94,32 @@ public class SteamPowerMain{
|
||||||
proxy.postInit();
|
proxy.postInit();
|
||||||
//Crafting
|
//Crafting
|
||||||
try{
|
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
|
TileEntityBoiler();<- metadata 1
|
||||||
TileEntityFireBox();<-metadata 2-5
|
TileEntityFireBox();<-metadata 2-5
|
||||||
*/
|
*/
|
||||||
GameRegistry.addRecipe(new ItemStack(gen, 1), new Object [] {"@T@", "OVO", "@T@",
|
CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(
|
||||||
'T',new ItemStack(BasicPipesMain.rod, 1),
|
new ItemStack(machine, 1, 1), new Object [] {"TT", "VV", "TT",
|
||||||
'@',new ItemStack(BasicComponents.itemSteelPlate),
|
|
||||||
'O',new ItemStack(BasicComponents.itemCircuit,1,0),
|
|
||||||
'V',new ItemStack(BasicComponents.itemMotor)});
|
|
||||||
GameRegistry.addRecipe(new ItemStack(machine, 1, 1), new Object [] {"TT", "VV", "TT",
|
|
||||||
'T',new ItemStack(BasicPipesMain.parts, 1,6),
|
'T',new ItemStack(BasicPipesMain.parts, 1,6),
|
||||||
'V',new ItemStack(BasicPipesMain.parts, 1,7)});
|
'V',new ItemStack(BasicPipesMain.parts, 1,7)}));
|
||||||
GameRegistry.addRecipe(new ItemStack(machine, 1, 2), new Object [] { "@", "F",
|
CraftingManager.getInstance().getRecipeList().add(
|
||||||
|
new ShapedOreRecipe(new ItemStack(machine, 1, 2), new Object [] { "@", "F",
|
||||||
'F',Block.stoneOvenIdle,
|
'F',Block.stoneOvenIdle,
|
||||||
'@',new ItemStack(BasicComponents.itemSteelPlate)});
|
'@',"plateSteel"}));
|
||||||
GameRegistry.addRecipe(new ItemStack(itemEngine, 1,0), new Object [] {"GGG", "VPV", "@T@",
|
CraftingManager.getInstance().getRecipeList().add(
|
||||||
|
new ShapedOreRecipe(new ItemStack(itemEngine, 1,0), new Object [] {"GGG", "VPV", "@T@",
|
||||||
'T',new ItemStack(BasicPipesMain.parts, 1,1),
|
'T',new ItemStack(BasicPipesMain.parts, 1,1),
|
||||||
'G',BasicPipesMain.rod,
|
'G',BasicPipesMain.rod,
|
||||||
'@',new ItemStack(BasicComponents.itemSteelPlate),
|
'@',"plateSteel",
|
||||||
'P',Block.pistonBase,
|
'P',Block.pistonBase,
|
||||||
'V',new ItemStack(BasicPipesMain.parts, 1,7),
|
'V',new ItemStack(BasicPipesMain.parts, 1,7),
|
||||||
'M',new ItemStack(BasicComponents.itemMotor)});}
|
'M',"motor"}));
|
||||||
|
}
|
||||||
catch(Exception e)
|
catch(Exception e)
|
||||||
{
|
{
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
|
|
|
@ -9,9 +9,8 @@ import net.minecraft.src.Packet;
|
||||||
import net.minecraft.src.TileEntity;
|
import net.minecraft.src.TileEntity;
|
||||||
import net.minecraftforge.common.ForgeDirection;
|
import net.minecraftforge.common.ForgeDirection;
|
||||||
import net.minecraftforge.common.ISidedInventory;
|
import net.minecraftforge.common.ISidedInventory;
|
||||||
import universalelectricity.network.PacketManager;
|
import universalelectricity.core.Vector3;
|
||||||
import universalelectricity.prefab.TileEntityElectricityReceiver;
|
import universalelectricity.prefab.network.PacketManager;
|
||||||
import universalelectricity.prefab.Vector3;
|
|
||||||
public class TileEntityMachine extends TileEntity implements IInventory, ISidedInventory
|
public class TileEntityMachine extends TileEntity implements IInventory, ISidedInventory
|
||||||
{
|
{
|
||||||
public int facing = 0;
|
public int facing = 0;
|
||||||
|
|
|
@ -1,22 +1,14 @@
|
||||||
package steampower.boiler;
|
package steampower.boiler;
|
||||||
import java.util.Random;
|
|
||||||
|
|
||||||
import net.minecraft.src.Block;
|
import net.minecraft.src.Block;
|
||||||
import net.minecraft.src.EntityPlayer;
|
import net.minecraft.src.EntityPlayer;
|
||||||
import net.minecraft.src.Item;
|
import net.minecraft.src.INetworkManager;
|
||||||
import net.minecraft.src.ItemStack;
|
|
||||||
import net.minecraft.src.NBTTagCompound;
|
import net.minecraft.src.NBTTagCompound;
|
||||||
import net.minecraft.src.NBTTagList;
|
|
||||||
import net.minecraft.src.NetworkManager;
|
|
||||||
import net.minecraft.src.Packet250CustomPayload;
|
import net.minecraft.src.Packet250CustomPayload;
|
||||||
import net.minecraft.src.TileEntity;
|
import net.minecraft.src.TileEntity;
|
||||||
import net.minecraftforge.common.ForgeDirection;
|
import net.minecraftforge.common.ForgeDirection;
|
||||||
import steampower.SteamPowerMain;
|
|
||||||
import steampower.TileEntityMachine;
|
import steampower.TileEntityMachine;
|
||||||
import universalelectricity.network.IPacketReceiver;
|
import universalelectricity.prefab.network.IPacketReceiver;
|
||||||
import basicpipes.conductors.TileEntityPipe;
|
|
||||||
import basicpipes.pipes.api.IHeatProducer;
|
import basicpipes.pipes.api.IHeatProducer;
|
||||||
import basicpipes.pipes.api.ILiquidConsumer;
|
|
||||||
import basicpipes.pipes.api.ILiquidProducer;
|
import basicpipes.pipes.api.ILiquidProducer;
|
||||||
import basicpipes.pipes.api.IStorageTank;
|
import basicpipes.pipes.api.IStorageTank;
|
||||||
import basicpipes.pipes.api.Liquid;
|
import basicpipes.pipes.api.Liquid;
|
||||||
|
@ -219,7 +211,7 @@ public class TileEntityBoiler extends TileEntityMachine implements IPacketReceiv
|
||||||
return new Object[]{this.water,this.steam,this.heat,this.hullHeat};
|
return new Object[]{this.water,this.steam,this.heat,this.hullHeat};
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void handlePacketData(NetworkManager network, int packetType,
|
public void handlePacketData(INetworkManager network, int packetType,
|
||||||
Packet250CustomPayload packet, EntityPlayer player,
|
Packet250CustomPayload packet, EntityPlayer player,
|
||||||
ByteArrayDataInput dataStream) {
|
ByteArrayDataInput dataStream) {
|
||||||
try{
|
try{
|
||||||
|
|
|
@ -2,10 +2,10 @@ package steampower.burner;
|
||||||
|
|
||||||
import net.minecraft.src.EntityPlayer;
|
import net.minecraft.src.EntityPlayer;
|
||||||
import net.minecraft.src.IInventory;
|
import net.minecraft.src.IInventory;
|
||||||
|
import net.minecraft.src.INetworkManager;
|
||||||
import net.minecraft.src.Item;
|
import net.minecraft.src.Item;
|
||||||
import net.minecraft.src.ItemStack;
|
import net.minecraft.src.ItemStack;
|
||||||
import net.minecraft.src.NBTTagCompound;
|
import net.minecraft.src.NBTTagCompound;
|
||||||
import net.minecraft.src.NetworkManager;
|
|
||||||
import net.minecraft.src.Packet250CustomPayload;
|
import net.minecraft.src.Packet250CustomPayload;
|
||||||
import net.minecraft.src.TileEntity;
|
import net.minecraft.src.TileEntity;
|
||||||
import net.minecraftforge.common.ForgeDirection;
|
import net.minecraftforge.common.ForgeDirection;
|
||||||
|
@ -13,7 +13,7 @@ import net.minecraftforge.common.ISidedInventory;
|
||||||
import steampower.SteamPowerMain;
|
import steampower.SteamPowerMain;
|
||||||
import steampower.TileEntityMachine;
|
import steampower.TileEntityMachine;
|
||||||
import steampower.boiler.TileEntityBoiler;
|
import steampower.boiler.TileEntityBoiler;
|
||||||
import universalelectricity.network.IPacketReceiver;
|
import universalelectricity.prefab.network.IPacketReceiver;
|
||||||
import basicpipes.pipes.api.IHeatProducer;
|
import basicpipes.pipes.api.IHeatProducer;
|
||||||
import basicpipes.pipes.api.MHelper;
|
import basicpipes.pipes.api.MHelper;
|
||||||
|
|
||||||
|
@ -195,7 +195,7 @@ public class TileEntityFireBox extends TileEntityMachine implements IPacketRecei
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void handlePacketData(NetworkManager network, int packetType,
|
public void handlePacketData(INetworkManager network, int packetType,
|
||||||
Packet250CustomPayload packet, EntityPlayer player,
|
Packet250CustomPayload packet, EntityPlayer player,
|
||||||
ByteArrayDataInput dataStream) {
|
ByteArrayDataInput dataStream) {
|
||||||
try
|
try
|
||||||
|
|
|
@ -30,42 +30,87 @@ public class ItemEngine extends Item
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
return SteamPowerMain.textureFile+"Items.png";
|
return SteamPowerMain.textureFile+"Items.png";
|
||||||
}
|
}
|
||||||
@Override
|
|
||||||
public boolean onItemUse(ItemStack itemStack, EntityPlayer ePlayer, World world, int x, int y, int z, int par7, float par8, float par9, float par10)
|
public boolean onItemUse(ItemStack itemStack, EntityPlayer ePlayer,
|
||||||
|
World world, int x, int y, int z, int par7, float par8, float par9, float par10)
|
||||||
{
|
{
|
||||||
if (world.isRemote)
|
int var11 = world.getBlockId(x, y, z);
|
||||||
|
int BlockID = SteamPowerMain.EngineID;
|
||||||
|
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
--y;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (par7 == 1)
|
||||||
|
{
|
||||||
|
++y;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (par7 == 2)
|
||||||
|
{
|
||||||
|
--z;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (par7 == 3)
|
||||||
|
{
|
||||||
|
++z;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (par7 == 4)
|
||||||
|
{
|
||||||
|
--x;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (par7 == 5)
|
||||||
|
{
|
||||||
|
++x;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (itemStack.stackSize == 0)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
else if (!ePlayer.func_82247_a(x, y, z, par7, itemStack))
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
else if (y == 255 && Block.blocksList[BlockID].blockMaterial.isSolid())
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
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 meta = world.getBlockMetadata(x, y, z);
|
||||||
|
//ePlayer.sendChatToPlayer("A:"+angle+" M:"+meta);
|
||||||
|
world.notifyBlocksOfNeighborChange(x, y, z, var12.blockID);
|
||||||
|
world.setBlockAndMetadataWithNotify(x, y+1, z, var12.blockID, 14);
|
||||||
|
world.notifyBlocksOfNeighborChange(x, y, z, var12.blockID);
|
||||||
|
world.editingBlocks = false;
|
||||||
|
--itemStack.stackSize;
|
||||||
|
|
||||||
Block var11 = SteamPowerMain.engine;
|
return true;
|
||||||
int angle = MathHelper.floor_double((ePlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3;
|
}
|
||||||
|
else
|
||||||
if (ePlayer.canPlayerEdit(x, y, z))
|
{
|
||||||
{
|
return false;
|
||||||
++y;
|
}
|
||||||
if (var11.canPlaceBlockAt(world, x, y, z))
|
|
||||||
{
|
|
||||||
world.editingBlocks = true;
|
|
||||||
|
|
||||||
switch (angle)
|
|
||||||
{
|
|
||||||
case 0: world.setBlockAndMetadata(x, y, z, var11.blockID, 0); break;
|
|
||||||
case 1: world.setBlockAndMetadata(x, y, z, var11.blockID, 1); break;
|
|
||||||
case 2: world.setBlockAndMetadata(x, y, z, var11.blockID, 2); break;
|
|
||||||
case 3: world.setBlockAndMetadata(x, y, z, var11.blockID, 3); break;
|
|
||||||
}
|
|
||||||
int meta = world.getBlockMetadata(x, y, z);
|
|
||||||
//ePlayer.sendChatToPlayer("A:"+angle+" M:"+meta);
|
|
||||||
world.notifyBlocksOfNeighborChange(x, y, z, var11.blockID);
|
|
||||||
world.setBlockAndMetadataWithNotify(x, y+1, z, var11.blockID, 14);
|
|
||||||
world.notifyBlocksOfNeighborChange(x, y, z, var11.blockID);
|
|
||||||
world.editingBlocks = false;
|
|
||||||
--itemStack.stackSize;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
package steampower.turbine;
|
package steampower.turbine;
|
||||||
|
|
||||||
import net.minecraft.src.EntityPlayer;
|
import net.minecraft.src.EntityPlayer;
|
||||||
import net.minecraft.src.NetworkManager;
|
import net.minecraft.src.INetworkManager;
|
||||||
import net.minecraft.src.Packet250CustomPayload;
|
import net.minecraft.src.Packet250CustomPayload;
|
||||||
import net.minecraft.src.TileEntity;
|
import net.minecraft.src.TileEntity;
|
||||||
import net.minecraftforge.common.ForgeDirection;
|
import net.minecraftforge.common.ForgeDirection;
|
||||||
|
@ -9,8 +9,7 @@ import steampower.TileEntityMachine;
|
||||||
import universalelectricity.electricity.ElectricityManager;
|
import universalelectricity.electricity.ElectricityManager;
|
||||||
import universalelectricity.implement.IConductor;
|
import universalelectricity.implement.IConductor;
|
||||||
import universalelectricity.implement.IElectricityProducer;
|
import universalelectricity.implement.IElectricityProducer;
|
||||||
import universalelectricity.network.IPacketReceiver;
|
import universalelectricity.prefab.network.IPacketReceiver;
|
||||||
|
|
||||||
import basicpipes.pipes.api.IMechanical;
|
import basicpipes.pipes.api.IMechanical;
|
||||||
|
|
||||||
import com.google.common.io.ByteArrayDataInput;
|
import com.google.common.io.ByteArrayDataInput;
|
||||||
|
@ -71,7 +70,7 @@ public class TileEntityGen extends TileEntityMachine implements IPacketReceiver,
|
||||||
|
|
||||||
if (tileEntity instanceof IConductor)
|
if (tileEntity instanceof IConductor)
|
||||||
{
|
{
|
||||||
if (ElectricityManager.instance.getElectricityRequired( ((IConductor)tileEntity).getConnectionID()) > 0)
|
if (ElectricityManager.instance.getElectricityRequired(((IConductor)tileEntity).getNetwork()) > 0)
|
||||||
{
|
{
|
||||||
this.wires[i] = (IConductor)tileEntity;
|
this.wires[i] = (IConductor)tileEntity;
|
||||||
wireCount++;
|
wireCount++;
|
||||||
|
@ -99,7 +98,7 @@ public class TileEntityGen extends TileEntityMachine implements IPacketReceiver,
|
||||||
super.updateEntity();
|
super.updateEntity();
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void handlePacketData(NetworkManager network, int packetType,
|
public void handlePacketData(INetworkManager network, int packetType,
|
||||||
Packet250CustomPayload packet, EntityPlayer player,
|
Packet250CustomPayload packet, EntityPlayer player,
|
||||||
ByteArrayDataInput data) {
|
ByteArrayDataInput data) {
|
||||||
// TODO Auto-generated method stub
|
// TODO Auto-generated method stub
|
||||||
|
|
|
@ -1,24 +1,17 @@
|
||||||
package steampower.turbine;
|
package steampower.turbine;
|
||||||
|
|
||||||
import net.minecraft.src.EntityPlayer;
|
import net.minecraft.src.EntityPlayer;
|
||||||
import net.minecraft.src.IInventory;
|
import net.minecraft.src.INetworkManager;
|
||||||
import net.minecraft.src.Item;
|
|
||||||
import net.minecraft.src.ItemStack;
|
|
||||||
import net.minecraft.src.NBTTagCompound;
|
import net.minecraft.src.NBTTagCompound;
|
||||||
import net.minecraft.src.NBTTagList;
|
|
||||||
import net.minecraft.src.NetworkManager;
|
|
||||||
import net.minecraft.src.Packet250CustomPayload;
|
import net.minecraft.src.Packet250CustomPayload;
|
||||||
import net.minecraft.src.TileEntity;
|
import net.minecraft.src.TileEntity;
|
||||||
import net.minecraftforge.common.ForgeDirection;
|
import net.minecraftforge.common.ForgeDirection;
|
||||||
import net.minecraftforge.common.ISidedInventory;
|
|
||||||
import steampower.TileEntityMachine;
|
import steampower.TileEntityMachine;
|
||||||
import universalelectricity.network.IPacketReceiver;
|
import universalelectricity.prefab.network.IPacketReceiver;
|
||||||
import basicpipes.conductors.TileEntityRod;
|
|
||||||
import basicpipes.pipes.api.ILiquidConsumer;
|
import basicpipes.pipes.api.ILiquidConsumer;
|
||||||
import basicpipes.pipes.api.ILiquidProducer;
|
import basicpipes.pipes.api.ILiquidProducer;
|
||||||
import basicpipes.pipes.api.IMechanical;
|
import basicpipes.pipes.api.IMechanical;
|
||||||
import basicpipes.pipes.api.Liquid;
|
import basicpipes.pipes.api.Liquid;
|
||||||
import basicpipes.conductors.*;
|
|
||||||
|
|
||||||
import com.google.common.io.ByteArrayDataInput;
|
import com.google.common.io.ByteArrayDataInput;
|
||||||
|
|
||||||
|
@ -276,7 +269,7 @@ public class TileEntitySteamPiston extends TileEntityMachine implements IPacketR
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@Override
|
@Override
|
||||||
public void handlePacketData(NetworkManager network, int packetType,
|
public void handlePacketData(INetworkManager network, int packetType,
|
||||||
Packet250CustomPayload packet, EntityPlayer player,
|
Packet250CustomPayload packet, EntityPlayer player,
|
||||||
ByteArrayDataInput dataStream) {
|
ByteArrayDataInput dataStream) {
|
||||||
try
|
try
|
||||||
|
|
|
@ -165,26 +165,8 @@ public class ModelLargePipe extends ModelBase
|
||||||
public void renderRight() { RightPipe.render(0.0625F);RightConnect.render(0.0625F); RightInter.render(0.0625F);}
|
public void renderRight() { RightPipe.render(0.0625F);RightConnect.render(0.0625F); RightInter.render(0.0625F);}
|
||||||
public void renderBack() { BackPipe.render(0.0625F); BackConnect.render(0.0625F);BackInter.render(0.0625F); }
|
public void renderBack() { BackPipe.render(0.0625F); BackConnect.render(0.0625F);BackInter.render(0.0625F); }
|
||||||
public void renderFront() { FrontPipe.render(0.0625F);FrontConnect.render(0.0625F);FrontInter.render(0.0625F);}
|
public void renderFront() { FrontPipe.render(0.0625F);FrontConnect.render(0.0625F);FrontInter.render(0.0625F);}
|
||||||
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
|
|
||||||
{
|
|
||||||
super.render(entity, f, f1, f2, f3, f4, f5);
|
|
||||||
setRotationAngles(f, f1, f2, f3, f4, f5);
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setRotation(ModelRenderer model, float x, float y, float z)
|
private void setRotation(ModelRenderer model, float x, float y, float z)
|
||||||
{
|
{
|
||||||
model.rotateAngleX = x;
|
model.rotateAngleX = x;
|
||||||
|
@ -192,9 +174,4 @@ public class ModelLargePipe extends ModelBase
|
||||||
model.rotateAngleZ = z;
|
model.rotateAngleZ = z;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5)
|
|
||||||
{
|
|
||||||
super.setRotationAngles(f, f1, f2, f3, f4, f5);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -65,7 +65,7 @@ public class ModelPipe extends ModelBase
|
||||||
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
|
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
|
||||||
{
|
{
|
||||||
super.render(entity, f, f1, f2, f3, f4, f5);
|
super.render(entity, f, f1, f2, f3, f4, f5);
|
||||||
setRotationAngles(f, f1, f2, f3, f4, f5);
|
super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
|
||||||
this.renderMiddle();
|
this.renderMiddle();
|
||||||
this.renderBottom();
|
this.renderBottom();
|
||||||
this.renderTop();
|
this.renderTop();
|
||||||
|
@ -90,9 +90,4 @@ public class ModelPipe extends ModelBase
|
||||||
model.rotateAngleZ = z;
|
model.rotateAngleZ = z;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5)
|
|
||||||
{
|
|
||||||
super.setRotationAngles(f, f1, f2, f3, f4, f5);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -106,7 +106,7 @@ public class ModelPump extends ModelBase
|
||||||
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
|
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
|
||||||
{
|
{
|
||||||
super.render(entity, f, f1, f2, f3, f4, f5);
|
super.render(entity, f, f1, f2, f3, f4, f5);
|
||||||
setRotationAngles(f, f1, f2, f3, f4, f5);
|
super.setRotationAngles(f, f1, f2, f3, f4, f5, entity);
|
||||||
}
|
}
|
||||||
public void renderMain(float f5)
|
public void renderMain(float f5)
|
||||||
{
|
{
|
||||||
|
@ -137,10 +137,4 @@ public class ModelPump extends ModelBase
|
||||||
model.rotateAngleY = y;
|
model.rotateAngleY = y;
|
||||||
model.rotateAngleZ = z;
|
model.rotateAngleZ = z;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5)
|
|
||||||
{
|
|
||||||
super.setRotationAngles(f, f1, f2, f3, f4, f5);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -419,9 +419,4 @@ public class ModelLiquidTank extends ModelBase
|
||||||
model.rotateAngleZ = z;
|
model.rotateAngleZ = z;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5)
|
|
||||||
{
|
|
||||||
super.setRotationAngles(f, f1, f2, f3, f4, f5);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -130,9 +130,4 @@ public class ModelLiquidTankCorner extends ModelBase
|
||||||
model.rotateAngleZ = z;
|
model.rotateAngleZ = z;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5)
|
|
||||||
{
|
|
||||||
super.setRotationAngles(f, f1, f2, f3, f4, f5);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
BIN
src/minecraft/mcp.png
Normal file
BIN
src/minecraft/mcp.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 6.8 KiB |
|
@ -41,7 +41,7 @@ public class ModelCenterTank extends ModelBase
|
||||||
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
|
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
|
||||||
{
|
{
|
||||||
super.render(entity, f, f1, f2, f3, f4, f5);
|
super.render(entity, f, f1, f2, f3, f4, f5);
|
||||||
setRotationAngles(f, f1, f2, f3, f4, f5);
|
setRotationAngles(f, f1, f2, f3, f4, f5, entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setRotation(ModelRenderer model, float x, float y, float z)
|
private void setRotation(ModelRenderer model, float x, float y, float z)
|
||||||
|
@ -50,10 +50,4 @@ public class ModelCenterTank extends ModelBase
|
||||||
model.rotateAngleY = y;
|
model.rotateAngleY = y;
|
||||||
model.rotateAngleZ = z;
|
model.rotateAngleZ = z;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5)
|
|
||||||
{
|
|
||||||
super.setRotationAngles(f, f1, f2, f3, f4, f5);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -82,7 +82,7 @@ public class ModelCornerTank extends ModelBase
|
||||||
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
|
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
|
||||||
{
|
{
|
||||||
super.render(entity, f, f1, f2, f3, f4, f5);
|
super.render(entity, f, f1, f2, f3, f4, f5);
|
||||||
setRotationAngles(f, f1, f2, f3, f4, f5);
|
setRotationAngles(f, f1, f2, f3, f4, f5, entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setRotation(ModelRenderer model, float x, float y, float z)
|
private void setRotation(ModelRenderer model, float x, float y, float z)
|
||||||
|
@ -92,9 +92,4 @@ public class ModelCornerTank extends ModelBase
|
||||||
model.rotateAngleZ = z;
|
model.rotateAngleZ = z;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5)
|
|
||||||
{
|
|
||||||
super.setRotationAngles(f, f1, f2, f3, f4, f5);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -78,7 +78,7 @@ public class ModelEngine extends ModelBase
|
||||||
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
|
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
|
||||||
{
|
{
|
||||||
super.render(entity, f, f1, f2, f3, f4, f5);
|
super.render(entity, f, f1, f2, f3, f4, f5);
|
||||||
setRotationAngles(f, f1, f2, f3, f4, f5);
|
setRotationAngles(f, f1, f2, f3, f4, f5, entity);
|
||||||
//renderBot(f5);
|
//renderBot(f5);
|
||||||
//renderTop(f5);
|
//renderTop(f5);
|
||||||
}
|
}
|
||||||
|
@ -106,10 +106,4 @@ public class ModelEngine extends ModelBase
|
||||||
model.rotateAngleY = y;
|
model.rotateAngleY = y;
|
||||||
model.rotateAngleZ = z;
|
model.rotateAngleZ = z;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5)
|
|
||||||
{
|
|
||||||
super.setRotationAngles(f, f1, f2, f3, f4, f5);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -57,7 +57,7 @@ public class ModelFurnace extends ModelBase
|
||||||
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
|
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
|
||||||
{
|
{
|
||||||
super.render(entity, f, f1, f2, f3, f4, f5);
|
super.render(entity, f, f1, f2, f3, f4, f5);
|
||||||
setRotationAngles(f, f1, f2, f3, f4, f5);
|
setRotationAngles(f, f1, f2, f3, f4, f5, entity);
|
||||||
genRender(f5);
|
genRender(f5);
|
||||||
}
|
}
|
||||||
public void genRender(float f5)
|
public void genRender(float f5)
|
||||||
|
@ -74,9 +74,4 @@ public class ModelFurnace extends ModelBase
|
||||||
model.rotateAngleZ = z;
|
model.rotateAngleZ = z;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5)
|
|
||||||
{
|
|
||||||
super.setRotationAngles(f, f1, f2, f3, f4, f5);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -99,7 +99,7 @@ public class ModelGenerator extends ModelBase
|
||||||
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
|
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
|
||||||
{
|
{
|
||||||
super.render(entity, f, f1, f2, f3, f4, f5);
|
super.render(entity, f, f1, f2, f3, f4, f5);
|
||||||
setRotationAngles(f, f1, f2, f3, f4, f5);
|
setRotationAngles(f, f1, f2, f3, f4, f5, entity);
|
||||||
|
|
||||||
}
|
}
|
||||||
public void RenderMain(float f5)
|
public void RenderMain(float f5)
|
||||||
|
@ -128,9 +128,4 @@ public class ModelGenerator extends ModelBase
|
||||||
model.rotateAngleZ = z;
|
model.rotateAngleZ = z;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5)
|
|
||||||
{
|
|
||||||
super.setRotationAngles(f, f1, f2, f3, f4, f5);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -120,7 +120,7 @@ public class ModelTank extends ModelBase
|
||||||
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
|
public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5)
|
||||||
{
|
{
|
||||||
super.render(entity, f, f1, f2, f3, f4, f5);
|
super.render(entity, f, f1, f2, f3, f4, f5);
|
||||||
setRotationAngles(f, f1, f2, f3, f4, f5);
|
setRotationAngles(f, f1, f2, f3, f4, f5, entity);
|
||||||
}
|
}
|
||||||
public void generalRender(float f5)
|
public void generalRender(float f5)
|
||||||
{
|
{
|
||||||
|
@ -145,10 +145,4 @@ public class ModelTank extends ModelBase
|
||||||
model.rotateAngleY = y;
|
model.rotateAngleY = y;
|
||||||
model.rotateAngleZ = z;
|
model.rotateAngleZ = z;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5)
|
|
||||||
{
|
|
||||||
super.setRotationAngles(f, f1, f2, f3, f4, f5);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -378,9 +378,4 @@ public class ModelGearPiston extends ModelBase
|
||||||
model.rotateAngleZ = z;
|
model.rotateAngleZ = z;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setRotationAngles(float f, float f1, float f2, float f3, float f4, float f5)
|
|
||||||
{
|
|
||||||
super.setRotationAngles(f, f1, f2, f3, f4, f5);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue