Preparations for 0.3.1-dev4

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -120,6 +120,7 @@ body:
       description: Select Immersive Intelligence version.
       options:
         - 0.3.1
+        - 0.3.1-dev4
         - 0.3.1-dev3-test1
         - 0.3.1-dev2
         - 0.3.1-dev1

gradle.properties

@@ -15,7 +15,7 @@ mcmod_Contributors=Pabilo8,Carver,Sch
 modForge=1.12.2-14.23.5.2847
 modMappings=snapshot_20171003
 #Project Data
-modVersion=0.3.1-dev3-test1
+modVersion=0.3.1-dev4
 modGroup=pl.pabilo8
 modName=immersiveintelligence
 # Private Team II Maven

src/main/java/pl/pabilo8/immersiveintelligence/api/LogisticTag.java

@@ -211,7 +211,7 @@ public NBTTagCompound serializeNBT()
 				.withString("origin", origin)
 				.withString("destination", destination)
 				.withColor("color", IIColor.fromDye(color))
-				.withUUID("owner", owner)
+				.conditionally(owner!=null, tis -> tis.withUUID("owner", owner))
 				.withInt("batch_number", batchNumber)
 				.unwrap();
 	}

src/main/java/pl/pabilo8/immersiveintelligence/api/ammo/enums/ComponentRole.java

@@ -1,9 +1,10 @@
 package pl.pabilo8.immersiveintelligence.api.ammo.enums;
 
 import pl.pabilo8.immersiveintelligence.common.util.IIColor;
-import pl.pabilo8.immersiveintelligence.common.util.ISerializableEnum;
+import pl.pabilo8.immersiveintelligence.common.util.IIReference;
+import pl.pabilo8.immersiveintelligence.common.util.ILocalizedEnum;
 
-public enum ComponentRole implements ISerializableEnum
+public enum ComponentRole implements ILocalizedEnum
 {
 	GENERAL_PURPOSE(0xaaaaaa),
 	SHRAPNEL(0x3f4f57),
@@ -32,4 +33,10 @@ public IIColor getColor()
 	{
 		return color;
 	}
+
+	@Override
+	public String geLocaleKey()
+	{
+		return IIReference.DESCRIPTION_KEY+"bullet_type.";
+	}
 }

src/main/java/pl/pabilo8/immersiveintelligence/api/ammo/enums/FuseType.java

@@ -1,11 +1,9 @@
 package pl.pabilo8.immersiveintelligence.api.ammo.enums;
 
-import pl.pabilo8.immersiveintelligence.common.util.ISerializableEnum;
+import pl.pabilo8.immersiveintelligence.common.util.IIReference;
+import pl.pabilo8.immersiveintelligence.common.util.ILocalizedEnum;
 
-import javax.annotation.Nonnull;
-import java.util.Arrays;
-
-public enum FuseType implements ISerializableEnum
+public enum FuseType implements ILocalizedEnum
 {
 	CONTACT('\u29b0'),
 	TIMED('\u29b1'),
@@ -18,11 +16,9 @@ public enum FuseType implements ISerializableEnum
 		this.symbol = symbol;
 	}
 
-	//TODO: 28.05.2024 replace with IIUtils.enumValue
-	@Nonnull
-	public static FuseType v(String s)
+	@Override
+	public String geLocaleKey()
 	{
-		String ss = s.toUpperCase();
-		return Arrays.stream(values()).filter(e -> e.name().equals(ss)).findFirst().orElse(CONTACT);
+		return IIReference.DESCRIPTION_KEY+"bullet_fuse.";
 	}
 }

src/main/java/pl/pabilo8/immersiveintelligence/api/ammo/parts/IAmmoTypeItem.java

@@ -13,6 +13,7 @@
 import pl.pabilo8.immersiveintelligence.api.ammo.enums.PropellantType;
 import pl.pabilo8.immersiveintelligence.api.utils.ItemTooltipHandler;
 import pl.pabilo8.immersiveintelligence.api.utils.ItemTooltipHandler.IAdvancedTooltipItem;
+import pl.pabilo8.immersiveintelligence.common.IIUtils;
 import pl.pabilo8.immersiveintelligence.common.entity.ammo.EntityAmmoBase;
 import pl.pabilo8.immersiveintelligence.common.util.IIColor;
 import pl.pabilo8.immersiveintelligence.common.util.easynbt.EasyNBT;
@@ -183,7 +184,7 @@ default FuseType getFuseType(ItemStack stack)
 	{
 		if(!ItemNBTHelper.hasKey(stack, NBT_FUSE))
 			makeDefault(stack);
-		return FuseType.v(ItemNBTHelper.getString(stack, NBT_FUSE));
+		return IIUtils.enumValue(FuseType.class, ItemNBTHelper.getString(stack, NBT_FUSE));
 	}
 
 	@Override

src/main/java/pl/pabilo8/immersiveintelligence/api/ammo/utils/AmmoFactory.java

@@ -17,6 +17,7 @@
 import pl.pabilo8.immersiveintelligence.common.IILogger;
 import pl.pabilo8.immersiveintelligence.common.entity.ammo.EntityAmmoBase;
 import pl.pabilo8.immersiveintelligence.common.entity.ammo.types.EntityAmmoProjectile;
+import pl.pabilo8.immersiveintelligence.common.util.gun.GunAimCoordinate;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -115,7 +116,21 @@ public AmmoFactory(World world)
 	public AmmoFactory<E> setStack(ItemStack stack)
 	{
 		this.stack = stack;
-		this.ammo = ((IAmmoType<?, E>)stack.getItem());
+		this.ammo = this.ammo==null?((IAmmoType<?, E>)stack.getItem()): this.ammo;
+		return this;
+	}
+
+	/**
+	 * Sets the ammo to create, used when the ammo type can't be determined directly from the stack, f.e. in turrets
+	 *
+	 * @param ammo The ammo to create
+	 * @return The factory
+	 */
+	@SuppressWarnings("rawtypes")
+	public AmmoFactory<E> setAmmo(@Nonnull IAmmoType ammo)
+	{
+		//noinspection unchecked
+		this.ammo = (IAmmoType<?, E>)ammo;
 		return this;
 	}
 
@@ -195,6 +210,12 @@ public AmmoFactory<E> setPositionAndVelocity(Vec3d pos, Vec3d dir, float velocit
 		return this;
 	}
 
+	public AmmoFactory<E> setPositionAndVelocity(Vec3d positionVector, GunAimCoordinate aim, float offset, float velocity)
+	{
+		Vec3d target = aim.getTarget(0);
+		return setPositionAndVelocity(positionVector.add(target.scale(offset)), target, offset);
+	}
+
 	/**
 	 * Sets the owner of the ammo
 	 *
@@ -252,6 +273,8 @@ public AmmoFactory<E> setUseArtilleryAngles(boolean useArtilleryAngles)
 		return this;
 	}
 
+	//--- Ammo Entity Creation ---//
+
 	/**
 	 * Builds the ammo based on passed data and spawns it in the world.
 	 *
@@ -272,7 +295,7 @@ public E create()
 	public E create(@Nullable Consumer<E> action)
 	{
 		//Invalid ammo type
-		if(ammo==null)
+		if(ammo==null||stack==null||stack.isEmpty())
 			return null;
 
 		//No position or direction passed
@@ -356,4 +379,21 @@ public boolean isValidAmmo(ItemStack stack)
 			return false;
 		return stack.getItem()==ammo&&!((IAmmoTypeItem<?, ?>)ammo).isBulletCore(stack);
 	}
+
+	//--- Getters ---//
+
+	public World getWorld()
+	{
+		return world.get();
+	}
+
+	public Vec3d getPos()
+	{
+		return pos;
+	}
+
+	public Vec3d getDirection()
+	{
+		return dir;
+	}
 }

src/main/java/pl/pabilo8/immersiveintelligence/api/crafting/BulletComponentStack.java

@@ -1,6 +1,5 @@
 package pl.pabilo8.immersiveintelligence.api.crafting;
 
-import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.util.INBTSerializable;
@@ -30,7 +29,7 @@ private BulletComponentStack(String name, int amount, @Nonnull NBTTagCompound ta
 	{
 		this.name = name;
 		this.amount = amount;
-		this.tagCompound = tag;
+		this.tagCompound = tag.copy();
 
 		Optional<AmmoComponent> first = AmmoRegistry.getAllComponents().stream()
 				.filter(comp -> this.name.equals(comp.getName()))
@@ -41,21 +40,31 @@ private BulletComponentStack(String name, int amount, @Nonnull NBTTagCompound ta
 
 	public BulletComponentStack(AmmoComponent component, @Nullable NBTTagCompound tag)
 	{
-		this(component.getName(), 16, tag==null?new NBTTagCompound(): tag);
+		this(component, 16, tag);
+	}
+
+	public BulletComponentStack(AmmoComponent component, int amount, @Nullable NBTTagCompound tag)
+	{
+		this(component.getName(), amount, tag==null?new NBTTagCompound(): tag);
 	}
 
 	public BulletComponentStack()
 	{
 		this("", 0, new NBTTagCompound());
 	}
 
+	public BulletComponentStack copy()
+	{
+		return new BulletComponentStack(name, amount, tagCompound);
+	}
+
 	@Override
 	public NBTTagCompound serializeNBT()
 	{
 		NBTTagCompound nbt = new NBTTagCompound();
 		nbt.setString("name", name);
 		nbt.setInteger("amount", amount);
-		nbt.setTag("nbt", tagCompound);
+		nbt.setTag("nbt", tagCompound.copy());
 
 		return nbt;
 	}
@@ -65,7 +74,7 @@ public void deserializeNBT(NBTTagCompound nbt)
 	{
 		name = nbt.getString("name");
 		amount = nbt.getInteger("amount");
-		tagCompound = nbt.getCompoundTag("nbt");
+		tagCompound = nbt.getCompoundTag("nbt").copy();
 
 		Optional<AmmoComponent> first = AmmoRegistry.getAllComponents().stream()
 				.filter(comp -> this.name.equals(comp.getName()))
@@ -76,7 +85,7 @@ public void deserializeNBT(NBTTagCompound nbt)
 
 	public boolean isEmpty()
 	{
-		return name.isEmpty()||amount==0;
+		return name.isEmpty()||amount==0||component==null;
 	}
 
 	public boolean isFluid()
@@ -86,30 +95,34 @@ public boolean isFluid()
 
 	public boolean matches(ItemStack stack)
 	{
-		if(isEmpty()||component==null)
+		if(isEmpty())
 			return true;
+		if(stack.isEmpty()||component==null)
+			return false;
 
 		NBTTagCompound stackTag = stack.getTagCompound();
 		if(stackTag==null)
 			stackTag = new NBTTagCompound();
 
-		return component.getName().equals(name)&&this.tagCompound.equals(stackTag);
+		return component.getMaterial().matchesItemStackIgnoringSize(stack)&&this.tagCompound.equals(stackTag);
 	}
 
 	public boolean matches(FluidStack fs)
 	{
 		if(isEmpty())
 			return true;
+		if(fs==null||component==null||component.getMaterial().fluid==null)
+			return false;
 
 		NBTTagCompound stackTag = fs.tag==null?new NBTTagCompound(): fs.tag;
 
-		return fs.getFluid().getName().equals(name)&&this.tagCompound.equals(stackTag);
+		return fs.isFluidEqual(component.getMaterial().fluid)&&this.tagCompound.equals(stackTag);
 	}
 
 	public void subtract(int amount)
 	{
 		this.amount = Math.max(0, this.amount-amount);
-		if(amount==0)
+		if(this.amount==0)
 		{
 			tagCompound = new NBTTagCompound();
 			name = "";
@@ -135,7 +148,7 @@ public float getAmountPercentage()
 	@SideOnly(Side.CLIENT)
 	public String getTranslatedName()
 	{
-		return I18n.format("ie.manual.entry.bullet_component."+name);
+		return component!=null?component.getTranslatedName(): "";
 	}
 
 	public AmmoComponent getComponent()

src/main/java/pl/pabilo8/immersiveintelligence/api/crafting/ProjectileWorkshopRecipe.java

@@ -17,9 +17,27 @@
  **/
 public class ProjectileWorkshopRecipe extends IIMultiblockRecipe
 {
+	public static final String FILLING_RECIPE_NAME = "core_filling";
+	public static final ProjectileWorkshopRecipe CORE_FILLING = new ProjectileWorkshopRecipe();
+
+	@Nullable
 	public IAmmoTypeItem<?, ?> ammo;
 	public boolean isFilling;
-	public ItemStack effect, ingredient;
+	public ItemStack effect = ItemStack.EMPTY, ingredient = ItemStack.EMPTY;
+
+	/**
+	 * Single hard-coded recipe used by Core Filler mode.
+	 */
+	private ProjectileWorkshopRecipe()
+	{
+		super(FILLING_RECIPE_NAME);
+		this.isFilling = true;
+
+		this.setTimeAndEnergy(
+				ProjectileWorkshop.fillingTime,
+				ProjectileWorkshop.fillingEnergyUsage
+		);
+	}
 
 	/**
 	 * Production recipe
@@ -42,25 +60,9 @@ public ProjectileWorkshopRecipe(IAmmoTypeItem<?, ?> ammo, AmmoCore core, CoreTyp
 		);
 	}
 
-	//Filling recipe
-	/*public ProjectileWorkshopRecipe(ItemStack inputStack, BulletComponentStack component)
-	{
-		assert inputStack.getItem() instanceof IAmmoTypeItem;
-
-		this.ammo = (IAmmoTypeItem<?, ?>)inputStack.getItem();
-		this.isFilling = true;
-
-		this.totalProcessTime = ProjectileWorkshop.fillingTime;
-		this.energyPerTick = ProjectileWorkshop.fillingEnergyUsage;
-
-		this.effect = inputStack.copy();
-		this.effect.setCount(1);
-		ammo.addComponents(this.effect, component.getComponent(), component.tagCompound);
-	}*/
-
 	public ItemStack getEffect()
 	{
-		return effect;
+		return effect.copy();
 	}
 
 	@Nullable

src/main/java/pl/pabilo8/immersiveintelligence/api/data/IIDataTypeUtils.java

@@ -38,7 +38,7 @@ public static void registerDataTypes()
 		//number types
 		registerType("integer", DataTypeInteger.class, DataTypeInteger::new, IIColor.fromPackedRGB(0x26732e), false);
 		registerType("float", DataTypeFloat.class, DataTypeFloat::new, IIColor.fromPackedRGB(0x0d6b68), false);
-		registerType("vector", DataTypeVector.class, DataTypeVector::new, IIColor.fromPackedRGB(0x9d8900), false);
+		registerType("vector", DataTypeVector.class, DataTypeVector::new, IIColor.fromPackedRGB(0x9d8900), true);
 		registerGenericType("number", NumericDataType.class);
 
 		//text types

src/main/java/pl/pabilo8/immersiveintelligence/api/data/types/DataTypeExpression.java

@@ -100,7 +100,8 @@ public void valueFromNBT(NBTTagCompound nbt)
 	{
 		this.operation = IIDataOperationUtils.getOperationInstance(nbt.getString("Operation"));
 		this.meta = this.operation.getMeta();
-		this.requiredVariable = nbt.getString("requiredVariable").charAt(0);
+		String required = nbt.getString("requiredVariable");
+		this.requiredVariable = required.isEmpty()?' ': required.charAt(0);
 
 		this.data = new DataType[meta.allowedTypes().length];
 		for(int i = 0; i < meta.allowedTypes().length; i++)