Anvilcraft/Create
1
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-11-11 12:32:05 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mc1.15/dev' into mc1.16/dev

Browse source
This commit is contained in:
simibubi 2020-10-20 21:25:17 +02:00
commit c47e83f87b
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/simibubi/create/content/logistics/item/filter/FilterItem.java
View file

@ -89,7 +89,7 @@ public class FilterItem extends Item implements INamedContainerProvider {
boolean blacklist = filter.getOrCreateTag()
.getBoolean("Blacklist");
list.add((blacklist ? Lang.translate("gui.filter.blacklist") : Lang.translate("gui.filter.whitelist")).formatted(TextFormatting.GOLD));
list.add((blacklist ? Lang.translate("gui.filter.deny_list") : Lang.translate("gui.filter.allow_list")).formatted(TextFormatting.GOLD));
int count = 0;
for (int i = 0; i < filterItems.getSlots(); i++) {
if (count > 3) {
@ -112,10 +112,10 @@ public class FilterItem extends Item implements INamedContainerProvider {
WhitelistMode whitelistMode = WhitelistMode.values()[filter.getOrCreateTag()
.getInt("WhitelistMode")];
list.add((whitelistMode == WhitelistMode.WHITELIST_CONJ
? Lang.translate("gui.attribute_filter.whitelist_conjunctive")
? Lang.translate("gui.attribute_filter.allow_list_conjunctive")
: whitelistMode == WhitelistMode.WHITELIST_DISJ
? Lang.translate("gui.attribute_filter.whitelist_disjunctive")
: Lang.translate("gui.attribute_filter.blacklist")).formatted(TextFormatting.GOLD));
? Lang.translate("gui.attribute_filter.allow_list_disjunctive")
: Lang.translate("gui.attribute_filter.deny_list")).formatted(TextFormatting.GOLD));
int count = 0;
ListNBT attributes = filter.getOrCreateTag()

13
src/main/java/com/simibubi/create/content/schematics/client/SchematicHandler.java
View file

@ -5,6 +5,7 @@ import java.util.Vector;
import com.google.common.collect.ImmutableList;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.simibubi.create.AllBlocks;
import com.simibubi.create.AllItems;
import com.simibubi.create.AllKeys;
import com.simibubi.create.content.schematics.SchematicWorld;
@ -28,6 +29,7 @@ import net.minecraft.nbt.NBTUtil;
import net.minecraft.util.Mirror;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.world.World;
import net.minecraft.world.gen.feature.template.PlacementSettings;
import net.minecraft.world.gen.feature.template.Template;
@ -198,11 +200,16 @@ public class SchematicHandler {
return;
if (!pressed || button != 1)
return;
if (Minecraft.getInstance().player.isSneaking())
Minecraft mc = Minecraft.getInstance();
if (mc.player.isSneaking())
return;
if (mc.objectMouseOver instanceof BlockRayTraceResult) {
BlockRayTraceResult blockRayTraceResult = (BlockRayTraceResult) mc.objectMouseOver;
if (AllBlocks.SCHEMATICANNON.has(mc.world.getBlockState(blockRayTraceResult.getPos())))
return;
}
currentTool.getTool()
.handleRightClick();
.handleRightClick();
}
public void onKeyInput(int key, boolean pressed) {