Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
reobf committed Jul 16, 2024
1 parent 3296a0c commit 52ba6a0
Show file tree
Hide file tree
Showing 14 changed files with 581 additions and 17 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ catch (Exception ignored) {

// Pulls version first from the VERSION env and then git tag
String identifiedVersion = null
String versionOverride = '0.0.17p8'
String versionOverride = '0.0.17p9'
try {
// Produce a version based on the tag, or for branches something like 0.2.2-configurable-maven-and-extras.38+43090270b6-dirty
if (versionOverride == null) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/reobf/proghatches/eucrafting/AECover.java
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ default public boolean requireChannel() {
default public AENetworkProxy getProxy() {

if (getGridProxy() == null) {
setGridProxy(new AENetworkProxy(this, "proxy", getVisual(), false));
setGridProxy(new AENetworkProxy(this, "proxy", getVisual(), true));
if (requireChannel())
getGridProxy().setFlags(GridFlags.REQUIRE_CHANNEL);
getGridProxy().setValidSides(EnumSet.of(getSide()));
Expand Down
10 changes: 9 additions & 1 deletion src/main/java/reobf/proghatches/eucrafting/ILazer.java
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
package reobf.proghatches.eucrafting;

import java.util.List;

import com.github.technus.tectech.mechanics.pipe.IConnectsToEnergyTunnel;

import gregtech.api.interfaces.tileentity.IColoredTileEntity;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.util.ForgeDirection;

public interface ILazer extends IConnectsToEnergyTunnel,IColoredTileEntity{

public boolean isHost();
public ILazer getLazerP2PIn(ForgeDirection dir);
public ForgeDirection getLazerDir();
public List<ILazer> getLazerP2POuts();
public default TileEntity findConnected(){return null;};
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Textures;
import gregtech.api.enums.Textures.BlockIcons.CustomIcon;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
Expand Down Expand Up @@ -59,7 +61,7 @@ public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int
@Override
public void registerIcons(IIconRegister _iconRegister) {
PartEUSource.registerIcons(_iconRegister);

}

@Override
Expand Down
95 changes: 95 additions & 0 deletions src/main/java/reobf/proghatches/eucrafting/ItemPartLazerP2P.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
package reobf.proghatches.eucrafting;

import java.util.List;

import javax.annotation.Nullable;

import appeng.api.AEApi;
import appeng.api.parts.IPart;
import appeng.api.parts.IPartItem;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Textures;
import gregtech.api.enums.Textures.BlockIcons.CustomIcon;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.IIcon;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;

public class ItemPartLazerP2P extends Item implements IPartItem {
@SideOnly(Side.CLIENT)
private IIcon icon;


public ItemPartLazerP2P() {
this.setMaxStackSize(64);
// this.setUnlocalizedName(NameConst.ITEM_PART_FLUID_EXPORT);
AEApi.instance().partHelper().setItemBusRenderer(this);
setHasSubtypes(true);
}

@Nullable
@Override
public IPart createPartFromItemStack(ItemStack is) {
return new PartLazerP2P(is);
}
@Override
public String getItemStackDisplayName(ItemStack stack) {
int damage=stack.getItemDamage();
if(damage>=1&&damage<=15){
return StatCollector.translateToLocalFormatted("item.proghatches.part.eu.source.superconduct.name",GT_Values.VN[damage-1]);
}
if(damage>=16&&damage<=30){
return StatCollector.translateToLocalFormatted("item.proghatches.part.eu.source.normal.name",GT_Values.VN[damage-16]);
}
return super.getItemStackDisplayName(stack);
}

@Override
public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
float xOffset, float yOffset, float zOffset) {
return AEApi.instance().partHelper().placeBus(player.getHeldItem(), x, y, z, side, player, world);
}

/*
* public ItemPartEUSource register() { //if (!Config.fluidIOBus) return
* null; GameRegistry.registerItem(this, NameConst.ITEM_PART_FLUID_EXPORT,
* FluidCraft.MODID); //setCreativeTab(FluidCraftingTabs.INSTANCE); return
* this; }
*/
@SideOnly(Side.CLIENT)
@Override
public void registerIcons(IIconRegister register) {

this.icon = register.registerIcon("appliedenergistics2:ItemPart.P2PTunnel");
}
@SideOnly(Side.CLIENT)
@Override
public IIcon getIconFromDamage(int dmg) {
return icon;
}
/*
@Override
public IIcon getIconIndex(ItemStack p_77650_1_) {
return PartEUSource.a;
}*/
@Override
@SideOnly(Side.CLIENT)
public int getSpriteNumber() {
return 0;
}
@SideOnly(value=Side.CLIENT)
@Override
public void addInformation(ItemStack p_77624_1_, EntityPlayer p_77624_2_, List p_77624_3_, boolean p_77624_4_) {
p_77624_3_.add(StatCollector.translateToLocal("item.proghatches.part.lazer.p2p.tooltips.0"));
p_77624_3_.add(StatCollector.translateToLocal("item.proghatches.part.lazer.p2p.tooltips.1"));

super.addInformation(p_77624_1_, p_77624_2_, p_77624_3_, p_77624_4_);
}

}
13 changes: 12 additions & 1 deletion src/main/java/reobf/proghatches/eucrafting/PartEUSource.java
Original file line number Diff line number Diff line change
Expand Up @@ -965,5 +965,16 @@ public byte setColorization(byte aColor) {

return 11;
}

public boolean isHost() {
return false;
}
public ILazer getLazerP2PIn(ForgeDirection dir) {
return null;
}
public ForgeDirection getLazerDir() {
return this.side;
}
public List<ILazer> getLazerP2POuts() {
return null;
}
}
Loading

0 comments on commit 52ba6a0

Please sign in to comment.