Really readd Insertion Pipe. It wasn't an old enough file I was looki…

…ng at. Tested with BC6.4.2. Add Translation Update for Russian from Lex1975
da3dsoul · Mar 5, 2015 · f221ba9 · f221ba9
1 parent c68d9ea
commit f221ba9
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 19 deletions.
diff --git a/.gradle/gradle.log b/.gradle/gradle.log
@@ -5,7 +5,21 @@
  R4wk, ZeuX, IngisKahn, bspkrs
  MCP Data version : unknown
 ****************************
+:compileApiJava UP-TO-DATE
+:processApiResources UP-TO-DATE
+:apiClasses UP-TO-DATE
+:sourceMainJava UP-TO-DATE
+:compileJava UP-TO-DATE
+:processResources
+:classes
+:jar
+:extractMcpData UP-TO-DATE
+:getVersionJson
+:extractUserDev UP-TO-DATE
+:genSrgs SKIPPED
+:reobf
+:assemble
 
 BUILD SUCCESSFUL
 
-Total time: 2.073 secs
+Total time: 4.096 secs
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,8 @@
 buildscript {
     repositories {
+    flatDir {
+       dirs 'libs'
+   }
         mavenCentral()
         maven {
             name = "forge"
@@ -17,21 +20,15 @@ buildscript {
 
 apply plugin: 'forge'
 
-version = "release2.1"
+version = "release2.3"
 group= "abo" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = "ABO-MC1.7.10-BC6.3"
+archivesBaseName = "ABO-MC1.7.10-BC6.4"
 
 minecraft {
     version = "1.7.10-10.13.2.1277"
     runDir = "eclipse/assets"
 }
 
-repositories {
-    flatDir {
-       dirs 'libs'
-   }
-}
-
 dependencies {
     // you may put jars on which you depend on in ./libs
     // or you may define them like so..
@@ -42,7 +39,7 @@ dependencies {
     //if buildcraft maven is not updated again, replace this with buildcraft-version-dev and uncomment it
     //compile name: 'buildcraft-6.1.4-dev'
     //if buildcraft maven is not updated, comment out this line
-    compile 'com.mod-buildcraft:buildcraft:6.3.1:dev'  // adds buildcraft to the dev env
+    //compile 'com.mod-buildcraft:buildcraft:6.4.0:dev'  // adds buildcraft to the dev env
     //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
 
     // for more info...

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jul 02 15:54:47 CDT 2014
+#Mon Feb 23 16:48:58 EST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.0-all.zip
diff --git a/src/main/java/abo/pipes/items/PipeItemsInsertion.java b/src/main/java/abo/pipes/items/PipeItemsInsertion.java
@@ -16,6 +16,7 @@
 import abo.pipes.ABOPipe;
 import buildcraft.api.transport.IPipeTile;
 import buildcraft.core.inventory.InvUtils;
+import buildcraft.core.inventory.Transactor;
 import buildcraft.core.inventory.TransactorSimple;
 import buildcraft.transport.PipeTransportItems;
 import buildcraft.transport.TileGenericPipe;
@@ -75,8 +76,8 @@ public void eventHandler(PipeEventItem.FindDest event) {
             TileEntity entity = container.getTile(o);
             if (entity instanceof IPipeTile) {
                 pipesList.add(o);
-            } else if (entity instanceof TileEntityEnderChest) {
-                nonPipesList.add(o);
+            }else{
+                    nonPipesList.add(o);
             }
         }
 
@@ -124,6 +125,8 @@ private boolean canReceivePipeObjects(ForgeDirection o, TravelingItem item) {
             TileGenericPipe pipe = (TileGenericPipe) entity;
 
             return pipe.pipe.transport instanceof PipeTransportItems;
+		} else if (entity instanceof IInventory && item.getInsertionHandler().canInsertItem(item, (IInventory) entity)) {
+			if (Transactor.getTransactorFor(entity).add(item.getItemStack(), o.getOpposite(), false).stackSize > 0) { return true; }
         } else if (entity instanceof TileEntityEnderChest) {
             if (new TransactorSimple(InvUtils.getInventory((IInventory) ABO.instance.getInventoryEnderChest())).add(
                     item.getItemStack(), o.getOpposite(), false).stackSize > 0) { return true; }

diff --git a/src/main/resources/assets/additional-buildcraft-objects/lang/en_US.lang b/src/main/resources/assets/additional-buildcraft-objects/lang/en_US.lang
@@ -7,7 +7,7 @@ item.PipeFluidsReinforcedGolden.name=Reinforced Golden Fluid Pipe
 item.PipeFluidsBalance.name=Balancing Fluid Pipe
 item.PipeFluidsInsertion.name=Insertion Fluid Pipe
 item.PipeItemsRoundRobin.name=Round-Robin Transport Pipe
-item.PipeItemsInsertion.name=Ender Insertion Pipe
+item.PipeItemsInsertion.name=Insertion Pipe
 item.PipeItemsDivide.name=Division Transport Pipe
 item.PipeItemsExtraction.name=Extraction Transport Pipe
 item.PipeItemsCrossover.name=Crossover Transport Pipe

diff --git a/src/main/resources/assets/additional-buildcraft-objects/lang/ru_RU.lang b/src/main/resources/assets/additional-buildcraft-objects/lang/ru_RU.lang
@@ -19,7 +19,7 @@ item.waterwheelItem.name=Водяное колесо
 item.MobBottleFull.name=Бутылка (Полная)
 item.MobBottleEmpty.name=Бутылка (Пустая)
 item.GoldenStaff.name=Жёлтая краска на палочке
-tile.windmillBlock.name=Мельница
+tile.windmillBlock.name=Гидрогенератор
 tile.waterwheelBlock.name=Водяное колесо
 
 generator.scaryGen=Жуткая генерация
diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info
@@ -3,11 +3,11 @@
   "modid": "Additional-Buildcraft-Objects",
   "name": "Additional Buildcraft Objects",
   "description": "Extending Buildcraft with additional pipes and machines.",
-  "version": "",
-  "credits": "Created by Flow86",
+  "version": "release2.3",
+  "credits": "Created by Flow86, DA3DSOUL",
   "logoFile": "/gfx/abo/logo.png",
   "mcversion": "",
-  "url": "http://www.minecraftforum.net/index.php?app=forums&module=forums&section=findpost&pid=8920844",
+  "url": "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/2310397",
   "updateUrl": "",
   "authors": [ "DA3DSOUL", "Flow86", "blakmajik", "Others" ],
   "parent":"",