From 9784e9f7228fc0aa3ca814e3830dbd81996a3693 Mon Sep 17 00:00:00 2001 From: shedaniel Date: Tue, 15 Dec 2020 20:45:35 +0800 Subject: wip Signed-off-by: shedaniel --- .../main/java/me/shedaniel/rei/api/Renderer.java | 23 +++++++++++++++++++ .../rei/api/entry/AbstractEntryRenderer.java | 23 +++++++++++++++++++ .../shedaniel/rei/api/entry/AbstractRenderer.java | 23 +++++++++++++++++++ .../rei/api/entry/BatchEntryRenderer.java | 23 +++++++++++++++++++ .../shedaniel/rei/api/entry/BuiltinEntryTypes.java | 23 +++++++++++++++++++ .../shedaniel/rei/api/entry/ComparisonContext.java | 23 +++++++++++++++++++ .../shedaniel/rei/api/entry/EntryDefinition.java | 23 +++++++++++++++++++ .../me/shedaniel/rei/api/entry/EntryRenderer.java | 23 +++++++++++++++++++ .../me/shedaniel/rei/api/entry/EntryStacks.java | 23 +++++++++++++++++++ .../java/me/shedaniel/rei/api/entry/EntryType.java | 23 +++++++++++++++++++ .../shedaniel/rei/api/entry/EntryTypeBridge.java | 25 +++++++++++++++++++++ .../shedaniel/rei/api/entry/EntryTypeRegistry.java | 26 ++++++++++++++++++++++ .../shedaniel/rei/api/entry/VanillaEntryTypes.java | 23 +++++++++++++++++++ .../shedaniel/rei/gui/config/AppearanceTheme.java | 1 + .../rei/gui/config/ConfigButtonPosition.java | 1 + .../rei/gui/config/DisplayPanelLocation.java | 1 + .../rei/gui/config/EntryPanelOrdering.java | 1 - .../rei/gui/config/ItemCheatingStyle.java | 3 ++- .../rei/utils/EntryStackCompoundList.java | 23 +++++++++++++++++++ .../me/shedaniel/rei/utils/EntryStackList.java | 20 ----------------- 20 files changed, 332 insertions(+), 22 deletions(-) delete mode 100644 RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/utils/EntryStackList.java (limited to 'RoughlyEnoughItems-api/src/main/java') diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/Renderer.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/Renderer.java index f6a9c39ba..2c1b3d86d 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/Renderer.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/Renderer.java @@ -1,3 +1,26 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020 shedaniel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package me.shedaniel.rei.api; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/AbstractEntryRenderer.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/AbstractEntryRenderer.java index 0fad3333a..bb0a6c556 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/AbstractEntryRenderer.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/AbstractEntryRenderer.java @@ -1,3 +1,26 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020 shedaniel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package me.shedaniel.rei.api.entry; import net.minecraft.client.gui.GuiComponent; diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/AbstractRenderer.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/AbstractRenderer.java index 23b90db65..a3a4d1a8a 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/AbstractRenderer.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/AbstractRenderer.java @@ -1,3 +1,26 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020 shedaniel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package me.shedaniel.rei.api.entry; import me.shedaniel.rei.api.Renderer; diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/BatchEntryRenderer.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/BatchEntryRenderer.java index 2384c2099..558b92638 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/BatchEntryRenderer.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/BatchEntryRenderer.java @@ -1,3 +1,26 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020 shedaniel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package me.shedaniel.rei.api.entry; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/BuiltinEntryTypes.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/BuiltinEntryTypes.java index a588bfa9f..d50267573 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/BuiltinEntryTypes.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/BuiltinEntryTypes.java @@ -1,3 +1,26 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020 shedaniel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package me.shedaniel.rei.api.entry; import me.shedaniel.rei.impl.Internals; diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/ComparisonContext.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/ComparisonContext.java index 3afebbcba..8c7b7a0c2 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/ComparisonContext.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/ComparisonContext.java @@ -1,3 +1,26 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020 shedaniel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package me.shedaniel.rei.api.entry; public enum ComparisonContext { diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryDefinition.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryDefinition.java index fcc6085dc..4a97aa8a4 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryDefinition.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryDefinition.java @@ -1,3 +1,26 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020 shedaniel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package me.shedaniel.rei.api.entry; import me.shedaniel.architectury.utils.Fraction; diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryRenderer.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryRenderer.java index 2606f1b8f..8c9bbba58 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryRenderer.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryRenderer.java @@ -1,3 +1,26 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020 shedaniel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package me.shedaniel.rei.api.entry; import com.mojang.blaze3d.vertex.PoseStack; diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryStacks.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryStacks.java index f2123aa6e..0dd9ffa3d 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryStacks.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryStacks.java @@ -1,3 +1,26 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020 shedaniel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package me.shedaniel.rei.api.entry; import com.google.common.collect.ImmutableList; diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryType.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryType.java index 1bbd98071..0d4ebb2c2 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryType.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryType.java @@ -1,3 +1,26 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020 shedaniel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package me.shedaniel.rei.api.entry; import me.shedaniel.rei.impl.Internals; diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryTypeBridge.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryTypeBridge.java index 2d9ac1e1e..c15f85b4f 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryTypeBridge.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryTypeBridge.java @@ -1,11 +1,36 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020 shedaniel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package me.shedaniel.rei.api.entry; import me.shedaniel.rei.api.EntryStack; import net.minecraft.world.InteractionResultHolder; +import org.jetbrains.annotations.NotNull; import java.util.stream.Stream; @FunctionalInterface public interface EntryTypeBridge { + @NotNull InteractionResultHolder>> bridge(EntryStack object); } diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryTypeRegistry.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryTypeRegistry.java index 689c6f99c..931a9a63e 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryTypeRegistry.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/EntryTypeRegistry.java @@ -1,8 +1,32 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020 shedaniel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package me.shedaniel.rei.api.entry; import me.shedaniel.rei.impl.Internals; import net.minecraft.resources.ResourceLocation; import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; public interface EntryTypeRegistry { @NotNull @@ -18,7 +42,9 @@ public interface EntryTypeRegistry { void registerBridge(EntryType original, EntryType destination, EntryTypeBridge bridge); + @Nullable EntryDefinition get(ResourceLocation id); + @NotNull Iterable> getBridgesFor(EntryType original, EntryType destination); } \ No newline at end of file diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/VanillaEntryTypes.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/VanillaEntryTypes.java index 553698da4..047f33439 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/VanillaEntryTypes.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/api/entry/VanillaEntryTypes.java @@ -1,3 +1,26 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020 shedaniel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package me.shedaniel.rei.api.entry; import me.shedaniel.architectury.fluid.FluidStack; diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/AppearanceTheme.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/AppearanceTheme.java index 89bd3db97..3fcba4383 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/AppearanceTheme.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/AppearanceTheme.java @@ -37,6 +37,7 @@ public enum AppearanceTheme implements SelectionListEntry.Translatable { DARK; @Override + @NotNull public String getKey() { return I18n.get("config.roughlyenoughitems.theme." + name().toLowerCase(Locale.ROOT)); } diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/ConfigButtonPosition.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/ConfigButtonPosition.java index 1d82587d9..fe5641165 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/ConfigButtonPosition.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/ConfigButtonPosition.java @@ -37,6 +37,7 @@ public enum ConfigButtonPosition implements SelectionListEntry.Translatable { LOWER; @Override + @NotNull public String getKey() { return I18n.get("config.roughlyenoughitems.layout.configButtonLocation." + name().toLowerCase(Locale.ROOT)); } diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/DisplayPanelLocation.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/DisplayPanelLocation.java index 3245b8533..92cc4cdb6 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/DisplayPanelLocation.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/DisplayPanelLocation.java @@ -42,6 +42,7 @@ public enum DisplayPanelLocation implements SelectionListEntry.Translatable { } @Override + @NotNull public String getKey() { return I18n.get("config.roughlyenoughitems.accessibility.displayPanelLocation." + name().toLowerCase(Locale.ROOT)); } diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/EntryPanelOrdering.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/EntryPanelOrdering.java index 8b8626193..daf237e93 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/EntryPanelOrdering.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/EntryPanelOrdering.java @@ -37,5 +37,4 @@ public enum EntryPanelOrdering { public String getNameTranslationKey() { return nameTranslationKey; } - } diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/ItemCheatingStyle.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/ItemCheatingStyle.java index f04bba46a..46fd9db09 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/ItemCheatingStyle.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/gui/config/ItemCheatingStyle.java @@ -37,7 +37,8 @@ public enum ItemCheatingStyle implements SelectionListEntry.Translatable { GIVE; @Override - public @NotNull String getKey() { + @NotNull + public String getKey() { return I18n.get("config.roughlyenoughitems.cheatingStyle." + name().toLowerCase(Locale.ROOT)); } } diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/utils/EntryStackCompoundList.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/utils/EntryStackCompoundList.java index 6e1bd757d..5b09e7ad7 100644 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/utils/EntryStackCompoundList.java +++ b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/utils/EntryStackCompoundList.java @@ -1,3 +1,26 @@ +/* + * This file is licensed under the MIT License, part of Roughly Enough Items. + * Copyright (c) 2018, 2019, 2020 shedaniel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + package me.shedaniel.rei.utils; import me.shedaniel.rei.api.EntryStack; diff --git a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/utils/EntryStackList.java b/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/utils/EntryStackList.java deleted file mode 100644 index 15acbed64..000000000 --- a/RoughlyEnoughItems-api/src/main/java/me/shedaniel/rei/utils/EntryStackList.java +++ /dev/null @@ -1,20 +0,0 @@ -package me.shedaniel.rei.utils; - -import me.shedaniel.rei.api.EntryStack; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; -import java.util.Collection; - -public class EntryStackList extends ArrayList> { - public EntryStackList(int initialCapacity) { - super(initialCapacity); - } - - public EntryStackList() { - } - - public EntryStackList(@NotNull Collection> c) { - super(c); - } -} -- cgit