Compare commits

..

No commits in common. "1e3ec0716758c3db88129dd36a9a0245790deec3" and "955652cd203bda5afd27ce94ec08df83b4b15f52" have entirely different histories.

7 changed files with 8 additions and 21 deletions

View file

@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'eclipse'
apply plugin: 'maven-publish'
version = '1.12.7'
version = '1.12.6'
group = 'de.ellpeck.prettypipes' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = 'PrettyPipes'

View file

@ -129,7 +129,6 @@ public class ItemFilter extends ItemStackHandler {
public void save() {
if (this.modified) {
this.stack.getOrCreateTag().put("filter", this.serializeNBT());
this.pipe.setChanged();
this.modified = false;
}
}

View file

@ -66,11 +66,6 @@ public class PipeBlockEntity extends BlockEntity implements MenuProvider, IPipeC
public int getSlotLimit(int slot) {
return 1;
}
@Override
protected void onContentsChanged(int slot) {
PipeBlockEntity.this.setChanged();
}
};
public final Queue<NetworkLock> craftIngredientRequests = new LinkedList<>();
public final List<Pair<BlockPos, ItemStack>> craftResultRequests = new ArrayList<>();
@ -339,8 +334,9 @@ public class PipeBlockEntity extends BlockEntity implements MenuProvider, IPipeC
Stream.Builder<Pair<ItemStack, IModule>> builder = Stream.builder();
for (var i = 0; i < this.modules.getSlots(); i++) {
var stack = this.modules.getStackInSlot(i);
if (!stack.isEmpty() && stack.getItem() instanceof IModule module)
builder.accept(Pair.of(stack, module));
if (stack.isEmpty())
continue;
builder.accept(Pair.of(stack, (IModule) stack.getItem()));
}
return builder.build();
}

View file

@ -27,7 +27,7 @@ public class ExtractionModuleItem extends ModuleItem {
this.maxExtraction = tier.forTier(1, 8, 64);
this.speed = tier.forTier(20, 15, 10);
this.filterSlots = tier.forTier(3, 6, 9);
this.preventOversending = tier.forTier(false, true, true);
this.preventOversending = tier.forTier(false, false, true);
}
@Override

View file

@ -74,7 +74,7 @@ public class FilterModifierModuleGui extends AbstractPipeGui<FilterModifierModul
public boolean mouseDragged(double mouseX, double mouseY, int i, double j, double k) {
if (this.isScrolling) {
var percentage = Mth.clamp(((float) mouseY - (this.topPos + 32 + 18)) / (58 - 15), 0, 1);
var offset = Math.max(0, (int) (percentage * (float) (this.tags.size() - 5)));
var offset = (int) (percentage * (float) (this.tags.size() - 5));
if (offset != this.scrollOffset) {
this.scrollOffset = offset;
this.updateWidgets();

View file

@ -34,12 +34,12 @@
"item.prettypipes.filter_increase_modifier": "Filter Increase Modifier",
"item.prettypipes.random_sorting_modifier": "Random Sorting Modifier",
"item.prettypipes.round_robin_sorting_modifier": "Round Robin Sorting Modifier",
"info.prettypipes.extraction_module": "Pulls items from adjacent inventories\nFilters and pull rates vary by tier\nMedium and high tiers prevent over-sending",
"info.prettypipes.extraction_module": "Pulls items from adjacent inventories\nFilters and pull rates vary by tier\nHigh tiers prevent over-sending",
"info.prettypipes.filter_module": "Restricts flow from pipes into adjacent inventories\nFilter amount varies by tier",
"info.prettypipes.speed_module": "Increases speed of items exiting adjacent inventories\nSpeed varies by tier",
"info.prettypipes.low_priority_module": "Decreases the reception priority of adjacent inventories\nLower priority means items will prefer other inventories, regardless of distance",
"info.prettypipes.high_priority_module": "Increases the reception priority of adjacent inventories\nHigher priority means items will prefer this inventory, regardless of distance",
"info.prettypipes.retrieval_module": "Pulls items from other inventories in the network\nFilters and pull rates vary by tier\nMedium and high tiers prevent over-sending",
"info.prettypipes.retrieval_module": "Pulls items from other inventories in the network\nFilters and pull rates vary by tier\nHigh tiers prevent over-sending",
"info.prettypipes.stack_size_module": "Limits the amount of items that can enter adjacent inventories\nAutomatically prevents over-sending",
"info.prettypipes.damage_filter_modifier": "Causes any filter slots to filter by item damage",
"info.prettypipes.nbt_filter_modifier": "Causes any filter slots to filter by item data (NBT)",

View file

@ -1,8 +0,0 @@
{
"values": [
"prettypipes:pipe",
"prettypipes:item_terminal",
"prettypipes:crafting_terminal",
"prettypipes:pressurizer"
]
}