diff --git a/.metadata/.lock b/.metadata/.lock deleted file mode 100644 index e69de29bb..000000000 diff --git a/.metadata/.mylyn/.taskListIndex/segments.gen b/.metadata/.mylyn/.taskListIndex/segments.gen deleted file mode 100644 index 63a7ec9a3..000000000 Binary files a/.metadata/.mylyn/.taskListIndex/segments.gen and /dev/null differ diff --git a/.metadata/.mylyn/.taskListIndex/segments_1 b/.metadata/.mylyn/.taskListIndex/segments_1 deleted file mode 100644 index 5cefa8859..000000000 Binary files a/.metadata/.mylyn/.taskListIndex/segments_1 and /dev/null differ diff --git a/.metadata/.mylyn/repositories.xml.zip b/.metadata/.mylyn/repositories.xml.zip deleted file mode 100644 index d84442417..000000000 Binary files a/.metadata/.mylyn/repositories.xml.zip and /dev/null differ diff --git a/.metadata/.mylyn/tasks.xml.zip b/.metadata/.mylyn/tasks.xml.zip deleted file mode 100644 index 4c1b58e44..000000000 Binary files a/.metadata/.mylyn/tasks.xml.zip and /dev/null differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version deleted file mode 100644 index 25cb955ba..000000000 --- a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index deleted file mode 100644 index 98daeff69..000000000 Binary files a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index and /dev/null differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version b/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version deleted file mode 100644 index 6b2aaa764..000000000 --- a/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree b/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree deleted file mode 100644 index 6f3b1e789..000000000 Binary files a/.metadata/.plugins/org.eclipse.core.resources/.root/1.tree and /dev/null differ diff --git a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources b/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources deleted file mode 100644 index 03c85b57d..000000000 Binary files a/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources and /dev/null differ diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/jd.ide.eclipse.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/jd.ide.eclipse.prefs deleted file mode 100644 index 5f8e5901f..000000000 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/jd.ide.eclipse.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -jd.ide.eclipse.prefs.Setup=true diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index dffc6b513..000000000 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -version=1 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.recording.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.recording.prefs deleted file mode 100644 index 32cbabee0..000000000 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.recording.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.epp.usagedata.recording.last-upload=1351461895073 diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index c8fd235a4..000000000 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,13 +0,0 @@ -content_assist_proposals_background=255,255,255 -content_assist_proposals_foreground=0,0,0 -eclipse.preferences.version=1 -fontPropagated=true -org.eclipse.jdt.ui.editor.tab.width= -org.eclipse.jdt.ui.formatterprofiles.version=12 -org.eclipse.jdt.ui.javadoclocations.migrated=true -org.eclipse.jface.textfont=1|Consolas|10.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Consolas; -proposalOrderMigrated=true -spelling_locale_initialized=true -tabWidthPropagated=true -useAnnotationsPrefPage=true -useQuickDiffPrefPage=true diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs deleted file mode 100644 index 67b1d96c9..000000000 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.m2e.discovery.pref.projects= diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs deleted file mode 100644 index 43e97e405..000000000 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -mylyn.attention.migrated=true diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs deleted file mode 100644 index 8d462a6cf..000000000 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.mylyn.monitor.activity.tracking.enabled.checked=true diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.cvs.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.cvs.ui.prefs deleted file mode 100644 index f9e585ba6..000000000 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.cvs.ui.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -pref_first_startup=false diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs deleted file mode 100644 index 56cd496ff..000000000 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.team.ui.first_time=false diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs deleted file mode 100644 index 05c0b05a5..000000000 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs +++ /dev/null @@ -1,5 +0,0 @@ -PROBLEMS_FILTERS_MIGRATE=true -eclipse.preferences.version=1 -platformState=1341384697020 -quickStart=false -tipsAndTricks=true diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs deleted file mode 100644 index 08076f236..000000000 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -showIntro=false diff --git a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs deleted file mode 100644 index 4676c7fd6..000000000 --- a/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs +++ /dev/null @@ -1,5 +0,0 @@ -ENABLED_DECORATORS=org.eclipse.m2e.core.mavenVersionDecorator\:false,org.eclipse.egit.ui.internal.decorators.GitLightweightDecorator\:true,org.eclipse.jdt.ui.override.decorator\:true,org.eclipse.jdt.ui.interface.decorator\:false,org.eclipse.jdt.ui.buildpath.decorator\:true,org.eclipse.m2e.core.maven2decorator\:true,org.eclipse.mylyn.context.ui.decorator.interest\:true,org.eclipse.mylyn.tasks.ui.decorators.task\:true,org.eclipse.mylyn.team.ui.changeset.decorator\:true,org.eclipse.team.cvs.ui.decorator\:true,org.eclipse.ui.LinkedResourceDecorator\:true,org.eclipse.ui.VirtualResourceDecorator\:true,org.eclipse.ui.ContentTypeDecorator\:true,org.eclipse.ui.ResourceFilterDecorator\:false, -PLUGINS_NOT_ACTIVATED_ON_STARTUP=org.eclipse.m2e.discovery; -eclipse.preferences.version=1 -editors=\r\n\r\n\r\n\r\n\r\n\r\n\r\n -resourcetypes=\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n diff --git a/.metadata/.plugins/org.eclipse.epp.usagedata.recording/usagedata.csv b/.metadata/.plugins/org.eclipse.epp.usagedata.recording/usagedata.csv deleted file mode 100644 index e5b7a6bb9..000000000 --- a/.metadata/.plugins/org.eclipse.epp.usagedata.recording/usagedata.csv +++ /dev/null @@ -1,119 +0,0 @@ -what,kind,bundleId,bundleVersion,description,time -activated,perspective,org.eclipse.jdt.ui,,"org.eclipse.jdt.ui.JavaPerspective",1351461893792 -started,bundle,org.eclipse.osgi,3.7.2.v20120110-1415,"org.eclipse.osgi",1351461893793 -started,bundle,org.eclipse.core.contenttype,3.4.100.v20110423-0524,"org.eclipse.core.contenttype",1351461893794 -started,bundle,org.eclipse.core.databinding.observable,1.4.0.I20110222-0800,"org.eclipse.core.databinding.observable",1351461893795 -started,bundle,org.eclipse.core.expressions,3.4.300.v20110228,"org.eclipse.core.expressions",1351461893795 -started,bundle,org.eclipse.core.net,1.2.100.I20110511-0800,"org.eclipse.core.net",1351461893796 -started,bundle,org.eclipse.core.runtime,3.7.0.v20110110,"org.eclipse.core.runtime",1351461893797 -started,bundle,org.eclipse.core.runtime.compatibility,3.2.100.v20100505,"org.eclipse.core.runtime.compatibility",1351461893797 -started,bundle,org.eclipse.core.runtime.compatibility.auth,3.2.200.v20110110,"org.eclipse.core.runtime.compatibility.auth",1351461893798 -started,bundle,org.eclipse.epp.usagedata.gathering,1.3.1.R201106061540,"org.eclipse.epp.usagedata.gathering",1351461893798 -started,bundle,org.eclipse.epp.usagedata.recording,1.3.1.R201106061540,"org.eclipse.epp.usagedata.recording",1351461893799 -started,bundle,org.eclipse.equinox.app,1.3.100.v20110321,"org.eclipse.equinox.app",1351461893799 -started,bundle,org.eclipse.equinox.common,3.6.0.v20110523,"org.eclipse.equinox.common",1351461893800 -started,bundle,org.eclipse.equinox.event,1.2.100.v20110502,"org.eclipse.equinox.event",1351461893800 -started,bundle,org.eclipse.equinox.util,1.0.300.v20110502,"org.eclipse.equinox.util",1351461893801 -started,bundle,org.eclipse.help,3.5.100.v20110426,"org.eclipse.help",1351461893813 -started,bundle,org.eclipse.team.core,3.6.0.I20110525-0800,"org.eclipse.team.core",1351461893814 -started,bundle,org.eclipse.ui.intro,3.4.100.v20110425,"org.eclipse.ui.intro",1351461893815 -started,bundle,org.eclipse.ui.intro.universal,3.2.500.v20110510,"org.eclipse.ui.intro.universal",1351461893815 -started,bundle,org.eclipse.update.configurator,3.3.100.v20100512,"org.eclipse.update.configurator",1351461893816 -started,bundle,org.eclipse.update.core,3.2.500.v20110330,"org.eclipse.update.core",1351461893854 -started,bundle,org.eclipse.update.scheduler,3.2.300.v20100512,"org.eclipse.update.scheduler",1351461893855 -started,bundle,jd.ide.eclipse,0.1.3,"jd.ide.eclipse",1351461893856 -started,bundle,org.eclipse.equinox.simpleconfigurator,1.0.200.v20110815-1438,"org.eclipse.equinox.simpleconfigurator",1351461893857 -started,bundle,com.ibm.icu,4.4.2.v20110823,"com.ibm.icu",1351461893857 -started,bundle,org.eclipse.core.filebuffers,3.5.200.v20110928-1504,"org.eclipse.core.filebuffers",1351461893858 -started,bundle,org.eclipse.core.jobs,3.5.101.v20120113-1953,"org.eclipse.core.jobs",1351461893859 -started,bundle,org.eclipse.core.resources,3.7.101.v20120125-1505,"org.eclipse.core.resources",1351461893860 -started,bundle,org.eclipse.epp.mpc.ui,1.1.1.I20110907-0947,"org.eclipse.epp.mpc.ui",1351461893860 -started,bundle,org.eclipse.equinox.ds,1.3.1.R37x_v20110701,"org.eclipse.equinox.ds",1351461893861 -started,bundle,org.eclipse.equinox.p2.core,2.1.1.v20120113-1346,"org.eclipse.equinox.p2.core",1351461893862 -started,bundle,org.eclipse.equinox.p2.directorywatcher,1.0.300.v20110815-1419,"org.eclipse.equinox.p2.directorywatcher",1351461893862 -started,bundle,org.eclipse.equinox.p2.operations,2.1.1.R37x_v20111111,"org.eclipse.equinox.p2.operations",1351461893863 -started,bundle,org.eclipse.equinox.p2.reconciler.dropins,1.1.100.v20110815-1419,"org.eclipse.equinox.p2.reconciler.dropins",1351461893864 -started,bundle,org.eclipse.equinox.preferences,3.4.2.v20120111-2020,"org.eclipse.equinox.preferences",1351461893865 -started,bundle,org.eclipse.equinox.registry,3.5.101.R37x_v20110810-1611,"org.eclipse.equinox.registry",1351461893865 -started,bundle,org.eclipse.equinox.security,1.1.1.R37x_v20110822-1018,"org.eclipse.equinox.security",1351461893882 -started,bundle,org.eclipse.jdt.core,3.7.3.v20120119-1537,"org.eclipse.jdt.core",1351461893883 -started,bundle,org.eclipse.jdt.core.manipulation,1.4.0.v20110928-1453,"org.eclipse.jdt.core.manipulation",1351461893883 -started,bundle,org.eclipse.jdt.ui,3.7.2.v20120109-1427,"org.eclipse.jdt.ui",1351461893888 -started,bundle,org.eclipse.jface,3.7.0.v20110928-1505,"org.eclipse.jface",1351461893889 -started,bundle,org.eclipse.m2e.logback.configuration,1.0.200.20111228-1245,"org.eclipse.m2e.logback.configuration",1351461893889 -started,bundle,org.eclipse.mylyn.bugzilla.core,3.7.1.v20120425-0100,"org.eclipse.mylyn.bugzilla.core",1351461893901 -started,bundle,org.eclipse.mylyn.bugzilla.ui,3.7.1.v20120425-0100,"org.eclipse.mylyn.bugzilla.ui",1351461893902 -started,bundle,org.eclipse.mylyn.commons.core,3.7.1.v20120425-0100,"org.eclipse.mylyn.commons.core",1351461893902 -started,bundle,org.eclipse.mylyn.commons.net,3.7.1.v20120425-0100,"org.eclipse.mylyn.commons.net",1351461893902 -started,bundle,org.eclipse.mylyn.commons.notifications.core,0.9.1.v20120425-0100,"org.eclipse.mylyn.commons.notifications.core",1351461893902 -started,bundle,org.eclipse.mylyn.commons.notifications.feed,0.9.1.v20120425-0100,"org.eclipse.mylyn.commons.notifications.feed",1351461893903 -started,bundle,org.eclipse.mylyn.commons.notifications.ui,0.9.1.v20120425-0100,"org.eclipse.mylyn.commons.notifications.ui",1351461893903 -started,bundle,org.eclipse.mylyn.commons.ui,3.7.1.v20120425-0100,"org.eclipse.mylyn.commons.ui",1351461893904 -started,bundle,org.eclipse.mylyn.commons.workbench,3.7.1.v20120425-0100,"org.eclipse.mylyn.commons.workbench",1351461893904 -started,bundle,org.eclipse.mylyn.context.core,3.7.1.v20120425-0100,"org.eclipse.mylyn.context.core",1351461893904 -started,bundle,org.eclipse.mylyn.context.tasks.ui,3.7.1.v20120425-0100,"org.eclipse.mylyn.context.tasks.ui",1351461893905 -started,bundle,org.eclipse.mylyn.monitor.ui,3.7.1.v20120425-0100,"org.eclipse.mylyn.monitor.ui",1351461893905 -started,bundle,org.eclipse.mylyn.tasks.index.core,3.7.1.v20120425-0100,"org.eclipse.mylyn.tasks.index.core",1351461893906 -started,bundle,org.eclipse.mylyn.tasks.ui,3.7.1.v20120425-0100,"org.eclipse.mylyn.tasks.ui",1351461893907 -started,bundle,org.eclipse.search,3.7.0.v20110928-1504,"org.eclipse.search",1351461893927 -started,bundle,org.eclipse.ui,3.7.0.v20110928-1505,"org.eclipse.ui",1351461893943 -started,bundle,org.eclipse.ui.editors,3.7.0.v20110928-1504,"org.eclipse.ui.editors",1351461893944 -started,bundle,org.eclipse.ui.forms,3.5.101.v20111011-1919,"org.eclipse.ui.forms",1351461893944 -started,bundle,org.eclipse.ui.ide,3.7.0.v20110928-1505,"org.eclipse.ui.ide",1351461893945 -started,bundle,org.eclipse.ui.net,1.2.100.v20111208-1155,"org.eclipse.ui.net",1351461893946 -started,bundle,org.eclipse.ui.views,3.6.0.v20110928-1505,"org.eclipse.ui.views",1351461893946 -started,bundle,org.eclipse.ui.workbench,3.7.1.v20120104-1859,"org.eclipse.ui.workbench",1351461893947 -started,bundle,org.eclipse.ui.workbench.texteditor,3.7.0.v20110928-1504,"org.eclipse.ui.workbench.texteditor",1351461893965 -os,sysinfo,,,"win32",1351461893968 -arch,sysinfo,,,"x86",1351461893968 -ws,sysinfo,,,"win32",1351461893968 -locale,sysinfo,,,"en_US",1351461893968 -processors,sysinfo,,,"4",1351461893968 -java.runtime.name,sysinfo,,,"Java(TM) SE Runtime Environment",1351461893968 -java.runtime.version,sysinfo,,,"1.7.0_07-b10",1351461893969 -java.specification.name,sysinfo,,,"Java Platform API Specification",1351461893969 -java.specification.vendor,sysinfo,,,"Oracle Corporation",1351461893969 -java.specification.version,sysinfo,,,"1.7",1351461893969 -java.vendor,sysinfo,,,"Oracle Corporation",1351461893969 -java.version,sysinfo,,,"1.7.0_07",1351461893969 -java.vm.info,sysinfo,,,"mixed mode, sharing",1351461893969 -java.vm.name,sysinfo,,,"Java HotSpot(TM) Client VM",1351461893969 -java.vm.specification.name,sysinfo,,,"Java Virtual Machine Specification",1351461893969 -java.vm.specification.vendor,sysinfo,,,"Oracle Corporation",1351461893969 -java.vm.specification.version,sysinfo,,,"1.7",1351461893969 -java.vm.vendor,sysinfo,,,"Oracle Corporation",1351461893969 -java.vm.version,sysinfo,,,"23.3-b01",1351461893969 -started,bundle,org.eclipse.equinox.p2.repository,2.1.1.v20120113-1346,"org.eclipse.equinox.p2.repository",1351461893994 -started,bundle,org.eclipse.m2e.usagedata,1.0.200.20111228-1245,"org.eclipse.m2e.usagedata",1351461893996 -started,bundle,org.eclipse.equinox.p2.metadata.repository,1.2.0.v20110815-1419,"org.eclipse.equinox.p2.metadata.repository",1351461894009 -started,bundle,org.eclipse.equinox.p2.ui.sdk.scheduler,1.0.100.v20110815-1419,"org.eclipse.equinox.p2.ui.sdk.scheduler",1351461894041 -started,bundle,org.eclipse.equinox.p2.updatechecker,1.1.200.v20110815-1419,"org.eclipse.equinox.p2.updatechecker",1351461894059 -started,bundle,org.eclipse.m2e.discovery,1.0.200.20111228-1245,"org.eclipse.m2e.discovery",1351461894081 -started,bundle,org.eclipse.mylyn.team.ui,3.7.1.v20120425-0100,"org.eclipse.mylyn.team.ui",1351461894094 -started,bundle,org.eclipse.wb.discovery.core,1.3.0.r37x201202052340,"org.eclipse.wb.discovery.core",1351461894163 -started,bundle,org.eclipse.jsch.core,1.1.300.I20110514-0800,"org.eclipse.jsch.core",1351461894266 -started,bundle,org.eclipse.team.cvs.core,3.3.400.I20110510-0800,"org.eclipse.team.cvs.core",1351461894280 -started,bundle,org.eclipse.team.ui,3.6.101.R37x_v20111109-0800,"org.eclipse.team.ui",1351461894298 -started,bundle,org.eclipse.ui.console,3.5.100.v20111007_r372,"org.eclipse.ui.console",1351461894313 -started,bundle,org.eclipse.team.cvs.ui,3.3.401.v20120126-1227,"org.eclipse.team.cvs.ui",1351461894437 -activated,view,org.eclipse.jdt.ui,3.7.2.v20120109-1427,"org.eclipse.jdt.ui.PackageExplorer",1351461894607 -activated,view,org.eclipse.jdt.ui,3.7.2.v20120109-1427,"org.eclipse.jdt.ui.PackageExplorer",1351461894647 -closed,view,org.eclipse.ui,3.7.0.v20110928-1505,"org.eclipse.ui.internal.introview",1351461894690 -started,bundle,org.eclipse.wb.discovery.ui,1.3.0.r37x201202052340,"org.eclipse.wb.discovery.ui",1351461895209 -deactivated,workbench,org.eclipse.ui.workbench,3.7.1.v20120104-1859,"",1351461904591 -activated,workbench,org.eclipse.ui.workbench,3.7.1.v20120104-1859,"",1351461924702 -closed,workbench,org.eclipse.ui.workbench,3.7.1.v20120104-1859,"",1351461924783 -started,bundle,org.eclipse.core.filesystem,1.3.100.v20110423-0524,"org.eclipse.core.filesystem",1351461925042 -started,bundle,org.eclipse.compare.core,3.5.200.I20110208-0800,"org.eclipse.compare.core",1351461925263 -started,bundle,org.eclipse.compare,3.5.202.R37x_v20111109-0800,"org.eclipse.compare",1351461925294 -stopped,bundle,org.eclipse.ui.cheatsheets,3.4.100.v20110425,"org.eclipse.ui.cheatsheets",1351461925606 -stopped,bundle,org.eclipse.epp.usagedata.ui,1.3.1.R201106061540,"org.eclipse.epp.usagedata.ui",1351461925607 -stopped,bundle,org.eclipse.epp.mpc.ui,1.1.1.I20110907-0947,"org.eclipse.epp.mpc.ui",1351461925607 -stopped,bundle,org.eclipse.ui.intro.universal,3.2.500.v20110510,"org.eclipse.ui.intro.universal",1351461925607 -stopped,bundle,org.eclipse.ui.intro,3.4.100.v20110425,"org.eclipse.ui.intro",1351461925607 -stopped,bundle,jd.ide.eclipse,0.1.3,"jd.ide.eclipse",1351461925607 -stopped,bundle,org.eclipse.help.ui,3.5.101.r37_20110819,"org.eclipse.help.ui",1351461925610 -stopped,bundle,org.eclipse.help.webapp,3.6.1.r37_20110929,"org.eclipse.help.webapp",1351461925640 -stopped,bundle,org.eclipse.help.base,3.6.2.v201202080800,"org.eclipse.help.base",1351461925640 -stopped,bundle,org.eclipse.equinox.http.jetty,2.0.100.v20110502,"org.eclipse.equinox.http.jetty",1351461925662 -stopped,bundle,org.eclipse.m2e.discovery,1.0.200.20111228-1245,"org.eclipse.m2e.discovery",1351461925662 diff --git a/.metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache b/.metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache deleted file mode 100644 index 593f4708d..000000000 Binary files a/.metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache and /dev/null differ diff --git a/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache b/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache deleted file mode 100644 index 593f4708d..000000000 Binary files a/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache and /dev/null differ diff --git a/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat b/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat deleted file mode 100644 index 53dd38e2d..000000000 Binary files a/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat and /dev/null differ diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml b/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml deleted file mode 100644 index a4ee3cbc9..000000000 --- a/.metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml b/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml deleted file mode 100644 index 9e390f501..000000000 --- a/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml b/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml deleted file mode 100644 index 0b856dc64..000000000 --- a/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml +++ /dev/null @@ -1,10 +0,0 @@ - -
-
- - - - - -
-
diff --git a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log deleted file mode 100644 index e69de29bb..000000000 diff --git a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.0.200.20111228-1245.xml b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.0.200.20111228-1245.xml deleted file mode 100644 index e0de5155a..000000000 --- a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.0.200.20111228-1245.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - %date [%thread] %-5level %logger{35} - %msg%n - - - - - - ${org.eclipse.m2e.log.dir}/0.log - - ${org.eclipse.m2e.log.dir}/%i.log - 1 - 10 - - - 100MB - - - %date [%thread] %-5level %logger{35} - %msg%n - - - - - - WARN - - - - - - - - - - - - - - - diff --git a/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml b/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml deleted file mode 100644 index 9a98d7e8a..000000000 --- a/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml +++ /dev/null @@ -1,11 +0,0 @@ - -
-
- - -
-
- - -
-
diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml b/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml deleted file mode 100644 index 5ca0b7769..000000000 --- a/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - -
-
diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml b/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml deleted file mode 100644 index e08b313aa..000000000 --- a/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml +++ /dev/null @@ -1,245 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml b/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml deleted file mode 100644 index f213774b7..000000000 --- a/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_ercp.png b/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_ercp.png deleted file mode 100644 index 1d364a630..000000000 Binary files a/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_ercp.png and /dev/null differ diff --git a/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_gwt.png b/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_gwt.png deleted file mode 100644 index 8f33b6b47..000000000 Binary files a/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_gwt.png and /dev/null differ diff --git a/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_swing.png b/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_swing.png deleted file mode 100644 index 3272ee2fe..000000000 Binary files a/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_swing.png and /dev/null differ diff --git a/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_swt.png b/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_swt.png deleted file mode 100644 index 897496a55..000000000 Binary files a/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_swt.png and /dev/null differ diff --git a/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_xwt.png b/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_xwt.png deleted file mode 100644 index dc1a68ce9..000000000 Binary files a/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_xwt.png and /dev/null differ diff --git a/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkits.xml b/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkits.xml deleted file mode 100644 index 1727003c4..000000000 --- a/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkits.xml +++ /dev/null @@ -1,145 +0,0 @@ - - - - - - - - This WindowBuilder toolkit allows you to build user interfaces with the Standard Widget Toolkit (SWT) from Eclipse. - - - - - - - - - - - - - - This WindowBuilder toolkit allows you to build user interfaces with Java's Swing GUI framework. - - - - - - - - - - - - - - This WindowBuilder toolkit allows you to build user interfaces with Eclipse's embedded Rich Client Platform (eRCP) framework. eRCP targets embedded devices. - - - - - - - - - - - - - - This WindowBuilder toolkit allows you to build user interfaces with the XML Windowing Toolkit (XWT) UI framework. - - - - - - - - - - - - - - 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. - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.metadata/version.ini b/.metadata/version.ini deleted file mode 100644 index c51ff745b..000000000 --- a/.metadata/version.ini +++ /dev/null @@ -1 +0,0 @@ -org.eclipse.core.runtime=1 \ No newline at end of file diff --git a/src/common/basicpipes/BasicPipesMain.java b/src/common/basicpipes/BasicPipesMain.java index 520bf1c25..e1b903af3 100644 --- a/src/common/basicpipes/BasicPipesMain.java +++ b/src/common/basicpipes/BasicPipesMain.java @@ -1,4 +1,5 @@ package basicpipes; + import java.io.File; import net.minecraft.src.Block; @@ -30,16 +31,18 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; -@Mod(modid = "basicPipes", name = "Basic Pipes", version = "1.9",dependencies = "after:UniversalElectricity") -@NetworkMod(channels = { "Pipes" }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class) -public class BasicPipesMain{ - - public BasicPipesMain instance; - - @SidedProxy(clientSide = "basicpipes.PipeClientProxy", serverSide = "basicpipes.PipeProxy") +@Mod(modid = "basicPipes", name = "Basic Pipes", version = "1.9", dependencies = "after:UniversalElectricity") +@NetworkMod(channels = { "Pipes" }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class) +public class BasicPipesMain { + + public BasicPipesMain instance; + + @SidedProxy(clientSide = "basicpipes.PipeClientProxy", serverSide = "basicpipes.PipeProxy") public static PipeProxy proxy; - static Configuration config = new Configuration((new File(cpw.mods.fml.common.Loader.instance().getConfigDir(), "/UniversalElectricity/BasicPipes.cfg"))); + static Configuration config = new Configuration((new File( + cpw.mods.fml.common.Loader.instance().getConfigDir(), + "/UniversalElectricity/BasicPipes.cfg"))); public static int pipeID = configurationProperties(); private static int partID; private static int ppipeID; @@ -49,7 +52,8 @@ public class BasicPipesMain{ public static int valveID; public static int rodID; public static Block pipe = new BlockPipe(pipeID).setBlockName("pipe"); - public static Block machine = new BlockMachine(machineID).setBlockName("pump"); + public static Block machine = new BlockMachine(machineID) + .setBlockName("pump"); public static Block valve = new BlockValve(valveID).setBlockName("valve"); public static Block rod = new BlockRod(rodID); public static Item parts = new ItemParts(partID); @@ -60,105 +64,158 @@ public class BasicPipesMain{ public static String channel = "Pipes"; public static String textureFile = "/textures"; public static boolean ueLoaded = false; - - - public static int configurationProperties() - { - config.load(); - pipeID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"PipeBlock", 155).value); - machineID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"machineBlock", 156).value); - valveID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"ValveBlock", 157).value); - rodID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"gearBlock", 158).value); - partID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,"parts", 23022).value); - ppipeID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,"pipes", 23023).value); - toolID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,"ToolID", 23024).value); - tankID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,"tankID", 23025).value); - config.save(); - return pipeID; - } - @PreInit - public void preInit(FMLPreInitializationEvent event) - { - proxy.preInit(); - GameRegistry.registerBlock(pipe); - GameRegistry.registerBlock(rod); - GameRegistry.registerBlock(machine,basicpipes.machines.ItemMachine.class); + + public static int configurationProperties() { + config.load(); + pipeID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK, + "PipeBlock", 155).value); + machineID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK, + "machineBlock", 156).value); + valveID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK, + "ValveBlock", 157).value); + rodID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK, + "gearBlock", 158).value); + partID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM, + "parts", 23022).value); + ppipeID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM, + "pipes", 23023).value); + toolID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM, + "ToolID", 23024).value); + tankID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM, + "tankID", 23025).value); + config.save(); + return pipeID; } + + @PreInit + public void preInit(FMLPreInitializationEvent event) { + proxy.preInit(); + GameRegistry.registerBlock(pipe); + GameRegistry.registerBlock(rod); + GameRegistry.registerBlock(machine, + basicpipes.machines.ItemMachine.class); + } + @Init - public void load(FMLInitializationEvent evt) - { - //register + public void load(FMLInitializationEvent evt) { + // register proxy.init(); GameRegistry.registerTileEntity(TileEntityPipe.class, "pipe"); GameRegistry.registerTileEntity(TileEntityPump.class, "pump"); GameRegistry.registerTileEntity(TileEntityRod.class, "rod"); GameRegistry.registerTileEntity(TileEntityLTank.class, "ltank"); - //Names and lang stuff - //Pipe Names - for(int i =0; i < Liquid.values().length;i++) - { - LanguageRegistry.addName((new ItemStack(itemPipes, 1, i)), Liquid.getLiquid(i).lName+" Pipe"); - } - for(int i =0; i < Liquid.values().length;i++) - { - LanguageRegistry.addName((new ItemStack(itemTank, 1, i)), Liquid.getLiquid(i).lName+" Tank"); - } - //Pump - LanguageRegistry.addName((new ItemStack(machine, 1, 0)), "WaterPump"); - LanguageRegistry.addName((new ItemStack(machine, 1, 4)), "WaterCondensor"); - LanguageRegistry.addName((new ItemStack(rod, 1)), "MechRod"); - //Tools - LanguageRegistry.addName((new ItemStack(gauge, 1, 0)), "PipeGuage"); - //Parts - LanguageRegistry.addName((new ItemStack(parts, 1, 0)), "BronzeTube"); - LanguageRegistry.addName((new ItemStack(parts, 1, 1)), "IronTube"); - LanguageRegistry.addName((new ItemStack(parts, 1, 2)), "ObsidianTube"); - LanguageRegistry.addName((new ItemStack(parts, 1, 3)), "NetherTube"); - LanguageRegistry.addName((new ItemStack(parts, 1, 4)), "LeatherSeal"); - LanguageRegistry.addName((new ItemStack(parts, 1, 5)), "SlimeSeal"); - LanguageRegistry.addName((new ItemStack(parts, 1, 6)), "BronzeTank"); - LanguageRegistry.addName((new ItemStack(parts, 1, 7)), "Valve"); + // Names and lang stuff + // Pipe Names + for (int i = 0; i < Liquid.values().length; i++) { + LanguageRegistry.addName((new ItemStack(itemPipes, 1, i)), + Liquid.getLiquid(i).lName + " Pipe"); + } + for (int i = 0; i < Liquid.values().length; i++) { + LanguageRegistry.addName((new ItemStack(itemTank, 1, i)), + Liquid.getLiquid(i).lName + " Tank"); + } + // Pump + LanguageRegistry.addName((new ItemStack(machine, 1, 0)), "WaterPump"); + LanguageRegistry.addName((new ItemStack(machine, 1, 4)), + "WaterCondensor"); + LanguageRegistry.addName((new ItemStack(rod, 1)), "MechRod"); + // Tools + LanguageRegistry.addName((new ItemStack(gauge, 1, 0)), "PipeGuage"); + // Parts + LanguageRegistry.addName((new ItemStack(parts, 1, 0)), "BronzeTube"); + LanguageRegistry.addName((new ItemStack(parts, 1, 1)), "IronTube"); + LanguageRegistry.addName((new ItemStack(parts, 1, 2)), "ObsidianTube"); + LanguageRegistry.addName((new ItemStack(parts, 1, 3)), "NetherTube"); + LanguageRegistry.addName((new ItemStack(parts, 1, 4)), "LeatherSeal"); + LanguageRegistry.addName((new ItemStack(parts, 1, 5)), "SlimeSeal"); + LanguageRegistry.addName((new ItemStack(parts, 1, 6)), "BronzeTank"); + LanguageRegistry.addName((new ItemStack(parts, 1, 7)), "Valve"); } + @PostInit - public void postInit(FMLPostInitializationEvent event) - { + public void postInit(FMLPostInitializationEvent event) { proxy.postInit(); - GameRegistry.addRecipe(new ItemStack(parts, 2,1), new Object[] { "@@@", '@',Item.ingotIron});//iron tube - GameRegistry.addRecipe(new ItemStack(parts, 2,2), new Object[] { "@@@", '@',Block.obsidian});//obby Tube - GameRegistry.addRecipe(new ItemStack(parts, 2,3), new Object[] { "N@N", 'N',Block.netherrack,'@',new ItemStack(parts, 2,2)});//nether tube - GameRegistry.addRecipe(new ItemStack(parts, 2,4), new Object[] { "@@","@@", '@',Item.leather});//seal - GameRegistry.addShapelessRecipe(new ItemStack(parts, 1,5), new Object[] { new ItemStack(parts, 1,4),new ItemStack(Item.slimeBall, 1)});//stick seal - //crafting pipes - //{"black", "red", "green", "brown", "blue", "purple", "cyan", - //"silver", "gray", "pink", "lime", "yellow", "lightBlue", "magenta", "orange", "white"}; - GameRegistry.addRecipe(new ItemStack(rod, 1), new Object[] { "I@I", 'I',Item.ingotIron,'@',new ItemStack(parts, 1,1)}); - //water - GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1,1), new Object[] { new ItemStack(parts, 1,1),new ItemStack(parts, 1,4),new ItemStack(Item.dyePowder, 1,4)}); - //lava TODO change to use obby pipe and nether items - GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1,2), new Object[] { new ItemStack(parts, 1,2),new ItemStack(Item.dyePowder, 1,1)}); - //oil - GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1,3), new Object[] { new ItemStack(parts, 1,1),new ItemStack(parts, 1,4),new ItemStack(Item.dyePowder, 1,0)}); - //fuel - GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1,4), new Object[] { new ItemStack(parts, 1,1),new ItemStack(parts, 1,4),new ItemStack(Item.dyePowder, 1,11)}); - GameRegistry.addRecipe(new ItemStack(parts, 1,7), new Object[] { "T@T", 'T',new ItemStack(parts,1,1),'@',Block.lever});//valve - - GameRegistry.addRecipe(new ItemStack(parts, 1,6), new Object[] { " @ ","@ @"," @ ", '@',Item.ingotIron});//tank - GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1,0), new Object[] { new ItemStack(parts, 1,6),new ItemStack(parts, 1,4),new ItemStack(Item.dyePowder, 1,15)}); - GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1,1), new Object[] { new ItemStack(parts, 1,6),new ItemStack(parts, 1,4),new ItemStack(Item.dyePowder, 1,4)}); - //lava TODO change to use obby pipe and nether items - GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1,2), new Object[] { new ItemStack(parts, 1,6),Block.obsidian,Block.obsidian,Block.obsidian,Block.obsidian}); - //oil - GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1,3), new Object[] { new ItemStack(parts, 1,6),new ItemStack(parts, 1,4),new ItemStack(Item.dyePowder, 1,0)}); - //fuel - GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1,4), new Object[] { new ItemStack(parts, 1,6),new ItemStack(parts, 1,4),new ItemStack(Item.dyePowder, 1,11)}); - GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1,0), new Object[] { new ItemStack(parts, 1,1),new ItemStack(parts, 1,4)}); - GameRegistry.addRecipe(new ItemStack(machine, 1,0), new Object[] { "@T@","BPB","@P@" - , '@',new ItemStack(Item.ingotIron,2) - , 'B',new ItemStack(parts, 1,7) - , 'P',new ItemStack(Block.pistonBase) - , 'T',new ItemStack(parts, 1,6) - }); - + GameRegistry.addRecipe(new ItemStack(this.gauge, 1, 0), new Object[] { + "TVT"," T ", 'V', new ItemStack(parts,1,7), 'T',new ItemStack(parts,1,1) }); + //iron tube + GameRegistry.addRecipe(new ItemStack(parts, 2, 1), new Object[] { + "@@@", '@', Item.ingotIron }); + //obby tube + GameRegistry.addRecipe(new ItemStack(parts, 2, 2), new Object[] { + "@@@", '@', Block.obsidian }); + //nether tube + GameRegistry + .addRecipe(new ItemStack(parts, 2, 3), + new Object[] { "N@N", 'N', Block.netherrack, '@', + new ItemStack(parts, 2, 2) }); + //seal + GameRegistry.addRecipe(new ItemStack(parts, 2, 4), new Object[] { "@@", + "@@", '@', Item.leather }); + //slime steal + GameRegistry.addShapelessRecipe(new ItemStack(parts, 1, 5), + new Object[] { new ItemStack(parts, 1, 4), + new ItemStack(Item.slimeBall, 1) });// stick seal + // crafting pipes + // {"black", "red", "green", "brown", "blue", "purple", "cyan", + // "silver", "gray", "pink", "lime", "yellow", "lightBlue", "magenta", + // "orange", "white"}; + GameRegistry.addRecipe(new ItemStack(rod, 1), new Object[] { "I@I", + 'I', Item.ingotIron, '@', new ItemStack(parts, 1, 1) }); + // water + GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1, 1), + new Object[] { new ItemStack(parts, 1, 1), + new ItemStack(parts, 1, 4), + new ItemStack(Item.dyePowder, 1, 4) }); + // lava TODO change to use obby pipe and nether items + GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1, 2), + new Object[] { new ItemStack(parts, 1, 2), + new ItemStack(Item.dyePowder, 1, 1) }); + // oil + GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1, 3), + new Object[] { new ItemStack(parts, 1, 1), + new ItemStack(parts, 1, 4), + new ItemStack(Item.dyePowder, 1, 0) }); + // fuel + GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1, 4), + new Object[] { new ItemStack(parts, 1, 1), + new ItemStack(parts, 1, 4), + new ItemStack(Item.dyePowder, 1, 11) }); + GameRegistry.addRecipe(new ItemStack(parts, 1, 7), new Object[] { + "T@T", 'T', new ItemStack(parts, 1, 1), '@', Block.lever });// valve + + GameRegistry.addRecipe(new ItemStack(parts, 1, 6), new Object[] { + " @ ", "@ @", " @ ", '@', Item.ingotIron });// tank + GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1, 0), + new Object[] { new ItemStack(parts, 1, 6), + new ItemStack(parts, 1, 4), + new ItemStack(Item.dyePowder, 1, 15) }); + GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1, 1), + new Object[] { new ItemStack(parts, 1, 6), + new ItemStack(parts, 1, 4), + new ItemStack(Item.dyePowder, 1, 4) }); + // lava TODO change to use obby pipe and nether items + GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1, 2), + new Object[] { new ItemStack(parts, 1, 6), Block.obsidian, + Block.obsidian, Block.obsidian, Block.obsidian }); + // oil + GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1, 3), + new Object[] { new ItemStack(parts, 1, 6), + new ItemStack(parts, 1, 4), + new ItemStack(Item.dyePowder, 1, 0) }); + // fuel + GameRegistry.addShapelessRecipe(new ItemStack(itemTank, 1, 4), + new Object[] { new ItemStack(parts, 1, 6), + new ItemStack(parts, 1, 4), + new ItemStack(Item.dyePowder, 1, 11) }); + GameRegistry.addShapelessRecipe(new ItemStack(itemPipes, 1, 0), + new Object[] { new ItemStack(parts, 1, 1), + new ItemStack(parts, 1, 4) }); + GameRegistry.addRecipe(new ItemStack(machine, 1, 0), new Object[] { + "@T@", "BPB", "@P@", '@', new ItemStack(Item.ingotIron, 2), + 'B', new ItemStack(parts, 1, 7), 'P', + new ItemStack(Block.pistonBase), 'T', + new ItemStack(parts, 1, 6) }); + } } diff --git a/src/common/basicpipes/conductors/ItemGuage.java b/src/common/basicpipes/conductors/ItemGuage.java index 564facd53..c1984a6f3 100644 --- a/src/common/basicpipes/conductors/ItemGuage.java +++ b/src/common/basicpipes/conductors/ItemGuage.java @@ -25,6 +25,7 @@ public class ItemGuage extends Item this.setIconIndex(10); this.setItemName("guage"); this.setCreativeTab(CreativeTabs.tabTools); + this.setMaxStackSize(1); } @Override public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) diff --git a/src/common/basicpipes/conductors/TileEntityPipe.java b/src/common/basicpipes/conductors/TileEntityPipe.java index a50d92939..a1dad79d7 100644 --- a/src/common/basicpipes/conductors/TileEntityPipe.java +++ b/src/common/basicpipes/conductors/TileEntityPipe.java @@ -1,4 +1,5 @@ package basicpipes.conductors; + import net.minecraft.src.EntityPlayer; import net.minecraft.src.INetworkManager; import net.minecraft.src.NBTTagCompound; @@ -15,193 +16,195 @@ import basicpipes.pipes.api.Liquid; import basicpipes.pipes.api.MHelper; import com.google.common.io.ByteArrayDataInput; -public class TileEntityPipe extends TileEntity implements ILiquidConsumer,IPacketReceiver -{ + +public class TileEntityPipe extends TileEntity implements ILiquidConsumer, + IPacketReceiver { protected Liquid type = Liquid.DEFUALT; - public int capacity = 2; + public int capacity = 2; public int presure = 0; public int connectedUnits = 0; public int liquidStored = 0; private int count = 0; - private int count2 =0; - + private int count2 = 0; + protected boolean firstUpdate = true; - - public TileEntity[] connectedBlocks = {null, null, null, null, null, null}; - public int getPressure() - { + + public TileEntity[] connectedBlocks = { null, null, null, null, null, null }; + + public int getPressure() { return this.presure; } - + @Override - public void updateEntity() - { + public void updateEntity() { int highestPressure = 0; - if(++count >= 5) - { - this.connectedBlocks = MHelper.getSourounding(worldObj,xCoord, yCoord, zCoord); - for(int i =0; i < 6; i++) - { - - - if(connectedBlocks[i] instanceof ILiquidConsumer && ((ILiquidConsumer) connectedBlocks[i]).canRecieveLiquid(this.type, ForgeDirection.getOrientation(i).getOpposite())) - { - this.connectedUnits++; - if(connectedBlocks[i] instanceof TileEntityPipe) - { - if(((TileEntityPipe) connectedBlocks[i]).getPressure() > highestPressure) - { - highestPressure = ((TileEntityPipe) connectedBlocks[i]).getPressure(); + if (++count >= 5) { + this.connectedBlocks = MHelper.getSourounding(worldObj, xCoord, + yCoord, zCoord); + for (int i = 0; i < 6; i++) { + + if (connectedBlocks[i] instanceof ILiquidConsumer + && ((ILiquidConsumer) connectedBlocks[i]) + .canRecieveLiquid(this.type, ForgeDirection + .getOrientation(i).getOpposite())) { + this.connectedUnits++; + if (connectedBlocks[i] instanceof TileEntityPipe) { + if (((TileEntityPipe) connectedBlocks[i]).getPressure() > highestPressure) { + highestPressure = ((TileEntityPipe) connectedBlocks[i]) + .getPressure(); } } - } - else - if(connectedBlocks[i] instanceof ILiquidProducer && ((ILiquidProducer) connectedBlocks[i]).canProduceLiquid(this.type, ForgeDirection.getOrientation(i).getOpposite())) - { - this.connectedUnits++; - if(((ILiquidProducer) connectedBlocks[i]).canProducePresure(this.type, ForgeDirection.getOrientation(i)) && ((ILiquidProducer) connectedBlocks[i]).presureOutput(this.type,ForgeDirection.getOrientation(i).getOpposite()) > highestPressure) - { - highestPressure = ((ILiquidProducer) connectedBlocks[i]).presureOutput(this.type,ForgeDirection.getOrientation(i)); - } - } - else - { + } else if (connectedBlocks[i] instanceof ILiquidProducer + && ((ILiquidProducer) connectedBlocks[i]) + .canProduceLiquid(this.type, ForgeDirection + .getOrientation(i).getOpposite())) { + this.connectedUnits++; + if (((ILiquidProducer) connectedBlocks[i]) + .canProducePresure(this.type, + ForgeDirection.getOrientation(i)) + && ((ILiquidProducer) connectedBlocks[i]) + .presureOutput(this.type, ForgeDirection + .getOrientation(i).getOpposite()) > highestPressure) { + highestPressure = ((ILiquidProducer) connectedBlocks[i]) + .presureOutput(this.type, + ForgeDirection.getOrientation(i)); + } + } else { connectedBlocks[i] = null; } } - if(!worldObj.isRemote) - { - if(firstUpdate || count2++ >= 10) - { count2= 0; + if (!worldObj.isRemote) { + if (firstUpdate || count2++ >= 10) { + count2 = 0; firstUpdate = false; - Packet packet = PacketManager.getPacket("Pipes",this, new Object[]{this.type.ordinal()}); - PacketManager.sendPacketToClients(packet, worldObj, Vector3.get(this), 60); + Packet packet = PacketManager.getPacket("Pipes", this, + new Object[] { this.type.ordinal() }); + PacketManager.sendPacketToClients(packet, worldObj, + Vector3.get(this), 60); } - this.presure = highestPressure -1; - for(int i =0; i < 6; i++) - { - if(connectedBlocks[i] instanceof ILiquidProducer) - { - int vol = ((ILiquidProducer)connectedBlocks[i]).onProduceLiquid(this.type, this.capacity - this.liquidStored, ForgeDirection.getOrientation(i).getOpposite()); - this.liquidStored = Math.max(this.liquidStored + vol,this.capacity); + this.presure = highestPressure - 1; + for (int i = 0; i < 6; i++) { + if (connectedBlocks[i] instanceof ILiquidProducer) { + int vol = ((ILiquidProducer) connectedBlocks[i]) + .onProduceLiquid(this.type, this.capacity + - this.liquidStored, ForgeDirection + .getOrientation(i).getOpposite()); + this.liquidStored = Math.min(this.liquidStored + vol, + this.capacity); } - if(connectedBlocks[i] instanceof ILiquidConsumer && this.liquidStored > 0 && this.presure > 0) - { - if(connectedBlocks[i] instanceof TileEntityPipe) - { + if (connectedBlocks[i] instanceof ILiquidConsumer + && this.liquidStored > 0 && this.presure > 0) { + if (connectedBlocks[i] instanceof TileEntityPipe) { this.liquidStored--; - int vol = ((ILiquidConsumer)connectedBlocks[i]).onReceiveLiquid(this.type, Math.max(this.liquidStored,1), ForgeDirection.getOrientation(i).getOpposite()); + int vol = ((ILiquidConsumer) connectedBlocks[i]) + .onReceiveLiquid(this.type, Math.max( + this.liquidStored, 1), + ForgeDirection.getOrientation(i) + .getOpposite()); this.liquidStored += vol; - }else - { - this.liquidStored = ((ILiquidConsumer)connectedBlocks[i]).onReceiveLiquid(this.type, this.liquidStored, ForgeDirection.getOrientation(i).getOpposite()); + } else { + this.liquidStored = ((ILiquidConsumer) connectedBlocks[i]) + .onReceiveLiquid(this.type, + this.liquidStored, ForgeDirection + .getOrientation(i) + .getOpposite()); } } } } } } - - //--------------- - //liquid stuff - //--------------- + + // --------------- + // liquid stuff + // --------------- @Override - public int onReceiveLiquid(Liquid type,int vol, ForgeDirection side) - { - if(type == this.type) - { - int rejectedVolume = Math.max((this.getStoredLiquid(type) + vol) - this.capacity, 0); - this.liquidStored = Math.min(Math.max((liquidStored + vol - rejectedVolume),0),this.capacity); + public int onReceiveLiquid(Liquid type, int vol, ForgeDirection side) { + if (type == this.type) { + int rejectedVolume = Math.max((this.getStoredLiquid(type) + vol) + - this.capacity, 0); + this.liquidStored = Math.min( + Math.max((liquidStored + vol - rejectedVolume), 0), + this.capacity); return rejectedVolume; } return vol; } + /** * @return Return the stored volume in this pipe. */ - @Override - public int getStoredLiquid(Liquid type) - { - if(type == this.type) - { - return this.liquidStored; - } + @Override + public int getStoredLiquid(Liquid type) { + if (type == this.type) { + return this.liquidStored; + } return 0; - } - - - @Override - public int getLiquidCapacity(Liquid type) - { - if(type == this.type) - { - return this.capacity; - } - return 0; - } - -//find wether or not this side of X block can recieve X liquid type. Also use to determine connection of a pipe + } + + @Override + public int getLiquidCapacity(Liquid type) { + if (type == this.type) { + return this.capacity; + } + return 0; + } + + // find wether or not this side of X block can recieve X liquid type. Also + // use to determine connection of a pipe @Override public boolean canRecieveLiquid(Liquid type, ForgeDirection side) { - if(type == this.type) - { + if (type == this.type) { return true; } return false; } - //returns liquid type - public Liquid getType() { + + // returns liquid type + public Liquid getType() { return this.type; } - //used by the item to set the liquid type on spawn + // used by the item to set the liquid type on spawn public void setType(Liquid rType) { this.type = rType; - + } - - //--------------------- - //data - //-------------------- + // --------------------- + // data + // -------------------- @Override public void handlePacketData(INetworkManager network, int packetType, Packet250CustomPayload packet, EntityPlayer player, ByteArrayDataInput data) { - try - { - int type = data.readInt(); - if(worldObj.isRemote) - { - this.type = Liquid.getLiquid(type); + try { + int type = data.readInt(); + if (worldObj.isRemote) { + this.type = Liquid.getLiquid(type); + } + } catch (Exception e) { + e.printStackTrace(); } - } - catch(Exception e) - { - e.printStackTrace(); - } - - + } + /** - * Reads a tile entity from NBT. - */ - public void readFromNBT(NBTTagCompound par1NBTTagCompound) - { - super.readFromNBT(par1NBTTagCompound); - this.liquidStored = par1NBTTagCompound.getInteger("liquid"); - this.type = Liquid.getLiquid(par1NBTTagCompound.getInteger("type")); - } + * Reads a tile entity from NBT. + */ + public void readFromNBT(NBTTagCompound par1NBTTagCompound) { + super.readFromNBT(par1NBTTagCompound); + this.liquidStored = par1NBTTagCompound.getInteger("liquid"); + this.type = Liquid.getLiquid(par1NBTTagCompound.getInteger("type")); + } - /** - * Writes a tile entity to NBT. - */ - public void writeToNBT(NBTTagCompound par1NBTTagCompound) - { - super.writeToNBT(par1NBTTagCompound); - par1NBTTagCompound.setInteger("liquid", this.liquidStored); - par1NBTTagCompound.setInteger("type", this.type.ordinal()); - } + /** + * Writes a tile entity to NBT. + */ + public void writeToNBT(NBTTagCompound par1NBTTagCompound) { + super.writeToNBT(par1NBTTagCompound); + par1NBTTagCompound.setInteger("liquid", this.liquidStored); + par1NBTTagCompound.setInteger("type", this.type.ordinal()); + } } - diff --git a/src/common/basicpipes/machines/TileEntityPump.java b/src/common/basicpipes/machines/TileEntityPump.java index d752f27c0..fc0fdf5c0 100644 --- a/src/common/basicpipes/machines/TileEntityPump.java +++ b/src/common/basicpipes/machines/TileEntityPump.java @@ -48,7 +48,7 @@ public class TileEntityPump extends TileEntityElectricityReceiver implements ILi if(!worldObj.isRemote) { - if(bBlock == type.Still && this.eStored > 200 && this.lStored < this.wMax) + if(bBlock == type.Still && this.eStored >= 200 && this.lStored < this.wMax) { eStored -= 200; lStored += 1; @@ -71,9 +71,8 @@ public class TileEntityPump extends TileEntityElectricityReceiver implements ILi public int onProduceLiquid(Liquid type, int maxVol, ForgeDirection side) { if(type == this.type && lStored > 0) { - int tradeW = Math.min(maxVol, lStored); - lStored -= tradeW; - return tradeW; + lStored -= 1; + return 1; } return 0; } diff --git a/src/common/steampower/SteamPowerMain.java b/src/common/steampower/SteamPowerMain.java index 9200d012a..f3e43eaec 100644 --- a/src/common/steampower/SteamPowerMain.java +++ b/src/common/steampower/SteamPowerMain.java @@ -1,4 +1,5 @@ package steampower; + import java.io.File; import net.minecraft.src.Block; @@ -25,12 +26,14 @@ import cpw.mods.fml.common.network.NetworkMod; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.LanguageRegistry; -@Mod(modid = "SteamPower", name = "Steam Power", version = "1.9",dependencies = "after:basicPipes") -@NetworkMod(channels = { "SPpack" }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class) -public class SteamPowerMain{ - static Configuration config = new Configuration((new File(cpw.mods.fml.common.Loader.instance().getConfigDir(), "/UniversalElectricity/SteamPower.cfg"))); - private static int BlockID= configurationProperties(); +@Mod(modid = "SteamPower", name = "Steam Power", version = "1.9", dependencies = "after:basicPipes") +@NetworkMod(channels = { "SPpack" }, clientSideRequired = true, serverSideRequired = false, packetHandler = PacketManager.class) +public class SteamPowerMain { + static Configuration config = new Configuration((new File( + cpw.mods.fml.common.Loader.instance().getConfigDir(), + "/UniversalElectricity/SteamPower.cfg"))); + private static int BlockID = configurationProperties(); public static int EngineItemID; public static int EngineID; public static int genID; @@ -40,91 +43,111 @@ public class SteamPowerMain{ public static int boilerHeat; public static int fireOutput; public static final String channel = "SPpack"; - public static Block machine = new BlockMachine(BlockID).setBlockName("machine"); - public static Block engine = new BlockSteamPiston(EngineID).setBlockName("SteamEngien"); + public static Block machine = new BlockMachine(BlockID) + .setBlockName("machine"); + public static Block engine = new BlockSteamPiston(EngineID) + .setBlockName("SteamEngien"); public static Block gen = new BlockGenerator(genID).setBlockName("ElecGen"); - public static Item itemEngine = new ItemEngine(EngineItemID).setItemName("SteamEngine"); - - public static SteamPowerMain instance; - - @SidedProxy(clientSide = "steampower.SteamClientProxy", serverSide = "steampower.SteamProxy") - public static SteamProxy proxy; + public static Item itemEngine = new ItemEngine(EngineItemID) + .setItemName("SteamEngine"); + + public static SteamPowerMain instance; + + @SidedProxy(clientSide = "steampower.SteamClientProxy", serverSide = "steampower.SteamProxy") + public static SteamProxy proxy; public static String textureFile = "/textures/"; - public static int configurationProperties() - { - config.load(); - BlockID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"MachinesID", 3030).value); - EngineItemID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,"EngineItem", 30308).value); - EngineID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"SteamEngineID", 3031).value); - genID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"ElecGenID", 3032).value); - genOutput = Integer.parseInt(config.get(Configuration.CATEGORY_GENERAL,"genOutputWattsmax", 1000).value); - steamOutBoiler = Integer.parseInt(config.get(Configuration.CATEGORY_GENERAL,"steamOutPerCycle", 10).value); - boilerHeat = Integer.parseInt(config.get(Configuration.CATEGORY_GENERAL,"boilerInKJNeed", 4500).value); - fireOutput = Integer.parseInt(config.get(Configuration.CATEGORY_GENERAL,"fireBoxOutKJMax", 250).value); - config.save(); - return BlockID; - } - @PreInit - public void preInit(FMLPreInitializationEvent event) - { - instance = this; - NetworkRegistry.instance().registerGuiHandler(this, this.proxy); - proxy.preInit(); - GameRegistry.registerBlock(machine, ItemMachine.class); - GameRegistry.registerBlock(engine); - GameRegistry.registerBlock(gen); - } - @Init - public void load(FMLInitializationEvent evt) - { - proxy.init(); - GameRegistry.registerTileEntity(TileEntitytopGen.class, "gentop"); - //Names............... + + public static int configurationProperties() { + config.load(); + BlockID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK, + "MachinesID", 3030).value); + EngineItemID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM, + "EngineItem", 30308).value); + EngineID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK, + "SteamEngineID", 3031).value); + genID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK, + "ElecGenID", 3032).value); + genOutput = Integer.parseInt(config.get(Configuration.CATEGORY_GENERAL, + "genOutputWattsmax", 1000).value); + steamOutBoiler = Integer.parseInt(config.get( + Configuration.CATEGORY_GENERAL, "steamOutPerCycle", 10).value); + boilerHeat = Integer.parseInt(config.get( + Configuration.CATEGORY_GENERAL, "boilerInKJNeed", 4500).value); + fireOutput = Integer.parseInt(config.get( + Configuration.CATEGORY_GENERAL, "fireBoxOutKJMax", 250).value); + config.save(); + return BlockID; + } + + @PreInit + public void preInit(FMLPreInitializationEvent event) { + instance = this; + NetworkRegistry.instance().registerGuiHandler(this, this.proxy); + proxy.preInit(); + GameRegistry.registerBlock(machine, ItemMachine.class); + GameRegistry.registerBlock(engine); + GameRegistry.registerBlock(gen); + } + + @Init + public void load(FMLInitializationEvent evt) { + proxy.init(); + GameRegistry.registerTileEntity(TileEntitytopGen.class, "gentop"); + // Names............... LanguageRegistry.addName((new ItemStack(machine, 1, 1)), "Boiler"); LanguageRegistry.addName((new ItemStack(gen, 1, 0)), "Generator"); LanguageRegistry.addName((new ItemStack(machine, 1, 2)), "FireBox"); - LanguageRegistry.addName((new ItemStack(itemEngine, 1, 0)), "SteamPiston"); - - + LanguageRegistry.addName((new ItemStack(itemEngine, 1, 0)), + "SteamPiston"); + } - @PostInit - public void postInit(FMLPostInitializationEvent event) - { - - proxy.postInit(); - //Crafting - try{ - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe(new ItemStack(gen, 1), new Object [] {"@T@", "OVO", "@T@", - 'T',new ItemStack(BasicPipesMain.rod, 1), - '@',"plateSteel", - 'O',"basicCircuit", - 'V',"motor"})); + + @PostInit + public void postInit(FMLPostInitializationEvent event) { + + proxy.postInit(); + // Crafting + try { + CraftingManager + .getInstance() + .getRecipeList() + .add(new ShapedOreRecipe(new ItemStack(gen, 1), + new Object[] { "@T@", "OVO", "@T@", 'T', + new ItemStack(BasicPipesMain.rod, 1), '@', + "plateSteel", 'O', "basicCircuit", 'V', + "motor" })); /** - TileEntityBoiler();<- metadata 1 - TileEntityFireBox();<-metadata 2-5 - */ - CraftingManager.getInstance().getRecipeList().add(new ShapedOreRecipe( - new ItemStack(machine, 1, 1), new Object [] {"TT", "VV", "TT", - 'T',new ItemStack(BasicPipesMain.parts, 1,6), - 'V',new ItemStack(BasicPipesMain.parts, 1,7)})); - CraftingManager.getInstance().getRecipeList().add( - new ShapedOreRecipe(new ItemStack(machine, 1, 2), new Object [] { "@", "F", - 'F',Block.stoneOvenIdle, - '@',"plateSteel"})); - CraftingManager.getInstance().getRecipeList().add( - new ShapedOreRecipe(new ItemStack(itemEngine, 1,0), new Object [] {"GGG", "VPV", "@T@", - 'T',new ItemStack(BasicPipesMain.parts, 1,1), - 'G',BasicPipesMain.rod, - '@',"plateSteel", - 'P',Block.pistonBase, - 'V',new ItemStack(BasicPipesMain.parts, 1,7), - 'M',"motor"})); - } - catch(Exception e) - { - e.printStackTrace(); - System.out.print("UE based recipes not loaded"); - } + * TileEntityBoiler();<- metadata 1 TileEntityFireBox();<-metadata + * 2-5 + */ + CraftingManager + .getInstance() + .getRecipeList() + .add(new ShapedOreRecipe(new ItemStack(machine, 1, 1), + new Object[] { "TT", "VV", "TT", 'T', + new ItemStack(BasicPipesMain.parts, 1, 6), + 'V', + new ItemStack(BasicPipesMain.parts, 1, 7) })); + CraftingManager + .getInstance() + .getRecipeList() + .add(new ShapedOreRecipe(new ItemStack(machine, 1, 2), + new Object[] { "@", "F", 'F', Block.stoneOvenIdle, + '@', "plateSteel" })); + CraftingManager + .getInstance() + .getRecipeList() + .add(new ShapedOreRecipe(new ItemStack(itemEngine, 1, 0), + new Object[] { "GGG", "VPV", "@T@", 'T', + new ItemStack(BasicPipesMain.parts, 1, 1), + 'G', BasicPipesMain.rod, '@', "plateSteel", + 'P', Block.pistonBase, 'V', + new ItemStack(BasicPipesMain.parts, 1, 7), + 'M', "motor" })); + } catch (Exception e) { + e.printStackTrace(); + System.out.print("UE based recipes not loaded"); } + } } diff --git a/src/common/steampower/turbine/BlockGenerator.java b/src/common/steampower/turbine/BlockGenerator.java index 4d5128326..8be43d01f 100644 --- a/src/common/steampower/turbine/BlockGenerator.java +++ b/src/common/steampower/turbine/BlockGenerator.java @@ -2,9 +2,6 @@ package steampower.turbine; import java.util.ArrayList; -import steampower.ItemRenderHelperS; -import steampower.TileEntityMachine; - import net.minecraft.src.CreativeTabs; import net.minecraft.src.EntityLiving; import net.minecraft.src.EntityPlayer; @@ -13,6 +10,7 @@ import net.minecraft.src.Material; import net.minecraft.src.MathHelper; import net.minecraft.src.TileEntity; import net.minecraft.src.World; +import steampower.ItemRenderHelperS; public class BlockGenerator extends universalelectricity.prefab.BlockMachine { @@ -20,50 +18,51 @@ public class BlockGenerator extends universalelectricity.prefab.BlockMachine { super("Generator", id, Material.iron); this.setCreativeTab(CreativeTabs.tabBlock); } + @Override - public void addCreativeItems(ArrayList itemList) - { - itemList.add(new ItemStack(this, 1,0)); - } - @Override - public void onBlockPlacedBy(World world, int x, int y, int z, EntityLiving par5EntityLiving) - { - int angle = MathHelper.floor_double((par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - world.setBlockAndMetadataWithUpdate(x, y, z, blockID, angle, true); - } + public void addCreativeItems(ArrayList itemList) { + itemList.add(new ItemStack(this, 1, 0)); + } + @Override - public boolean onUseWrench(World par1World, int x, int y, int z, EntityPlayer par5EntityPlayer) - { - int angle = MathHelper.floor_double((par5EntityPlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - int metadata = par1World.getBlockMetadata(x, y, z); - if(metadata < 3) - { - par1World.setBlockAndMetadata(x, y, z, blockID, metadata+angle); - } - else - { - par1World.setBlockAndMetadata(x, y, z, blockID, 0); - } - return true; - } - @Override - public boolean isOpaqueCube() - { - return false; - } - @Override - public boolean renderAsNormalBlock() - { - return false; - } - @Override - public int getRenderType() - { - return ItemRenderHelperS.renderID; - } - @Override - public TileEntity createNewTileEntity(World world) - { - return new TileEntityGen(); + public void onBlockPlacedBy(World world, int x, int y, int z, + EntityLiving par5EntityLiving) { + int angle = MathHelper + .floor_double((par5EntityLiving.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; + world.setBlockAndMetadataWithUpdate(x, y, z, blockID, angle, true); + } + + @Override + public boolean onUseWrench(World par1World, int x, int y, int z, + EntityPlayer par5EntityPlayer) { + int angle = MathHelper + .floor_double((par5EntityPlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; + int metadata = par1World.getBlockMetadata(x, y, z); + if (metadata < 3) { + par1World.setBlockAndMetadata(x, y, z, blockID, metadata + angle); + } else { + par1World.setBlockAndMetadata(x, y, z, blockID, 0); } + return true; + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public int getRenderType() { + return ItemRenderHelperS.renderID; + } + + @Override + public TileEntity createNewTileEntity(World world) { + return new TileEntityGen(); + } } diff --git a/src/common/steampower/turbine/BlockSteamPiston.java b/src/common/steampower/turbine/BlockSteamPiston.java index 5411682fc..40759920f 100644 --- a/src/common/steampower/turbine/BlockSteamPiston.java +++ b/src/common/steampower/turbine/BlockSteamPiston.java @@ -2,148 +2,113 @@ package steampower.turbine; import java.util.Random; -import net.minecraft.src.EntityLiving; import net.minecraft.src.EntityPlayer; import net.minecraft.src.Material; import net.minecraft.src.MathHelper; import net.minecraft.src.TileEntity; import net.minecraft.src.World; import steampower.SteamPowerMain; -import steampower.TileEntityMachine; -public class BlockSteamPiston extends universalelectricity.prefab.BlockMachine{ +public class BlockSteamPiston extends universalelectricity.prefab.BlockMachine { public BlockSteamPiston(int par1) { super("SteamEngine", par1, Material.iron); + + } + + @Override + public boolean onMachineActivated(World par1World, int x, int y, int z, + EntityPlayer par5EntityPlayer) { + return false; } - @Override - public boolean onMachineActivated(World par1World, int x, int y, int z, EntityPlayer par5EntityPlayer) - { - if (par1World.isRemote) - { - return true; - } - else - { - TileEntity blockEntity = (TileEntity)par1World.getBlockTileEntity(x, y, z); - if (blockEntity != null) - { - - if(blockEntity instanceof TileEntitySteamPiston) - { - par5EntityPlayer.openGui(SteamPowerMain.instance, 2, par1World, x, y, z); - } - if(blockEntity instanceof TileEntitytopGen) - { - par5EntityPlayer.openGui(SteamPowerMain.instance, 2, par1World, x, y-1, z); - } - } - return true; - } - } @Override - public boolean onUseWrench(World par1World, int x, int y, int z, EntityPlayer par5EntityPlayer) - { - int angle = MathHelper.floor_double((par5EntityPlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - int metadata = par1World.getBlockMetadata(x, y, z); - if(metadata < 3) - { - par1World.setBlockAndMetadata(x, y, z, blockID, metadata+angle); - } - else - { - par1World.setBlockAndMetadata(x, y, z, blockID, 0); - } - return true; - } - public TileEntity createNewTileEntity(World var1) - { - return null; - } - public void breakBlock(World world, int x, int y, int z,int par5, int par6) - { - super.breakBlock(world, x, y, z, par5, par6); - int meta = world.getBlockMetadata(x, y, z); - if(meta < 4) - { - if(world.getBlockId(x, y+1, z) == this.blockID) - { - if(world.getBlockMetadata(x, y, z)> 4) - { - world.setBlockAndMetadataWithUpdate(x, y, z, 0, 0, true); - } - } - } - else - if(meta > 4) - { - if(world.getBlockId(x, y-1, z) == this.blockID) - { - if(world.getBlockMetadata(x, y, z)< 4) - { - world.setBlockAndMetadataWithUpdate(x, y, z, 0, 0, true); - } - } - } - } - @Override - public boolean isOpaqueCube() - { - return false; - } - @Override - public boolean renderAsNormalBlock() - { - return false; + public boolean onUseWrench(World par1World, int x, int y, int z, + EntityPlayer par5EntityPlayer) { + int angle = MathHelper + .floor_double((par5EntityPlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; + int metadata = par1World.getBlockMetadata(x, y, z); + if (metadata < 3) { + par1World.setBlockAndMetadata(x, y, z, blockID, metadata + angle); + } else { + par1World.setBlockAndMetadata(x, y, z, blockID, 0); } - @Override - public int getRenderType() - { - return -1; - } - @Override - public TileEntity createNewTileEntity(World world, int metadata) - { - if(metadata >= 0 && metadata < 4) - { - return new TileEntitySteamPiston(); + return true; + } + + public TileEntity createNewTileEntity(World var1) { + return null; + } + + public void breakBlock(World world, int x, int y, int z, int par5, int par6) { + super.breakBlock(world, x, y, z, par5, par6); + int meta = world.getBlockMetadata(x, y, z); + if (meta < 4) { + if (world.getBlockId(x, y + 1, z) == this.blockID) { + if (world.getBlockMetadata(x, y, z) > 4) { + world.setBlockAndMetadataWithUpdate(x, y, z, 0, 0, true); + } } - if(metadata == 14) - { - return new TileEntitytopGen(); + } else if (meta > 4) { + if (world.getBlockId(x, y - 1, z) == this.blockID) { + if (world.getBlockMetadata(x, y, z) < 4) { + world.setBlockAndMetadataWithUpdate(x, y, z, 0, 0, true); + } } - return null; } - public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, int par5) - { - int meta = par1World.getBlockMetadata(par2, par3, par4); - if (meta < 4) - { - if (par1World.getBlockId(par2, par3 + 1, par4) != this.blockID) - { - par1World.setBlockWithNotify(par2, par3, par4, 0); - } - } - else - { - if (par1World.getBlockId(par2, par3 - 1, par4) != this.blockID) - { - par1World.setBlockWithNotify(par2, par3, par4, 0); - } - } - } - @Override - public int idDropped(int par1, Random par2Random, int par3) - { - return SteamPowerMain.itemEngine.shiftedIndex; - } - @Override - public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) - { - int var5 = par1World.getBlockId(par2, par3, par4); - int var6 = par1World.getBlockId(par2, par3+1, par4); - return (var5 == 0 || blocksList[var5].blockMaterial.isGroundCover()) && (var6 == 0 || blocksList[var6].blockMaterial.isGroundCover()); - } + } + + @Override + public boolean isOpaqueCube() { + return false; + } + + @Override + public boolean renderAsNormalBlock() { + return false; + } + + @Override + public int getRenderType() { + return -1; + } + + @Override + public TileEntity createNewTileEntity(World world, int metadata) { + if (metadata >= 0 && metadata < 4) { + return new TileEntitySteamPiston(); + } + if (metadata == 14) { + return new TileEntitytopGen(); + } + return null; + } + + public void onNeighborBlockChange(World par1World, int par2, int par3, + int par4, int par5) { + int meta = par1World.getBlockMetadata(par2, par3, par4); + if (meta < 4) { + if (par1World.getBlockId(par2, par3 + 1, par4) != this.blockID) { + par1World.setBlockWithNotify(par2, par3, par4, 0); + } + } else { + if (par1World.getBlockId(par2, par3 - 1, par4) != this.blockID) { + par1World.setBlockWithNotify(par2, par3, par4, 0); + } + } + } + + @Override + public int idDropped(int par1, Random par2Random, int par3) { + return SteamPowerMain.itemEngine.shiftedIndex; + } + + @Override + public boolean canPlaceBlockAt(World par1World, int par2, int par3, int par4) { + int var5 = par1World.getBlockId(par2, par3, par4); + int var6 = par1World.getBlockId(par2, par3 + 1, par4); + return (var5 == 0 || blocksList[var5].blockMaterial.isGroundCover()) + && (var6 == 0 || blocksList[var6].blockMaterial.isGroundCover()); + } } diff --git a/src/common/steampower/turbine/ItemEngine.java b/src/common/steampower/turbine/ItemEngine.java index 8af348f2b..3cb43c29b 100644 --- a/src/common/steampower/turbine/ItemEngine.java +++ b/src/common/steampower/turbine/ItemEngine.java @@ -1,4 +1,5 @@ package steampower.turbine; + import java.util.List; import net.minecraft.src.Block; @@ -11,106 +12,101 @@ import net.minecraft.src.World; import steampower.SteamPowerMain; import steampower.TileEntityMachine; -public class ItemEngine extends Item -{ - public ItemEngine(int par1) - { - super(par1); - this.maxStackSize = 5; - this.setCreativeTab(CreativeTabs.tabBlock); - this.setIconIndex(21); - } - @Override - public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List) - { +public class ItemEngine extends Item { + public ItemEngine(int par1) { + super(par1); + this.maxStackSize = 5; + this.setCreativeTab(CreativeTabs.tabBlock); + this.setIconIndex(21); + } + + @Override + public void getSubItems(int par1, CreativeTabs par2CreativeTabs, + List par3List) { par3List.add(new ItemStack(this, 1, 0)); - } - @Override + } + + @Override public String getTextureFile() { // TODO Auto-generated method stub - return SteamPowerMain.textureFile+"Items.png"; + return SteamPowerMain.textureFile + "Items.png"; } - + public boolean onItemUse(ItemStack itemStack, EntityPlayer ePlayer, - World world, int x, int y, int z, int par7, float par8, float par9, float par10) - { - int var11 = world.getBlockId(x, y, z); - int BlockID = SteamPowerMain.EngineID; + World world, int x, int y, int z, int par7, float par8, float par9, + float par10) { + int var11 = world.getBlockId(x, y, z); + int BlockID = SteamPowerMain.EngineID; - if (var11 == Block.snow.blockID) - { - 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 (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 == 1) { + ++y; + } - if (par7 == 2) - { - --z; - } + if (par7 == 2) { + --z; + } - if (par7 == 3) - { - ++z; - } + if (par7 == 3) { + ++z; + } - if (par7 == 4) - { - --x; - } + if (par7 == 4) { + --x; + } - if (par7 == 5) - { - ++x; - } - } + if (par7 == 5) { + ++x; + } + } - if (itemStack.stackSize == 0) - { - 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; + if (itemStack.stackSize == 0) { + 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; - return true; - } - else - { - return false; - } - } + return true; + } else { + return false; + } + } }