MOre work on solar panels. Blockstate json isn't ready yet.

This commit is contained in:
drcrazy 2018-09-19 18:24:35 +03:00
parent 4245decc3c
commit b7a0854cae
22 changed files with 125 additions and 305 deletions

View file

@ -31,23 +31,27 @@ import reborncore.client.models.ModelCompound;
import reborncore.client.models.RebornModelRegistry;
import reborncore.common.blocks.BlockMachineBase;
import techreborn.TechReborn;
import techreborn.init.TRContent.SolarPanels;
import techreborn.tiles.generator.TileSolarPanel;
import techreborn.utils.TechRebornCreativeTab;
/**
* Created by modmuss50 on 25/02/2016.
*/
public class BlockSolarPanel extends BlockMachineBase {
public final SolarPanels panelType;
public BlockSolarPanel() {
public BlockSolarPanel(SolarPanels panel) {
super();
this.panelType = panel;
setCreativeTab(TechRebornCreativeTab.instance);
RebornModelRegistry.registerModel(new ModelCompound(TechReborn.MOD_ID, this, "machines/generators"));
}
@Override
public TileEntity createNewTileEntity(final World world, final int meta) {
// TODO: FIx me
return null;
return new TileSolarPanel();
}
@Override

View file

@ -1,87 +0,0 @@
/*
* 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.solarpanel;
import net.minecraft.util.IStringSerializable;
import reborncore.api.power.EnumPowerTier;
import techreborn.config.ConfigTechReborn;
public enum EnumPanelType implements IStringSerializable {
Basic("basic", EnumPowerTier.MICRO),
Hybrid("hybrid", EnumPowerTier.LOW),
Advanced("advanced", EnumPowerTier.MEDIUM),
Ultimate("ultimate", EnumPowerTier.HIGH),
Quantum("quantum", EnumPowerTier.EXTREME),
CREATIVE("creative", EnumPowerTier.EXTREME);
private String friendlyName;
// Generation of EU during Day
public int generationRateD = 1;
// Generation of EU during Night
public int generationRateN = 0;
// Internal EU storage of solar panel
public int internalCapacity = 1000;
public EnumPowerTier powerTier;
EnumPanelType(String friendlyName, EnumPowerTier tier) {
this.friendlyName = friendlyName;
this.powerTier = tier;
// TODO: Fix me
switch (friendlyName) {
case "basic":
this.generationRateD = ConfigTechReborn.basicGenerationRateD;
this.generationRateN = ConfigTechReborn.basicGenerationRateN;
break;
case "hybrid":
this.generationRateD = ConfigTechReborn.hybridGenerationRateD;
this.generationRateN = ConfigTechReborn.hybridGenerationRateN;
break;
case "advanced":
this.generationRateD = ConfigTechReborn.advancedGenerationRateD;
this.generationRateN = ConfigTechReborn.advancedGenerationRateN;
break;
case "ultimate":
this.generationRateD = ConfigTechReborn.ultimateGenerationRateD;
this.generationRateN = ConfigTechReborn.ultimateGenerationRateN;
break;
case "quantum":
this.generationRateD = ConfigTechReborn.quantumGenerationRateD;
this.generationRateN = ConfigTechReborn.quantumGenerationRateN;
break;
}
this.internalCapacity = (this.generationRateD * 1000);
}
@Override
public String getName() {
return friendlyName;
}
}