The One Probe implementation

Multiple modules for the chassis pipe were implemented. Crafting pipe and satellite pipe were also implemented.
RS485 · Apr 25, 2021 · 6631b89 · 6631b89
1 parent c1c6325
commit 6631b89
Show file tree

Hide file tree

Showing 5 changed files with 393 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -248,6 +248,7 @@ dependencies {
     implementation group: 'com.charleskorn.kaml', name: 'kaml', version: kaml_version
     implementation group: 'com.github.RS485', name: 'CodeChickenLib', version: '5901b4c6f4af70e6ef2dbe194bf7e0e097bb375c', classifier: 'deobf'
 
+    compileOnly group: 'mcjty.theoneprobe', name: 'TheOneProbe-1.12', version: '1.12-1.4.28-17', classifier: 'api'
     compileOnly group: 'mezz.jei', name: 'jei_1.12.2', version: '4.15.0.293'
     compileOnly group: 'MCMultiPart2', name: 'MCMultiPart', version: '2.5.3', classifier: 'deobf'
     compileOnly group: 'com.mod-buildcraft', name: 'buildcraft-all', version: '7.99.24.6', transitive: false

diff --git a/common/logisticspipes/LPConstants.java b/common/logisticspipes/LPConstants.java
@@ -31,5 +31,6 @@ private LPConstants() {}
 	public static final String mcmpModID = "mcmultipart";
 	public static final String appliedenergisticsModID = "appliedenergistics2";
 	public static final String storagedrawersModID = "storagedrawers";
+	public static final String theOneProbeModID = "theoneprobe";
 
 }
diff --git a/common/logisticspipes/LogisticsPipes.java b/common/logisticspipes/LogisticsPipes.java
@@ -48,9 +48,11 @@
 import net.minecraftforge.common.crafting.CraftingHelper;
 import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.fluids.capability.IFluidHandler;
+import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.FMLFingerprintViolationEvent;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLInterModComms;
 import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
 import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent;
@@ -187,6 +189,7 @@
 import logisticspipes.utils.TankUtilFactory;
 import logisticspipes.utils.tuples.Pair;
 import network.rs485.grow.ServerTickDispatcher;
+import network.rs485.logisticspipes.compat.TheOneProbeIntegration;
 import network.rs485.logisticspipes.config.ClientConfiguration;
 import network.rs485.logisticspipes.config.ServerConfigurationManager;
 import network.rs485.logisticspipes.gui.LPFontRenderer;
@@ -407,6 +410,11 @@ public void preInit(FMLPreInitializationEvent evt) {
 		SimpleServiceLocator.setPipeInformationManager(new PipeInformationManager());
 		SimpleServiceLocator.setLogisticsFluidManager(new LogisticsFluidManager());
 
+		if (Loader.isModLoaded(LPConstants.theOneProbeModID)) {
+			FMLInterModComms.sendFunctionMessage(LPConstants.theOneProbeModID, "getTheOneProbe",
+					TheOneProbeIntegration.class.getName());
+		}
+
 		MainProxy.proxy.initModelLoader();
 	}
 

diff --git a/resources/assets/logisticspipes/lang/en_us.lang b/resources/assets/logisticspipes/lang/en_us.lang
@@ -523,4 +523,37 @@ gui.popup.selectsatellite.unset=Unset
 
 itemstackinfo.lprouteditem=$REDItem with stored LogisticsPipes routing information
 itemstackinfo.lproutediteminfo=$YELLOWDrop to remove routing information and get original items back
-itemstackinfo.lprouteditemtype=Stored item
+itemstackinfo.lprouteditemtype=Stored item
+
+top.logistics_pipes.crafting_result=§e§lCrafting result:
+top.logistics_pipes.crafting_ingredients=§e§lCrafting result:
+top.logistics_pipes.crafting_satellite_ingredients=§e§Ingredients sent through %s:
+top.logistics_pipes.crafting_extracting_byproduct=§e§lExtracting byproduct:
+top.logistics_pipes.crafting_no_result=§c§lNo crafting setup
+
+top.logistics_pipes.satellite_name=§e§lSatellite name:
+
+top.logistics_pipes.general_upgrades=§e§lUpgrades:
+top.logistics_pipes.general_no_upgrades=§cNo upgrades.
+top.logistics_pipes.general_is_default_route=§oThis §a§ois§f§o set as a default route.
+top.logistics_pipes.general_is_not_default_route=§oThis §c§ois not§f§o set as a default route.
+
+top.logistics_pipes.general_exclude=§c§oexclude
+top.logistics_pipes.general_include=§a§oinclude
+
+top.logistics_pipes.module_provider_filter=§oFiltering items to %s.
+top.logistics_pipes.module_crafting_result=Crafting §b§o%s§f§o.
+top.logistics_pipes.module_crafting_result_with_byproduct=§oCrafting §b§o%s§f§o with §b§o%s§f§o as byproduct.
+
+top.logistics_pipes.chassis_no_modules=§cNo modules installed.
+
+top.logistics_pipes.module_terminus_terminated_items=§oThere are terminated items.
+
+top.logistics_pipes.module_mod_item_sink_filtered=§oAccepting items from mods: %s
+top.logistics_pipes.module_mod_item_sink_no_filter=§oThere are §c§ono mods set§f§o to filter.
+
+top.logistics_pipes.module_creative_tab_item_sink_filtered=§oAccepting items from tabs: %s
+top.logistics_pipes.module_creative_tab_item_sink_no_filter=§oThere are §c§ono creative tabs set§f§o to filter.
+
+top.logistics_pipes.module_ore_item_sink_filtered=§oAccepting ores matching: %s
+top.logistics_pipes.module_ore_item_sink_no_filter=§oThere are §c§ono ores set§f§o to filter.