Ellpeck/PrettyPipes
1
0
Fork 0
mirror of https://github.com/Ellpeck/PrettyPipes.git synced 2024-05-20 07:41:22 +02:00
Code Issues Projects Releases Wiki Activity

updated to 1.18.2

Browse source
This commit is contained in:
Ell 2022-03-04 15:15:47 +01:00
parent bdd507885e
commit 9da43852dc
4 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build.gradle
View file

@ -24,7 +24,7 @@ if (System.getenv('BUILD_NUMBER') != null) {
java.toolchain.languageVersion = JavaLanguageVersion.of(17) java.toolchain.languageVersion = JavaLanguageVersion.of(17)
minecraft { minecraft {
mappings channel: 'official', version: '1.18.1' mappings channel: 'official', version: '1.18.2'
runs { runs {
client { client {
@ -105,11 +105,11 @@ configurations {
} }
dependencies { dependencies {
minecraft 'net.minecraftforge:forge:1.18.1-39.0.5' minecraft 'net.minecraftforge:forge:1.18.2-40.0.3'
embed 'org.jgrapht:jgrapht-core:1.5.1' embed 'org.jgrapht:jgrapht-core:1.5.1'
compileOnly fg.deobf("mezz.jei:jei-1.18.1:9.1.0.47:api") compileOnly fg.deobf("mezz.jei:jei-1.18.2:9.4.1.117:api")
runtimeOnly fg.deobf("mezz.jei:jei-1.18.1:9.1.0.47") runtimeOnly fg.deobf("mezz.jei:jei-1.18.2:9.4.1.117")
// to test the rf requiring and crafting stuff // to test the rf requiring and crafting stuff
/* runtimeOnly fg.deobf("curse.maven:powah-352656:3057732") /* runtimeOnly fg.deobf("curse.maven:powah-352656:3057732")

3
src/main/java/de/ellpeck/prettypipes/misc/ItemEquality.java
View file

@ -3,6 +3,7 @@ package de.ellpeck.prettypipes.misc;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import java.util.Objects;
import java.util.function.BiFunction; import java.util.function.BiFunction;
import java.util.function.Supplier; import java.util.function.Supplier;
@ -23,7 +24,7 @@ public class ItemEquality {
} }
public static ItemEquality tag(ResourceLocation tag) { public static ItemEquality tag(ResourceLocation tag) {
return new ItemEquality((stack, filter) -> stack.getItem().getTags().contains(tag), true, Type.TAG); return new ItemEquality((stack, filter) -> stack.getTags().anyMatch(t -> Objects.equals(tag, t.location())), true, Type.TAG);
} }
public static boolean compareItems(ItemStack stack, ItemStack filter, ItemEquality... types) { public static boolean compareItems(ItemStack stack, ItemStack filter, ItemEquality... types) {

2
src/main/java/de/ellpeck/prettypipes/network/PipeItem.java
View file

@ -126,7 +126,7 @@ public class PipeItem implements IPipeItem {
currPipe = next; currPipe = next;
} }
} else { } else {
var dist = (this.currGoalPos).distSqr(this.x - 0.5F, this.y - 0.5F, this.z - 0.5F, false); var dist = (this.currGoalPos).distToLowCornerSqr(this.x - 0.5F, this.y - 0.5F, this.z - 0.5F);
if (dist < currSpeed * currSpeed) { if (dist < currSpeed * currSpeed) {
// we're past the start of the pipe, so move to the center of the next pipe // we're past the start of the pipe, so move to the center of the next pipe
BlockPos nextPos; BlockPos nextPos;

4
src/main/java/de/ellpeck/prettypipes/pipe/modules/modifier/FilterModifierModuleContainer.java
View file

@ -1,12 +1,10 @@
package de.ellpeck.prettypipes.pipe.modules.modifier; package de.ellpeck.prettypipes.pipe.modules.modifier;
import de.ellpeck.prettypipes.misc.ItemFilter;
import de.ellpeck.prettypipes.pipe.containers.AbstractPipeContainer; import de.ellpeck.prettypipes.pipe.containers.AbstractPipeContainer;
import net.minecraft.core.BlockPos; import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.inventory.MenuType; import net.minecraft.world.inventory.MenuType;
import net.minecraft.world.item.ItemStack;
import javax.annotation.Nullable; import javax.annotation.Nullable;
import java.util.HashSet; import java.util.HashSet;
@ -25,7 +23,7 @@ public class FilterModifierModuleContainer extends AbstractPipeContainer<FilterM
for (var filter : this.tile.getFilters()) { for (var filter : this.tile.getFilters()) {
for (var i = 0; i < filter.getSlots(); i++) { for (var i = 0; i < filter.getSlots(); i++) {
var stack = filter.getStackInSlot(i); var stack = filter.getStackInSlot(i);
unsortedTags.addAll(stack.getItem().getTags()); stack.getTags().forEach(t -> unsortedTags.add(t.location()));
} }
} }
return unsortedTags.stream().sorted().collect(Collectors.toList()); return unsortedTags.stream().sorted().collect(Collectors.toList());