diff --git a/gradle.properties b/gradle.properties index f1269606..fa86da40 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,4 +2,4 @@ # This is required to provide enough memory for the Minecraft decompilation process. org.gradle.jvmargs=-Xmx8G minecraftVersion=1.16.5 -api_version=3.2.8.7 +api_version=3.2.8.8 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ffed3a25..774fae87 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/com/hrznstudio/titanium/block/tile/ActiveTile.java b/src/main/java/com/hrznstudio/titanium/block/tile/ActiveTile.java index ba77ab69..72aff393 100644 --- a/src/main/java/com/hrznstudio/titanium/block/tile/ActiveTile.java +++ b/src/main/java/com/hrznstudio/titanium/block/tile/ActiveTile.java @@ -288,11 +288,11 @@ public void handleButtonMessage(int id, PlayerEntity playerEntity, CompoundNBT c if (fluidTankComponent.getName().equalsIgnoreCase(name)) playerEntity.inventory.getItemStack().getCapability(CapabilityFluidHandler.FLUID_HANDLER_ITEM_CAPABILITY).ifPresent(iFluidHandlerItem -> { if (fill) { - int amount = Minecraft.getInstance().player.inventory.getItemStack().getItem() instanceof BucketItem ? FluidAttributes.BUCKET_VOLUME : Integer.MAX_VALUE; + int amount = playerEntity.inventory.getItemStack().getItem() instanceof BucketItem ? FluidAttributes.BUCKET_VOLUME : Integer.MAX_VALUE; amount = fluidTankComponent.fill(iFluidHandlerItem.drain(amount, IFluidHandler.FluidAction.SIMULATE), IFluidHandler.FluidAction.EXECUTE); iFluidHandlerItem.drain(amount, IFluidHandler.FluidAction.EXECUTE); } else { - int amount = Minecraft.getInstance().player.inventory.getItemStack().getItem() instanceof BucketItem ? FluidAttributes.BUCKET_VOLUME : Integer.MAX_VALUE; + int amount = playerEntity.inventory.getItemStack().getItem() instanceof BucketItem ? FluidAttributes.BUCKET_VOLUME : Integer.MAX_VALUE; amount = iFluidHandlerItem.fill(fluidTankComponent.drain(amount, IFluidHandler.FluidAction.SIMULATE), IFluidHandler.FluidAction.EXECUTE); fluidTankComponent.drain(amount, IFluidHandler.FluidAction.EXECUTE); } diff --git a/src/main/resources/assets/titanium/lang/pt_br.json b/src/main/resources/assets/titanium/lang/pt_br.json new file mode 100644 index 00000000..f6ebabf9 --- /dev/null +++ b/src/main/resources/assets/titanium/lang/pt_br.json @@ -0,0 +1,47 @@ +{ + "tooltip.titanium.facing_handler.direction": "Direção: ", + "tooltip.titanium.facing_handler.top": "Topo", + "tooltip.titanium.facing_handler.bottom": "Fundo", + "tooltip.titanium.facing_handler.left": "Esquerda", + "tooltip.titanium.facing_handler.right": "Direita", + "tooltip.titanium.facing_handler.front": "Frente", + "tooltip.titanium.facing_handler.back": "Atrás", + "tooltip.titanium.facing_handler.action": "Ação: ", + "tooltip.titanium.facing_handler.none": "Desabilitado", + "tooltip.titanium.facing_handler.pull": "Puxar", + "tooltip.titanium.facing_handler.push": "Empurre", + "tooltip.titanium.facing_handler.enabled": "Habilitado", + "tooltip.titanium.facing_handler.test": "Coisa de teste", + "tooltip.titanium.facing_handler.test2": "Este é um segundo teste", + "tooltip.titanium.facing_handler.inventory": "Entrada", + "tooltip.titanium.facing_handler.real_output": "Resultado", + "tooltip.titanium.facing_handler.fluid_input": "Inserção de fluido manual", + "tooltip.titanium.progressbar.progress": "Progresso: ", + "tooltip.titanium.tank.fluid": "Fluido: ", + "tooltip.titanium.tank.empty": "Vazio ", + "tooltip.titanium.tank.amount": "Quantia: ", + "tooltip.titanium.tank.can_fill_from_item": "Pode preencher a partir do item", + "tooltip.titanium.tank.action_fill": "", + "tooltip.titanium.tank.can_drain_from_item": "Pode drenar do item", + "tooltip.titanium.tank.action_drain": "", + "tooltip.titanium.tank.no_tank": "", + "tooltip.titanium.tank.no_action": "Não é possível encher ou drenar do item", + "titanium.rewards.remove_success": "Recompensa removida com sucesso", + "titanium.rewards.enabled_success": "Recompensa ativada com sucesso", + "titanium.rewards.granted_success": "Recompensa concedida ao servidor com sucesso", + "block.titanium.block_asset_test": "Teste de ativos", + "direction.titanium.east": "Leste", + "direction.titanium.west": "Oeste", + "direction.titanium.north": "Norte", + "direction.titanium.south": "Sul", + "direction.titanium.up": "Acima", + "direction.titanium.down": "Abaixo", + "itemGroup.resources": "Titanium: Recursos", + "tooltip.titanium.redstone.ignored": "Modo Redstone: Ignorado", + "tooltip.titanium.redstone.no_redstone": "Modo Redstone: Executar sem sinal de redstone", + "tooltip.titanium.redstone.redstone": "Modo Redstone: Executar com sinal redstone", + "tooltip.titanium.redstone.once": "Modo Redstone: Executar em Pulso", + "tooltip.titanium.unlocks": "Desbloqueios:", + "tooltip.titanium.locks": "Bloqueios:" + } + \ No newline at end of file diff --git a/src/main/resources/assets/titanium/lang/pt_br.lang b/src/main/resources/assets/titanium/lang/pt_br.lang new file mode 100644 index 00000000..bb1fc569 --- /dev/null +++ b/src/main/resources/assets/titanium/lang/pt_br.lang @@ -0,0 +1,21 @@ +itemGroup.titanium.resources=Titanium Resources + +item.titanium.plate.name=%s Placa +item.titanium.ingot.name=%s Lingote +item.titanium.dust.name=%s Pó +item.titanium.smalldust.name=Pequeno %s Pó +item.titanium.nugget.name=%s Pepita +item.titanium.purified.name=Purificado %s Grindings +item.titanium.grindings.name=%s Grindings +item.titanium.pebbles.name=%s Pebbles +item.titanium.clump.name=%s Clump +item.titanium.chunk.name=%s Chunk +item.titanium.stone.name=%s Stone +item.titanium.crushed.name=Crushed %s +item.titanium.flakes.name=%s Flakes +item.titanium.rod.name=%s Haste +item.titanium.dense_rod.name=Denso %s Haste +item.titanium.gear.name=%s Gear +item.titanium.casing.name=%s Revestimento +item.titanium.reinforced_plate.name=Reforçado %s Placa +item.titanium.dense_plate.name=Denso %s Placa \ No newline at end of file