From 6de16576d65b7f02123bb400f063200c41ee7cab Mon Sep 17 00:00:00 2001 From: Tec Date: Fri, 25 Oct 2019 18:02:03 +0200 Subject: Add missing side only --- .../tectech/thing/item/DebugElementalInstanceContainer_EM.java | 7 +++++-- .../tectech/thing/item/ElementalDefinitionContainer_EM.java | 5 ++++- .../tectech/thing/item/ElementalDefinitionScanStorage_EM.java | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java index 3eb71abca1..f2e5101305 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/item/DebugElementalInstanceContainer_EM.java @@ -1,8 +1,8 @@ package com.github.technus.tectech.thing.item; import com.github.technus.tectech.CommonValues; -import com.github.technus.tectech.font.TecTechFontRender; import com.github.technus.tectech.Util; +import com.github.technus.tectech.font.TecTechFontRender; import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalInstanceStackMap; import com.github.technus.tectech.mechanics.elementalMatter.core.iElementalInstanceContainer; import com.github.technus.tectech.mechanics.elementalMatter.core.stacks.cElementalInstanceStack; @@ -10,6 +10,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalExcep import com.github.technus.tectech.mechanics.elementalMatter.core.templates.iElementalDefinition; import com.github.technus.tectech.thing.item.renderElemental.IElementalItem; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import net.minecraft.client.gui.FontRenderer; @@ -29,6 +30,7 @@ import java.util.TreeSet; import static com.github.technus.tectech.Reference.MODID; import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; +import static cpw.mods.fml.relauncher.Side.CLIENT; /** * Created by Tec on 15.03.2017. @@ -158,7 +160,8 @@ public final class DebugElementalInstanceContainer_EM extends Item implements IE } @Override + @SideOnly(CLIENT) public FontRenderer getFontRenderer(ItemStack stack) { - return (FontRenderer) (Object) TecTechFontRender.INSTANCE; + return TecTechFontRender.INSTANCE; } } diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java index 8de3d1540c..e1f09bfa69 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionContainer_EM.java @@ -7,6 +7,7 @@ import com.github.technus.tectech.mechanics.elementalMatter.core.cElementalDefin import com.github.technus.tectech.mechanics.elementalMatter.core.tElementalException; import com.github.technus.tectech.thing.item.renderElemental.IElementalItem; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.gui.FontRenderer; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.player.EntityPlayer; @@ -19,6 +20,7 @@ import java.util.List; import static com.github.technus.tectech.Reference.MODID; import static com.github.technus.tectech.loader.TecTechConfig.DEBUG_MODE; +import static cpw.mods.fml.relauncher.Side.CLIENT; /** * Created by Tec on 15.03.2017. @@ -145,7 +147,8 @@ public final class ElementalDefinitionContainer_EM extends Item implements IElem } @Override + @SideOnly(CLIENT) public FontRenderer getFontRenderer(ItemStack stack) { - return (FontRenderer) (Object) TecTechFontRender.INSTANCE; + return TecTechFontRender.INSTANCE; } } diff --git a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java index 564209062a..8cd3f850e7 100644 --- a/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java +++ b/src/main/java/com/github/technus/tectech/thing/item/ElementalDefinitionScanStorage_EM.java @@ -25,6 +25,7 @@ import net.minecraft.world.World; import java.util.List; import static com.github.technus.tectech.Reference.MODID; +import static cpw.mods.fml.relauncher.Side.CLIENT; /** * Created by Tec on 15.03.2017. @@ -149,7 +150,8 @@ public final class ElementalDefinitionScanStorage_EM extends Item implements IEl } @Override + @SideOnly(CLIENT) public FontRenderer getFontRenderer(ItemStack stack) { - return (FontRenderer) (Object) TecTechFontRender.INSTANCE; + return TecTechFontRender.INSTANCE; } } -- cgit From 704829e835e6ec5572b6bbeacbeaae2a2baee8dc Mon Sep 17 00:00:00 2001 From: Dream-Master Date: Fri, 25 Oct 2019 21:24:34 +0200 Subject: update gt dependencies --- build.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.properties b/build.properties index a1bc5fd88c..3781376459 100644 --- a/build.properties +++ b/build.properties @@ -6,8 +6,8 @@ ic2.version=2.2.790-experimental codechickenlib.version=1.1.3.140 codechickencore.version=1.0.7.47 nei.version=1.0.5.120 -gregtech.jenkinsbuild=316 -gregtech.version=5.09.33.17 +gregtech.jenkinsbuild=336 +gregtech.version=5.09.33.22 cofhcore.version=[1.7.10]3.1.4-329-dev cofhlib.version=[1.7.10]1.0.3-175-dev -- cgit From ca37294a0d8004729795164152b31905b9fc5882 Mon Sep 17 00:00:00 2001 From: Technus Date: Fri, 1 Nov 2019 14:41:35 +0100 Subject: add OC --- libs/OpenComputers-MC1.7.10-1.7.4.1265-universal.jar | Bin 0 -> 14990149 bytes libs/OpenComputers-MC1.7.10-1.7.4.1279-javadoc.jar | Bin 0 -> 689285 bytes libs/OpenComputers-MC1.7.10-1.7.4.1279-sources.jar | Bin 0 -> 1109820 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 libs/OpenComputers-MC1.7.10-1.7.4.1265-universal.jar create mode 100644 libs/OpenComputers-MC1.7.10-1.7.4.1279-javadoc.jar create mode 100644 libs/OpenComputers-MC1.7.10-1.7.4.1279-sources.jar diff --git a/libs/OpenComputers-MC1.7.10-1.7.4.1265-universal.jar b/libs/OpenComputers-MC1.7.10-1.7.4.1265-universal.jar new file mode 100644 index 0000000000..1faff073e0 Binary files /dev/null and b/libs/OpenComputers-MC1.7.10-1.7.4.1265-universal.jar differ diff --git a/libs/OpenComputers-MC1.7.10-1.7.4.1279-javadoc.jar b/libs/OpenComputers-MC1.7.10-1.7.4.1279-javadoc.jar new file mode 100644 index 0000000000..64b9e9e0e6 Binary files /dev/null and b/libs/OpenComputers-MC1.7.10-1.7.4.1279-javadoc.jar differ diff --git a/libs/OpenComputers-MC1.7.10-1.7.4.1279-sources.jar b/libs/OpenComputers-MC1.7.10-1.7.4.1279-sources.jar new file mode 100644 index 0000000000..8e4dbaeca9 Binary files /dev/null and b/libs/OpenComputers-MC1.7.10-1.7.4.1279-sources.jar differ -- cgit