done shit, compressor fix, some preparation

This commit is contained in:
Boblet 2024-03-13 16:24:46 +01:00
parent 7429327034
commit b15447d6eb
6 changed files with 42 additions and 3 deletions

View File

@ -530,6 +530,7 @@ public class ModBlocks {
public static Block foam_layer;
public static Block sand_boron_layer;
public static Block leaves_layer;
public static Block oil_spill;
public static Block sellafield_slaked;
public static Block sellafield;
@ -1745,6 +1746,7 @@ public class ModBlocks {
foam_layer = new BlockLayering(Material.snow).setBlockName("foam_layer").setStepSound(Block.soundTypeSnow).setCreativeTab(MainRegistry.blockTab).setHardness(0.1F).setLightOpacity(0).setBlockTextureName(RefStrings.MODID + ":foam");
sand_boron_layer = new BlockLayering(Material.sand).setBlockName("sand_boron_layer").setStepSound(Block.soundTypeSand).setCreativeTab(MainRegistry.blockTab).setHardness(0.1F).setLightOpacity(0).setBlockTextureName(RefStrings.MODID + ":sand_boron");
leaves_layer = new BlockLayering(Material.leaves).setBlockName("leaves_layer").setStepSound(Block.soundTypeGrass).setCreativeTab(MainRegistry.blockTab).setHardness(0.1F).setLightOpacity(0).setBlockTextureName(RefStrings.MODID + ":waste_leaves");
oil_spill = new BlockLayering(Material.ground).setBlockName("oil_spill").setStepSound(Block.soundTypeSnow).setCreativeTab(MainRegistry.blockTab).setHardness(0.1F).setLightOpacity(0).setBlockTextureName(RefStrings.MODID + ":oil_spill");
burning_earth = new WasteEarth(Material.ground, true).setBlockName("burning_earth").setStepSound(Block.soundTypeGrass).setCreativeTab(MainRegistry.blockTab).setHardness(0.6F).setBlockTextureName(RefStrings.MODID + ":burning_earth");
tektite = new BlockGeneric(Material.sand).setBlockName("tektite").setStepSound(Block.soundTypeSand).setCreativeTab(MainRegistry.blockTab).setHardness(0.5F).setBlockTextureName(RefStrings.MODID + ":tektite");
@ -2933,6 +2935,7 @@ public class ModBlocks {
GameRegistry.registerBlock(foam_layer, foam_layer.getUnlocalizedName());
GameRegistry.registerBlock(sand_boron_layer, sand_boron_layer.getUnlocalizedName());
GameRegistry.registerBlock(leaves_layer, leaves_layer.getUnlocalizedName());
GameRegistry.registerBlock(oil_spill, oil_spill.getUnlocalizedName());
GameRegistry.registerBlock(burning_earth, burning_earth.getUnlocalizedName());
GameRegistry.registerBlock(tektite, tektite.getUnlocalizedName());
GameRegistry.registerBlock(ore_tektite_osmiridium, ore_tektite_osmiridium.getUnlocalizedName());

View File

@ -1,5 +1,8 @@
package com.hbm.blocks.network;
import java.util.List;
import com.hbm.blocks.ITooltipProvider;
import com.hbm.blocks.ModBlocks;
import com.hbm.main.MainRegistry;
import com.hbm.tileentity.network.TileEntityDroneDock;
@ -13,11 +16,12 @@ import net.minecraft.block.BlockContainer;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.IIcon;
import net.minecraft.world.World;
public class DroneDock extends BlockContainer {
public class DroneDock extends BlockContainer implements ITooltipProvider {
@SideOnly(Side.CLIENT) private IIcon iconTop;
@SideOnly(Side.CLIENT) private IIcon iconBottom;
@ -61,4 +65,9 @@ public class DroneDock extends BlockContainer {
return false;
}
}
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) {
this.addStandardInfo(stack, player, list, ext);
}
}

View File

@ -1,12 +1,18 @@
package com.hbm.items.tool;
import java.util.List;
import org.lwjgl.input.Keyboard;
import com.hbm.entity.item.EntityDeliveryDrone;
import com.hbm.items.ItemEnumMulti;
import com.hbm.main.MainRegistry;
import com.hbm.util.I18nUtil;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumChatFormatting;
import net.minecraft.world.World;
public class ItemDrone extends ItemEnumMulti {
@ -49,4 +55,16 @@ public class ItemDrone extends ItemEnumMulti {
return false;
}
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) {
if(Keyboard.isKeyDown(Keyboard.KEY_LSHIFT)) {
for(String s : I18nUtil.resolveKeyArray(stack.getUnlocalizedName() + ".desc"))
list.add(EnumChatFormatting.YELLOW + s);
} else {
list.add(EnumChatFormatting.DARK_GRAY + "" + EnumChatFormatting.ITALIC + "Hold <" + EnumChatFormatting.YELLOW + "" + EnumChatFormatting.ITALIC + "LSHIFT" + EnumChatFormatting.DARK_GRAY
+ "" + EnumChatFormatting.ITALIC + "> to display more info");
}
}
}

View File

@ -348,8 +348,8 @@ public class TileEntityMachineCompressor extends TileEntityMachineBase implement
public void provideInfo(UpgradeType type, int level, List<String> info, boolean extendedInfo) {
info.add(IUpgradeInfoProvider.getStandardLabel(ModBlocks.machine_compressor));
if(type == UpgradeType.SPEED) {
info.add(EnumChatFormatting.GREEN + "Recipe: "+ I18nUtil.resolveKey(this.KEY_DELAY, "-" + (level == 3 ? 90 : level == 2 ? 80 : level == 1 ? 40 : 0) + "%"));
info.add(EnumChatFormatting.GREEN + "Generic compression: "+ I18nUtil.resolveKey(this.KEY_DELAY, "-" + (100 - 100 / (level + 1)) + "%"));
info.add(EnumChatFormatting.GREEN + "Generic compression: "+ I18nUtil.resolveKey(this.KEY_DELAY, "-" + (level == 3 ? 90 : level == 2 ? 80 : level == 1 ? 40 : 0) + "%"));
info.add(EnumChatFormatting.GREEN + "Recipe: "+ I18nUtil.resolveKey(this.KEY_DELAY, "-" + (100 - 100 / (level + 1)) + "%"));
}
if(type == UpgradeType.POWER) {
info.add(EnumChatFormatting.GREEN + I18nUtil.resolveKey(this.KEY_CONSUMPTION, "-" + (100 - 100 / (level + 1)) + "%"));

View File

@ -2454,10 +2454,15 @@ item.drillbit_tcalloy.name=Technetium Steel Drillbit
item.drillbit_tcalloy_diamond.name=Technetium Steel Drillbit (Diamond-Tipped)
item.drill_titanium.name=Titanium Drill
item.drone.patrol.name=Transport Drone
item.drone.patrol.desc=Follows a route of waypoints$Tries to load/unload every time it reaches a drone crate$Right click on top of a drone crate to place.
item.drone.patrol_chunkloading.name=Chunkloading Transport Drone
item.drone.patrol_chunkloading.desc=Follows a route of waypoints$Tries to load/unload every time it reaches a drone crate$Right click on top of a drone crate to place.$Loads chunks!
item.drone.patrol_express.name=Express Transport Drone
item.drone.patrol_express.desc=Follows a route of waypoints$Tries to load/unload every time it reaches a drone crate$Right click on top of a drone crate to place.
item.drone.patrol_express_chunkloading.name=Chunkloading Express Transport Drone
item.drone.patrol_express_chunkloading.desc=Follows a route of waypoints$Tries to load/unload every time it reaches a drone crate$Right click on top of a drone crate to place.$Loads chunks!
item.drone.request.name=Logistics Drone
item.drone.request.desc=Used by logistics drone docks to spawn logistics drones$Drones will follow logistics drone waypoints$After completing a request, the drone will return to the dock.
item.drone_linker.name=Transport Drone Linker
item.ducttape.name=Duct Tape
item.dust.name=Dust
@ -4910,9 +4915,13 @@ tile.dirt_dead.name=Dead Dirt
tile.dirt_oily.name=Oily Dirt
tile.drill_pipe.name=Drill Pipe
tile.drone_crate.name=Transport Drone Crate
tile.drone_crate.desc=Loading and unloading point for transport drones.$Acts as a waypoint, has to be linked with the drone linker.$Drones must approach from a high angle, or they will get stuck.
tile.drone_crate_provider.name=Logistics Provider Crate
tile.drone_crate_provider.desc=Offers items to the logistics network.$Logistics drones will try to move items from providers to requester crates.
tile.drone_crate_requester.name=Logistics Requester Crate
tile.drone_crate_requester.desc=Requests items from the logistics network.$Items added to the filter will be requested, if not present in its inventory.
tile.drone_dock.name=Logistics Drone Dock
tile.drone_dock.desc=Spawn point for logistics drones.$Can only detect providers and requesters within a 5 chunk radius.$Drones will only follow up to 10 waypoints per connection.
tile.drone_waypoint.name=Transport Drone Waypoint
tile.drone_waypoint.desc=Waypoint for transport drones$Use a transport drone linker to set the path$Click on each waypoint and crate in sequence to create the path,$then shift-click to clear the saved position$Right-click or shift-click the waypoint to change the waypoint's offset
tile.drone_waypoint_request.name=Logistics Drone Waypoint

Binary file not shown.

After

Width:  |  Height:  |  Size: 622 B