diff --git a/src/main/java/techreborn/TechReborn.java b/src/main/java/techreborn/TechReborn.java index df224299d..d3e78ec2b 100644 --- a/src/main/java/techreborn/TechReborn.java +++ b/src/main/java/techreborn/TechReborn.java @@ -26,7 +26,6 @@ package techreborn; import net.fabricmc.api.ModInitializer; import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder; -import net.fabricmc.loader.api.FabricLoader; import net.minecraft.block.DispenserBlock; import net.minecraft.item.ItemGroup; import net.minecraft.item.ItemStack; @@ -40,7 +39,6 @@ import reborncore.common.util.Torus; import reborncore.common.world.DataAttachment; import techreborn.blockentity.storage.idsu.IDSUManager; import techreborn.client.GuiHandler; -import techreborn.compat.libcd.TRTweaker; import techreborn.config.TechRebornConfig; import techreborn.events.ModRegistry; import techreborn.init.*; diff --git a/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java index 38ea0cf8d..33f7d41e2 100644 --- a/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier1/RollingMachineBlockEntity.java @@ -30,7 +30,6 @@ import net.minecraft.inventory.CraftingInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.CompoundTag; import net.minecraft.recipe.Ingredient; -import net.minecraft.recipe.Recipe; import net.minecraft.util.math.Direction; import net.minecraft.world.World; import org.apache.commons.lang3.tuple.Pair; @@ -68,7 +67,7 @@ public class RollingMachineBlockEntity extends PowerAcceptorBlockEntity public int tickTime; @Nonnull public ItemStack currentRecipeOutput; - public Recipe currentRecipe; + public RollingMachineRecipe currentRecipe; private int outputSlot; public boolean locked = false; public int balanceSlot = 0; @@ -327,14 +326,14 @@ public class RollingMachineBlockEntity extends PowerAcceptorBlockEntity } public ItemStack findMatchingRecipeOutput(CraftingInventory inv, World world) { - Recipe recipe = findMatchingRecipe(inv, world); + RollingMachineRecipe recipe = findMatchingRecipe(inv, world); if(recipe == null){ return ItemStack.EMPTY; } return recipe.getOutput(); } - public Recipe findMatchingRecipe(CraftingInventory inv, World world) { + public RollingMachineRecipe findMatchingRecipe(CraftingInventory inv, World world) { for (RollingMachineRecipe recipe : getAllRecipe(world)) { if (recipe.matches(inv, world)) { return recipe; diff --git a/src/main/java/techreborn/blockentity/machine/tier3/QuantumTankBlockEntity.java b/src/main/java/techreborn/blockentity/machine/tier3/QuantumTankBlockEntity.java index d3b7a5609..abdcdb4cb 100644 --- a/src/main/java/techreborn/blockentity/machine/tier3/QuantumTankBlockEntity.java +++ b/src/main/java/techreborn/blockentity/machine/tier3/QuantumTankBlockEntity.java @@ -40,7 +40,6 @@ import reborncore.common.blockentity.MachineBaseBlockEntity; import reborncore.common.fluid.FluidValue; import reborncore.common.util.RebornInventory; import reborncore.common.util.Tank; -import techreborn.config.TechRebornConfig; import techreborn.init.TRContent; import techreborn.init.TRBlockEntities; import techreborn.utils.FluidUtils; diff --git a/src/main/java/techreborn/blocks/generator/GenericGeneratorBlock.java b/src/main/java/techreborn/blocks/generator/GenericGeneratorBlock.java index 5b5b85e5d..99055b134 100644 --- a/src/main/java/techreborn/blocks/generator/GenericGeneratorBlock.java +++ b/src/main/java/techreborn/blocks/generator/GenericGeneratorBlock.java @@ -1,3 +1,27 @@ +/* + * This file is part of TechReborn, licensed under the MIT License (MIT). + * + * Copyright (c) 2018 TechReborn + * + * 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 techreborn.blocks.generator; import net.minecraft.block.BlockState; diff --git a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java index 4e1c48792..d97950717 100644 --- a/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java +++ b/src/main/java/techreborn/client/gui/GuiImplosionCompressor.java @@ -28,7 +28,6 @@ import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.block.BlockState; import net.minecraft.entity.player.PlayerEntity; import net.minecraft.util.math.BlockPos; -import reborncore.RebornCoreClient; import reborncore.client.containerBuilder.builder.BuiltContainer; import reborncore.client.gui.builder.GuiBase; import reborncore.client.gui.builder.widget.GuiButtonExtended; diff --git a/src/main/java/techreborn/client/render/DynamicCellBakedModel.java b/src/main/java/techreborn/client/render/DynamicCellBakedModel.java index 3dcfc78b1..299102061 100644 --- a/src/main/java/techreborn/client/render/DynamicCellBakedModel.java +++ b/src/main/java/techreborn/client/render/DynamicCellBakedModel.java @@ -30,7 +30,6 @@ import net.minecraft.client.render.model.BakedModelManager; import net.minecraft.client.texture.Sprite; import net.minecraft.client.texture.SpriteAtlasTexture; import net.minecraft.client.util.ModelIdentifier; -import net.minecraft.client.util.SpriteIdentifier; import net.minecraft.item.ItemStack; import net.minecraft.util.Identifier; import techreborn.TechReborn; diff --git a/src/main/java/techreborn/compat/libcd/LibCDPlugin.java b/src/main/java/techreborn/compat/libcd/LibCDPlugin.java index d9487b569..0fe94cbfc 100644 --- a/src/main/java/techreborn/compat/libcd/LibCDPlugin.java +++ b/src/main/java/techreborn/compat/libcd/LibCDPlugin.java @@ -1,3 +1,27 @@ +/* + * This file is part of TechReborn, licensed under the MIT License (MIT). + * + * Copyright (c) 2018 TechReborn + * + * 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 techreborn.compat.libcd; import io.github.cottonmc.libcd.api.LibCDInitializer; diff --git a/src/main/java/techreborn/compat/libcd/TRRecipeParser.java b/src/main/java/techreborn/compat/libcd/TRRecipeParser.java index f92530b4a..e076ee8e5 100644 --- a/src/main/java/techreborn/compat/libcd/TRRecipeParser.java +++ b/src/main/java/techreborn/compat/libcd/TRRecipeParser.java @@ -1,3 +1,27 @@ +/* + * This file is part of TechReborn, licensed under the MIT License (MIT). + * + * Copyright (c) 2018 TechReborn + * + * 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 techreborn.compat.libcd; import com.mojang.brigadier.StringReader; diff --git a/src/main/java/techreborn/compat/libcd/TRTweaker.java b/src/main/java/techreborn/compat/libcd/TRTweaker.java index c33177a73..cfcbee280 100644 --- a/src/main/java/techreborn/compat/libcd/TRTweaker.java +++ b/src/main/java/techreborn/compat/libcd/TRTweaker.java @@ -1,3 +1,27 @@ +/* + * This file is part of TechReborn, licensed under the MIT License (MIT). + * + * Copyright (c) 2018 TechReborn + * + * 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 techreborn.compat.libcd; import blue.endless.jankson.JsonArray; diff --git a/src/main/java/techreborn/entities/EntityNukePrimed.java b/src/main/java/techreborn/entities/EntityNukePrimed.java index 70f62330a..1b19ab721 100644 --- a/src/main/java/techreborn/entities/EntityNukePrimed.java +++ b/src/main/java/techreborn/entities/EntityNukePrimed.java @@ -29,7 +29,6 @@ import net.minecraft.entity.LivingEntity; import net.minecraft.entity.MovementType; import net.minecraft.entity.TntEntity; import net.minecraft.particle.ParticleTypes; -import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Vec3d; import net.minecraft.world.World; import reborncore.common.explosion.RebornExplosion; diff --git a/src/main/java/techreborn/items/tool/ItemJackhammer.java b/src/main/java/techreborn/items/tool/ItemJackhammer.java index 4660e1595..c94f45ef0 100644 --- a/src/main/java/techreborn/items/tool/ItemJackhammer.java +++ b/src/main/java/techreborn/items/tool/ItemJackhammer.java @@ -24,7 +24,6 @@ package techreborn.items.tool; -import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.Material; import net.minecraft.enchantment.EnchantmentHelper; diff --git a/src/main/java/techreborn/world/RubberSaplingGenerator.java b/src/main/java/techreborn/world/RubberSaplingGenerator.java index 19f57bf71..d9003eb81 100644 --- a/src/main/java/techreborn/world/RubberSaplingGenerator.java +++ b/src/main/java/techreborn/world/RubberSaplingGenerator.java @@ -25,11 +25,8 @@ package techreborn.world; import net.minecraft.block.sapling.SaplingGenerator; -import net.minecraft.world.biome.DefaultBiomeFeatures; import net.minecraft.world.gen.feature.BranchedTreeFeatureConfig; import net.minecraft.world.gen.feature.ConfiguredFeature; -import net.minecraft.world.gen.feature.DefaultFeatureConfig; - import javax.annotation.Nullable; import java.util.Random; diff --git a/src/main/java/techreborn/world/RubberTreeFeature.java b/src/main/java/techreborn/world/RubberTreeFeature.java index 87ff737db..83b005a0e 100644 --- a/src/main/java/techreborn/world/RubberTreeFeature.java +++ b/src/main/java/techreborn/world/RubberTreeFeature.java @@ -29,7 +29,6 @@ import net.minecraft.block.BlockState; import net.minecraft.util.math.BlockBox; import net.minecraft.util.math.BlockPos; import net.minecraft.world.ModifiableTestableWorld; -import net.minecraft.world.World; import net.minecraft.world.gen.feature.BranchedTreeFeatureConfig; import net.minecraft.world.gen.feature.OakTreeFeature; import techreborn.init.TRContent; @@ -37,7 +36,6 @@ import techreborn.init.TRContent; import java.util.Random; import java.util.Set; import java.util.function.Function; -import java.util.function.Predicate; /** * @author drcrazy