View difference between Paste ID: ZnHMn60g and 4XYCedMC

---[[
+--[[Gestion base 1.0 : Ce script permet de faire un suivis des stocks d'une base (tank, chest et barrels) avec une station principale et des secondaires. Pour les chest et barrels il faut utiliser "peripheral proxy".--]]
-	Base Monitor 1.9.1
+
-		This script allows you to monitor caches, tanks, barrels and chests
+local isMain = true; -- base principale (qui va recevoire les information sdes autres bases
-		Monitoring chests requires an open peripheral proxy, the same goes for
+local myid = os.computerLabel()
-		buildcraft tanks.
+local id = myid -- "Base principale"; -- nom de la base
-		You can build one of more computers and set one of them as the main server by
+local UpdateIntervalSeconds = 10; -- reduire le temps si server trop charge
-		setting isMain to true. This will let it receive information from other computers.
+local ItemsFullPercentAt = 256; -- stock minimum d'objet (barre %)
-		For the main server to receive info from other computers you need to attach a
+local FluidFullPercentAt = 64000; -- stock minimum de liquide (barre %)
-		wireless modem to each computer.
+
-		Peripherals can be attached to any side you like, the script will automatically
+local VersionInfo = "Gestion stock"; -- nom de la version
-		work out where the peripherals are.
+
-	Changes since 1.9
+
-		Added support for minecraft chests behind Advanced Peripherals
+
-		Added support for Liquid tanks behind Advanced Peripherals
+
-	Changes since 1.8
+
-		Added support for the Advanced Peripherals Block Reader
+local chestTextColor = colors.white; -- couleur text (chest)
-		Added support for Liquids in the RS Bridge
+local chestBackColor = colors.purple; -- couleur fond (chest)
-	Changes since 1.7
+
-		Updated the script for ComputerCraft Tweaked.
+
-		Chests and Tanks have different function names when getting info via modems.
+
-		Added checks to support both new and old methods.
+
-		Added support for industrial foregoing blackhole tanks.
+
-		Replacing multiple spaces in names with a single space.
+local blacklist = {"xxxx"}; -- element a exclure de l'affichage ex: "iron" n'affichera pas Iron ore, Iron Block, Iron Helmet, ...
-		Updated Energy section to support new function names.
+local whitelist = {""}; -- ajouter les therme a afficher. si whitelist = "" pour desactiver
-	Changes since 1.6
+
-		Made significant changed to how peripherals are checked and processed.
+
-		Redesigned how the contents is processed and stored so that there is a timestamp.
+
-		The timestamp allows remote computer information to be processed correctly.
+
-		Each computer must have a unique id set, if the same id is used for two systems,
+
-		then the last one to update the table will win and you won't see all the content.
+print("Demmarrage "..VersionInfo);
-		Added ItemsFullPercentAt and FluidFullPercentAt to set what level is considered full.
+
-	Changes since 1.5
+
-        Added a workaround to ignore BuildCraft pipes if attached
+
-    Changes since 1.4
+
-        Added support for PeripheralPlusOne on Minecraft 1.12.2
+
-        Currently only supports ME Systems via the ME Bridge
+
-	Changes since 1.3
+
-		Changed filterexclude to blacklist and added whitelist
+
-	Changes since 1.2
+
-		Changed the way ME systems are processed as it was very slow.
+
-		Added filtering so that certain names of items can be excluded.
+function padString (sText, iLen) -- longueur des text
-		This was again a problem on ME systems with a lot of items in them.
+
-	Changes since 1.1
+
-		Fixed a bug with tanks. Used to check if getInventoryName existed to determine if the
+
-		peripheral is a tank or not. Now using the getType function instead.
+
-		Changed the string.match to string.find
+
-	http://youtu.be/KT-2hKjUpGA
+
---]]
+
 	if (iTextLen > iLen) then
-local isMain = true;
+
-local id = "Main Base";
+
-local UpdateIntervalSeconds = 60;
+
-local ItemsFullPercentAt = 256;
+
-local FluidFullPercentAt = 256;
+
 
-local VersionInfo = "Base Monitor 1.9.1";
+function prepmonitor(objectmon) -- preparation du moniteur
 	mon = peripheral.wrap(objectmon);
 	if (mon.isColor() == false) then
 		titleTextColor = colors.black;
 		titleBackColor = colors.white;
 		tankTextColor = colors.black;
-local chestTextColor = colors.white;
+
-local chestBackColor = colors.purple;
+
 		chestBackColor = colors.white;
 		cacheTextColor = colors.black;
 		cacheBackColor = colors.white;
 		powerTextColor = colors.black;
 		powerBackColor = colors.white;
---[[
+
-	Add or remove values here to exclude items from being displayed.
+
-	It is case insensitive and it will look for matches.
+
-	So an item called "Nether Brick" will not be displayed if any of the following is set
+function updateTable(strSource,strName,strAmount,timestamp,strLegend) -- gestion des la table et affichage information
-	"Brick","brick","rick","ck"
+
-	This also means that of you set a filter call "iron" then it will remove all items containing iron.
+
-	it will not show Iron Ore, Iron Block, Iron Helmet, etc.
+
---]]
+
-local blacklist = {"Flesh","Nugget","Brain","Sapling","Seed","egg","eye"};
+
---[[
+
-	Add or remove values here to only show items matching these names.
+
-	It is case insensitive and it will look for matches.
+
-	So an item called "Nether Brick" will be displayed if any of the following is set
+
-	"Brick","brick","rick","ck"
+
-	This also means that of you set a filter called "iron" then it will show all items containing iron.
+
-	it will show show Iron Ore, Iron Block, Iron Helmet, etc.
+
-	To disable the whitelist set it to local whitelist = "";
+
-	To enable the whitelist set it to local whitelist = {"Diamond","Gold"};
+
---]]
+
-local whitelist = "";
+
 			end
 		end
 	end
 	if (ContentData[strSource] == nil) then
 		ContentData[strSource] = {};
 	end
-print("Starting "..VersionInfo);
+
 		ContentData[strSource][timestamp] = {};
 	end
 	if (ContentData[strSource][timestamp][strName] == nil) then
 		ContentData[strSource][timestamp][strName] = {};
 	end
 	if (ContentData[strSource][timestamp][strName]["count"] == nil) then
 		ContentData[strSource][timestamp][strName]["count"] = strAmount;
 	else
 		ContentData[strSource][timestamp][strName]["count"] = ContentData[strSource][timestamp][strName]["count"] + strAmount;
 	end
-function padString (sText, iLen)
+
 end
 
 function printmon(strName,strAmount,strMax,strLegend)
 	local textColor;
 	local backColor;
 	local FullPercentAt = ItemsFullPercentAt;
 	if (strLegend == "#") then
 		textColor = chestTextColor;
 		backColor = chestBackColor;
 		strLegend = "";
 	end
 	if (strLegend == "+") then
 		textColor = tankTextColor;
 		backColor = tankBackColor;
-function prepmonitor(objectmon)
+
 		strLegend = "";
 	end
 	if (strLegend == "*") then
 		textColor = powerTextColor;
 		backColor = powerBackColor;
 		strLegend = "";
 	end
 	if (strLegend == "$") then
 		textColor = cacheTextColor;
 		backColor = cacheBackColor;
 		strLegend = "";
 	end
 	local line = string.format("%s  %3i%s",padString(strName,NameLen+1),strAmount,padString(strLegend,1));
 	if (strAmount >= 1000000) then
 		line = string.format("%s  %3iM%s",padString(strName,NameLen),math.floor(strAmount/1000000),padString(strLegend,1));
-function updateTable(strSource,strName,strAmount,timestamp,strLegend)
+
 		line = string.format("%s  %3iK%s",padString(strName,NameLen),math.floor(strAmount/1000),padString(strLegend,1));
 	end
 
 	local ColPadding = 0;
 	if (CurColumn > 0) then
 		ColPadding = 1;
 	end
 	local CurX = math.floor((CurColumn*ColumnWidth))+math.floor(CurColumn*ColPadding)+1;
  	if (CurColumn == 0) then
 		--  print("CurX:"..CurX);
  	end
 	mon.setCursorPos(CurX,CurLine);
 	--local percent = strAmount / strMax * 100;
 	mon.setBackgroundColor(backColor);
 	local percent = strAmount / FullPercentAt * 100;
 	if (percent > 100) then percent = 100; end
 	local barlength = math.floor(percent / 100 * (string.len(line)-1));
  	--if (CurColumn == 0) then
    	--	barlength = barlength + 1;
 	--end
 
 	if (string.len(line) > barlength) then
 		local msg = string.sub(line,1,barlength);
 		mon.setTextColor(textColor);
 		mon.write(msg);
 		--[[if (percent == 0) then
 			mon.setBackgroundColor();
 		else
 			mon.setBackgroundColor(colors.black);
 		end--]]
 		mon.setBackgroundColor(colors.black);
 		mon.setTextColor(backColor);
 		mon.write(string.sub(line,barlength+1,-2))
 	else
 		local spaces = barlength - string.len(line);
 		mon.write(line);
 		mon.write(string.rep(" ",spaces));
 	end
 
 	mon.setTextColor(colors.white);
 	CurColumn = CurColumn + 1;
 	if (CurColumn > MaxColumn) then
 		CurColumn = 0;
 		CurLine = CurLine + 1;
 	end
 	return true;
 end
 
 function findMonitor() -- recherche moniteur
 	for i,name in pairs(peripherals) do
 		for j,method in pairs(peripheral.getMethods(name)) do
 			if (method == 'getCursorPos') then
 				prepmonitor(name);
 			end
 		end
 	end
 end
 
 function findWirelessModem() -- recherche modem
 	local foundWireless = false;
 	for i,name in pairs(peripherals) do
 		for j,method in pairs(peripheral.getMethods(name)) do
 			if (method == 'isWireless') then
 				wmod = peripheral.wrap(name);
 				if (wmod.isWireless()) then
 					wmod.closeAll();
 					foundWireless = true;
 					break;
 				else
 					wmod = {};
 				end
 			end
 		end
 		if (foundWireless) then
 			break;
 		end
 	end
 end
 
 function collectLocalInfo()
 	local timestamp = os.clock();
 	for i,name in pairs(peripherals) do
 		local p = peripheral.wrap(name);
 		local displayNames = {};
 		if (p.getTankInfo ~= nil) then -- RECHERCHE TANK
 			print("Processing Tank");
 			local iteminfo = p.getTankInfo();
 			if (iteminfo ~= nil) then
 				local displayname = "Empty";
 				local amount = 0;
 				if (iteminfo[1].contents) then
 					displayname = iteminfo[1].contents.rawName;
 					amount = iteminfo[1].contents.amount;
 					amount = math.floor(amount/1000);
 				end
 				if (amount ~= 0) then
 					updateTable(id,displayname,amount,timestamp,"+");
 				end
 			end
 		end
 		if (p.getStoredItems ~= nil) then -- RECHERCHE STOCKAGE ITEM (barrel)
 			print("Processing Cache");
 			local iteminfo = p.getStoredItems();
 			if (iteminfo) then
 				local displayname = iteminfo.display_name;
 				updateTable(id,displayname,iteminfo.qty,timestamp,"$");
 			end
 		end
 		if (p.getEnergyStored ~= nil) then -- RECHERCHE STOCAGE ENERGY
 			print("Processing Energy");
 			local energy = p.getEnergyStored();
 			if (energy ~= nil) then
 				updateTable(id,"Energy",energy,timestamp,"*");
--- Find a monitor
+
-function findMonitor()
+
 		if (p.getInventorySize ~= nil) then -- RECHERCHE STOCKAGE ITEM (chest)
 			print("Processing Chest");
 			local chestSize = p.getInventorySize();
 			if (chestSize ~= nil) then
 				local items = {};
 				for j=1,chestSize,1 do
 					local iteminfo = p.getStackInSlot(j);
 					if (iteminfo) then
 						displayname = iteminfo.display_name;
--- Find a wireless modem
+
-function findWirelessModem()
+
 								items[displayname] = iteminfo.qty;
 							else
 								items[displayname] = items[displayname] + iteminfo.qty;
 							end
 						end
 					end
 				end
 				local k = 0;
 				for key,val in pairs(items) do
 					k = k + 1;
 					updateTable(id,key,val,timestamp,"#");
 				end
 			end
 		end
 		if (p.getAvailableItems ~= nil) then -- RECHERCHE DONNEES ME / APPLIED ENERGETIC
 			print("Processing ME System");
 			local itemarray = p.getAvailableItems();
 			if (itemarray ~= nil) then
 				for j=1,table.getn(itemarray),1 do
 					if (itemarray[j].size > 0) then
 						local fingerprint = itemarray[j].fingerprint;
 						if ( (displayNames[fingerprint.id] == nil) or (displayNames[fingerprint.id] == fingerprint.id)) then
 							local ItemDetail = p.getItemDetail(fingerprint);
 							if (ItemDetail ~= nil) then
 								displayNames[fingerprint.id] = ItemDetail.basic().display_name;
-		if (p.getBlockData ~= nil) then
+
-			print("Processing Advanced Peripherals");
+
-			local blockdata = p.getBlockData();
+
-			if (blockdata.Items ~= nil) then
+
-				local blockitems;
+
-				if (blockdata.Items.Items ~= nil) then
+
-					blockitems = blockdata.Items.Items;
+
 			end
-					blockitems = blockdata.Items;
+
         if (p.listItems ~= nil) then -- RECHERCHE BRIDGE ME
-				if (blockitems) then
+			print("Processing ME Bridge");
-					print("Processing Item Storage via Advanced Peripherals");
+
-					local items = {};
+
-					for j in pairs(blockitems) do
+
-						local iteminfo = blockitems[j];
+
-						displayname = iteminfo.id;
+
-						if (blockitems[j].Item ~= nil) then -- Workaround for Mekanism bins
+
-							displayname = blockitems[j].Item.id;
+
 					end
 				end
-							if(string.find(displayname,":") ~= nil) then
+
-								k = string.find(displayname,":")+1;
+
-								displayname = string.sub(displayname,k);
+
 	end
-							displayname = string.gsub(displayname,"%s+"," ");
+
-							local itemcount = iteminfo.Count;
+
-							if (itemcount == nil and iteminfo.SizeOverride ~= nil) then
+function updateMonitor() -- mise a jour moniteur
-								itemcount = iteminfo.SizeOverride;
+
 	ColumnWidth = NameLen + 7;
-							if (itemcount == nil) then
+
-								itemcount = 0;
+
 	mon.clear();
 	CurColumn = 0;
-								items[displayname] = itemcount;
+
 	mon.setCursorPos(1,1);
-								items[displayname] = items[displayname] + itemcount;
+
 	mon.setTextScale(0.5);
 	mon.write(VersionInfo);
 	-- Tri par nom de base
-					local k = 0;
+
-					for key,val in pairs(items) do
+
-						k = k + 1;
+
-						updateTable(id,key,val,timestamp,"#");
+
 	table.sort(sortedSources);
 	local name = "";
 	for i,source in ipairs(sortedSources) do
-			if (blockdata.GasTanks) then
+
-				print("Processing Gas Storage via Advanced Peripherals");
+
 			CurColumn = 0;
-				for j in pairs(blockdata.GasTanks) do
+
-					local iteminfo = blockdata.GasTanks[j];
+
-					displayname = iteminfo.stored.gasName;
+
-					if (displayname) then
+			mon.write(padString("Stock de "..name,x-1));
-						if(string.find(displayname,":") ~= nil) then
+
-							k = string.find(displayname,":")+1;
+
-							displayname = string.sub(displayname,k);
+
 		for timestamp in pairs(ContentData[source]) do
-						displayname = string.gsub(displayname,"%s+"," ");
+
-						local amount = 0;
+
-						if (not items[displayname]) then
+
-							amount = iteminfo.stored.amount;
+
-							if (amount == nil) then
+
-								amount = 0;
+
 				latest = sortedTimestamps[j];
-							amount = math.floor(amount/1000);
+
-							items[displayname] = amount;
+
-						else
+
-							amount = iteminfo.stored.amount;
+
-							if (amount == nil) then
+
-								amount = 0;
+
-							end
+
-							amount = math.floor(amount/1000);
+
-							items[displayname] = items[displayname] + amount;
+
 			printmon(displayname,count,max,legend);
 		end
 	end
 end
 
 -----------------------------------------------PROGRAM---------------------------------------------------
-					updateTable(id,key,val,timestamp,"+");
+
 findWirelessModem();
 
-			if (blockdata.FluidTanks) then
+
-				print("Processing Fluid Storage via Advanced Peripherals");
+
 		wmod.open(mainChannel);
-				for j in pairs(blockdata.FluidTanks) do
+
-					local iteminfo = blockdata.FluidTanks[j];
+		print("Pas de modem sur le PC principal");
-					displayname = iteminfo.stored.FluidName;
+
-					if (displayname) then
+
-						if(string.find(displayname,":") ~= nil) then
+
-							k = string.find(displayname,":")+1;
+
-							displayname = string.sub(displayname,k);
+
 local timerUpdate = os.startTimer(UpdateIntervalSeconds);
-						displayname = string.gsub(displayname,"%s+"," ");
+
-						local amount = 0;
+
-						if (not items[displayname]) then
+
-							amount = iteminfo.stored.Amount;
+
-							if (amount == nil) then
+
-								amount = 0;
+
 -- Main program loop
-							amount = math.floor(amount/1000);
+
-							items[displayname] = amount;
+
-						else
+	print("Event recus :"..event);
-							amount = iteminfo.stored.Amount;
+
-							if (amount == nil) then
+
-								amount = 0;
+
-							end
+
-							amount = math.floor(amount/1000);
+
-							items[displayname] = items[displayname] + amount;
+
 				end
 			end
 			updateMonitor();
 			wirelessEventCount = 0;
 			timerUpdate = os.startTimer(UpdateIntervalSeconds);
 		end
-					updateTable(id,key,val,timestamp,"+");
+
 	if (event == "modem_message") then
 		if (isMain == true) then
 			wirelessEventCount = wirelessEventCount + 1;
-		if (p.getTankInfo ~= nil or p.getFilledPercentage ~= nil or p.tanks) then
+
 				if (ContentData[source] == nil) then
-			local iteminfo;
+
-			if (p.getTankInfo ~= nil) then
+
-				iteminfo = p.getTankInfo();
+
 			end
-			if (p.getFilledPercentage ~= nil) then
+
-				iteminfo = p.getStored();
+
 			end
-			if (p.tanks ~= nil) then
+
-				tankinfo = p.tanks(); -- Industrial Foregoing blackhole tank
+
-				if (tankinfo[1] ~= nil) then
+
-					iteminfo = tankinfo[1];
+
 		updateMonitor();
 	end
 	if (event == "peripheral") or (event == "peripheral_detach") then
 		print("Updating the peripheral list");
 		peripherals = peripheral.getNames();
-				if (iteminfo[1] ~= nil) then
+
-					if (iteminfo[1].contents) then
+end