diff --git a/src/main/java/com/gregtechceu/gtceu/common/cover/CoverSolarPanel.java b/src/main/java/com/gregtechceu/gtceu/common/cover/CoverSolarPanel.java index 62c622a8e9..d0bd4135be 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/cover/CoverSolarPanel.java +++ b/src/main/java/com/gregtechceu/gtceu/common/cover/CoverSolarPanel.java @@ -20,6 +20,11 @@ public class CoverSolarPanel extends CoverBehavior { private final long EUt; protected TickableSubscription subscription; + public CoverSolarPanel(CoverDefinition definition, ICoverable coverHolder, Direction attachedSide) { + super(definition, coverHolder, attachedSide); + this.EUt = 1; + } + public CoverSolarPanel(CoverDefinition definition, ICoverable coverHolder, Direction attachedSide, int tier) { super(definition, coverHolder, attachedSide); this.EUt = GTValues.V[tier]; diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTCovers.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTCovers.java index 36fb5c432c..d57b61af09 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTCovers.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTCovers.java @@ -129,6 +129,9 @@ public class GTCovers { new SimpleCoverRenderer(GTCEu.id("block/cover/overlay_maintenance_detector"))); // Solar Panels + public final static CoverDefinition SOLAR_PANEL_BASIC = register( + "solar_panel", CoverSolarPanel::new, + new SimpleCoverRenderer(GTCEu.id("block/cover/overlay_solar_panel"))); public final static CoverDefinition[] SOLAR_PANEL = registerTiered( "solar_panel", CoverSolarPanel::new, tier -> new SimpleCoverRenderer(GTCEu.id("block/cover/overlay_solar_panel")), ALL_TIERS_WITH_ULV); diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java index 1f48431d95..061531ba42 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java +++ b/src/main/java/com/gregtechceu/gtceu/common/data/GTItems.java @@ -1989,13 +1989,13 @@ public Component getItemName(ItemStack stack) { // Solar Panels: ID 331-346 public static ItemEntry COVER_SOLAR_PANEL = REGISTRATE.item("solar_panel", ComponentItem::create) .lang("Solar Panel").onRegister(attach(new TooltipBehavior(lines -> { - lines.addAll(LangHandler.getMultiLang("metaitem.cover.solar.panel.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.voltage_out", 1, GTValues.VNF[GTValues.ULV])); - }))).register(); + }))).onRegister(attach(new CoverPlaceBehavior(GTCovers.SOLAR_PANEL_BASIC))) + .register(); public static ItemEntry COVER_SOLAR_PANEL_ULV = REGISTRATE .item("ulv_solar_panel", ComponentItem::create).lang("Ultra Low Voltage Solar Panel") .onRegister(attach(new TooltipBehavior(lines -> { - lines.addAll(LangHandler.getMultiLang("metaitem.cover.solar.panel.tooltip")); + lines.addAll(LangHandler.getMultiLang("item.gtceu.solar_panel.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.voltage_out", GTValues.V[GTValues.ULV], GTValues.VNF[GTValues.ULV])); }))).onRegister(attach(new CoverPlaceBehavior(GTCovers.SOLAR_PANEL[0]))) @@ -2003,7 +2003,7 @@ public Component getItemName(ItemStack stack) { public static ItemEntry COVER_SOLAR_PANEL_LV = REGISTRATE .item("lv_solar_panel", ComponentItem::create).lang("Low Voltage Solar Panel") .onRegister(attach(new TooltipBehavior(lines -> { - lines.addAll(LangHandler.getMultiLang("metaitem.cover.solar.panel.tooltip")); + lines.addAll(LangHandler.getMultiLang("item.gtceu.solar_panel.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.voltage_out", GTValues.V[GTValues.LV], GTValues.VNF[GTValues.LV])); }))).onRegister(attach(new CoverPlaceBehavior(GTCovers.SOLAR_PANEL[1]))) @@ -2011,7 +2011,7 @@ public Component getItemName(ItemStack stack) { public static ItemEntry COVER_SOLAR_PANEL_MV = REGISTRATE .item("mv_solar_panel", ComponentItem::create).lang("Medium Voltage Solar Panel") .onRegister(attach(new TooltipBehavior(lines -> { - lines.addAll(LangHandler.getMultiLang("metaitem.cover.solar.panel.tooltip")); + lines.addAll(LangHandler.getMultiLang("item.gtceu.solar_panel.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.voltage_out", GTValues.V[GTValues.MV], GTValues.VNF[GTValues.MV])); }))).onRegister(attach(new CoverPlaceBehavior(GTCovers.SOLAR_PANEL[2]))) @@ -2019,7 +2019,7 @@ public Component getItemName(ItemStack stack) { public static ItemEntry COVER_SOLAR_PANEL_HV = REGISTRATE .item("hv_solar_panel", ComponentItem::create).lang("High Voltage Solar Panel") .onRegister(attach(new TooltipBehavior(lines -> { - lines.addAll(LangHandler.getMultiLang("metaitem.cover.solar.panel.tooltip")); + lines.addAll(LangHandler.getMultiLang("item.gtceu.solar_panel.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.voltage_out", GTValues.V[GTValues.HV], GTValues.VNF[GTValues.HV])); }))).onRegister(attach(new CoverPlaceBehavior(GTCovers.SOLAR_PANEL[3]))) @@ -2027,7 +2027,7 @@ public Component getItemName(ItemStack stack) { public static ItemEntry COVER_SOLAR_PANEL_EV = REGISTRATE .item("ev_solar_panel", ComponentItem::create).lang("Extreme Voltage Solar Panel") .onRegister(attach(new TooltipBehavior(lines -> { - lines.addAll(LangHandler.getMultiLang("metaitem.cover.solar.panel.tooltip")); + lines.addAll(LangHandler.getMultiLang("item.gtceu.solar_panel.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.voltage_out", GTValues.V[GTValues.EV], GTValues.VNF[GTValues.EV])); }))).onRegister(attach(new CoverPlaceBehavior(GTCovers.SOLAR_PANEL[4]))) @@ -2035,7 +2035,7 @@ public Component getItemName(ItemStack stack) { public static ItemEntry COVER_SOLAR_PANEL_IV = REGISTRATE .item("iv_solar_panel", ComponentItem::create).lang("Insane Voltage Solar Panel") .onRegister(attach(new TooltipBehavior(lines -> { - lines.addAll(LangHandler.getMultiLang("metaitem.cover.solar.panel.tooltip")); + lines.addAll(LangHandler.getMultiLang("item.gtceu.solar_panel.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.voltage_out", GTValues.V[GTValues.IV], GTValues.VNF[GTValues.IV])); }))).onRegister(attach(new CoverPlaceBehavior(GTCovers.SOLAR_PANEL[5]))) @@ -2043,7 +2043,7 @@ public Component getItemName(ItemStack stack) { public static ItemEntry COVER_SOLAR_PANEL_LuV = REGISTRATE .item("luv_solar_panel", ComponentItem::create).lang("Ludicrous Voltage Solar Panel") .onRegister(attach(new TooltipBehavior(lines -> { - lines.addAll(LangHandler.getMultiLang("metaitem.cover.solar.panel.tooltip")); + lines.addAll(LangHandler.getMultiLang("item.gtceu.solar_panel.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.voltage_out", GTValues.V[GTValues.LuV], GTValues.VNF[GTValues.LuV])); }))).onRegister(attach(new CoverPlaceBehavior(GTCovers.SOLAR_PANEL[6]))) @@ -2051,7 +2051,7 @@ public Component getItemName(ItemStack stack) { public static ItemEntry COVER_SOLAR_PANEL_ZPM = REGISTRATE .item("zpm_solar_panel", ComponentItem::create).lang("Zero Point Module Solar Panel") .onRegister(attach(new TooltipBehavior(lines -> { - lines.addAll(LangHandler.getMultiLang("metaitem.cover.solar.panel.tooltip")); + lines.addAll(LangHandler.getMultiLang("item.gtceu.solar_panel.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.voltage_out", GTValues.V[GTValues.ZPM], GTValues.VNF[GTValues.ZPM])); }))).onRegister(attach(new CoverPlaceBehavior(GTCovers.SOLAR_PANEL[7]))) @@ -2059,7 +2059,7 @@ public Component getItemName(ItemStack stack) { public static ItemEntry COVER_SOLAR_PANEL_UV = REGISTRATE .item("uv_solar_panel", ComponentItem::create).lang("Ultimate Voltage Solar Panel") .onRegister(attach(new TooltipBehavior(lines -> { - lines.addAll(LangHandler.getMultiLang("metaitem.cover.solar.panel.tooltip")); + lines.addAll(LangHandler.getMultiLang("item.gtceu.solar_panel.tooltip")); lines.add(Component.translatable("gtceu.universal.tooltip.voltage_out", GTValues.V[GTValues.UV], GTValues.VNF[GTValues.UV])); }))).onRegister(attach(new CoverPlaceBehavior(GTCovers.SOLAR_PANEL[8])))