From 4e1065855ed7db543a4fd30071c4670ebeab5bc8 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 2 Jan 2016 23:21:55 -0600 Subject: [PATCH] Some formatting cleanups. Add copyleft header to all new classes --- .../api/lexicon/multiblock/Multiblock.java | 1 + .../api/lexicon/multiblock/MultiblockSet.java | 1 + .../component/ColorSwitchingComponent.java | 7 ++----- .../component/MultiblockComponent.java | 1 + .../botania/api/render/SpecialFlowerModel.java | 18 ++++++++++++------ .../botania/api/state/BotaniaStateProps.java | 12 +++++++++--- .../botania/api/state/PropertyString.java | 9 ++++++++- .../api/state/enums/AlfPortalState.java | 9 +++++++++ .../api/state/enums/AltGrassVariant.java | 9 +++++++++ .../botania/api/state/enums/AltarVariant.java | 9 +++++++++ .../api/state/enums/BiomeBrickVariant.java | 9 +++++++++ .../api/state/enums/BiomeStoneVariant.java | 9 +++++++++ .../botania/api/state/enums/CrateVariant.java | 9 +++++++++ .../api/state/enums/CustomBrickVariant.java | 9 +++++++++ .../botania/api/state/enums/DrumVariant.java | 9 +++++++++ .../api/state/enums/EndBrickVariant.java | 9 +++++++++ .../api/state/enums/FutureStoneVariant.java | 9 +++++++++ .../api/state/enums/LivingRockVariant.java | 9 +++++++++ .../api/state/enums/LivingWoodVariant.java | 9 +++++++++ .../api/state/enums/LuminizerVariant.java | 9 +++++++++ .../api/state/enums/PlatformVariant.java | 9 +++++++++ .../botania/api/state/enums/PoolVariant.java | 9 +++++++++ .../api/state/enums/PrismarineVariant.java | 9 +++++++++ .../botania/api/state/enums/PylonVariant.java | 9 +++++++++ .../botania/api/state/enums/QuartzVariant.java | 9 +++++++++ .../api/state/enums/SpreaderVariant.java | 9 +++++++++ .../api/state/enums/StorageVariant.java | 9 +++++++++ .../client/core/handler/ModelHandler.java | 9 +++++++++ .../client/model/FloatingFlowerModel.java | 10 ++++++++++ .../botania/client/model/ModelPylon.java | 1 + 30 files changed, 234 insertions(+), 15 deletions(-) diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java index 94ee3dd3a..38271b2a8 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java @@ -185,4 +185,5 @@ public class Multiblock { public MultiblockComponent getComponentForLocation(BlockPos pos) { return locationCache.get(pos); } + } diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java index b5f967681..100e286cb 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/MultiblockSet.java @@ -35,4 +35,5 @@ public class MultiblockSet { public Multiblock getForFacing(EnumFacing facing) { return mbs.get(facing); } + } diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java index 52239a29e..31b437370 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java @@ -24,13 +24,10 @@ import vazkii.botania.api.BotaniaAPI; */ public class ColorSwitchingComponent extends MultiblockComponent { - private final PropertyEnum colorProp; + private final PropertyEnum colorProp; - public ColorSwitchingComponent(BlockPos relPos, Block block, PropertyEnum colorProp) { + public ColorSwitchingComponent(BlockPos relPos, Block block, PropertyEnum colorProp) { super(relPos, block.getDefaultState()); - if (colorProp.getValueClass() != EnumDyeColor.class) { - throw new IllegalArgumentException("Must be EnumDyeColor"); - } this.colorProp = colorProp; } diff --git a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java index 1c2f3e082..a8281c46e 100644 --- a/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java +++ b/src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java @@ -88,4 +88,5 @@ public class MultiblockComponent { public boolean shouldDoFancyRender() { return doFancyRender; } + } diff --git a/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java b/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java index b2b7cdcb4..4b5f1a274 100644 --- a/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/api/render/SpecialFlowerModel.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.render; import com.google.common.base.Function; @@ -111,7 +119,8 @@ public class SpecialFlowerModel implements IModelCustomData { builder.addAll(blockModels.values()); builder.addAll(itemModels.values()); - // Force mini island model to be loaded and baked, for use elsewhere. See + // Force mini island model to be loaded and baked, for use elsewhere. See FloatingFlowerModel + // TODO 1.8.8!!!! IslandType is not in the API, will crash when botania is not present!! Must relocate this elsewhere! for (IFloatingFlower.IslandType i : IFloatingFlower.IslandType.values()) { builder.add(new ModelResourceLocation("botania:miniIsland", "variant=" + i.name().toLowerCase(Locale.ROOT))); } @@ -214,6 +223,7 @@ public class SpecialFlowerModel implements IModelCustomData { private void refreshBakedModels() { if (baseModel == null) { + // If not done already, steal all the real baked models and cache them ModelManager manager = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager(); baseModel = getBlockModel(manager, Optional.absent()); @@ -327,9 +337,6 @@ public class SpecialFlowerModel implements IModelCustomData { refreshBakedModels(); IExtendedBlockState extendedState = ((IExtendedBlockState) state); IBakedModel ret = bakedBlockModels.get(extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); - if (ret == null) { - System.out.println("Warning: no flower model for subtile: " + extendedState.getValue(BotaniaStateProps.SUBTILE_ID)); - } return ret == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : ret; } @@ -346,14 +353,13 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public IBakedModel handleItemState(ItemStack stack) { refreshBakedModels(); - //System.out.println("calling smart item"); IBakedModel item = bakedItemModels.get(ItemBlockSpecialFlower.getType(stack)); if (item == null) { - System.out.println("Missing item model, selecting block model"); item = bakedBlockModels.get(ItemBlockSpecialFlower.getType(stack)); } return item == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : item; } } + } diff --git a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java index f9c02ca6c..b6d60778f 100644 --- a/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java +++ b/src/main/java/vazkii/botania/api/state/BotaniaStateProps.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state; import com.google.common.base.Predicate; @@ -11,9 +19,6 @@ import net.minecraft.block.properties.PropertyInteger; import net.minecraft.item.EnumDyeColor; import net.minecraft.util.EnumFacing; import vazkii.botania.api.state.enums.*; -import vazkii.botania.common.block.decor.IFloatingFlower; - -import javax.annotation.Nullable; /** * Holds all Botania block state properties. Use these to set botania blockstates @@ -163,4 +168,5 @@ public class BotaniaStateProps { public static final PropertyEnum STORAGE_VARIANT = PropertyEnum.create("variant", StorageVariant.class); private BotaniaStateProps() {} + } diff --git a/src/main/java/vazkii/botania/api/state/PropertyString.java b/src/main/java/vazkii/botania/api/state/PropertyString.java index ed414b7ea..b3a9799f6 100644 --- a/src/main/java/vazkii/botania/api/state/PropertyString.java +++ b/src/main/java/vazkii/botania/api/state/PropertyString.java @@ -1,7 +1,14 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state; import net.minecraftforge.common.property.IUnlistedProperty; -import vazkii.botania.api.subtile.SubTileEntity; public class PropertyString implements IUnlistedProperty { diff --git a/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java b/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java index 8851a319b..8fefab1b8 100644 --- a/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java +++ b/src/main/java/vazkii/botania/api/state/enums/AlfPortalState.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -13,4 +21,5 @@ public enum AlfPortalState implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java b/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java index f6c547005..5c39e7641 100644 --- a/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/AltGrassVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -16,4 +24,5 @@ public enum AltGrassVariant implements IStringSerializable { public String getName() { return this.name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java b/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java index 329ac2949..4a537727d 100644 --- a/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/AltarVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -20,4 +28,5 @@ public enum AltarVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java index 7962ab47c..26fd82de6 100644 --- a/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/BiomeBrickVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -26,4 +34,5 @@ public enum BiomeBrickVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java b/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java index 844667aa8..64d535329 100644 --- a/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/BiomeStoneVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -26,4 +34,5 @@ public enum BiomeStoneVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java b/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java index b8e3c1717..1cf832200 100644 --- a/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/CrateVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -12,4 +20,5 @@ public enum CrateVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java index e8582c8bc..1576e4c73 100644 --- a/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/CustomBrickVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -26,4 +34,5 @@ public enum CustomBrickVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java b/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java index abf23d24e..56ea59434 100644 --- a/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/DrumVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -13,4 +21,5 @@ public enum DrumVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java b/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java index a19544117..d11fe84be 100644 --- a/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/EndBrickVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -14,4 +22,5 @@ public enum EndBrickVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java b/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java index bf667f908..6856734a9 100644 --- a/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/FutureStoneVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -26,4 +34,5 @@ public enum FutureStoneVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java b/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java index 47be762c4..51030e40a 100644 --- a/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/LivingRockVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -15,4 +23,5 @@ public enum LivingRockVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java b/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java index 561017457..0c84b36e5 100644 --- a/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/LivingWoodVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -16,4 +24,5 @@ public enum LivingWoodVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java b/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java index 3b2db192c..08b89d741 100644 --- a/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/LuminizerVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -12,4 +20,5 @@ public enum LuminizerVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java b/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java index 67d7b213b..572b22e49 100644 --- a/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/PlatformVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -13,4 +21,5 @@ public enum PlatformVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java b/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java index 132f17c46..e57d8b373 100644 --- a/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/PoolVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -14,4 +22,5 @@ public enum PoolVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java b/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java index 95aa0a100..6e37065d7 100644 --- a/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/PrismarineVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -13,4 +21,5 @@ public enum PrismarineVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java b/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java index ce316c222..ed431c756 100644 --- a/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/PylonVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -13,4 +21,5 @@ public enum PylonVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java b/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java index 0f5d0a0a8..6d3767ec3 100644 --- a/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/QuartzVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -15,4 +23,5 @@ public enum QuartzVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java b/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java index 333c62ae2..fbae11307 100644 --- a/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/SpreaderVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -14,4 +22,5 @@ public enum SpreaderVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java b/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java index e1376be3a..23f5efb7c 100644 --- a/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java +++ b/src/main/java/vazkii/botania/api/state/enums/StorageVariant.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.api.state.enums; import net.minecraft.util.IStringSerializable; @@ -15,4 +23,5 @@ public enum StorageVariant implements IStringSerializable { public String getName() { return name().toLowerCase(Locale.ROOT); } + } diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index 09c6fa04e..331984185 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.core.handler; import com.google.common.collect.ImmutableList; @@ -1018,4 +1026,5 @@ public final class ModelHandler { } private ModelHandler() {} + } diff --git a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java index 5e62745af..da7c35b62 100644 --- a/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java @@ -1,3 +1,11 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under the + * Botania License: http://botaniamod.net/license.php + */ package vazkii.botania.client.model; import com.google.common.base.Function; @@ -42,6 +50,7 @@ import java.util.List; import java.util.Map; public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, IResourceManagerReloadListener { + public static final FloatingFlowerModel INSTANCE = new FloatingFlowerModel(); private static Table CACHE = HashBasedTable.create(); @@ -222,4 +231,5 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; } + } diff --git a/src/main/java/vazkii/botania/client/model/ModelPylon.java b/src/main/java/vazkii/botania/client/model/ModelPylon.java index 587184a61..2e42a52a1 100644 --- a/src/main/java/vazkii/botania/client/model/ModelPylon.java +++ b/src/main/java/vazkii/botania/client/model/ModelPylon.java @@ -141,4 +141,5 @@ public class ModelPylon implements IPylonModel { for (BakedQuad bakedquad : quads) LightUtil.renderQuadColor(renderer, bakedquad, color); } + }