From a9fe90b3ca9ce9c2b2572873cac340834d6fdd1a Mon Sep 17 00:00:00 2001 From: Rseifert Date: Mon, 29 Oct 2012 10:08:06 -0400 Subject: [PATCH] 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. --- .metadata/.lock | 0 .metadata/.mylyn/.taskListIndex/segments.gen | Bin 0 -> 20 bytes .metadata/.mylyn/.taskListIndex/segments_1 | Bin 0 -> 32 bytes .metadata/.mylyn/repositories.xml.zip | Bin 0 -> 442 bytes .metadata/.mylyn/tasks.xml.zip | Bin 0 -> 250 bytes .../.root/.indexes/history.version | 1 + .../.root/.indexes/properties.index | Bin 0 -> 57 bytes .../.root/.indexes/properties.version | 1 + .../org.eclipse.core.resources/.root/1.tree | Bin 0 -> 124 bytes .../.safetable/org.eclipse.core.resources | Bin 0 -> 364 bytes .../.settings/jd.ide.eclipse.prefs | 2 + .../org.eclipse.core.resources.prefs | 2 + .../org.eclipse.epp.usagedata.recording.prefs | 2 + .../.settings/org.eclipse.jdt.ui.prefs | 13 + .../.settings/org.eclipse.m2e.discovery.prefs | 2 + .../org.eclipse.mylyn.context.core.prefs | 2 + .../org.eclipse.mylyn.monitor.ui.prefs | 2 + .../.settings/org.eclipse.team.cvs.ui.prefs | 2 + .../.settings/org.eclipse.team.ui.prefs | 2 + .../.settings/org.eclipse.ui.ide.prefs | 5 + .../.settings/org.eclipse.ui.prefs | 2 + .../.settings/org.eclipse.ui.workbench.prefs | 5 + .../usagedata.csv | 119 +++++++++ .../org.eclipse.jdt.core/invalidArchivesCache | Bin 0 -> 4 bytes .../org.eclipse.jdt.core/nonChainingJarsCache | Bin 0 -> 4 bytes .../variablesAndContainers.dat | Bin 0 -> 110 bytes .../org.eclipse.jdt.ui/OpenTypeHistory.xml | 2 + .../QualifiedTypeNameHistory.xml | 2 + .../org.eclipse.jdt.ui/dialog_settings.xml | 10 + .../0.log | 0 .../logback.1.0.200.20111228-1245.xml | 41 +++ .../org.eclipse.ui.ide/dialog_settings.xml | 11 + .../dialog_settings.xml | 3 + .../org.eclipse.ui.workbench/workbench.xml | 245 ++++++++++++++++++ .../org.eclipse.ui.workbench/workingsets.xml | 4 + .../toolkit_ercp.png | Bin 0 -> 4060 bytes .../toolkit_gwt.png | Bin 0 -> 3892 bytes .../toolkit_swing.png | Bin 0 -> 3675 bytes .../toolkit_swt.png | Bin 0 -> 3894 bytes .../toolkit_xwt.png | Bin 0 -> 4007 bytes .../toolkits.xml | 145 +++++++++++ .metadata/version.ini | 1 + src/common/basicpipes/BasicPipesMain.java | 45 +--- .../basicpipes/LTanks/TileEntityLTank.java | 28 +- .../basicpipes/conductors/BlockRod.java | 2 +- .../basicpipes/conductors/TileEntityPipe.java | 10 +- .../basicpipes/conductors/TileEntityRod.java | 10 +- .../basicpipes/machines/BlockMachine.java | 4 +- .../basicpipes/machines/BlockValve.java | 12 +- src/common/mcpmod.info | 17 ++ src/common/steampower/BlockMachine.java | 2 +- src/common/steampower/SteamPowerMain.java | 49 ++-- src/common/steampower/TileEntityMachine.java | 5 +- .../steampower/boiler/TileEntityBoiler.java | 14 +- .../steampower/burner/TileEntityFireBox.java | 6 +- src/common/steampower/turbine/ItemEngine.java | 111 +++++--- .../steampower/turbine/TileEntityGen.java | 9 +- .../turbine/TileEntitySteamPiston.java | 13 +- src/minecraft/basicpipes/ModelLargePipe.java | 25 +- src/minecraft/basicpipes/ModelPipe.java | 7 +- src/minecraft/basicpipes/ModelPump.java | 8 +- .../renderTank/ModelLiquidTank.java | 5 - .../renderTank/ModelLiquidTankCorner.java | 5 - src/minecraft/mcp.png | Bin 0 -> 6940 bytes src/minecraft/steampower/ModelCenterTank.java | 8 +- src/minecraft/steampower/ModelCornerTank.java | 7 +- src/minecraft/steampower/ModelEngine.java | 8 +- src/minecraft/steampower/ModelFurnace.java | 7 +- src/minecraft/steampower/ModelGenerator.java | 7 +- src/minecraft/steampower/ModelTank.java | 8 +- .../steampower/geared/ModelGearPiston.java | 5 - 71 files changed, 816 insertions(+), 247 deletions(-) create mode 100644 .metadata/.lock create mode 100644 .metadata/.mylyn/.taskListIndex/segments.gen create mode 100644 .metadata/.mylyn/.taskListIndex/segments_1 create mode 100644 .metadata/.mylyn/repositories.xml.zip create mode 100644 .metadata/.mylyn/tasks.xml.zip create mode 100644 .metadata/.plugins/org.eclipse.core.resources/.root/.indexes/history.version create mode 100644 .metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index create mode 100644 .metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.version create mode 100644 .metadata/.plugins/org.eclipse.core.resources/.root/1.tree create mode 100644 .metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources create mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/jd.ide.eclipse.prefs create mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs create mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.recording.prefs create mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs create mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs create mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs create mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs create mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.cvs.ui.prefs create mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs create mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs create mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs create mode 100644 .metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs create mode 100644 .metadata/.plugins/org.eclipse.epp.usagedata.recording/usagedata.csv create mode 100644 .metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache create mode 100644 .metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache create mode 100644 .metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat create mode 100644 .metadata/.plugins/org.eclipse.jdt.ui/OpenTypeHistory.xml create mode 100644 .metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml create mode 100644 .metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml create mode 100644 .metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log create mode 100644 .metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.0.200.20111228-1245.xml create mode 100644 .metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml create mode 100644 .metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml create mode 100644 .metadata/.plugins/org.eclipse.ui.workbench/workbench.xml create mode 100644 .metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml create mode 100644 .metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_ercp.png create mode 100644 .metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_gwt.png create mode 100644 .metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_swing.png create mode 100644 .metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_swt.png create mode 100644 .metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_xwt.png create mode 100644 .metadata/.plugins/org.eclipse.wb.discovery.core/toolkits.xml create mode 100644 .metadata/version.ini create mode 100644 src/common/mcpmod.info create mode 100644 src/minecraft/mcp.png diff --git a/.metadata/.lock b/.metadata/.lock new file mode 100644 index 00000000..e69de29b diff --git a/.metadata/.mylyn/.taskListIndex/segments.gen b/.metadata/.mylyn/.taskListIndex/segments.gen new file mode 100644 index 0000000000000000000000000000000000000000..63a7ec9a3ce3e4c844ffb7c8dd88e6eb3ff32ef5 GIT binary patch literal 20 QcmezW|NlP*2w;TK07=6G{r~^~ literal 0 HcmV?d00001 diff --git a/.metadata/.mylyn/.taskListIndex/segments_1 b/.metadata/.mylyn/.taskListIndex/segments_1 new file mode 100644 index 0000000000000000000000000000000000000000..5cefa8859c47b027a4acf915ddd0455e95070aea GIT binary patch literal 32 acmezW|NnOe21cuu>7So4paHHZuH68^HV8lf literal 0 HcmV?d00001 diff --git a/.metadata/.mylyn/repositories.xml.zip b/.metadata/.mylyn/repositories.xml.zip new file mode 100644 index 0000000000000000000000000000000000000000..d84442417efcd5124149b7780ceadfe85a5d4f94 GIT binary patch literal 442 zcmWIWW@Zs#;Nak3STiBUkpT$^0NF*U1^LC9CHX~}sl|E~xjAn`e7%_s1^#L)mT&G- zQ1b0&x9#i-J2=^=eEIDQH&s$5ZMz+xpS6EUXvWu9xieDY?(O;RvD`e{!^dDlVc2Qo zQZ3e7mqL$Si`w@k-(N3v{q2{`{qrwan_XmW){zVPqPZ{c*^_f~!+LtxZjo71mDl0W zCE{^9uxH--E~V{}iJr%dwZvbYZ@cr!B3%5pjf)BIxw)>o>!o>?wLFqr{ytx?XXyzA z=>yA_URyQe=Y)qV4v9ZH#crM*nzW{XqjS+TLlv8vd5KN^2W(0gT9uV;v|VEHOZY@l z<9h)Pwi%}TZl0>L(29}}NL!&OAb(IT=`p9$I?E|L*KPhA^-g)s`74)lW;nEbn6sxm zG1vK{bI*yX4y$?AzRFGeKl#(?C3keE+ML*YRCv#a10tM})e_1n?sGR z7zYG-ob^8EfAWm?_E0X~!pmC&f;99z&v<*DIeFfDYv`%d;hVN^=JeD#_wA&PULZ&F zOB1G7EgjbC)0QlIE*`2?!BF~?VQb4XRp%C?)j`2iME(dB8?tFG|--P0q(jX;3k{Kkz002QT7dQX_ literal 0 HcmV?d00001 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 new file mode 100644 index 0000000000000000000000000000000000000000..03c85b57de306eeac17d333a881f6c2e6d8d1dbb GIT binary patch literal 364 zcmZ?R*xjhShe1S2b=vdAllRFf=Oz}Hq!uZZBqrsg@^UE$m*y$>CzmJ~StuA!l{=WEK>s>Sd*r=q2YDrP>-A zn;M#!8Cn{d8W>sda_Q@p6r}=1dASZm{QeBKJMeQ)_3rXx4s>@*a!zVukqgKZ*qxr1 fm{SZ41suw9D|0II^hy$ovy1ggGi{-Yar+MdGA4Xu literal 0 HcmV?d00001 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 new file mode 100644 index 00000000..5f8e5901 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/jd.ide.eclipse.prefs @@ -0,0 +1,2 @@ +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 new file mode 100644 index 00000000..dffc6b51 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +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 new file mode 100644 index 00000000..32cbabee --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.epp.usagedata.recording.prefs @@ -0,0 +1,2 @@ +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 new file mode 100644 index 00000000..c8fd235a --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs @@ -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 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 new file mode 100644 index 00000000..67b1d96c --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.m2e.discovery.prefs @@ -0,0 +1,2 @@ +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 new file mode 100644 index 00000000..43e97e40 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.context.core.prefs @@ -0,0 +1,2 @@ +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 new file mode 100644 index 00000000..8d462a6c --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.mylyn.monitor.ui.prefs @@ -0,0 +1,2 @@ +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 new file mode 100644 index 00000000..f9e585ba --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.cvs.ui.prefs @@ -0,0 +1,2 @@ +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 new file mode 100644 index 00000000..56cd496f --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.ui.prefs @@ -0,0 +1,2 @@ +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 new file mode 100644 index 00000000..05c0b05a --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs @@ -0,0 +1,5 @@ +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 new file mode 100644 index 00000000..08076f23 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.prefs @@ -0,0 +1,2 @@ +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 new file mode 100644 index 00000000..4676c7fd --- /dev/null +++ b/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs @@ -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=\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 new file mode 100644 index 00000000..e5b7a6bb --- /dev/null +++ b/.metadata/.plugins/org.eclipse.epp.usagedata.recording/usagedata.csv @@ -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 diff --git a/.metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache b/.metadata/.plugins/org.eclipse.jdt.core/invalidArchivesCache new file mode 100644 index 0000000000000000000000000000000000000000..593f4708db84ac8fd0f5cc47c634f38c013fe9e4 GIT binary patch literal 4 LcmZQzU|;|M00aO5 literal 0 HcmV?d00001 diff --git a/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache b/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache new file mode 100644 index 0000000000000000000000000000000000000000..593f4708db84ac8fd0f5cc47c634f38c013fe9e4 GIT binary patch literal 4 LcmZQzU|;|M00aO5 literal 0 HcmV?d00001 diff --git a/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat b/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat new file mode 100644 index 0000000000000000000000000000000000000000..53dd38e2daf019473d0b90168bb2db166051c355 GIT binary patch literal 110 zcmZQzU|?c^05&ki?iJ)39~|V&2;?y`u=^Ut2e}6LgLq5~TwbAmo+0rb{=Tjt0cHkn esNx`h{}7M}3j + diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml b/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml new file mode 100644 index 00000000..9e390f50 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml @@ -0,0 +1,2 @@ + + diff --git a/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml b/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml new file mode 100644 index 00000000..0b856dc6 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml @@ -0,0 +1,10 @@ + +
+
+ + + + + +
+
diff --git a/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/0.log new file mode 100644 index 00000000..e69de29b 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 new file mode 100644 index 00000000..e0de5155 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.m2e.logback.configuration/logback.1.0.200.20111228-1245.xml @@ -0,0 +1,41 @@ + + + + %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 new file mode 100644 index 00000000..9a98d7e8 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml @@ -0,0 +1,11 @@ + +
+
+ + +
+
+ + +
+
diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml b/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml new file mode 100644 index 00000000..5ca0b776 --- /dev/null +++ b/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml @@ -0,0 +1,3 @@ + +
+
diff --git a/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml b/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml new file mode 100644 index 00000000..e08b313a --- /dev/null +++ b/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml @@ -0,0 +1,245 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 new file mode 100644 index 00000000..f213774b --- /dev/null +++ b/.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml @@ -0,0 +1,4 @@ + + + + \ 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 new file mode 100644 index 0000000000000000000000000000000000000000..1d364a6301c57140488f01f9ebc02d744417fb4e GIT binary patch literal 4060 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 O0000 literal 0 HcmV?d00001 diff --git a/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_gwt.png b/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_gwt.png new file mode 100644 index 0000000000000000000000000000000000000000..8f33b6b47f5eb6233215e56b1cd92b3116c71738 GIT binary patch literal 3892 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 literal 0 HcmV?d00001 diff --git a/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_swt.png b/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_swt.png new file mode 100644 index 0000000000000000000000000000000000000000..897496a555c115c3f6826dcc8703d999725be298 GIT binary patch literal 3894 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 Eg6)rWg8%>k literal 0 HcmV?d00001 diff --git a/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_xwt.png b/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkit_xwt.png new file mode 100644 index 0000000000000000000000000000000000000000..dc1a68ce930096b79932aa690dae19165c19aa47 GIT binary patch literal 4007 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 literal 0 HcmV?d00001 diff --git a/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkits.xml b/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkits.xml new file mode 100644 index 00000000..1727003c --- /dev/null +++ b/.metadata/.plugins/org.eclipse.wb.discovery.core/toolkits.xml @@ -0,0 +1,145 @@ + + + + + + + + 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 new file mode 100644 index 00000000..c51ff745 --- /dev/null +++ b/.metadata/version.ini @@ -0,0 +1 @@ +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 e243429f..520bf1c2 100644 --- a/src/common/basicpipes/BasicPipesMain.java +++ b/src/common/basicpipes/BasicPipesMain.java @@ -5,8 +5,7 @@ import net.minecraft.src.Block; import net.minecraft.src.Item; import net.minecraft.src.ItemStack; import net.minecraftforge.common.Configuration; -import universalelectricity.BasicComponents; -import universalelectricity.network.PacketManager; +import universalelectricity.prefab.network.PacketManager; import basicpipes.LTanks.ItemTank; import basicpipes.LTanks.TileEntityLTank; import basicpipes.conductors.BlockPipe; @@ -66,14 +65,14 @@ public class BasicPipesMain{ public static int configurationProperties() { config.load(); - pipeID = Integer.parseInt(config.getOrCreateIntProperty("PipeBlock", Configuration.CATEGORY_BLOCK, 155).value); - machineID = Integer.parseInt(config.getOrCreateIntProperty("machineBlock", Configuration.CATEGORY_BLOCK, 156).value); - valveID = Integer.parseInt(config.getOrCreateIntProperty("ValveBlock", Configuration.CATEGORY_BLOCK, 157).value); - rodID = Integer.parseInt(config.getOrCreateIntProperty("gearBlock", Configuration.CATEGORY_BLOCK, 158).value); - partID = Integer.parseInt(config.getOrCreateIntProperty("parts", Configuration.CATEGORY_ITEM, 23022).value); - ppipeID = Integer.parseInt(config.getOrCreateIntProperty("pipes", Configuration.CATEGORY_ITEM, 23023).value); - toolID = Integer.parseInt(config.getOrCreateIntProperty("ToolID", Configuration.CATEGORY_ITEM, 23024).value); - tankID = Integer.parseInt(config.getOrCreateIntProperty("tankID", Configuration.CATEGORY_ITEM, 23025).value); + pipeID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"PipeBlock", 155).value); + machineID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"machineBlock", 156).value); + valveID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"ValveBlock", 157).value); + rodID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"gearBlock", 158).value); + partID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,"parts", 23022).value); + ppipeID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,"pipes", 23023).value); + toolID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,"ToolID", 23024).value); + tankID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,"tankID", 23025).value); config.save(); return pipeID; } @@ -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)}); //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)}); - - try{ - GameRegistry.addRecipe(new ItemStack(parts, 2,0), new Object[] { "@@@", '@',BasicComponents.itemBronzeIngot});//bronze tube - //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 + 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) - , 'C',BasicComponents.blockCopperWire , '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)}); - } + } } diff --git a/src/common/basicpipes/LTanks/TileEntityLTank.java b/src/common/basicpipes/LTanks/TileEntityLTank.java index a19dd139..328dc94f 100644 --- a/src/common/basicpipes/LTanks/TileEntityLTank.java +++ b/src/common/basicpipes/LTanks/TileEntityLTank.java @@ -1,26 +1,22 @@ 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.ItemStack; +import net.minecraft.src.INetworkManager; import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.NBTTagList; -import net.minecraft.src.NetworkManager; import net.minecraft.src.Packet; import net.minecraft.src.Packet250CustomPayload; import net.minecraft.src.TileEntity; 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 TileEntity[] cc = {null,null,null,null,null,null}; @@ -193,7 +189,7 @@ public int presureOutput(Liquid type, ForgeDirection side) { @Override -public void handlePacketData(NetworkManager network, int packetType, +public void handlePacketData(INetworkManager network, int packetType, Packet250CustomPayload packet, EntityPlayer player, ByteArrayDataInput data) { try diff --git a/src/common/basicpipes/conductors/BlockRod.java b/src/common/basicpipes/conductors/BlockRod.java index ea4eb87a..6c69a42a 100644 --- a/src/common/basicpipes/conductors/BlockRod.java +++ b/src/common/basicpipes/conductors/BlockRod.java @@ -19,7 +19,7 @@ public class BlockRod extends universalelectricity.prefab.BlockMachine { this.setCreativeTab(CreativeTabs.tabRedstone); } @Override - protected int damageDropped(int metadata) + public int damageDropped(int metadata) { return 0; } diff --git a/src/common/basicpipes/conductors/TileEntityPipe.java b/src/common/basicpipes/conductors/TileEntityPipe.java index 61c4ed00..a50d9293 100644 --- a/src/common/basicpipes/conductors/TileEntityPipe.java +++ b/src/common/basicpipes/conductors/TileEntityPipe.java @@ -1,14 +1,14 @@ package basicpipes.conductors; import net.minecraft.src.EntityPlayer; +import net.minecraft.src.INetworkManager; import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.NetworkManager; import net.minecraft.src.Packet; import net.minecraft.src.Packet250CustomPayload; import net.minecraft.src.TileEntity; import net.minecraftforge.common.ForgeDirection; -import universalelectricity.network.IPacketReceiver; -import universalelectricity.network.PacketManager; -import universalelectricity.prefab.Vector3; +import universalelectricity.core.Vector3; +import universalelectricity.prefab.network.IPacketReceiver; +import universalelectricity.prefab.network.PacketManager; import basicpipes.pipes.api.ILiquidConsumer; import basicpipes.pipes.api.ILiquidProducer; import basicpipes.pipes.api.Liquid; @@ -166,7 +166,7 @@ public class TileEntityPipe extends TileEntity implements ILiquidConsumer,IPacke //data //-------------------- @Override - public void handlePacketData(NetworkManager network, int packetType, + public void handlePacketData(INetworkManager network, int packetType, Packet250CustomPayload packet, EntityPlayer player, ByteArrayDataInput data) { try diff --git a/src/common/basicpipes/conductors/TileEntityRod.java b/src/common/basicpipes/conductors/TileEntityRod.java index ca588e9e..73d7c485 100644 --- a/src/common/basicpipes/conductors/TileEntityRod.java +++ b/src/common/basicpipes/conductors/TileEntityRod.java @@ -1,15 +1,15 @@ package basicpipes.conductors; import net.minecraft.src.EntityPlayer; -import net.minecraft.src.NetworkManager; +import net.minecraft.src.INetworkManager; import net.minecraft.src.Packet; import net.minecraft.src.Packet250CustomPayload; import net.minecraft.src.TileEntity; import net.minecraftforge.common.ForgeDirection; import steampower.SteamPowerMain; -import universalelectricity.network.IPacketReceiver; -import universalelectricity.network.PacketManager; -import universalelectricity.prefab.Vector3; +import universalelectricity.core.Vector3; +import universalelectricity.prefab.network.IPacketReceiver; +import universalelectricity.prefab.network.PacketManager; import basicpipes.pipes.api.IMechanical; import com.google.common.io.ByteArrayDataInput; @@ -112,7 +112,7 @@ public class TileEntityRod extends TileEntity implements IPacketReceiver,IMechan } @Override - public void handlePacketData(NetworkManager network, int packetType, + public void handlePacketData(INetworkManager network, int packetType, Packet250CustomPayload packet, EntityPlayer player, ByteArrayDataInput data) { try diff --git a/src/common/basicpipes/machines/BlockMachine.java b/src/common/basicpipes/machines/BlockMachine.java index 729a0eb9..d27395e2 100644 --- a/src/common/basicpipes/machines/BlockMachine.java +++ b/src/common/basicpipes/machines/BlockMachine.java @@ -1,7 +1,5 @@ package basicpipes.machines; -import java.util.Random; - import net.minecraft.src.BlockContainer; import net.minecraft.src.CreativeTabs; import net.minecraft.src.Material; @@ -41,7 +39,7 @@ public class BlockMachine extends BlockContainer { return ItemRenderHelper.renderID; } - protected int damageDropped(int meta) + public int damageDropped(int meta) { if(meta < 4) { diff --git a/src/common/basicpipes/machines/BlockValve.java b/src/common/basicpipes/machines/BlockValve.java index d139ba67..9240a9e1 100644 --- a/src/common/basicpipes/machines/BlockValve.java +++ b/src/common/basicpipes/machines/BlockValve.java @@ -1,12 +1,12 @@ package basicpipes.machines; -import java.util.ArrayList; -import net.minecraft.src.*; - 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; public class BlockValve extends universalelectricity.prefab.BlockMachine @@ -148,7 +148,7 @@ public class BlockValve extends universalelectricity.prefab.BlockMachine { return this.blockID; } - protected int damageDropped(int meta) + public int damageDropped(int meta) { if(meta < 8) { diff --git a/src/common/mcpmod.info b/src/common/mcpmod.info new file mode 100644 index 00000000..4a0d4ac4 --- /dev/null +++ b/src/common/mcpmod.info @@ -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": [] +} +] diff --git a/src/common/steampower/BlockMachine.java b/src/common/steampower/BlockMachine.java index 612810a4..06ea2bda 100644 --- a/src/common/steampower/BlockMachine.java +++ b/src/common/steampower/BlockMachine.java @@ -30,7 +30,7 @@ public class BlockMachine extends universalelectricity.prefab.BlockMachine this.setResistance(3f); } @Override - protected int damageDropped(int metadata) + public int damageDropped(int metadata) { return metadata; } diff --git a/src/common/steampower/SteamPowerMain.java b/src/common/steampower/SteamPowerMain.java index 8d8edf19..9200d012 100644 --- a/src/common/steampower/SteamPowerMain.java +++ b/src/common/steampower/SteamPowerMain.java @@ -2,15 +2,16 @@ package steampower; import java.io.File; import net.minecraft.src.Block; +import net.minecraft.src.CraftingManager; import net.minecraft.src.Item; import net.minecraft.src.ItemStack; import net.minecraftforge.common.Configuration; +import net.minecraftforge.oredict.ShapedOreRecipe; import steampower.turbine.BlockGenerator; import steampower.turbine.BlockSteamPiston; import steampower.turbine.ItemEngine; import steampower.turbine.TileEntitytopGen; -import universalelectricity.BasicComponents; -import universalelectricity.network.PacketManager; +import universalelectricity.prefab.network.PacketManager; import basicpipes.BasicPipesMain; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.Init; @@ -52,14 +53,14 @@ public class SteamPowerMain{ public static int configurationProperties() { config.load(); - BlockID = Integer.parseInt(config.getOrCreateIntProperty("MachinesID", Configuration.CATEGORY_BLOCK, 3030).value); - EngineItemID = Integer.parseInt(config.getOrCreateIntProperty("EngineItem", Configuration.CATEGORY_ITEM, 30308).value); - EngineID = Integer.parseInt(config.getOrCreateIntProperty("SteamEngineID", Configuration.CATEGORY_BLOCK, 3031).value); - genID = Integer.parseInt(config.getOrCreateIntProperty("ElecGenID", Configuration.CATEGORY_BLOCK, 3032).value); - genOutput = Integer.parseInt(config.getOrCreateIntProperty("genOutputWattsmax", Configuration.CATEGORY_GENERAL, 1000).value); - steamOutBoiler = Integer.parseInt(config.getOrCreateIntProperty("steamOutPerCycle", Configuration.CATEGORY_GENERAL, 10).value); - boilerHeat = Integer.parseInt(config.getOrCreateIntProperty("boilerInKJNeed", Configuration.CATEGORY_GENERAL, 4500).value); - fireOutput = Integer.parseInt(config.getOrCreateIntProperty("fireBoxOutKJMax", Configuration.CATEGORY_GENERAL,250).value); + BlockID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"MachinesID", 3030).value); + EngineItemID = Integer.parseInt(config.get(Configuration.CATEGORY_ITEM,"EngineItem", 30308).value); + EngineID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"SteamEngineID", 3031).value); + genID = Integer.parseInt(config.get(Configuration.CATEGORY_BLOCK,"ElecGenID", 3032).value); + genOutput = Integer.parseInt(config.get(Configuration.CATEGORY_GENERAL,"genOutputWattsmax", 1000).value); + steamOutBoiler = Integer.parseInt(config.get(Configuration.CATEGORY_GENERAL,"steamOutPerCycle", 10).value); + boilerHeat = Integer.parseInt(config.get(Configuration.CATEGORY_GENERAL,"boilerInKJNeed", 4500).value); + fireOutput = Integer.parseInt(config.get(Configuration.CATEGORY_GENERAL,"fireBoxOutKJMax", 250).value); config.save(); return BlockID; } @@ -93,28 +94,32 @@ public class SteamPowerMain{ 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 */ - GameRegistry.addRecipe(new ItemStack(gen, 1), new Object [] {"@T@", "OVO", "@T@", - 'T',new ItemStack(BasicPipesMain.rod, 1), - '@',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", + 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)}); - GameRegistry.addRecipe(new ItemStack(machine, 1, 2), new Object [] { "@", "F", + 'V',new ItemStack(BasicPipesMain.parts, 1,7)})); + CraftingManager.getInstance().getRecipeList().add( + new ShapedOreRecipe(new ItemStack(machine, 1, 2), new Object [] { "@", "F", 'F',Block.stoneOvenIdle, - '@',new ItemStack(BasicComponents.itemSteelPlate)}); - GameRegistry.addRecipe(new ItemStack(itemEngine, 1,0), new Object [] {"GGG", "VPV", "@T@", + '@',"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, - '@',new ItemStack(BasicComponents.itemSteelPlate), + '@',"plateSteel", 'P',Block.pistonBase, 'V',new ItemStack(BasicPipesMain.parts, 1,7), - 'M',new ItemStack(BasicComponents.itemMotor)});} + 'M',"motor"})); + } catch(Exception e) { e.printStackTrace(); diff --git a/src/common/steampower/TileEntityMachine.java b/src/common/steampower/TileEntityMachine.java index cd5d9242..59352751 100644 --- a/src/common/steampower/TileEntityMachine.java +++ b/src/common/steampower/TileEntityMachine.java @@ -9,9 +9,8 @@ import net.minecraft.src.Packet; import net.minecraft.src.TileEntity; import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ISidedInventory; -import universalelectricity.network.PacketManager; -import universalelectricity.prefab.TileEntityElectricityReceiver; -import universalelectricity.prefab.Vector3; +import universalelectricity.core.Vector3; +import universalelectricity.prefab.network.PacketManager; public class TileEntityMachine extends TileEntity implements IInventory, ISidedInventory { public int facing = 0; diff --git a/src/common/steampower/boiler/TileEntityBoiler.java b/src/common/steampower/boiler/TileEntityBoiler.java index afabf5d7..6639f660 100644 --- a/src/common/steampower/boiler/TileEntityBoiler.java +++ b/src/common/steampower/boiler/TileEntityBoiler.java @@ -1,22 +1,14 @@ package steampower.boiler; -import java.util.Random; - import net.minecraft.src.Block; import net.minecraft.src.EntityPlayer; -import net.minecraft.src.Item; -import net.minecraft.src.ItemStack; +import net.minecraft.src.INetworkManager; import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.NBTTagList; -import net.minecraft.src.NetworkManager; import net.minecraft.src.Packet250CustomPayload; import net.minecraft.src.TileEntity; import net.minecraftforge.common.ForgeDirection; -import steampower.SteamPowerMain; import steampower.TileEntityMachine; -import universalelectricity.network.IPacketReceiver; -import basicpipes.conductors.TileEntityPipe; +import universalelectricity.prefab.network.IPacketReceiver; import basicpipes.pipes.api.IHeatProducer; -import basicpipes.pipes.api.ILiquidConsumer; import basicpipes.pipes.api.ILiquidProducer; import basicpipes.pipes.api.IStorageTank; 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}; } @Override - public void handlePacketData(NetworkManager network, int packetType, + public void handlePacketData(INetworkManager network, int packetType, Packet250CustomPayload packet, EntityPlayer player, ByteArrayDataInput dataStream) { try{ diff --git a/src/common/steampower/burner/TileEntityFireBox.java b/src/common/steampower/burner/TileEntityFireBox.java index 21c299ae..3d0777ac 100644 --- a/src/common/steampower/burner/TileEntityFireBox.java +++ b/src/common/steampower/burner/TileEntityFireBox.java @@ -2,10 +2,10 @@ package steampower.burner; 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.NetworkManager; import net.minecraft.src.Packet250CustomPayload; import net.minecraft.src.TileEntity; import net.minecraftforge.common.ForgeDirection; @@ -13,7 +13,7 @@ import net.minecraftforge.common.ISidedInventory; import steampower.SteamPowerMain; import steampower.TileEntityMachine; import steampower.boiler.TileEntityBoiler; -import universalelectricity.network.IPacketReceiver; +import universalelectricity.prefab.network.IPacketReceiver; import basicpipes.pipes.api.IHeatProducer; import basicpipes.pipes.api.MHelper; @@ -195,7 +195,7 @@ public class TileEntityFireBox extends TileEntityMachine implements IPacketRecei } @Override - public void handlePacketData(NetworkManager network, int packetType, + public void handlePacketData(INetworkManager network, int packetType, Packet250CustomPayload packet, EntityPlayer player, ByteArrayDataInput dataStream) { try diff --git a/src/common/steampower/turbine/ItemEngine.java b/src/common/steampower/turbine/ItemEngine.java index 7dac120e..8af348f2 100644 --- a/src/common/steampower/turbine/ItemEngine.java +++ b/src/common/steampower/turbine/ItemEngine.java @@ -30,42 +30,87 @@ public class ItemEngine extends Item // TODO Auto-generated method stub 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; + } + 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; } - - Block var11 = SteamPowerMain.engine; - int angle = MathHelper.floor_double((ePlayer.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; - - if (ePlayer.canPlayerEdit(x, y, z)) - { - ++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; } } diff --git a/src/common/steampower/turbine/TileEntityGen.java b/src/common/steampower/turbine/TileEntityGen.java index e4565030..96dad40b 100644 --- a/src/common/steampower/turbine/TileEntityGen.java +++ b/src/common/steampower/turbine/TileEntityGen.java @@ -1,7 +1,7 @@ package steampower.turbine; import net.minecraft.src.EntityPlayer; -import net.minecraft.src.NetworkManager; +import net.minecraft.src.INetworkManager; import net.minecraft.src.Packet250CustomPayload; import net.minecraft.src.TileEntity; import net.minecraftforge.common.ForgeDirection; @@ -9,8 +9,7 @@ import steampower.TileEntityMachine; import universalelectricity.electricity.ElectricityManager; import universalelectricity.implement.IConductor; import universalelectricity.implement.IElectricityProducer; -import universalelectricity.network.IPacketReceiver; - +import universalelectricity.prefab.network.IPacketReceiver; import basicpipes.pipes.api.IMechanical; import com.google.common.io.ByteArrayDataInput; @@ -71,7 +70,7 @@ public class TileEntityGen extends TileEntityMachine implements IPacketReceiver, 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; wireCount++; @@ -99,7 +98,7 @@ public class TileEntityGen extends TileEntityMachine implements IPacketReceiver, super.updateEntity(); } @Override - public void handlePacketData(NetworkManager network, int packetType, + public void handlePacketData(INetworkManager network, int packetType, Packet250CustomPayload packet, EntityPlayer player, ByteArrayDataInput data) { // TODO Auto-generated method stub diff --git a/src/common/steampower/turbine/TileEntitySteamPiston.java b/src/common/steampower/turbine/TileEntitySteamPiston.java index f77868a4..79f2be34 100644 --- a/src/common/steampower/turbine/TileEntitySteamPiston.java +++ b/src/common/steampower/turbine/TileEntitySteamPiston.java @@ -1,24 +1,17 @@ package steampower.turbine; import net.minecraft.src.EntityPlayer; -import net.minecraft.src.IInventory; -import net.minecraft.src.Item; -import net.minecraft.src.ItemStack; +import net.minecraft.src.INetworkManager; import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.NBTTagList; -import net.minecraft.src.NetworkManager; import net.minecraft.src.Packet250CustomPayload; import net.minecraft.src.TileEntity; import net.minecraftforge.common.ForgeDirection; -import net.minecraftforge.common.ISidedInventory; import steampower.TileEntityMachine; -import universalelectricity.network.IPacketReceiver; -import basicpipes.conductors.TileEntityRod; +import universalelectricity.prefab.network.IPacketReceiver; import basicpipes.pipes.api.ILiquidConsumer; import basicpipes.pipes.api.ILiquidProducer; import basicpipes.pipes.api.IMechanical; import basicpipes.pipes.api.Liquid; -import basicpipes.conductors.*; import com.google.common.io.ByteArrayDataInput; @@ -276,7 +269,7 @@ public class TileEntitySteamPiston extends TileEntityMachine implements IPacketR return false; } @Override - public void handlePacketData(NetworkManager network, int packetType, + public void handlePacketData(INetworkManager network, int packetType, Packet250CustomPayload packet, EntityPlayer player, ByteArrayDataInput dataStream) { try diff --git a/src/minecraft/basicpipes/ModelLargePipe.java b/src/minecraft/basicpipes/ModelLargePipe.java index c8939584..212b10db 100644 --- a/src/minecraft/basicpipes/ModelLargePipe.java +++ b/src/minecraft/basicpipes/ModelLargePipe.java @@ -165,25 +165,7 @@ public class ModelLargePipe extends ModelBase 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 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) { @@ -191,10 +173,5 @@ public class ModelLargePipe extends ModelBase model.rotateAngleY = y; 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); - } } diff --git a/src/minecraft/basicpipes/ModelPipe.java b/src/minecraft/basicpipes/ModelPipe.java index e1a21d36..b6122956 100644 --- a/src/minecraft/basicpipes/ModelPipe.java +++ b/src/minecraft/basicpipes/ModelPipe.java @@ -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) { 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.renderBottom(); this.renderTop(); @@ -89,10 +89,5 @@ public class ModelPipe extends ModelBase model.rotateAngleY = y; 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); - } } diff --git a/src/minecraft/basicpipes/ModelPump.java b/src/minecraft/basicpipes/ModelPump.java index 4be9d07a..88cb2af9 100644 --- a/src/minecraft/basicpipes/ModelPump.java +++ b/src/minecraft/basicpipes/ModelPump.java @@ -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) { 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) { @@ -137,10 +137,4 @@ public class ModelPump extends ModelBase model.rotateAngleY = y; 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); - } - } diff --git a/src/minecraft/basicpipes/renderTank/ModelLiquidTank.java b/src/minecraft/basicpipes/renderTank/ModelLiquidTank.java index 8375b443..e4d217c2 100644 --- a/src/minecraft/basicpipes/renderTank/ModelLiquidTank.java +++ b/src/minecraft/basicpipes/renderTank/ModelLiquidTank.java @@ -418,10 +418,5 @@ public class ModelLiquidTank extends ModelBase model.rotateAngleY = y; 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); - } } diff --git a/src/minecraft/basicpipes/renderTank/ModelLiquidTankCorner.java b/src/minecraft/basicpipes/renderTank/ModelLiquidTankCorner.java index 199fc650..b666d216 100644 --- a/src/minecraft/basicpipes/renderTank/ModelLiquidTankCorner.java +++ b/src/minecraft/basicpipes/renderTank/ModelLiquidTankCorner.java @@ -129,10 +129,5 @@ public class ModelLiquidTankCorner extends ModelBase model.rotateAngleY = y; 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); - } } diff --git a/src/minecraft/mcp.png b/src/minecraft/mcp.png new file mode 100644 index 0000000000000000000000000000000000000000..8ebae880d0244f25a76a984a55729e4c0c9c3cf1 GIT binary patch literal 6940 zcmV+%8{_1OP)N2bPDNB8 zb~7$DE;u(kfL#Cp8ktE%K~#8N?VU}MB*hVhduD_{BQs$bCbSqsW}1bTy2313VXQHh z?AdStZUCp?oUM6P^Yy%ZxJP7G6+^cai?Z&_it_OApBMfUS#|f%zkhoF#iuV%uYbS# z{Pfa2e{r9`|M}NH?)72}_g}qwb+1>BXIwYWnt#cE+27OmzdL}z!J%{R8K@)(&8~g! zHUE2XUh=QOb=lu}v+p+bnZM=xxAwmUChwxG1!fD(W)buPvoV<6xqvclNhJI7i_h-$ z%5j+TVqLKuKCX`_^!6JcSFeRhtdD?It!YyS5Ix+VW}A$Zx}xN!T}{BMEDyXTS?m@P2N zM!^EJV_W z+fGKl`Of4#n=fVb)Hl=9p|uR}_$q;1T$jsNPJtkQ{PD*Vpg5>xHGVdK8oI8f?C-z- z{zTX5rGfF;ufP8Kfd?P&3g>_LJ-UAHf>nIzUh=EYbUb(K_WS%VSyWxPYHT-OcfSh% zHD4vWBRuE1B3(OOKmvUqSxefr^VB$N645I=QH#p~mvA%;l&)Q8f1R02Uz6MM>KAbMf@Az;7 z_O)=IC{Wj37vczwN{8A#XJCTt(&>G7@AyckmwY-t_N)aR&cLLKLiAa;gHDGPn9OwO zvdQ&vjXgXDFcE<0CA;GPH*fCB!Z?0%D!`_(a8daMezg zJGVzAiZ+sN#|PjeUPn$00Qye9XZ=oBavJfG5ng48ZtQ8)6>Z73iX4y9&fQ<1uhuWU zc5AF?bbPq|X$>Q~N7mwWpTDDQVIm55$%3f|Ek1A8R#QuE!fYYqNthoUW z{S|od^6T_d=-vcOBt-3C9`@>*h(v;xLM8mp=-nB8(WxNO)eCTdCZF&40CaqQAIpv= z1Cv2Jua_vZ;sYK=U;-bkGi6FWBJX!{?bcZF*U389uer3ABQ!cb5==x_o5ZEGk(=Zs zn-H(EJ?y1h;}JPYf7plUV&_L_bbS0#VB#Q>z(I5Zu(V)O749+u=^_Tk0Vb|U-{B?f z=g*%#C}7rw@%by-awJj_(bbD+z@3l+7c~$E9-=A6dok<`erJ9?5ABe>IxpjNp)DsN zI&&FxYs~weHek5WMh5Pj)fzpF&$at}fST@gwT&bEtdToU^0NXPv)JHwh-x zwnnsFCgN{ITlCp*0F;V0^6+)LJbW!gCQethD;m;y#~*X~oWCcSbkPS92Xdhz^}*E&M_VVN3)Dv8nZhx#}Nc-LT#g|@LV{zK(!|9G_!|%r*z1T$3 z%=Pl+%aaXY|GrM<(0ZM>s@sFU8TZ#u{(SPmOZ>00Ki{OGnW>5cNag=TC+_RIr}gWz ze*d8Wdo7r_BX~68pyE5cM-?#S&gWsc-*?(52xVq#IwK^nudv>3&T2gxt2r+L6JL*Z zFHfCVeyfm?|GKeY#Cjj2!l`g9z4yy6 zzdRgt%3L{V6Pd`_^h!|5IW=F7JvwI=PrXo%p>}q?psRIw1mQe6P0gjT)J)takfF;!W4-vv82-u* zNlD;AOEQ*=9wCl55u7M%^DAo-ki)uG+)c zh4T#E>@2xH8LzR}U)L=4gek%_Fy9Yrx#DN z=8@I%N-nJ53&4D?;sx;XG@#Q*&hG}&@#2NPj_yeRT8Gnic_m2U^dnwaCu7;o0ev

_~`&Fa@&~$bKKN-Eu);~OF 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 i