mirror of
https://github.com/Creators-of-Create/Create.git
synced 2024-09-20 16:38:56 +02:00
Merge remote-tracking branch 'origin/mc1.16/dev' into mc1.16/dev
This commit is contained in:
zelophed
commit
5975a3cbac
18 changed files with 3060 additions and 2681 deletions
|
|
@ -417,11 +417,11 @@ fc1a5dc58cb00012cd311f909de3cd6085664994 assets/create/lang/unfinished/es_es.jso
|
|||
dd04db4e469ece034e9edde1d182d40ece3c917f assets/create/lang/unfinished/ja_jp.json
|
||||
a46af574991af844c58a7fe75b4c2b0ac888b4e0 assets/create/lang/unfinished/ko_kr.json
|
||||
1ee72b0c9ac509ffcd17b19d17ab1f4b3506c9ce assets/create/lang/unfinished/nl_nl.json
|
||||
b23f249ef0b28b2e2312e63f2fccf4401b282ac4 assets/create/lang/unfinished/pl_pl.json
|
||||
c80b1e4310942e34b46f3cfed724e104782f1c65 assets/create/lang/unfinished/pl_pl.json
|
||||
73030bf3d5aace5c3e991c6bf265322bba42286f assets/create/lang/unfinished/pt_br.json
|
||||
73b1927e1d32e4229caa96e8d1bc25d39fb51377 assets/create/lang/unfinished/ru_ru.json
|
||||
aa3f0b918d948795e10878c3d42dbd4c39f71795 assets/create/lang/unfinished/zh_cn.json
|
||||
1f15238d524e7b94b0ce5bcd09703b4742b9f960 assets/create/lang/unfinished/zh_tw.json
|
||||
f6aef786fdc291201f388c661fb9ff2d0b936ba2 assets/create/lang/unfinished/zh_tw.json
|
||||
487a511a01b2a4531fb672f917922312db78f958 assets/create/models/block/acacia_window.json
|
||||
b48060cba1a382f373a05bf0039054053eccf076 assets/create/models/block/acacia_window_pane_noside.json
|
||||
3066db1bf03cffa1a9c7fbacf47ae586632f4eb3 assets/create/models/block/acacia_window_pane_noside_alt.json
|
||||
|
|
@ -3708,6 +3708,7 @@ f6c8f34ceb475546dba5cc6ff288863ea795d20b data/forge/tags/items/storage_blocks/co
|
|||
0d188ad2c33d10ee8f0d455c4e63a4460a8302fb data/minecraft/tags/blocks/stairs.json
|
||||
92584f914c53e00c111f9ff5e3894e2e3594946b data/minecraft/tags/blocks/walls.json
|
||||
09d26bcd0f94459f945219997277c4fbf14adeb7 data/minecraft/tags/fluids/water.json
|
||||
49cadea86f6b63d5065b859a0d0e7ad772cf51d6 data/minecraft/tags/items/piglin_loved.json
|
||||
29e6f7e3d4be9a9b0af1fca5d32fa55e29905ce2 data/minecraft/tags/items/slabs.json
|
||||
0d188ad2c33d10ee8f0d455c4e63a4460a8302fb data/minecraft/tags/items/stairs.json
|
||||
92584f914c53e00c111f9ff5e3894e2e3594946b data/minecraft/tags/items/walls.json
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"_": "Missing Localizations: 44",
|
||||
"_": "Missing Localizations: 6",
|
||||
|
||||
"_": "->------------------------] Game Elements [------------------------<-",
|
||||
|
||||
|
|
@ -58,7 +58,7 @@
|
|||
"block.create.cogwheel": "Koło zębate",
|
||||
"block.create.content_observer": "Detektor zawartości",
|
||||
"block.create.controller_rail": "Tory sterujące",
|
||||
"block.create.copper_backtank": "UNLOCALIZED: Copper Backtank",
|
||||
"block.create.copper_backtank": "Miedziany zbiornik w plecaku",
|
||||
"block.create.copper_block": "Blok miedzi",
|
||||
"block.create.copper_casing": "Miedziana Obudowa",
|
||||
"block.create.copper_ore": "Ruda miedzi",
|
||||
|
|
@ -439,7 +439,7 @@
|
|||
"item.create.chocolate_glazed_berries": "Jagody w czekoladzie",
|
||||
"item.create.chromatic_compound": "Związek chromatyczny",
|
||||
"item.create.cinder_flour": "Rozżarzona mąka",
|
||||
"item.create.copper_backtank": "UNLOCALIZED: Copper Backtank",
|
||||
"item.create.copper_backtank": "Miedziany zbiornik w plecaku",
|
||||
"item.create.copper_ingot": "Sztabka miedzi",
|
||||
"item.create.copper_nugget": "Bryłka miedzi",
|
||||
"item.create.copper_sheet": "Arkusz miedzi",
|
||||
|
|
@ -458,8 +458,8 @@
|
|||
"item.create.crushed_tin_ore": "Rozkruszona ruda cyny",
|
||||
"item.create.crushed_uranium_ore": "Rozkruszona ruda uranu",
|
||||
"item.create.crushed_zinc_ore": "Rozkruszona ruda cynku",
|
||||
"item.create.diving_boots": "UNLOCALIZED: Diving Boots",
|
||||
"item.create.diving_helmet": "UNLOCALIZED: Diving Helmet",
|
||||
"item.create.diving_boots": "Buty do nurkowania",
|
||||
"item.create.diving_helmet": "Hełm do nurkowania",
|
||||
"item.create.dough": "Ciasto",
|
||||
"item.create.electron_tube": "Lampa elektronowa",
|
||||
"item.create.empty_blaze_burner": "Pusty płomienny palnik",
|
||||
|
|
@ -683,7 +683,7 @@
|
|||
"create.recipe.fan_blasting.fan": "Wiatrak za lawą",
|
||||
"create.recipe.pressing": "Tłoczenie",
|
||||
"create.recipe.mixing": "Mieszanie",
|
||||
"create.recipe.deploying": "UNLOCALIZED: Deploying",
|
||||
"create.recipe.deploying": "Aplikowanie",
|
||||
"create.recipe.automatic_shapeless": "Zautomatyzowanie nieokreślone konstruowanie",
|
||||
"create.recipe.automatic_brewing": "Zautomatyzowane warzenie",
|
||||
"create.recipe.packing": "Prasowanie",
|
||||
|
|
@ -750,15 +750,15 @@
|
|||
"create.orientation.alongX": "Wzdłuż X",
|
||||
|
||||
"create.gui.terrainzapper.title": "Ręczny kształter",
|
||||
"create.gui.terrainzapper.searchDiagonal": "UNLOCALIZED: Follow Diagonals",
|
||||
"create.gui.terrainzapper.searchFuzzy": "UNLOCALIZED: Ignore Material Borders",
|
||||
"create.gui.terrainzapper.patternSection": "UNLOCALIZED: Pattern",
|
||||
"create.gui.terrainzapper.pattern.solid": "UNLOCALIZED: Solid",
|
||||
"create.gui.terrainzapper.pattern.checkered": "UNLOCALIZED: Checkerboard",
|
||||
"create.gui.terrainzapper.pattern.inversecheckered": "UNLOCALIZED: Inverted Checkerboard",
|
||||
"create.gui.terrainzapper.pattern.chance25": "UNLOCALIZED: 25% Roll",
|
||||
"create.gui.terrainzapper.pattern.chance50": "UNLOCALIZED: 50% Roll",
|
||||
"create.gui.terrainzapper.pattern.chance75": "UNLOCALIZED: 75% Roll",
|
||||
"create.gui.terrainzapper.searchDiagonal": "Wzdłuż linii ukośnych",
|
||||
"create.gui.terrainzapper.searchFuzzy": "Ignoruj krawędzie materiałów",
|
||||
"create.gui.terrainzapper.patternSection": "Wzór",
|
||||
"create.gui.terrainzapper.pattern.solid": "Ciągły",
|
||||
"create.gui.terrainzapper.pattern.checkered": "Szachownica",
|
||||
"create.gui.terrainzapper.pattern.inversecheckered": "Odrócona szachownica",
|
||||
"create.gui.terrainzapper.pattern.chance25": "Obrót o 25%",
|
||||
"create.gui.terrainzapper.pattern.chance50": "Obrót o 50%",
|
||||
"create.gui.terrainzapper.pattern.chance75": "Obrót o 75%",
|
||||
"create.gui.terrainzapper.placement": "Położenie",
|
||||
"create.gui.terrainzapper.placement.merged": "Połączony",
|
||||
"create.gui.terrainzapper.placement.attached": "Przyłączony",
|
||||
|
|
@ -767,8 +767,8 @@
|
|||
"create.gui.terrainzapper.brush.cuboid": "Prostopadłościan",
|
||||
"create.gui.terrainzapper.brush.sphere": "Kula",
|
||||
"create.gui.terrainzapper.brush.cylinder": "Walec",
|
||||
"create.gui.terrainzapper.brush.surface": "UNLOCALIZED: Surface",
|
||||
"create.gui.terrainzapper.brush.cluster": "UNLOCALIZED: Cluster",
|
||||
"create.gui.terrainzapper.brush.surface": "Powierzchnia",
|
||||
"create.gui.terrainzapper.brush.cluster": "Grupa",
|
||||
"create.gui.terrainzapper.tool": "Narzędzie",
|
||||
"create.gui.terrainzapper.tool.fill": "Wypełnianie",
|
||||
"create.gui.terrainzapper.tool.place": "Stawianie",
|
||||
|
|
@ -778,8 +778,8 @@
|
|||
"create.gui.terrainzapper.tool.flatten": "Wypłaszczanie",
|
||||
|
||||
"create.terrainzapper.shiftRightClickToSet": "Shift+Prawe kliknięcie, aby wybrać kształt",
|
||||
"create.terrainzapper.usingBlock": "UNLOCALIZED: Using: %1$s",
|
||||
"create.terrainzapper.leftClickToSet": "UNLOCALIZED: Left-Click a Block to set Material",
|
||||
"create.terrainzapper.usingBlock": "Używając: %1$s",
|
||||
"create.terrainzapper.leftClickToSet": "Kliknij LPM na blok aby ustawić materiał",
|
||||
|
||||
"create.minecart_coupling.two_couplings_max": "Wagoniki nie mogą mieć więcej niż dwa łączniki każdy",
|
||||
"create.minecart_coupling.unloaded": "Część twojego pociągu wydaje się być w niezaładowanych Chunkach.",
|
||||
|
|
@ -1138,35 +1138,35 @@
|
|||
"create.command.killTPSCommand.status.usage.1": "[Create]: Użyj \"/killtps start\", aby sztucznie spowolnić serwer\n",
|
||||
"create.command.killTPSCommand.argument.tickTime": "tickTime",
|
||||
|
||||
"create.contraption.minecart_contraption_too_big": "UNLOCALIZED: This Cart Contraption seems too big to pick up",
|
||||
"create.contraption.minecart_contraption_too_big": "Ta maszyna w wagoniku jest zbyt duża, aby ją podnieść",
|
||||
|
||||
|
||||
"_": "->------------------------] Subtitles [------------------------<-",
|
||||
|
||||
"create.subtitle.cogs": "UNLOCALIZED: Cogwheels rumble",
|
||||
"create.subtitle.cogs": "Koła zębate terkoczą",
|
||||
"create.subtitle.slime_added": "Szlam plaska",
|
||||
"create.subtitle.contraption_disassemble": "UNLOCALIZED: Contraption stops",
|
||||
"create.subtitle.wrench_rotate": "UNLOCALIZED: Wrench used",
|
||||
"create.subtitle.mixing": "UNLOCALIZED: Mixing Noises",
|
||||
"create.subtitle.mechanical_press_activation_belt": "UNLOCALIZED: Mechanical Press bonks",
|
||||
"create.subtitle.worldshaper_place": "UNLOCALIZED: Worldshaper zaps",
|
||||
"create.subtitle.deployer_polish": "UNLOCALIZED: Deployer applies polish",
|
||||
"create.subtitle.depot_slide": "UNLOCALIZED: Item slides",
|
||||
"create.subtitle.deny": "UNLOCALIZED: Declining boop",
|
||||
"create.subtitle.contraption_disassemble": "Maszyna staje",
|
||||
"create.subtitle.wrench_rotate": "Klucz skrzypi",
|
||||
"create.subtitle.mixing": "Dźwięki mieszania",
|
||||
"create.subtitle.mechanical_press_activation_belt": "Mechaniczna prasa stuka",
|
||||
"create.subtitle.worldshaper_place": "Kształter strzela",
|
||||
"create.subtitle.deployer_polish": "Aplikator poleruje",
|
||||
"create.subtitle.depot_slide": "Przedmiot ślizga się",
|
||||
"create.subtitle.deny": "Dźwięk odmowy",
|
||||
"create.subtitle.blaze_munch": "Płomyk szczęśliwie przeżuwa",
|
||||
"create.subtitle.schematicannon_launch_block": "Schematoarmata strzela",
|
||||
"create.subtitle.funnel_flap": "UNLOCALIZED: Funnel Flaps",
|
||||
"create.subtitle.copper_armor_equip": "UNLOCALIZED: Diving equipment clinks",
|
||||
"create.subtitle.funnel_flap": "Lejek trzepocze",
|
||||
"create.subtitle.copper_armor_equip": "Sprzęt do nurkowania pobrzękuje",
|
||||
"create.subtitle.schematicannon_finish": "Schematoarmata skończyła",
|
||||
"create.subtitle.scroll_value": "UNLOCALIZED: Scroll-input clicks",
|
||||
"create.subtitle.scroll_value": "Kliknięcie",
|
||||
"create.subtitle.mechanical_press_activation": "Mechaniczna prasa się uruchamia",
|
||||
"create.subtitle.contraption_assemble": "UNLOCALIZED: Contraption moves",
|
||||
"create.subtitle.crafter_craft": "UNLOCALIZED: Crafter crafts",
|
||||
"create.subtitle.cranking": "UNLOCALIZED: Hand Crank turns",
|
||||
"create.subtitle.crafter_click": "UNLOCALIZED: Crafter clicks",
|
||||
"create.subtitle.wrench_remove": "UNLOCALIZED: Component breaks",
|
||||
"create.subtitle.depot_plop": "UNLOCALIZED: Item lands",
|
||||
"create.subtitle.confirm": "UNLOCALIZED: Affirmative ding",
|
||||
"create.subtitle.contraption_assemble": "Maszyna przesuwa się",
|
||||
"create.subtitle.crafter_craft": "Mechaniczny stół rzemieślniczy konstruuje",
|
||||
"create.subtitle.cranking": "Ręczna korba obraca się",
|
||||
"create.subtitle.crafter_click": "Mechaniczny stół rzemieślniczy stuka",
|
||||
"create.subtitle.wrench_remove": "Komponent niszczy się",
|
||||
"create.subtitle.depot_plop": "Przedmiot ląduje",
|
||||
"create.subtitle.confirm": "Dźwięk potwierdzenia",
|
||||
|
||||
|
||||
"_": "->------------------------] Item Descriptions [------------------------<-",
|
||||
|
|
@ -1545,11 +1545,11 @@
|
|||
"create.ponder.blaze_burner.text_3": "Z użyciem płomiennego ciasta, palnik może uzyskać szczególnie wysoką temperaturę",
|
||||
"create.ponder.blaze_burner.text_4": "Dostarczanie płomykowi przedmiotów może zostać zautomatyzowane z użyciem aplikatorów lub mechanicznych ramion",
|
||||
|
||||
"create.ponder.brass_funnel.header": "Mosiężny lejek",
|
||||
"create.ponder.brass_funnel.text_1": "Andezytowe lejki mogą pobierać jedynie pojedyncze przedmioty",
|
||||
"create.ponder.brass_funnel.text_2": "Mosiężne lejki mogą pobierać nawet pełne stosy",
|
||||
"create.ponder.brass_funnel.header": "Mosiężny lej",
|
||||
"create.ponder.brass_funnel.text_1": "Andezytowe leje mogą pobierać jedynie pojedyncze przedmioty",
|
||||
"create.ponder.brass_funnel.text_2": "Mosiężne leje mogą pobierać nawet pełne stosy",
|
||||
"create.ponder.brass_funnel.text_3": "Przewijanie na slocie filtrującym pozwala na precyzyjną kontrolę nad maksymalną wielkością stosu",
|
||||
"create.ponder.brass_funnel.text_4": "Użycie przedmiotów patrząc na slot filtrujący spowoduje, że lejek będzie przesyłał tylko pasujące przedmioty",
|
||||
"create.ponder.brass_funnel.text_4": "Użycie przedmiotu patrząc na slot filtrujący spowoduje, że lej będzie przesyłał tylko pasujące przedmioty",
|
||||
|
||||
"create.ponder.brass_tunnel.header": "Używanie mosiężnych tuneli",
|
||||
"create.ponder.brass_tunnel.text_1": "Mosiężne tunele mogą być użyte do przykrycia Twoich taśmociągów",
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
"replace": false,
|
||||
"values": [
|
||||
"create:golden_sheet",
|
||||
"create:crushed_gold_ore"
|
||||
]
|
||||
}
|
||||
|
|
@ -58,6 +58,7 @@ import net.minecraft.item.Food;
|
|||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.Rarity;
|
||||
import net.minecraft.tags.ITag;
|
||||
import net.minecraft.tags.ItemTags;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
|
||||
public class AllItems {
|
||||
|
|
@ -147,11 +148,11 @@ public class AllItems {
|
|||
COPPER_SHEET = taggedIngredient("copper_sheet", forgeItemTag("plates/copper"), PLATES.tag),
|
||||
BRASS_SHEET = taggedIngredient("brass_sheet", forgeItemTag("plates/brass"), PLATES.tag),
|
||||
IRON_SHEET = taggedIngredient("iron_sheet", forgeItemTag("plates/iron"), PLATES.tag),
|
||||
GOLDEN_SHEET = taggedIngredient("golden_sheet", forgeItemTag("plates/gold"), PLATES.tag),
|
||||
GOLDEN_SHEET = taggedIngredient("golden_sheet", forgeItemTag("plates/gold"), PLATES.tag, ItemTags.PIGLIN_LOVED),
|
||||
LAPIS_SHEET = taggedIngredient("lapis_sheet", forgeItemTag("plates/lapis_lazuli"), PLATES.tag),
|
||||
|
||||
CRUSHED_IRON = taggedIngredient("crushed_iron_ore", CRUSHED_ORES.tag),
|
||||
CRUSHED_GOLD = taggedIngredient("crushed_gold_ore", CRUSHED_ORES.tag),
|
||||
CRUSHED_GOLD = taggedIngredient("crushed_gold_ore", CRUSHED_ORES.tag, ItemTags.PIGLIN_LOVED),
|
||||
CRUSHED_COPPER = taggedIngredient("crushed_copper_ore", CRUSHED_ORES.tag),
|
||||
CRUSHED_ZINC = taggedIngredient("crushed_zinc_ore", CRUSHED_ORES.tag),
|
||||
CRUSHED_BRASS = taggedIngredient("crushed_brass", CRUSHED_ORES.tag);
|
||||
|
|
|
|||
|
|
@ -9,10 +9,10 @@ import com.simibubi.create.AllSoundEvents;
|
|||
import com.simibubi.create.Create;
|
||||
import com.simibubi.create.content.contraptions.components.deployer.DeployerTileEntity.Mode;
|
||||
import com.simibubi.create.content.contraptions.components.deployer.DeployerTileEntity.State;
|
||||
import com.simibubi.create.content.contraptions.processing.InWorldProcessing;
|
||||
import com.simibubi.create.content.contraptions.relays.belt.BeltHelper;
|
||||
import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
|
||||
import com.simibubi.create.content.curiosities.tools.SandPaperPolishingRecipe;
|
||||
import com.simibubi.create.content.logistics.InWorldProcessing;
|
||||
import com.simibubi.create.foundation.tileEntity.behaviour.belt.BeltProcessingBehaviour.ProcessingResult;
|
||||
import com.simibubi.create.foundation.tileEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
|
||||
import com.simibubi.create.foundation.tileEntity.behaviour.belt.TransportedItemStackHandlerBehaviour.TransportedResult;
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ import org.apache.commons.lang3.tuple.Pair;
|
|||
|
||||
import com.simibubi.create.AllTags;
|
||||
import com.simibubi.create.content.contraptions.particle.AirFlowParticleData;
|
||||
import com.simibubi.create.content.logistics.InWorldProcessing;
|
||||
import com.simibubi.create.content.logistics.InWorldProcessing.Type;
|
||||
import com.simibubi.create.content.contraptions.processing.InWorldProcessing;
|
||||
import com.simibubi.create.content.contraptions.processing.InWorldProcessing.Type;
|
||||
import com.simibubi.create.foundation.advancement.AllTriggers;
|
||||
import com.simibubi.create.foundation.config.AllConfigs;
|
||||
import com.simibubi.create.foundation.tileEntity.TileEntityBehaviour;
|
||||
|
|
|
|||
|
|
@ -3,22 +3,22 @@ package com.simibubi.create.content.contraptions.components.fan;
|
|||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
|
||||
import com.simibubi.create.AllRecipeTypes;
|
||||
import com.simibubi.create.content.contraptions.processing.InWorldProcessing;
|
||||
import com.simibubi.create.content.contraptions.processing.ProcessingRecipe;
|
||||
import com.simibubi.create.content.contraptions.processing.InWorldProcessing.SplashingWrapper;
|
||||
import com.simibubi.create.content.contraptions.processing.ProcessingRecipeBuilder.ProcessingRecipeParams;
|
||||
import com.simibubi.create.content.logistics.InWorldProcessing;
|
||||
import com.simibubi.create.content.logistics.InWorldProcessing.SplashingInv;
|
||||
|
||||
import net.minecraft.world.World;
|
||||
|
||||
@ParametersAreNonnullByDefault
|
||||
public class SplashingRecipe extends ProcessingRecipe<InWorldProcessing.SplashingInv> {
|
||||
public class SplashingRecipe extends ProcessingRecipe<InWorldProcessing.SplashingWrapper> {
|
||||
|
||||
public SplashingRecipe(ProcessingRecipeParams params) {
|
||||
super(AllRecipeTypes.SPLASHING, params);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean matches(SplashingInv inv, World worldIn) {
|
||||
public boolean matches(SplashingWrapper inv, World worldIn) {
|
||||
if (inv.isEmpty())
|
||||
return false;
|
||||
return ingredients.get(0)
|
||||
|
|
|
|||
|
|
@ -9,9 +9,9 @@ import java.util.stream.Collectors;
|
|||
|
||||
import com.simibubi.create.Create;
|
||||
import com.simibubi.create.content.contraptions.components.press.MechanicalPressTileEntity.Mode;
|
||||
import com.simibubi.create.content.contraptions.processing.InWorldProcessing;
|
||||
import com.simibubi.create.content.contraptions.relays.belt.BeltHelper;
|
||||
import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
|
||||
import com.simibubi.create.content.logistics.InWorldProcessing;
|
||||
import com.simibubi.create.foundation.tileEntity.behaviour.belt.BeltProcessingBehaviour.ProcessingResult;
|
||||
import com.simibubi.create.foundation.tileEntity.behaviour.belt.TransportedItemStackHandlerBehaviour;
|
||||
import com.simibubi.create.foundation.tileEntity.behaviour.belt.TransportedItemStackHandlerBehaviour.TransportedResult;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ import com.simibubi.create.AllSoundEvents;
|
|||
import com.simibubi.create.Create;
|
||||
import com.simibubi.create.content.contraptions.processing.BasinOperatingTileEntity;
|
||||
import com.simibubi.create.content.contraptions.processing.BasinTileEntity;
|
||||
import com.simibubi.create.content.logistics.InWorldProcessing;
|
||||
import com.simibubi.create.content.contraptions.processing.InWorldProcessing;
|
||||
import com.simibubi.create.foundation.advancement.AllTriggers;
|
||||
import com.simibubi.create.foundation.advancement.ITriggerable;
|
||||
import com.simibubi.create.foundation.config.AllConfigs;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import javax.annotation.Nonnull;
|
|||
|
||||
import com.simibubi.create.Create;
|
||||
import com.simibubi.create.content.contraptions.components.fan.IAirCurrentSource;
|
||||
import com.simibubi.create.content.logistics.InWorldProcessing;
|
||||
import com.simibubi.create.content.contraptions.processing.InWorldProcessing;
|
||||
import com.simibubi.create.foundation.utility.ColorHelper;
|
||||
import com.simibubi.create.foundation.utility.VecHelper;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package com.simibubi.create.content.logistics;
|
||||
package com.simibubi.create.content.contraptions.processing;
|
||||
|
||||
import static com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock.getHeatLevelOf;
|
||||
|
||||
|
|
@ -12,7 +12,6 @@ import javax.annotation.Nullable;
|
|||
import com.simibubi.create.AllBlocks;
|
||||
import com.simibubi.create.AllRecipeTypes;
|
||||
import com.simibubi.create.content.contraptions.components.fan.SplashingRecipe;
|
||||
import com.simibubi.create.content.contraptions.processing.ProcessingRecipe;
|
||||
import com.simibubi.create.content.contraptions.processing.burner.BlazeBurnerBlock;
|
||||
import com.simibubi.create.content.contraptions.relays.belt.transport.TransportedItemStack;
|
||||
import com.simibubi.create.foundation.config.AllConfigs;
|
||||
|
|
@ -37,9 +36,6 @@ import net.minecraft.nbt.CompoundNBT;
|
|||
import net.minecraft.particles.ParticleTypes;
|
||||
import net.minecraft.particles.RedstoneParticleData;
|
||||
import net.minecraft.tags.BlockTags;
|
||||
import net.minecraft.tileentity.BlastFurnaceTileEntity;
|
||||
import net.minecraft.tileentity.FurnaceTileEntity;
|
||||
import net.minecraft.tileentity.SmokerTileEntity;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.vector.Vector3d;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
|
|
@ -50,13 +46,8 @@ import net.minecraftforge.items.wrapper.RecipeWrapper;
|
|||
|
||||
public class InWorldProcessing {
|
||||
|
||||
public static class SplashingInv extends RecipeWrapper {
|
||||
public SplashingInv() {
|
||||
super(new ItemStackHandler(1));
|
||||
}
|
||||
}
|
||||
|
||||
public static SplashingInv splashingInv = new SplashingInv();
|
||||
private static final RecipeWrapper WRAPPER = new RecipeWrapper(new ItemStackHandler(1));
|
||||
private static final SplashingWrapper SPLASHING_WRAPPER = new SplashingWrapper();
|
||||
|
||||
public enum Type {
|
||||
SMOKING, BLASTING, SPLASHING, NONE
|
||||
|
|
@ -104,16 +95,27 @@ public class InWorldProcessing {
|
|||
|
||||
private static boolean canProcess(ItemStack stack, Type type, World world) {
|
||||
if (type == Type.BLASTING) {
|
||||
return true;
|
||||
WRAPPER.setInventorySlotContents(0, stack);
|
||||
Optional<FurnaceRecipe> smeltingRecipe = world.getRecipeManager()
|
||||
.getRecipe(IRecipeType.SMELTING, WRAPPER, world);
|
||||
|
||||
if (smeltingRecipe.isPresent())
|
||||
return true;
|
||||
|
||||
WRAPPER.setInventorySlotContents(0, stack);
|
||||
Optional<BlastingRecipe> blastingRecipe = world.getRecipeManager()
|
||||
.getRecipe(IRecipeType.BLASTING, WRAPPER, world);
|
||||
|
||||
if (blastingRecipe.isPresent())
|
||||
return true;
|
||||
|
||||
return !stack.getItem().isFireproof();
|
||||
}
|
||||
|
||||
if (type == Type.SMOKING) {
|
||||
// FIXME this does not need to be a TE
|
||||
SmokerTileEntity smoker = new SmokerTileEntity();
|
||||
smoker.setLocation(world, BlockPos.ZERO);
|
||||
smoker.setInventorySlotContents(0, stack);
|
||||
WRAPPER.setInventorySlotContents(0, stack);
|
||||
Optional<SmokingRecipe> recipe = world.getRecipeManager()
|
||||
.getRecipe(IRecipeType.SMOKING, smoker, world);
|
||||
.getRecipe(IRecipeType.SMOKING, WRAPPER, world);
|
||||
return recipe.isPresent();
|
||||
}
|
||||
|
||||
|
|
@ -124,8 +126,8 @@ public class InWorldProcessing {
|
|||
}
|
||||
|
||||
public static boolean isWashable(ItemStack stack, World world) {
|
||||
splashingInv.setInventorySlotContents(0, stack);
|
||||
Optional<SplashingRecipe> recipe = AllRecipeTypes.SPLASHING.find(splashingInv, world);
|
||||
SPLASHING_WRAPPER.setInventorySlotContents(0, stack);
|
||||
Optional<SplashingRecipe> recipe = AllRecipeTypes.SPLASHING.find(SPLASHING_WRAPPER, world);
|
||||
return recipe.isPresent();
|
||||
}
|
||||
|
||||
|
|
@ -179,38 +181,29 @@ public class InWorldProcessing {
|
|||
|
||||
private static List<ItemStack> process(ItemStack stack, Type type, World world) {
|
||||
if (type == Type.SPLASHING) {
|
||||
splashingInv.setInventorySlotContents(0, stack);
|
||||
Optional<SplashingRecipe> recipe = AllRecipeTypes.SPLASHING.find(splashingInv, world);
|
||||
SPLASHING_WRAPPER.setInventorySlotContents(0, stack);
|
||||
Optional<SplashingRecipe> recipe = AllRecipeTypes.SPLASHING.find(SPLASHING_WRAPPER, world);
|
||||
if (recipe.isPresent())
|
||||
return applyRecipeOn(stack, recipe.get());
|
||||
return null;
|
||||
}
|
||||
|
||||
// FIXME this does not need to be a TE
|
||||
SmokerTileEntity smoker = new SmokerTileEntity();
|
||||
smoker.setLocation(world, BlockPos.ZERO);
|
||||
smoker.setInventorySlotContents(0, stack);
|
||||
WRAPPER.setInventorySlotContents(0, stack);
|
||||
Optional<SmokingRecipe> smokingRecipe = world.getRecipeManager()
|
||||
.getRecipe(IRecipeType.SMOKING, smoker, world);
|
||||
.getRecipe(IRecipeType.SMOKING, WRAPPER, world);
|
||||
|
||||
if (type == Type.BLASTING) {
|
||||
// FIXME this does not need to be a TE
|
||||
FurnaceTileEntity furnace = new FurnaceTileEntity();
|
||||
furnace.setLocation(world, BlockPos.ZERO);
|
||||
furnace.setInventorySlotContents(0, stack);
|
||||
Optional<FurnaceRecipe> smeltingRecipe = world.getRecipeManager()
|
||||
.getRecipe(IRecipeType.SMELTING, furnace, world);
|
||||
|
||||
if (!smokingRecipe.isPresent()) {
|
||||
WRAPPER.setInventorySlotContents(0, stack);
|
||||
Optional<FurnaceRecipe> smeltingRecipe = world.getRecipeManager()
|
||||
.getRecipe(IRecipeType.SMELTING, WRAPPER, world);
|
||||
|
||||
if (smeltingRecipe.isPresent())
|
||||
return applyRecipeOn(stack, smeltingRecipe.get());
|
||||
|
||||
// FIXME this does not need to be a TE
|
||||
BlastFurnaceTileEntity blastFurnace = new BlastFurnaceTileEntity();
|
||||
blastFurnace.setLocation(world, BlockPos.ZERO);
|
||||
blastFurnace.setInventorySlotContents(0, stack);
|
||||
WRAPPER.setInventorySlotContents(0, stack);
|
||||
Optional<BlastingRecipe> blastingRecipe = world.getRecipeManager()
|
||||
.getRecipe(IRecipeType.BLASTING, blastFurnace, world);
|
||||
.getRecipe(IRecipeType.BLASTING, WRAPPER, world);
|
||||
|
||||
if (blastingRecipe.isPresent())
|
||||
return applyRecipeOn(stack, blastingRecipe.get());
|
||||
|
|
@ -299,6 +292,7 @@ public class InWorldProcessing {
|
|||
|
||||
return stacks;
|
||||
}
|
||||
|
||||
public static void spawnParticlesForProcessing(@Nullable World world, Vector3d vec, Type type) {
|
||||
if (world == null || !world.isRemote)
|
||||
return;
|
||||
|
|
@ -325,4 +319,10 @@ public class InWorldProcessing {
|
|||
}
|
||||
}
|
||||
|
||||
public static class SplashingWrapper extends RecipeWrapper {
|
||||
public SplashingWrapper() {
|
||||
super(new ItemStackHandler(1));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -2,8 +2,8 @@ package com.simibubi.create.content.contraptions.relays.belt.transport;
|
|||
|
||||
import java.util.Random;
|
||||
|
||||
import com.simibubi.create.content.contraptions.processing.InWorldProcessing;
|
||||
import com.simibubi.create.content.contraptions.relays.belt.BeltHelper;
|
||||
import com.simibubi.create.content.logistics.InWorldProcessing;
|
||||
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.CompoundNBT;
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ import java.util.stream.Collectors;
|
|||
import org.apache.commons.lang3.StringUtils;
|
||||
|
||||
import com.simibubi.create.AllRecipeTypes;
|
||||
import com.simibubi.create.content.logistics.InWorldProcessing;
|
||||
import com.simibubi.create.content.contraptions.processing.InWorldProcessing;
|
||||
import com.simibubi.create.content.logistics.item.filter.attribute.BookAuthorAttribute;
|
||||
import com.simibubi.create.content.logistics.item.filter.attribute.BookCopyAttribute;
|
||||
import com.simibubi.create.content.logistics.item.filter.attribute.ColorAttribute;
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ import com.simibubi.create.AllBlocks;
|
|||
import com.simibubi.create.AllFluids;
|
||||
import com.simibubi.create.AllItems;
|
||||
import com.simibubi.create.Create;
|
||||
import com.simibubi.create.content.logistics.InWorldProcessing;
|
||||
import com.simibubi.create.content.contraptions.processing.InWorldProcessing;
|
||||
|
||||
import net.minecraft.advancements.Advancement;
|
||||
import net.minecraft.advancements.Advancement.Builder;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import java.util.LinkedList;
|
|||
import java.util.List;
|
||||
import java.util.function.Predicate;
|
||||
|
||||
import com.simibubi.create.content.logistics.InWorldProcessing;
|
||||
import com.simibubi.create.content.contraptions.processing.InWorldProcessing;
|
||||
|
||||
import net.minecraft.advancements.CriteriaTriggers;
|
||||
import net.minecraft.block.Block;
|
||||
|
|
|
|||
|
|
@ -57,6 +57,7 @@
|
|||
"block.create.cogwheel": "Koło zębate",
|
||||
"block.create.content_observer": "Detektor zawartości",
|
||||
"block.create.controller_rail": "Tory sterujące",
|
||||
"block.create.copper_backtank": "Miedziany zbiornik w plecaku",
|
||||
"block.create.copper_block": "Blok miedzi",
|
||||
"block.create.copper_casing": "Miedziana Obudowa",
|
||||
"block.create.copper_ore": "Ruda miedzi",
|
||||
|
|
@ -437,6 +438,7 @@
|
|||
"item.create.chocolate_glazed_berries": "Jagody w czekoladzie",
|
||||
"item.create.chromatic_compound": "Związek chromatyczny",
|
||||
"item.create.cinder_flour": "Rozżarzona mąka",
|
||||
"item.create.copper_backtank": "Miedziany zbiornik w plecaku",
|
||||
"item.create.copper_ingot": "Sztabka miedzi",
|
||||
"item.create.copper_nugget": "Bryłka miedzi",
|
||||
"item.create.copper_sheet": "Arkusz miedzi",
|
||||
|
|
@ -455,6 +457,8 @@
|
|||
"item.create.crushed_tin_ore": "Rozkruszona ruda cyny",
|
||||
"item.create.crushed_uranium_ore": "Rozkruszona ruda uranu",
|
||||
"item.create.crushed_zinc_ore": "Rozkruszona ruda cynku",
|
||||
"item.create.diving_boots": "Buty do nurkowania",
|
||||
"item.create.diving_helmet": "Hełm do nurkowania",
|
||||
"item.create.deforester": "Wylesiacz",
|
||||
"item.create.dough": "Ciasto",
|
||||
"item.create.electron_tube": "Lampa elektronowa",
|
||||
|
|
@ -685,6 +689,7 @@
|
|||
"create.recipe.fan_blasting.fan": "Wiatrak za lawą",
|
||||
"create.recipe.pressing": "Tłoczenie",
|
||||
"create.recipe.mixing": "Mieszanie",
|
||||
"create.recipe.deploying": "Aplikowanie",
|
||||
"create.recipe.automatic_shapeless": "Zautomatyzowanie nieokreślone konstruowanie",
|
||||
"create.recipe.automatic_brewing": "Zautomatyzowane warzenie",
|
||||
"create.recipe.packing": "Prasowanie",
|
||||
|
|
@ -760,11 +765,20 @@
|
|||
"create.gui.blockzapper.patternSection": "Wzór",
|
||||
"create.gui.blockzapper.pattern.solid": "Ciągły",
|
||||
"create.gui.blockzapper.pattern.checkered": "Szachownica",
|
||||
"create.gui.blockzapper.pattern.inversecheckered": "Odwrócona Szachownica",
|
||||
"create.gui.blockzapper.pattern.inversecheckered": "Odwrócona szachownica",
|
||||
"create.gui.blockzapper.pattern.chance25": "Obrót o 25%",
|
||||
"create.gui.blockzapper.pattern.chance50": "Obrót o 50%",
|
||||
"create.gui.blockzapper.pattern.chance75": "Obrót o 75%",
|
||||
"create.gui.terrainzapper.title": "Ręczny kształter",
|
||||
"create.gui.terrainzapper.searchDiagonal": "Wzdłuż linii ukośnych",
|
||||
"create.gui.terrainzapper.searchFuzzy": "Ignoruj krawędzie materiałów",
|
||||
"create.gui.terrainzapper.patternSection": "Wzór",
|
||||
"create.gui.terrainzapper.pattern.solid": "Ciągły",
|
||||
"create.gui.terrainzapper.pattern.checkered": "Szachownica",
|
||||
"create.gui.terrainzapper.pattern.inversecheckered": "Odrócona szachownica",
|
||||
"create.gui.terrainzapper.pattern.chance25": "Obrót o 25%",
|
||||
"create.gui.terrainzapper.pattern.chance50": "Obrót o 50%",
|
||||
"create.gui.terrainzapper.pattern.chance75": "Obrót o 75%",
|
||||
"create.gui.terrainzapper.placement": "Położenie",
|
||||
"create.gui.terrainzapper.placement.merged": "Połączony",
|
||||
"create.gui.terrainzapper.placement.attached": "Przyłączony",
|
||||
|
|
@ -773,6 +787,8 @@
|
|||
"create.gui.terrainzapper.brush.cuboid": "Prostopadłościan",
|
||||
"create.gui.terrainzapper.brush.sphere": "Kula",
|
||||
"create.gui.terrainzapper.brush.cylinder": "Walec",
|
||||
"create.gui.terrainzapper.brush.surface": "Powierzchnia",
|
||||
"create.gui.terrainzapper.brush.cluster": "Grupa",
|
||||
"create.gui.terrainzapper.tool": "Narzędzie",
|
||||
"create.gui.terrainzapper.tool.fill": "Wypełnianie",
|
||||
"create.gui.terrainzapper.tool.place": "Stawianie",
|
||||
|
|
@ -782,6 +798,8 @@
|
|||
"create.gui.terrainzapper.tool.flatten": "Wypłaszczanie",
|
||||
|
||||
"create.terrainzapper.shiftRightClickToSet": "Shift+Prawe kliknięcie, aby wybrać kształt",
|
||||
"create.terrainzapper.usingBlock": "Używając: %1$s",
|
||||
"create.terrainzapper.leftClickToSet": "Kliknij LPM na blok aby ustawić materiał",
|
||||
|
||||
"create.blockzapper.usingBlock": "Używając: %1$s",
|
||||
"create.blockzapper.componentUpgrades": "Ulepszenia komponentów:",
|
||||
|
|
@ -1147,16 +1165,35 @@
|
|||
"create.command.killTPSCommand.status.usage.1": "[Create]: Użyj \"/killtps start\", aby sztucznie spowolnić serwer\n",
|
||||
"create.command.killTPSCommand.argument.tickTime": "tickTime",
|
||||
|
||||
"create.subtitle.schematicannon_launch_block": "Schematoarmata strzela",
|
||||
"create.subtitle.schematicannon_finish": "Schematoarmata skończyła",
|
||||
"create.subtitle.slime_added": "Szlam plaska",
|
||||
"create.subtitle.mechanical_press_activation": "Mechaniczna prasa się uruchamia",
|
||||
"create.subtitle.mechanical_press_item_break": "Metal brzęczy",
|
||||
"create.subtitle.blockzapper_place": "Bloki lecą na miejsce",
|
||||
"create.subtitle.blockzapper_confirm": "Potwierdzający sygnał",
|
||||
"create.subtitle.blockzapper_deny": "Odrzucający sygnał",
|
||||
"create.subtitle.block_funnel_eat": "Lejek zjada",
|
||||
"create.subtitle.blaze_munch": "Płomyk szczęśliwie przeżuwa",
|
||||
"create.contraption.minecart_contraption_too_big": "Ta maszyna w wagoniku jest zbyt duża, aby ją podnieść",
|
||||
|
||||
|
||||
"_": "->------------------------] Napisy dla niesłyszących [------------------------<-",
|
||||
|
||||
"create.subtitle.cogs": "Koła zębate terkoczą",
|
||||
"create.subtitle.slime_added": "Szlam plaska",
|
||||
"create.subtitle.contraption_disassemble": "Maszyna staje",
|
||||
"create.subtitle.wrench_rotate": "Klucz skrzypi",
|
||||
"create.subtitle.mixing": "Dźwięki mieszania",
|
||||
"create.subtitle.mechanical_press_activation_belt": "Mechaniczna prasa stuka",
|
||||
"create.subtitle.worldshaper_place": "Kształter strzela",
|
||||
"create.subtitle.deployer_polish": "Aplikator poleruje",
|
||||
"create.subtitle.depot_slide": "Przedmiot ślizga się",
|
||||
"create.subtitle.deny": "Dźwięk odmowy",
|
||||
"create.subtitle.blaze_munch": "Płomyk szczęśliwie przeżuwa",
|
||||
"create.subtitle.schematicannon_launch_block": "Schematoarmata strzela",
|
||||
"create.subtitle.funnel_flap": "Lejek trzepocze",
|
||||
"create.subtitle.copper_armor_equip": "Sprzęt do nurkowania pobrzękuje",
|
||||
"create.subtitle.schematicannon_finish": "Schematoarmata skończyła",
|
||||
"create.subtitle.scroll_value": "Kliknięcie",
|
||||
"create.subtitle.mechanical_press_activation": "Mechaniczna prasa się uruchamia",
|
||||
"create.subtitle.contraption_assemble": "Maszyna przesuwa się",
|
||||
"create.subtitle.crafter_craft": "Mechaniczny stół rzemieślniczy konstruuje",
|
||||
"create.subtitle.cranking": "Ręczna korba obraca się",
|
||||
"create.subtitle.crafter_click": "Mechaniczny stół rzemieślniczy stuka",
|
||||
"create.subtitle.wrench_remove": "Komponent niszczy się",
|
||||
"create.subtitle.depot_plop": "Przedmiot ląduje",
|
||||
"create.subtitle.confirm": "Dźwięk potwierdzenia",
|
||||
|
||||
|
||||
"_": "->------------------------] Opisy Przedmiotów [------------------------<-",
|
||||
|
|
@ -1547,11 +1584,11 @@
|
|||
"create.ponder.blaze_burner.text_3": "Z użyciem płomiennego ciasta, palnik może uzyskać szczególnie wysoką temperaturę",
|
||||
"create.ponder.blaze_burner.text_4": "Dostarczanie płomykowi przedmiotów może zostać zautomatyzowane z użyciem aplikatorów lub mechanicznych ramion",
|
||||
|
||||
"create.ponder.brass_funnel.header": "Mosiężny lejek",
|
||||
"create.ponder.brass_funnel.text_1": "Andezytowe lejki mogą pobierać jedynie pojedyncze przedmioty",
|
||||
"create.ponder.brass_funnel.text_2": "Mosiężne lejki mogą pobierać nawet pełne stosy",
|
||||
"create.ponder.brass_funnel.header": "Mosiężny lej",
|
||||
"create.ponder.brass_funnel.text_1": "Andezytowe leje mogą pobierać jedynie pojedyncze przedmioty",
|
||||
"create.ponder.brass_funnel.text_2": "Mosiężne leje mogą pobierać nawet pełne stosy",
|
||||
"create.ponder.brass_funnel.text_3": "Przewijanie na slocie filtrującym pozwala na precyzyjną kontrolę nad maksymalną wielkością stosu",
|
||||
"create.ponder.brass_funnel.text_4": "Użycie przedmiotów patrząc na slot filtrujący spowoduje, że lejek będzie przesyłał tylko pasujące przedmioty",
|
||||
"create.ponder.brass_funnel.text_4": "Użycie przedmiotu patrząc na slot filtrujący spowoduje, że lej będzie przesyłał tylko pasujące przedmioty",
|
||||
|
||||
"create.ponder.brass_tunnel.header": "Używanie mosiężnych tuneli",
|
||||
"create.ponder.brass_tunnel.text_1": "Mosiężne tunele mogą być użyte do przykrycia Twoich taśmociągów",
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue