byte/lumiscope
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

recipe for jammer

Browse Source
This commit is contained in:
Daniel
2024-08-16 21:30:03 +03:00
parent 530638448c
commit f046a1e4df
9 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -13,7 +13,7 @@ apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'eclipse'
apply plugin: 'maven-publish'
version = '1.1.0'
version = '1.3.0'
group = 'com.lumijiez.lumiscope' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
archivesBaseName = 'lumiscope'

10
src/main/java/com/lumijiez/lumiscope/items/radars/LongRadar.java
View File

@@ -18,22 +18,18 @@ public class LongRadar extends ItemBase {
public LongRadar() {
super("long_radar");
setMaxStackSize(1);
setMaxDamage(1000);
setMaxDamage(400);
}
@Override
@ParametersAreNonnullByDefault
public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> tooltip, ITooltipFlag flagIn) {
ITextComponent info = new TextComponentString("Checks for faraway players.")
.setStyle(new Style().setColor(TextFormatting.AQUA));
.setStyle(new Style().setColor(TextFormatting.BLUE));
tooltip.add(info.getFormattedText());
ITextComponent warning = new TextComponentString("Can be imprecise!")
.setStyle(new Style().setColor(TextFormatting.RED));
tooltip.add(warning.getFormattedText());
tooltip.add(new TextComponentString("Does not detect invisible players!")
.setStyle(new Style().setColor(TextFormatting.DARK_RED).setItalic(true)).getFormattedText());
.setStyle(new Style().setColor(TextFormatting.DARK_RED)).getFormattedText());
super.addInformation(stack, worldIn, tooltip, flagIn);

6
src/main/java/com/lumijiez/lumiscope/items/radars/ShortRadar.java
View File

@@ -16,17 +16,17 @@ public class ShortRadar extends ItemBase {
public ShortRadar() {
super("short_radar");
setMaxStackSize(1);
setMaxDamage(1000);
setMaxDamage(400);
}
@Override
@ParametersAreNonnullByDefault
public void addInformation(ItemStack stack, @Nullable World worldIn, List<String> tooltip, ITooltipFlag flagIn) {
tooltip.add(new TextComponentString("Checks for nearby players.")
.setStyle(new Style().setColor(TextFormatting.AQUA)).getFormattedText());
.setStyle(new Style().setColor(TextFormatting.BLUE)).getFormattedText());
tooltip.add(new TextComponentString("Does detect invisible players!")
.setStyle(new Style().setColor(TextFormatting.GREEN).setBold(true).setItalic(true)).getFormattedText());
.setStyle(new Style().setColor(TextFormatting.GREEN)).getFormattedText());
super.addInformation(stack, worldIn, tooltip, flagIn);
}

1
src/main/java/com/lumijiez/lumiscope/network/handlers/LongRadarPacketHandler.java
View File

@@ -51,6 +51,7 @@ public class LongRadarPacketHandler {
private static boolean shouldIncludePlayer(EntityPlayerMP player, EntityPlayerMP otherPlayer) {
return !otherPlayer.equals(player)
&& player.getDistance(otherPlayer) >= 300
&& player.dimension == otherPlayer.dimension
&& !otherPlayer.isPotionActive(PotionManager.JAMMERED_POTION_EFFECT);
}
}

7
src/main/java/com/lumijiez/lumiscope/render/radar/LongRadarRenderer.java
View File

@@ -2,6 +2,7 @@ package com.lumijiez.lumiscope.render.radar;
import com.lumijiez.lumiscope.items.radars.LongRadar;
import com.lumijiez.lumiscope.network.records.PlayerInfo;
import com.lumijiez.lumiscope.potions.PotionManager;
import net.minecraftforge.client.event.RenderHandEvent;
import net.minecraftforge.client.event.RenderWorldLastEvent;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -36,8 +37,10 @@ public class LongRadarRenderer extends BaseRadarRenderer {
@Override
protected boolean shouldRenderRadar() {
return mc.player.getHeldItemMainhand().getItem() instanceof LongRadar ||
mc.player.getHeldItemOffhand().getItem() instanceof LongRadar;
return (mc.player.getHeldItemMainhand().getItem() instanceof LongRadar
|| mc.player.getHeldItemOffhand().getItem() instanceof LongRadar)
&& !mc.player.isPotionActive(PotionManager.JAMMERED_POTION_EFFECT);
}
@Override

7
src/main/java/com/lumijiez/lumiscope/render/radar/ShortRadarRenderer.java
View File

@@ -1,7 +1,9 @@
package com.lumijiez.lumiscope.render.radar;
import com.lumijiez.lumiscope.items.radars.LongRadar;
import com.lumijiez.lumiscope.items.radars.ShortRadar;
import com.lumijiez.lumiscope.network.records.PlayerInfo;
import com.lumijiez.lumiscope.potions.PotionManager;
import com.lumijiez.lumiscope.util.CustomMath;
import com.lumijiez.lumiscope.util.GLHelper;
import net.minecraft.client.renderer.GlStateManager;
@@ -76,8 +78,9 @@ public class ShortRadarRenderer extends BaseRadarRenderer {
@Override
protected boolean shouldRenderRadar() {
return mc.player.getHeldItemMainhand().getItem() instanceof ShortRadar ||
mc.player.getHeldItemOffhand().getItem() instanceof ShortRadar;
return (mc.player.getHeldItemMainhand().getItem() instanceof ShortRadar
|| mc.player.getHeldItemOffhand().getItem() instanceof ShortRadar)
&& !mc.player.isPotionActive(PotionManager.JAMMERED_POTION_EFFECT);
}
@Override

2
src/main/java/com/lumijiez/lumiscope/util/Ref.java
View File

@@ -6,7 +6,7 @@ import org.apache.logging.log4j.Logger;
public class Ref {
public static final String MODID = "lumiscope";
public static final String NAME = "Lumiscope";
public static final String VERSION = "1.1.1";
public static final String VERSION = "1.3.0";
public static final String CLIENT_PROXY_CLASS = "com.lumijiez.lumiscope.proxy.ClientProxy";
public static final String COMMON_PROXY_CLASS = "com.lumijiez.lumiscope.proxy.CommonProxy";
public static final Logger logger = LogManager.getLogger();

2
src/main/resources/assets/lumiscope/lang/en_us.lang
View File

@@ -2,5 +2,5 @@ item.short_radar.name=Short Distance Radar
item.long_radar.name=Long Distance Radar
item.radar_antenna.name=Radar Antenna
item.radar_screen.name=Radar Screen
item.portable_jammer=Portable Jammer
item.portable_jammer.name=Portable Jammer
effect.jammered=Jammered

23
src/main/resources/assets/lumiscope/recipes/portable_jammer.json Normal file
View File

@@ -0,0 +1,23 @@
{
"type": "minecraft:crafting_shaped",
"pattern": [
"OSO",
"OLO",
"OSO"
],
"key": {
"S": {
"item": "lumiscope:short_radar"
},
"L": {
"item": "lumiscope:long_radar"
},
"O": {
"item": "minecraft:obsidian"
}
},
"result": {
"item": "lumiscope:portable_jammer",
"count": 1
}
}